From 1a141c71e201ed361aabc1d89a21181667f0b39c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 12:50:05 +0000 Subject: [PATCH 01/20] Bump the github-actions group with 2 updates (#454) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 2 updates: [actions/cache](https://github.com/actions/cache) and [actions/checkout](https://github.com/actions/checkout). Updates `actions/cache` from 4.0.2 to 4.1.2
Release notes

Sourced from actions/cache's releases.

v4.1.2

What's Changed

New Contributors

Full Changelog: https://github.com/actions/cache/compare/v4...v4.1.2

v4.1.1

What's Changed

Full Changelog: https://github.com/actions/cache/compare/v4.1.0...v4.1.1

v4.1.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/cache/compare/v4.0.2...v4.1.0

Changelog

Sourced from actions/cache's changelog.

Releases

4.1.2

4.1.1

4.1.0

4.0.2

4.0.1

4.0.0

3.3.3

3.3.2

3.3.1

3.3.0

3.2.6

3.2.5

... (truncated)

Commits

Updates `actions/checkout` from 4.2.0 to 4.2.2
Release notes

Sourced from actions/checkout's releases.

v4.2.2

What's Changed

Full Changelog: https://github.com/actions/checkout/compare/v4.2.1...v4.2.2

v4.2.1

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4.2.0...v4.2.1

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.2.2

v4.2.1

v4.2.0

v4.1.7

v4.1.6

v4.1.5

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--- .github/workflows/dart.yml | 62 +++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index d59f173b..41febb1e 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -34,7 +34,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: mono_repo self validate run: dart pub global activate mono_repo 6.6.1 - name: mono_repo self validate @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -59,7 +59,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade @@ -128,7 +128,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:analyze" @@ -143,7 +143,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -158,7 +158,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -173,7 +173,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -251,7 +251,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:format" @@ -266,7 +266,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -344,7 +344,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -359,7 +359,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade @@ -434,7 +434,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_test_handler;commands:test_1" @@ -449,7 +449,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_test_handler_pub_upgrade name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade @@ -470,7 +470,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" @@ -485,7 +485,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -506,7 +506,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" @@ -521,7 +521,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -542,7 +542,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_2" @@ -557,7 +557,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -587,7 +587,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" @@ -602,7 +602,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -632,7 +632,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -647,7 +647,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -731,7 +731,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf_router_generator;commands:test_3" @@ -746,7 +746,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_router_generator_pub_upgrade name: pkgs/shelf_router_generator; dart pub upgrade run: dart pub upgrade @@ -772,7 +772,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade @@ -825,7 +825,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_test_handler_pub_upgrade name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade @@ -851,7 +851,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -877,7 +877,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -912,7 +912,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade From 0bb44cb7b54f856c4c20ff00eed7f006d865bb3e Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Tue, 12 Nov 2024 11:39:33 -0800 Subject: [PATCH 02/20] add direct links to the package issues (#455) --- .github/labeler.yml | 22 +++++++++--------- README.md | 29 ++++++++++++++++-------- pkgs/shelf/pubspec.yaml | 1 + pkgs/shelf_packages_handler/pubspec.yaml | 1 + pkgs/shelf_proxy/pubspec.yaml | 1 + pkgs/shelf_router/pubspec.yaml | 1 + pkgs/shelf_router_generator/pubspec.yaml | 1 + pkgs/shelf_static/pubspec.yaml | 1 + pkgs/shelf_test_handler/pubspec.yaml | 1 + pkgs/shelf_web_socket/pubspec.yaml | 1 + 10 files changed, 38 insertions(+), 21 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index c5e15a37..b82b065f 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,37 +1,37 @@ -# Configuration for .github/workflows/pull_request_label.yml. +# Configuration for .github/workflows/pull_request_label.yml. -'infra': +'type-infra': - changed-files: - - any-glob-to-any-file: '.github/**' + - any-glob-to-any-file: '.github/**' 'package:shelf': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf/**' + - any-glob-to-any-file: 'pkgs/shelf/**' 'package:shelf_packages_handler': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf_packages_handler/**' + - any-glob-to-any-file: 'pkgs/shelf_packages_handler/**' 'package:shelf_proxy': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf_proxy/**' + - any-glob-to-any-file: 'pkgs/shelf_proxy/**' 'package:shelf_router': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf_router/**' + - any-glob-to-any-file: 'pkgs/shelf_router/**' 'package:shelf_router_generator': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf_router_generator/**' + - any-glob-to-any-file: 'pkgs/shelf_router_generator/**' 'package:shelf_static': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf_static/**' + - any-glob-to-any-file: 'pkgs/shelf_static/**' 'package:shelf_test_handler': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf_test_handler/**' + - any-glob-to-any-file: 'pkgs/shelf_test_handler/**' 'package:shelf_web_socket': - changed-files: - - any-glob-to-any-file: 'pkgs/shelf_web_socket/**' + - any-glob-to-any-file: 'pkgs/shelf_web_socket/**' diff --git a/README.md b/README.md index 617e6e98..fd47e316 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,25 @@ See the [package:shelf readme](pkgs/shelf/) for more information. ## Packages -| Package | Description | Version | -| --- | --- | --- | -| [shelf](pkgs/shelf/) | A model for web server middleware that encourages composition and easy reuse. | [![pub package](https://img.shields.io/pub/v/shelf.svg)](https://pub.dev/packages/shelf) | -| [shelf_packages_handler](pkgs/shelf_packages_handler/) | A shelf handler for serving a `packages/` directory. | [![pub package](https://img.shields.io/pub/v/shelf_packages_handler.svg)](https://pub.dev/packages/shelf_packages_handler) | -| [shelf_proxy](pkgs/shelf_proxy/) | A shelf handler for proxying HTTP requests to another server. | [![pub package](https://img.shields.io/pub/v/shelf_proxy.svg)](https://pub.dev/packages/shelf_proxy) | -| [shelf_router](pkgs/shelf_router/) | A convenient request router for the shelf web-framework, with support for URL-parameters, nested routers and routers generated from source annotations. | [![pub package](https://img.shields.io/pub/v/shelf_router.svg)](https://pub.dev/packages/shelf_router) | -| [shelf_router_generator](pkgs/shelf_router_generator/) | A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. | [![pub package](https://img.shields.io/pub/v/shelf_router_generator.svg)](https://pub.dev/packages/shelf_router_generator) | -| [shelf_static](pkgs/shelf_static/) | Static file server support for the shelf package and ecosystem. | [![pub package](https://img.shields.io/pub/v/shelf_static.svg)](https://pub.dev/packages/shelf_static) | -| [shelf_test_handler](pkgs/shelf_test_handler/) | A Shelf handler that makes it easy to test HTTP interactions. | [![pub package](https://img.shields.io/pub/v/shelf_test_handler.svg)](https://pub.dev/packages/shelf_test_handler) | -| [shelf_web_socket](pkgs/shelf_web_socket/) | A shelf handler that wires up a listener for every connection. | [![pub package](https://img.shields.io/pub/v/shelf_web_socket.svg)](https://pub.dev/packages/shelf_web_socket) | +| Package | Description | Issues | Version | +| --- | --- | --- | --- | +| [shelf](pkgs/shelf/) | A model for web server middleware that encourages composition and easy reuse. | [![issues](https://img.shields.io/badge/package:shelf-4774bc)][shelf_issues] | [![pub package](https://img.shields.io/pub/v/shelf.svg)](https://pub.dev/packages/shelf) | +| [shelf_packages_handler](pkgs/shelf_packages_handler/) | A shelf handler for serving a `packages/` directory. | [![issues](https://img.shields.io/badge/package:shelf__packages__handler-4774bc)][shelf_packages_handler_issues] | [![pub package](https://img.shields.io/pub/v/shelf_packages_handler.svg)](https://pub.dev/packages/shelf_packages_handler) | +| [shelf_proxy](pkgs/shelf_proxy/) | A shelf handler for proxying HTTP requests to another server. | [![issues](https://img.shields.io/badge/package:shelf__proxy-4774bc)][shelf_proxy_issues] | [![pub package](https://img.shields.io/pub/v/shelf_proxy.svg)](https://pub.dev/packages/shelf_proxy) | +| [shelf_router](pkgs/shelf_router/) | A convenient request router for the shelf web-framework, with support for URL-parameters, nested routers and routers generated from source annotations. | [![issues](https://img.shields.io/badge/package:shelf__router-4774bc)][shelf_router_issues] | [![pub package](https://img.shields.io/pub/v/shelf_router.svg)](https://pub.dev/packages/shelf_router) | +| [shelf_router_generator](pkgs/shelf_router_generator/) | A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. | [![issues](https://img.shields.io/badge/package:shelf__router__generator-4774bc)][shelf_router_generator_issues] | [![pub package](https://img.shields.io/pub/v/shelf_router_generator.svg)](https://pub.dev/packages/shelf_router_generator) | +| [shelf_static](pkgs/shelf_static/) | Static file server support for the shelf package and ecosystem. | [![issues](https://img.shields.io/badge/package:shelf__static-4774bc)][shelf_static_issues] | [![pub package](https://img.shields.io/pub/v/shelf_static.svg)](https://pub.dev/packages/shelf_static) | +| [shelf_test_handler](pkgs/shelf_test_handler/) | A Shelf handler that makes it easy to test HTTP interactions. | [![issues](https://img.shields.io/badge/package:shelf__test__handler-4774bc)][shelf_test_handler_issues] | [![pub package](https://img.shields.io/pub/v/shelf_test_handler.svg)](https://pub.dev/packages/shelf_test_handler) | +| [shelf_web_socket](pkgs/shelf_web_socket/) | A shelf handler that wires up a listener for every connection. | [![issues](https://img.shields.io/badge/package:shelf__web__socket-4774bc)][shelf_web_socket_issues] | [![pub package](https://img.shields.io/pub/v/shelf_web_socket.svg)](https://pub.dev/packages/shelf_web_socket) | + +[shelf_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf +[shelf_packages_handler_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_packages_handler +[shelf_proxy_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_proxy +[shelf_router_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_router +[shelf_router_generator_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_router_generator +[shelf_static_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_static +[shelf_test_handler_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_test_handler +[shelf_web_socket_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_web_socket ## Publishing automation diff --git a/pkgs/shelf/pubspec.yaml b/pkgs/shelf/pubspec.yaml index ead1b55f..3dd9347c 100644 --- a/pkgs/shelf/pubspec.yaml +++ b/pkgs/shelf/pubspec.yaml @@ -3,6 +3,7 @@ version: 1.4.3-wip description: > A model for web server middleware that encourages composition and easy reuse. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf topics: - server diff --git a/pkgs/shelf_packages_handler/pubspec.yaml b/pkgs/shelf_packages_handler/pubspec.yaml index bd119031..0d674ff2 100644 --- a/pkgs/shelf_packages_handler/pubspec.yaml +++ b/pkgs/shelf_packages_handler/pubspec.yaml @@ -2,6 +2,7 @@ name: shelf_packages_handler version: 3.0.3-wip description: A shelf handler for serving a `packages/` directory. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_packages_handler +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_packages_handler topics: - server diff --git a/pkgs/shelf_proxy/pubspec.yaml b/pkgs/shelf_proxy/pubspec.yaml index 1ac4060d..2e4125f4 100644 --- a/pkgs/shelf_proxy/pubspec.yaml +++ b/pkgs/shelf_proxy/pubspec.yaml @@ -2,6 +2,7 @@ name: shelf_proxy version: 1.0.5-wip description: A shelf handler for proxying HTTP requests to another server. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_proxy +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_proxy topics: - server diff --git a/pkgs/shelf_router/pubspec.yaml b/pkgs/shelf_router/pubspec.yaml index 9be8a34f..08a9ba43 100644 --- a/pkgs/shelf_router/pubspec.yaml +++ b/pkgs/shelf_router/pubspec.yaml @@ -4,6 +4,7 @@ description: > A convenient request router for the shelf web-framework, with support for URL-parameters, nested routers and routers generated from source annotations. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_router +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_router topics: - server diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml index 1dfc6832..609432da 100644 --- a/pkgs/shelf_router_generator/pubspec.yaml +++ b/pkgs/shelf_router_generator/pubspec.yaml @@ -4,6 +4,7 @@ description: > A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_router_generator +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_router_generator topics: - server diff --git a/pkgs/shelf_static/pubspec.yaml b/pkgs/shelf_static/pubspec.yaml index 132e51a2..eb1c8e94 100644 --- a/pkgs/shelf_static/pubspec.yaml +++ b/pkgs/shelf_static/pubspec.yaml @@ -2,6 +2,7 @@ name: shelf_static version: 1.1.3 description: Static file server support for the shelf package and ecosystem. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_static +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_static topics: - server diff --git a/pkgs/shelf_test_handler/pubspec.yaml b/pkgs/shelf_test_handler/pubspec.yaml index bb9d8118..35afd903 100644 --- a/pkgs/shelf_test_handler/pubspec.yaml +++ b/pkgs/shelf_test_handler/pubspec.yaml @@ -2,6 +2,7 @@ name: shelf_test_handler version: 2.0.3-wip description: A Shelf handler that makes it easy to test HTTP interactions. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_test_handler +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_test_handler topics: - server diff --git a/pkgs/shelf_web_socket/pubspec.yaml b/pkgs/shelf_web_socket/pubspec.yaml index 84cf9f2f..1b4adfe3 100644 --- a/pkgs/shelf_web_socket/pubspec.yaml +++ b/pkgs/shelf_web_socket/pubspec.yaml @@ -3,6 +3,7 @@ version: 2.0.1-wip description: > A shelf handler that wires up a listener for every connection. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_web_socket +issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_web_socket topics: - server From a2708cd8bce88d5e6391b1cb5bbe80b5a072c55a Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Thu, 21 Nov 2024 08:39:40 -0800 Subject: [PATCH 03/20] shorten the issue badges (#456) --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fd47e316..1a42afb3 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,14 @@ See the [package:shelf readme](pkgs/shelf/) for more information. | Package | Description | Issues | Version | | --- | --- | --- | --- | -| [shelf](pkgs/shelf/) | A model for web server middleware that encourages composition and easy reuse. | [![issues](https://img.shields.io/badge/package:shelf-4774bc)][shelf_issues] | [![pub package](https://img.shields.io/pub/v/shelf.svg)](https://pub.dev/packages/shelf) | -| [shelf_packages_handler](pkgs/shelf_packages_handler/) | A shelf handler for serving a `packages/` directory. | [![issues](https://img.shields.io/badge/package:shelf__packages__handler-4774bc)][shelf_packages_handler_issues] | [![pub package](https://img.shields.io/pub/v/shelf_packages_handler.svg)](https://pub.dev/packages/shelf_packages_handler) | -| [shelf_proxy](pkgs/shelf_proxy/) | A shelf handler for proxying HTTP requests to another server. | [![issues](https://img.shields.io/badge/package:shelf__proxy-4774bc)][shelf_proxy_issues] | [![pub package](https://img.shields.io/pub/v/shelf_proxy.svg)](https://pub.dev/packages/shelf_proxy) | -| [shelf_router](pkgs/shelf_router/) | A convenient request router for the shelf web-framework, with support for URL-parameters, nested routers and routers generated from source annotations. | [![issues](https://img.shields.io/badge/package:shelf__router-4774bc)][shelf_router_issues] | [![pub package](https://img.shields.io/pub/v/shelf_router.svg)](https://pub.dev/packages/shelf_router) | -| [shelf_router_generator](pkgs/shelf_router_generator/) | A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. | [![issues](https://img.shields.io/badge/package:shelf__router__generator-4774bc)][shelf_router_generator_issues] | [![pub package](https://img.shields.io/pub/v/shelf_router_generator.svg)](https://pub.dev/packages/shelf_router_generator) | -| [shelf_static](pkgs/shelf_static/) | Static file server support for the shelf package and ecosystem. | [![issues](https://img.shields.io/badge/package:shelf__static-4774bc)][shelf_static_issues] | [![pub package](https://img.shields.io/pub/v/shelf_static.svg)](https://pub.dev/packages/shelf_static) | -| [shelf_test_handler](pkgs/shelf_test_handler/) | A Shelf handler that makes it easy to test HTTP interactions. | [![issues](https://img.shields.io/badge/package:shelf__test__handler-4774bc)][shelf_test_handler_issues] | [![pub package](https://img.shields.io/pub/v/shelf_test_handler.svg)](https://pub.dev/packages/shelf_test_handler) | -| [shelf_web_socket](pkgs/shelf_web_socket/) | A shelf handler that wires up a listener for every connection. | [![issues](https://img.shields.io/badge/package:shelf__web__socket-4774bc)][shelf_web_socket_issues] | [![pub package](https://img.shields.io/pub/v/shelf_web_socket.svg)](https://pub.dev/packages/shelf_web_socket) | +| [shelf](pkgs/shelf/) | A model for web server middleware that encourages composition and easy reuse. | [![issues](https://img.shields.io/badge/shelf-4774bc)][shelf_issues] | [![pub package](https://img.shields.io/pub/v/shelf.svg)](https://pub.dev/packages/shelf) | +| [shelf_packages_handler](pkgs/shelf_packages_handler/) | A shelf handler for serving a `packages/` directory. | [![issues](https://img.shields.io/badge/shelf__packages__handler-4774bc)][shelf_packages_handler_issues] | [![pub package](https://img.shields.io/pub/v/shelf_packages_handler.svg)](https://pub.dev/packages/shelf_packages_handler) | +| [shelf_proxy](pkgs/shelf_proxy/) | A shelf handler for proxying HTTP requests to another server. | [![issues](https://img.shields.io/badge/shelf__proxy-4774bc)][shelf_proxy_issues] | [![pub package](https://img.shields.io/pub/v/shelf_proxy.svg)](https://pub.dev/packages/shelf_proxy) | +| [shelf_router](pkgs/shelf_router/) | A convenient request router for the shelf web-framework, with support for URL-parameters, nested routers and routers generated from source annotations. | [![issues](https://img.shields.io/badge/shelf__router-4774bc)][shelf_router_issues] | [![pub package](https://img.shields.io/pub/v/shelf_router.svg)](https://pub.dev/packages/shelf_router) | +| [shelf_router_generator](pkgs/shelf_router_generator/) | A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. | [![issues](https://img.shields.io/badge/shelf__router__generator-4774bc)][shelf_router_generator_issues] | [![pub package](https://img.shields.io/pub/v/shelf_router_generator.svg)](https://pub.dev/packages/shelf_router_generator) | +| [shelf_static](pkgs/shelf_static/) | Static file server support for the shelf package and ecosystem. | [![issues](https://img.shields.io/badge/shelf__static-4774bc)][shelf_static_issues] | [![pub package](https://img.shields.io/pub/v/shelf_static.svg)](https://pub.dev/packages/shelf_static) | +| [shelf_test_handler](pkgs/shelf_test_handler/) | A Shelf handler that makes it easy to test HTTP interactions. | [![issues](https://img.shields.io/badge/shelf__test__handler-4774bc)][shelf_test_handler_issues] | [![pub package](https://img.shields.io/pub/v/shelf_test_handler.svg)](https://pub.dev/packages/shelf_test_handler) | +| [shelf_web_socket](pkgs/shelf_web_socket/) | A shelf handler that wires up a listener for every connection. | [![issues](https://img.shields.io/badge/shelf__web__socket-4774bc)][shelf_web_socket_issues] | [![pub package](https://img.shields.io/pub/v/shelf_web_socket.svg)](https://pub.dev/packages/shelf_web_socket) | [shelf_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf [shelf_packages_handler_issues]: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_packages_handler From 7f26ebdeab5bdc18e0ab3f6d3944aa51524eafdf Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Fri, 22 Nov 2024 08:37:09 -0800 Subject: [PATCH 04/20] rev shelf_web_socket in prep for publishing (#458) --- pkgs/shelf_web_socket/CHANGELOG.md | 2 +- pkgs/shelf_web_socket/pubspec.yaml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/shelf_web_socket/CHANGELOG.md b/pkgs/shelf_web_socket/CHANGELOG.md index 77f0882d..aeff3eb0 100644 --- a/pkgs/shelf_web_socket/CHANGELOG.md +++ b/pkgs/shelf_web_socket/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.1-wip +## 2.0.1 * Require Dart `^3.3.0`. diff --git a/pkgs/shelf_web_socket/pubspec.yaml b/pkgs/shelf_web_socket/pubspec.yaml index 1b4adfe3..af6f48c2 100644 --- a/pkgs/shelf_web_socket/pubspec.yaml +++ b/pkgs/shelf_web_socket/pubspec.yaml @@ -1,7 +1,6 @@ name: shelf_web_socket -version: 2.0.1-wip -description: > - A shelf handler that wires up a listener for every connection. +version: 2.0.1 +description: A shelf handler that wires up a listener for every connection. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_web_socket issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_web_socket From 657ebd359c528a8655b8f6b96ae19254686cd91c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 12:13:18 +0000 Subject: [PATCH 05/20] Bump dart-lang/setup-dart in the github-actions group (#462) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart). Updates `dart-lang/setup-dart` from 1.6.5 to 1.7.0
Release notes

Sourced from dart-lang/setup-dart's releases.

v1.7.0

What's Changed

  • Install a Flutter SDK in the publish workflow allowing for publication of flutter packages.
Changelog

Sourced from dart-lang/setup-dart's changelog.

v1.7.0

v1.6.5

  • Fix zip path handling on Windows 11 (#118[])

#118: dart-lang/setup-dart#118

v1.6.4

  • Rebuild JS code.

v1.6.3

v1.6.2

v1.6.1

  • Updated the google storage url for main channel releases.

v1.6.0

  • Enable provisioning of the latest Dart SDK patch release by specifying just the major and minor version (e.g. 3.2).

v1.5.1

  • No longer test the setup-dart action on pre-2.12 SDKs.
  • Upgrade JS interop code to use extension types (the new name for inline classes).
  • The upcoming rename of the be channel to main is now supported with forward compatibility that switches when the rename happens.

v1.5.0

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=dart-lang/setup-dart&package-manager=github_actions&previous-version=1.6.5&new-version=1.7.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--- .github/workflows/dart.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 41febb1e..555e2215 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -29,7 +29,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: stable - id: checkout @@ -54,7 +54,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.3.0" - id: checkout @@ -138,7 +138,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.4.0" - id: checkout @@ -168,7 +168,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout @@ -261,7 +261,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout @@ -354,7 +354,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.3.0" - id: checkout @@ -444,7 +444,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.3.0" - id: checkout @@ -480,7 +480,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.4.0" - id: checkout @@ -516,7 +516,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.4.0" - id: checkout @@ -552,7 +552,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout @@ -597,7 +597,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout @@ -642,7 +642,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout @@ -741,7 +741,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout @@ -767,7 +767,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.3.0" - id: checkout @@ -820,7 +820,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.3.0" - id: checkout @@ -846,7 +846,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: "3.4.0" - id: checkout @@ -872,7 +872,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout @@ -907,7 +907,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 with: sdk: dev - id: checkout From 2b5b683e78f5cc84e479a43297fd7b5489d7db02 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 2 Dec 2024 10:27:59 -0800 Subject: [PATCH 06/20] move analysis_options.yaml into packages (#460) * move analysis_options.yaml into packages * regenerate mono_repo files --- .github/workflows/dart.yml | 4 ++-- pkgs/shelf/CHANGELOG.md | 2 +- analysis_options.yaml => pkgs/shelf/analysis_options.yaml | 6 +----- pkgs/shelf/lib/src/body.dart | 2 ++ pkgs/shelf/lib/src/hijack_exception.dart | 2 ++ pkgs/shelf/lib/src/message.dart | 5 ++++- pkgs/shelf/lib/src/middleware_extensions.dart | 1 + pkgs/shelf/lib/src/pipeline.dart | 1 + pkgs/shelf/lib/src/response.dart | 1 + pkgs/shelf/lib/src/server.dart | 4 ++-- pkgs/shelf_packages_handler/analysis_options.yaml | 1 + pkgs/shelf_proxy/analysis_options.yaml | 1 + pkgs/shelf_router/analysis_options.yaml | 1 + pkgs/shelf_router_generator/analysis_options.yaml | 1 + pkgs/shelf_static/analysis_options.yaml | 1 + pkgs/shelf_test_handler/analysis_options.yaml | 1 + pkgs/shelf_test_handler/lib/src/expectation.dart | 2 ++ pkgs/shelf_test_handler/lib/src/server.dart | 1 + pkgs/shelf_web_socket/analysis_options.yaml | 1 + tool/ci.sh | 2 +- 20 files changed, 28 insertions(+), 12 deletions(-) rename analysis_options.yaml => pkgs/shelf/analysis_options.yaml (75%) create mode 100644 pkgs/shelf_packages_handler/analysis_options.yaml create mode 100644 pkgs/shelf_proxy/analysis_options.yaml create mode 100644 pkgs/shelf_router/analysis_options.yaml create mode 100644 pkgs/shelf_router_generator/analysis_options.yaml create mode 100644 pkgs/shelf_static/analysis_options.yaml create mode 100644 pkgs/shelf_test_handler/analysis_options.yaml create mode 100644 pkgs/shelf_web_socket/analysis_options.yaml diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 555e2215..2f060b11 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.1 +# Created with package:mono_repo v6.6.2 name: Dart CI on: push: @@ -36,7 +36,7 @@ jobs: name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.1 + run: dart pub global activate mono_repo 6.6.2 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: diff --git a/pkgs/shelf/CHANGELOG.md b/pkgs/shelf/CHANGELOG.md index daff6c4f..c08105fb 100644 --- a/pkgs/shelf/CHANGELOG.md +++ b/pkgs/shelf/CHANGELOG.md @@ -280,7 +280,7 @@ ## 0.6.1+2 -* `logRequests` outputs a better message a request has a query string. +* `logRequests` outputs a better message if a request has a query string. ## 0.6.1+1 diff --git a/analysis_options.yaml b/pkgs/shelf/analysis_options.yaml similarity index 75% rename from analysis_options.yaml rename to pkgs/shelf/analysis_options.yaml index 11122447..75fcb402 100644 --- a/analysis_options.yaml +++ b/pkgs/shelf/analysis_options.yaml @@ -1,13 +1,10 @@ # https://dart.dev/guides/language/analysis-options + include: package:dart_flutter_team_lints/analysis_options.yaml analyzer: language: - strict-casts: true - strict-inference: true strict-raw-types: true - errors: - comment_references: ignore # too many false positives linter: rules: @@ -17,5 +14,4 @@ linter: - missing_whitespace_between_adjacent_strings - no_adjacent_strings_in_list - no_runtimeType_toString - - package_api_docs - unnecessary_await_in_return diff --git a/pkgs/shelf/lib/src/body.dart b/pkgs/shelf/lib/src/body.dart index 57f9fa4e..c80cc483 100644 --- a/pkgs/shelf/lib/src/body.dart +++ b/pkgs/shelf/lib/src/body.dart @@ -5,6 +5,8 @@ import 'dart:async'; import 'dart:convert'; +import 'message.dart'; + /// The body of a request or response. /// /// This tracks whether the body has been read. It's separate from [Message] diff --git a/pkgs/shelf/lib/src/hijack_exception.dart b/pkgs/shelf/lib/src/hijack_exception.dart index 4a3d84e4..41156495 100644 --- a/pkgs/shelf/lib/src/hijack_exception.dart +++ b/pkgs/shelf/lib/src/hijack_exception.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'request.dart'; + /// An exception used to indicate that a request has been hijacked. /// /// This shouldn't be captured by any code other than the Shelf adapter that diff --git a/pkgs/shelf/lib/src/message.dart b/pkgs/shelf/lib/src/message.dart index 8b28bb8e..c270d187 100644 --- a/pkgs/shelf/lib/src/message.dart +++ b/pkgs/shelf/lib/src/message.dart @@ -10,6 +10,9 @@ import 'package:http_parser/http_parser.dart'; import 'body.dart'; import 'headers.dart'; +import 'middleware/logger.dart'; +import 'request.dart'; +import 'response.dart'; import 'shelf_unmodifiable_map.dart'; import 'util.dart'; @@ -171,7 +174,7 @@ abstract class Message { {Map headers, Map context, Object? body}); } -/// Adds information about [encoding] to [headers]. +/// Adds information about encoding to [headers]. /// /// Returns a new map without modifying [headers]. Map> _adjustHeaders( diff --git a/pkgs/shelf/lib/src/middleware_extensions.dart b/pkgs/shelf/lib/src/middleware_extensions.dart index 8c707dfe..521710ae 100644 --- a/pkgs/shelf/lib/src/middleware_extensions.dart +++ b/pkgs/shelf/lib/src/middleware_extensions.dart @@ -1,5 +1,6 @@ import 'handler.dart'; import 'middleware.dart'; +import 'pipeline.dart'; /// Extensions on [Middleware] to aid in composing [Middleware] and [Handler]s. /// diff --git a/pkgs/shelf/lib/src/pipeline.dart b/pkgs/shelf/lib/src/pipeline.dart index d931a309..1d079350 100644 --- a/pkgs/shelf/lib/src/pipeline.dart +++ b/pkgs/shelf/lib/src/pipeline.dart @@ -4,6 +4,7 @@ import 'handler.dart'; import 'middleware.dart'; +import 'request.dart'; /// A helper that makes it easy to compose a set of [Middleware] and a /// [Handler]. diff --git a/pkgs/shelf/lib/src/response.dart b/pkgs/shelf/lib/src/response.dart index 1938a631..2cd40e48 100644 --- a/pkgs/shelf/lib/src/response.dart +++ b/pkgs/shelf/lib/src/response.dart @@ -6,6 +6,7 @@ import 'dart:convert'; import 'package:http_parser/http_parser.dart'; +import 'handler.dart'; import 'message.dart'; import 'util.dart'; diff --git a/pkgs/shelf/lib/src/server.dart b/pkgs/shelf/lib/src/server.dart index 8a20f0e2..72564e7e 100644 --- a/pkgs/shelf/lib/src/server.dart +++ b/pkgs/shelf/lib/src/server.dart @@ -20,8 +20,8 @@ import 'handler.dart'; /// code to a single server implementation. /// /// There are two built-in implementations of this interface. You can create a -/// server backed by `dart:io` using [IOServer], or you can create a server -/// that's backed by a normal [Handler] using [ServerHandler]. +/// server backed by `dart:io` using `IOServer`, or you can create a server +/// that's backed by a normal [Handler] using `ServerHandler`. /// /// Implementations of this interface are responsible for ensuring that the /// members work as documented. diff --git a/pkgs/shelf_packages_handler/analysis_options.yaml b/pkgs/shelf_packages_handler/analysis_options.yaml new file mode 100644 index 00000000..d978f811 --- /dev/null +++ b/pkgs/shelf_packages_handler/analysis_options.yaml @@ -0,0 +1 @@ +include: package:dart_flutter_team_lints/analysis_options.yaml diff --git a/pkgs/shelf_proxy/analysis_options.yaml b/pkgs/shelf_proxy/analysis_options.yaml new file mode 100644 index 00000000..d978f811 --- /dev/null +++ b/pkgs/shelf_proxy/analysis_options.yaml @@ -0,0 +1 @@ +include: package:dart_flutter_team_lints/analysis_options.yaml diff --git a/pkgs/shelf_router/analysis_options.yaml b/pkgs/shelf_router/analysis_options.yaml new file mode 100644 index 00000000..d978f811 --- /dev/null +++ b/pkgs/shelf_router/analysis_options.yaml @@ -0,0 +1 @@ +include: package:dart_flutter_team_lints/analysis_options.yaml diff --git a/pkgs/shelf_router_generator/analysis_options.yaml b/pkgs/shelf_router_generator/analysis_options.yaml new file mode 100644 index 00000000..d978f811 --- /dev/null +++ b/pkgs/shelf_router_generator/analysis_options.yaml @@ -0,0 +1 @@ +include: package:dart_flutter_team_lints/analysis_options.yaml diff --git a/pkgs/shelf_static/analysis_options.yaml b/pkgs/shelf_static/analysis_options.yaml new file mode 100644 index 00000000..d978f811 --- /dev/null +++ b/pkgs/shelf_static/analysis_options.yaml @@ -0,0 +1 @@ +include: package:dart_flutter_team_lints/analysis_options.yaml diff --git a/pkgs/shelf_test_handler/analysis_options.yaml b/pkgs/shelf_test_handler/analysis_options.yaml new file mode 100644 index 00000000..d978f811 --- /dev/null +++ b/pkgs/shelf_test_handler/analysis_options.yaml @@ -0,0 +1 @@ +include: package:dart_flutter_team_lints/analysis_options.yaml diff --git a/pkgs/shelf_test_handler/lib/src/expectation.dart b/pkgs/shelf_test_handler/lib/src/expectation.dart index ef189900..c08808bb 100644 --- a/pkgs/shelf_test_handler/lib/src/expectation.dart +++ b/pkgs/shelf_test_handler/lib/src/expectation.dart @@ -4,6 +4,8 @@ import 'package:shelf/shelf.dart'; +import 'handler.dart'; + /// A single expectation for an HTTP request sent to a [ShelfTestHandler]. class Expectation { /// The expected request method, or `null` if this allows any requests. diff --git a/pkgs/shelf_test_handler/lib/src/server.dart b/pkgs/shelf_test_handler/lib/src/server.dart index 32af56bd..d784ae41 100644 --- a/pkgs/shelf_test_handler/lib/src/server.dart +++ b/pkgs/shelf_test_handler/lib/src/server.dart @@ -7,6 +7,7 @@ import 'dart:io'; import 'package:http_multi_server/http_multi_server.dart'; import 'package:shelf/shelf_io.dart'; +import 'package:test/test.dart'; import 'handler.dart'; diff --git a/pkgs/shelf_web_socket/analysis_options.yaml b/pkgs/shelf_web_socket/analysis_options.yaml new file mode 100644 index 00000000..d978f811 --- /dev/null +++ b/pkgs/shelf_web_socket/analysis_options.yaml @@ -0,0 +1 @@ +include: package:dart_flutter_team_lints/analysis_options.yaml diff --git a/tool/ci.sh b/tool/ci.sh index c7b4cd76..d576ee0e 100644 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.6.1 +# Created with package:mono_repo v6.6.2 # Support built in commands on windows out of the box. From e3975a8a41a861a78bef591345ee14f1f95fc0a0 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 9 Dec 2024 10:06:23 -0800 Subject: [PATCH 07/20] add more type information to the 'webSocketHandler' method (#463) * [shelf_web_socket] add more type information to the 'webSocketHandler' method * update docs * use a dependency_override * require dart 3.5.0 --- .github/workflows/dart.yml | 176 +++++++++++++----- pkgs/shelf_test_handler/test/server_test.dart | 2 +- pkgs/shelf_web_socket/CHANGELOG.md | 33 +++- pkgs/shelf_web_socket/README.md | 5 +- pkgs/shelf_web_socket/example/example.dart | 18 ++ .../lib/shelf_web_socket.dart | 28 ++- .../lib/src/web_socket_handler.dart | 10 +- pkgs/shelf_web_socket/pubspec.yaml | 8 +- .../test/web_socket_test.dart | 13 +- 9 files changed, 212 insertions(+), 81 deletions(-) create mode 100644 pkgs/shelf_web_socket/example/example.dart diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 2f060b11..057e8e4c 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,16 +40,16 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -114,15 +114,6 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_test_handler - - id: pkgs_shelf_web_socket_pub_upgrade - name: pkgs/shelf_web_socket; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_web_socket - - name: "pkgs/shelf_web_socket; dart analyze --fatal-infos ." - run: dart analyze --fatal-infos . - if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_web_socket job_003: name: "analyze_and_format; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest @@ -154,6 +145,36 @@ jobs: if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf job_004: + name: "analyze_and_format; linux; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart analyze --fatal-infos .`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:analyze" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + with: + sdk: "3.5.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_web_socket_pub_upgrade + name: pkgs/shelf_web_socket; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_web_socket + - name: "pkgs/shelf_web_socket; dart analyze --fatal-infos ." + run: dart analyze --fatal-infos . + if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_web_socket + job_005: name: "analyze_and_format; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -246,7 +267,7 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_web_socket - job_005: + job_006: name: "analyze_and_format; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart format --output=none --set-exit-if-changed .`" runs-on: ubuntu-latest steps: @@ -339,17 +360,17 @@ jobs: run: "dart format --output=none --set-exit-if-changed ." if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_web_socket - job_006: - name: "unit_test; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" + job_007: + name: "unit_test; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -414,22 +435,14 @@ jobs: run: "dart test --test-randomize-ordering-seed=random" if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_test_handler - - id: pkgs_shelf_web_socket_pub_upgrade - name: pkgs/shelf_web_socket; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_web_socket - - name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_web_socket needs: - job_001 - job_002 - job_003 - job_004 - job_005 - job_007: + - job_006 + job_008: name: "unit_test; linux; Dart 3.3.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: ubuntu-latest steps: @@ -465,7 +478,8 @@ jobs: - job_003 - job_004 - job_005 - job_008: + - job_006 + job_009: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: ubuntu-latest steps: @@ -501,7 +515,8 @@ jobs: - job_003 - job_004 - job_005 - job_009: + - job_006 + job_010: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -537,7 +552,45 @@ jobs: - job_003 - job_004 - job_005 - job_010: + - job_006 + job_011: + name: "unit_test; linux; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:test_0" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + with: + sdk: "3.5.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_web_socket_pub_upgrade + name: pkgs/shelf_web_socket; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_web_socket + - name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" + if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_web_socket + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + job_012: name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`" runs-on: ubuntu-latest steps: @@ -582,7 +635,8 @@ jobs: - job_003 - job_004 - job_005 - job_011: + - job_006 + job_013: name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: ubuntu-latest steps: @@ -627,7 +681,8 @@ jobs: - job_003 - job_004 - job_005 - job_012: + - job_006 + job_014: name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -726,7 +781,8 @@ jobs: - job_003 - job_004 - job_005 - job_013: + - job_006 + job_015: name: "unit_test; linux; Dart dev; PKG: pkgs/shelf_router_generator; `dart test --run-skipped -t presubmit-only`" runs-on: ubuntu-latest steps: @@ -762,8 +818,9 @@ jobs: - job_003 - job_004 - job_005 - job_014: - name: "unit_test; windows; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" + - job_006 + job_016: + name: "unit_test; windows; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -800,22 +857,14 @@ jobs: run: "dart test --test-randomize-ordering-seed=random" if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_test_handler - - id: pkgs_shelf_web_socket_pub_upgrade - name: pkgs/shelf_web_socket; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_web_socket - - name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_web_socket needs: - job_001 - job_002 - job_003 - job_004 - job_005 - job_015: + - job_006 + job_017: name: "unit_test; windows; Dart 3.3.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: windows-latest steps: @@ -841,7 +890,8 @@ jobs: - job_003 - job_004 - job_005 - job_016: + - job_006 + job_018: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: windows-latest steps: @@ -867,7 +917,35 @@ jobs: - job_003 - job_004 - job_005 - job_017: + - job_006 + job_019: + name: "unit_test; windows; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" + runs-on: windows-latest + steps: + - name: Setup Dart SDK + uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + with: + sdk: "3.5.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_web_socket_pub_upgrade + name: pkgs/shelf_web_socket; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_web_socket + - name: "pkgs/shelf_web_socket; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" + if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_web_socket + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + job_020: name: "unit_test; windows; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: windows-latest steps: @@ -902,7 +980,8 @@ jobs: - job_003 - job_004 - job_005 - job_018: + - job_006 + job_021: name: "unit_test; windows; Dart dev; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -955,3 +1034,4 @@ jobs: - job_003 - job_004 - job_005 + - job_006 diff --git a/pkgs/shelf_test_handler/test/server_test.dart b/pkgs/shelf_test_handler/test/server_test.dart index 5e3c0e88..d92e85e7 100644 --- a/pkgs/shelf_test_handler/test/server_test.dart +++ b/pkgs/shelf_test_handler/test/server_test.dart @@ -29,7 +29,7 @@ void main() { addTearDown(server.close); server.handler.expect('GET', '/', - webSocketHandler((WebSocketChannel webSocket) { + webSocketHandler((WebSocketChannel webSocket, _) { webSocket.sink.add('hello!'); webSocket.sink.close(); })); diff --git a/pkgs/shelf_web_socket/CHANGELOG.md b/pkgs/shelf_web_socket/CHANGELOG.md index aeff3eb0..3948a193 100644 --- a/pkgs/shelf_web_socket/CHANGELOG.md +++ b/pkgs/shelf_web_socket/CHANGELOG.md @@ -1,12 +1,43 @@ +## 3.0.0-wip + +* **BREAKING:**: Change the signature of the `webSocketHandler` method's + `onConnection` callback. Previously this took an untyped function with either + one or two parameters. This now requires a `ConnectionCallback`; a typedef + taking two parameters. See also https://github.com/dart-lang/shelf/issues/457. +* Add a API usage example. +* Require Dart `^3.5.0`. + +Note that most clients seeing analysis issues from the above breaking change can +fix it by adding a second parameter to their callback. So, they would change +this: + +```dart +webSocketHandler((webSocket) { + webSocket.stream.listen((message) { + webSocket.sink.add('echo $message'); + }); +}); +``` + +to this: + +``` +webSocketHandler((webSocket, _) { + webSocket.stream.listen((message) { + webSocket.sink.add('echo $message'); + }); +}); +``` + ## 2.0.1 * Require Dart `^3.3.0`. ## 2.0.0 -* Require Dart `^3.0.0`. * **BREAKING:**: Remove support for hijacking WebSocket requests that are not being transported using `dart:io` `Socket`s. +* Require Dart `^3.0.0`. ## 1.0.4 diff --git a/pkgs/shelf_web_socket/README.md b/pkgs/shelf_web_socket/README.md index 7105c114..a4854dca 100644 --- a/pkgs/shelf_web_socket/README.md +++ b/pkgs/shelf_web_socket/README.md @@ -19,12 +19,11 @@ connection that's established. ```dart import 'package:shelf/shelf_io.dart' as shelf_io; import 'package:shelf_web_socket/shelf_web_socket.dart'; -import 'package:web_socket_channel/web_socket_channel.dart'; void main() { - var handler = webSocketHandler((webSocket) { + var handler = webSocketHandler((webSocket, _) { webSocket.stream.listen((message) { - webSocket.sink.add("echo $message"); + webSocket.sink.add('echo $message'); }); }); diff --git a/pkgs/shelf_web_socket/example/example.dart b/pkgs/shelf_web_socket/example/example.dart new file mode 100644 index 00000000..44bb9e45 --- /dev/null +++ b/pkgs/shelf_web_socket/example/example.dart @@ -0,0 +1,18 @@ +// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +import 'package:shelf/shelf_io.dart' as shelf_io; +import 'package:shelf_web_socket/shelf_web_socket.dart'; + +void main() { + var handler = webSocketHandler((webSocket, _) { + webSocket.stream.listen((message) { + webSocket.sink.add('echo $message'); + }); + }); + + shelf_io.serve(handler, 'localhost', 8080).then((server) { + print('Serving at ws://${server.address.host}:${server.port}'); + }); +} diff --git a/pkgs/shelf_web_socket/lib/shelf_web_socket.dart b/pkgs/shelf_web_socket/lib/shelf_web_socket.dart index 18e19e03..c6b0f9b6 100644 --- a/pkgs/shelf_web_socket/lib/shelf_web_socket.dart +++ b/pkgs/shelf_web_socket/lib/shelf_web_socket.dart @@ -18,12 +18,12 @@ import 'src/web_socket_handler.dart'; /// This means that this can be placed first in a [Cascade] and only upgrade /// requests will be handled. /// -/// The [onConnection] must take a [WebSocketChannel] as its first argument. It -/// may also take a string, the [WebSocket subprotocol][], as its second -/// argument. The subprotocol is determined by looking at the client's +/// The [onConnection] takes a [WebSocketChannel] as its first argument and a +/// nullable string, the [WebSocket subprotocol][], as its second argument. +/// The subprotocol is determined by looking at the client's /// `Sec-WebSocket-Protocol` header and selecting the first entry that also /// appears in [protocols]. If no subprotocols are shared between the client and -/// the server, `null` will be passed instead and no subprotocol heaader will be +/// the server, `null` will be passed instead and no subprotocol header will be /// sent to the client which may cause it to disconnect. /// /// [WebSocket subprotocol]: https://tools.ietf.org/html/rfc6455#section-1.9 @@ -37,18 +37,14 @@ import 'src/web_socket_handler.dart'; /// [origin considerations]: https://tools.ietf.org/html/rfc6455#section-10.2 /// /// If [pingInterval] is specified, it will get passed to the created -/// channel instance, enabling round-trip disconnect detection. -/// See [WebSocketChannel] for more details. -Handler webSocketHandler(Function onConnection, - {Iterable? protocols, - Iterable? allowedOrigins, - Duration? pingInterval}) { - if (onConnection is! void Function(Never, Never)) { - final innerOnConnection = onConnection; - // ignore: inference_failure_on_untyped_parameter, avoid_dynamic_calls - onConnection = (webSocket, _) => innerOnConnection(webSocket); - } - +/// channel instance, enabling round-trip disconnect detection. See +/// [WebSocketChannel] for more details. +Handler webSocketHandler( + ConnectionCallback onConnection, { + Iterable? protocols, + Iterable? allowedOrigins, + Duration? pingInterval, +}) { return WebSocketHandler( onConnection, protocols?.toSet(), diff --git a/pkgs/shelf_web_socket/lib/src/web_socket_handler.dart b/pkgs/shelf_web_socket/lib/src/web_socket_handler.dart index 4c9c5ceb..e86010fd 100644 --- a/pkgs/shelf_web_socket/lib/src/web_socket_handler.dart +++ b/pkgs/shelf_web_socket/lib/src/web_socket_handler.dart @@ -9,10 +9,17 @@ import 'package:shelf/shelf.dart'; import 'package:web_socket_channel/io.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; +/// Used by `webSocketHandler` report connections back to callers. +/// +/// This takes a [WebSocketChannel] as its first argument and an optional +/// [subprotocol] as its second argument. +typedef ConnectionCallback = void Function( + WebSocketChannel webSocket, String? subprotocol); + /// A class that exposes a handler for upgrading WebSocket requests. class WebSocketHandler { /// The function to call when a request is upgraded. - final Function _onConnection; + final ConnectionCallback _onConnection; /// The set of protocols the user supports, or `null`. final Set? _protocols; @@ -88,7 +95,6 @@ class WebSocketHandler { protocol: protocol, serverSide: true) ..pingInterval = _pingInterval; - // ignore: avoid_dynamic_calls _onConnection(IOWebSocketChannel(webSocket), protocol); }); } diff --git a/pkgs/shelf_web_socket/pubspec.yaml b/pkgs/shelf_web_socket/pubspec.yaml index af6f48c2..3f9a24a5 100644 --- a/pkgs/shelf_web_socket/pubspec.yaml +++ b/pkgs/shelf_web_socket/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_web_socket -version: 2.0.1 +version: 3.0.0-wip description: A shelf handler that wires up a listener for every connection. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_web_socket issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_web_socket @@ -9,7 +9,7 @@ topics: - shelf environment: - sdk: ^3.3.0 + sdk: ^3.5.0 dependencies: shelf: ^1.1.0 @@ -20,3 +20,7 @@ dev_dependencies: dart_flutter_team_lints: ^3.0.0 http: '>=0.13.0 <2.0.0' test: ^1.25.2 + +# TODO(devoncarew): Remove once package:test supports v2+v3 of shelf_web_socket. +dependency_overrides: + test: ^1.25.11 diff --git a/pkgs/shelf_web_socket/test/web_socket_test.dart b/pkgs/shelf_web_socket/test/web_socket_test.dart index eb8e00bb..dbc5878c 100644 --- a/pkgs/shelf_web_socket/test/web_socket_test.dart +++ b/pkgs/shelf_web_socket/test/web_socket_test.dart @@ -21,8 +21,7 @@ Map get _handshakeHeaders => { void main() { test('can communicate with a dart:io WebSocket client', () async { - final server = - await shelf_io.serve(webSocketHandler((WebSocketChannel webSocket) { + final server = await shelf_io.serve(webSocketHandler((webSocket, _) { webSocket.sink.add('hello!'); webSocket.stream.first.then((request) { expect(request, equals('ping')); @@ -73,8 +72,7 @@ void main() { }); test('handles protocol header without allowed protocols', () async { - final server = - await shelf_io.serve(webSocketHandler((WebSocketChannel webSocket) { + final server = await shelf_io.serve(webSocketHandler((webSocket, _) { webSocket.sink.close(); }), 'localhost', 0); @@ -136,7 +134,7 @@ void main() { late Uri url; setUp(() async { server = await shelf_io.serve( - webSocketHandler((WebSocketChannel webSocket) { + webSocketHandler((webSocket, _) { webSocket.sink.close(); }, allowedOrigins: ['pub.dartlang.org', 'GoOgLe.CoM']), 'localhost', @@ -177,8 +175,7 @@ void main() { // Regression test for issue 21894. test('allows a Connection header with multiple values', () async { - final server = - await shelf_io.serve(webSocketHandler((WebSocketChannel webSocket) { + final server = await shelf_io.serve(webSocketHandler((webSocket, _) { webSocket.sink.close(); }), 'localhost', 0); @@ -193,7 +190,7 @@ void main() { late HttpServer server; late Uri url; setUp(() async { - server = await shelf_io.serve(webSocketHandler((_) { + server = await shelf_io.serve(webSocketHandler((_, __) { fail('should not create a WebSocket'); }), 'localhost', 0); url = Uri.http('localhost:${server.port}', ''); From 6b8b338d6a2a38dcf8a3717af7bbba66f4f6d192 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Tue, 17 Dec 2024 19:21:55 -0600 Subject: [PATCH 08/20] shelf_router_generator: bump dependencies (#464) The min versions bumps were updated using ` _PUB_TEST_SDK_VERSION=3.3.0 dart pub downgrade --tighten` --- pkgs/shelf_router_generator/CHANGELOG.md | 1 + pkgs/shelf_router_generator/pubspec.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/shelf_router_generator/CHANGELOG.md b/pkgs/shelf_router_generator/CHANGELOG.md index eeac453c..fa2138aa 100644 --- a/pkgs/shelf_router_generator/CHANGELOG.md +++ b/pkgs/shelf_router_generator/CHANGELOG.md @@ -1,5 +1,6 @@ ## 1.1.1-wip +* Support the latest `package:analyzer` and `package:source_gen` * Require `sdk: ^3.3.0` ## 1.1.0 diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml index 609432da..6d5e51dd 100644 --- a/pkgs/shelf_router_generator/pubspec.yaml +++ b/pkgs/shelf_router_generator/pubspec.yaml @@ -14,18 +14,18 @@ environment: sdk: ^3.3.0 dependencies: - analyzer: '>=4.6.0 <7.0.0' - build: ^2.0.0 + analyzer: '>=4.6.0 <8.0.0' + build: ^2.2.2 build_config: ^1.0.0 code_builder: ^4.2.0 - http_methods: ^1.0.0 + http_methods: ^1.1.0 shelf: ^1.1.0 shelf_router: ^1.1.0 - source_gen: ^1.0.0 + source_gen: ">=1.2.2 <3.0.0" dev_dependencies: - build_runner: ^2.0.0 + build_runner: ^2.1.9 build_verify: ^3.0.0 dart_flutter_team_lints: ^3.0.0 - http: '>=0.13.0 <2.0.0' - test: ^1.5.3 + http: ^1.0.0 + test: ^1.21.0 From 8ea524bca13e120505527b8da78ab49b37bc6c3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 12:09:22 +0000 Subject: [PATCH 09/20] Bump actions/cache from 4.1.2 to 4.2.0 in the github-actions group (#465) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/cache](https://github.com/actions/cache). Updates `actions/cache` from 4.1.2 to 4.2.0
Release notes

Sourced from actions/cache's releases.

v4.2.0

⚠️ Important Changes

The cache backend service has been rewritten from the ground up for improved performance and reliability. actions/cache now integrates with the new cache service (v2) APIs.

The new service will gradually roll out as of February 1st, 2025. The legacy service will also be sunset on the same date. Changes in these release are fully backward compatible.

We are deprecating some versions of this action. We recommend upgrading to version v4 or v3 as soon as possible before February 1st, 2025. (Upgrade instructions below).

If you are using pinned SHAs, please use the SHAs of versions v4.2.0 or v3.4.0

If you do not upgrade, all workflow runs using any of the deprecated actions/cache will fail.

Upgrading to the recommended versions will not break your workflows.

Read more about the change & access the migration guide: reference to the announcement.

Minor changes

Minor and patch version updates for these dependencies:

  • @​actions/core: 1.11.1
  • @​actions/io: 1.1.3
  • @​vercel/ncc: 0.38.3

Full Changelog: https://github.com/actions/cache/compare/v4...v4.2.0

Changelog

Sourced from actions/cache's changelog.

Releases

4.2.0

TLDR; The cache backend service has been rewritten from the ground up for improved performance and reliability. actions/cache now integrates with the new cache service (v2) APIs.

The new service will gradually roll out as of February 1st, 2025. The legacy service will also be sunset on the same date. Changes in these release are fully backward compatible.

We are deprecating some versions of this action. We recommend upgrading to version v4 or v3 as soon as possible before February 1st, 2025. (Upgrade instructions below).

If you are using pinned SHAs, please use the SHAs of versions v4.2.0 or v3.4.0

If you do not upgrade, all workflow runs using any of the deprecated actions/cache will fail.

Upgrading to the recommended versions will not break your workflows.

4.1.2

  • Add GitHub Enterprise Cloud instances hostname filters to inform API endpoint choices - #1474
  • Security fix: Bump braces from 3.0.2 to 3.0.3 - #1475

4.1.1

  • Restore original behavior of cache-hit output - #1467

4.1.0

  • Ensure cache-hit output is set when a cache is missed - #1404
  • Deprecate save-always input - #1452

4.0.2

  • Fixed restore fail-on-cache-miss not working.

4.0.1

  • Updated isGhes check

4.0.0

  • Updated minimum runner version support from node 12 -> node 20

3.4.0

  • Integrated with the new cache service (v2) APIs

3.3.3

  • Updates @​actions/cache to v3.2.3 to fix accidental mutated path arguments to getCacheVersion actions/toolkit#1378
  • Additional audit fixes of npm package(s)

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/cache&package-manager=github_actions&previous-version=4.1.2&new-version=4.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--- .github/workflows/dart.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 057e8e4c..20ac674b 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:analyze" @@ -119,7 +119,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:analyze" @@ -149,7 +149,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:analyze" @@ -179,7 +179,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -272,7 +272,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:format" @@ -365,7 +365,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:test_0" @@ -447,7 +447,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_test_handler;commands:test_1" @@ -484,7 +484,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" @@ -521,7 +521,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" @@ -558,7 +558,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:test_0" @@ -595,7 +595,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_2" @@ -641,7 +641,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" @@ -687,7 +687,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -787,7 +787,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf_router_generator;commands:test_3" From bf799519cda2898a7c5af06dcfdd5fe6443afd79 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 7 Jan 2025 11:56:57 -0800 Subject: [PATCH 10/20] Publish shelf_router_generator 1.1.1 (#467) * Publish shelf_router_generator 1.1.1 * Update CHANGELOG.md --- pkgs/shelf_router_generator/CHANGELOG.md | 2 +- pkgs/shelf_router_generator/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shelf_router_generator/CHANGELOG.md b/pkgs/shelf_router_generator/CHANGELOG.md index fa2138aa..ca33e6e0 100644 --- a/pkgs/shelf_router_generator/CHANGELOG.md +++ b/pkgs/shelf_router_generator/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.1.1-wip +## 1.1.1 * Support the latest `package:analyzer` and `package:source_gen` * Require `sdk: ^3.3.0` diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml index 6d5e51dd..e1840d5e 100644 --- a/pkgs/shelf_router_generator/pubspec.yaml +++ b/pkgs/shelf_router_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_router_generator -version: 1.1.1-wip +version: 1.1.1 description: > A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. From 2a7442f7d6d3e63fdc7b387128619b263dcb7e78 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Tue, 21 Jan 2025 14:24:53 -0800 Subject: [PATCH 11/20] rev shelf_web_socket to 3.0 in prep for publishing (#469) --- pkgs/shelf_web_socket/CHANGELOG.md | 2 +- pkgs/shelf_web_socket/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shelf_web_socket/CHANGELOG.md b/pkgs/shelf_web_socket/CHANGELOG.md index 3948a193..8a6c40f0 100644 --- a/pkgs/shelf_web_socket/CHANGELOG.md +++ b/pkgs/shelf_web_socket/CHANGELOG.md @@ -1,4 +1,4 @@ -## 3.0.0-wip +## 3.0.0 * **BREAKING:**: Change the signature of the `webSocketHandler` method's `onConnection` callback. Previously this took an untyped function with either diff --git a/pkgs/shelf_web_socket/pubspec.yaml b/pkgs/shelf_web_socket/pubspec.yaml index 3f9a24a5..deb6656d 100644 --- a/pkgs/shelf_web_socket/pubspec.yaml +++ b/pkgs/shelf_web_socket/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_web_socket -version: 3.0.0-wip +version: 3.0.0 description: A shelf handler that wires up a listener for every connection. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_web_socket issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_web_socket From b39e61196ce555dc1d3a0c3da695228fa6bdebb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2025 09:19:55 -0800 Subject: [PATCH 12/20] Bump actions/stale from 9.0.0 to 9.1.0 in the github-actions group (#470) Bumps the github-actions group with 1 update: [actions/stale](https://github.com/actions/stale). Updates `actions/stale` from 9.0.0 to 9.1.0 - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/28ca1036281a5e5922ead5184a1bbf96e5fc984e...5bef64f19d7facfb25b37b414482c7164d639639) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/no-response.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml index 1a6f2ecd..cdc73e11 100644 --- a/.github/workflows/no-response.yml +++ b/.github/workflows/no-response.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.repository_owner == 'dart-lang' }} steps: - - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e + - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 with: days-before-stale: -1 days-before-close: 14 From f5ae7971be971955865d1afae8b7d259bd3f43c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 12:10:23 +0000 Subject: [PATCH 13/20] Bump the github-actions group with 2 updates (#471) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 2 updates: [actions/cache](https://github.com/actions/cache) and [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart). Updates `actions/cache` from 4.2.0 to 4.2.2
Release notes

Sourced from actions/cache's releases.

v4.2.2

What's Changed

[!IMPORTANT] As a reminder, there were important backend changes to release v4.2.0, see those release notes and the announcement for more details.

Full Changelog: https://github.com/actions/cache/compare/v4.2.1...v4.2.2

v4.2.1

What's Changed

[!IMPORTANT] As a reminder, there were important backend changes to release v4.2.0, see those release notes and the announcement for more details.

New Contributors

Full Changelog: https://github.com/actions/cache/compare/v4.2.0...v4.2.1

Changelog

Sourced from actions/cache's changelog.

Releases

4.2.2

  • Bump @actions/cache to v4.0.2

4.2.1

  • Bump @actions/cache to v4.0.1

4.2.0

TLDR; The cache backend service has been rewritten from the ground up for improved performance and reliability. actions/cache now integrates with the new cache service (v2) APIs.

The new service will gradually roll out as of February 1st, 2025. The legacy service will also be sunset on the same date. Changes in these release are fully backward compatible.

We are deprecating some versions of this action. We recommend upgrading to version v4 or v3 as soon as possible before February 1st, 2025. (Upgrade instructions below).

If you are using pinned SHAs, please use the SHAs of versions v4.2.0 or v3.4.0

If you do not upgrade, all workflow runs using any of the deprecated actions/cache will fail.

Upgrading to the recommended versions will not break your workflows.

4.1.2

  • Add GitHub Enterprise Cloud instances hostname filters to inform API endpoint choices - #1474
  • Security fix: Bump braces from 3.0.2 to 3.0.3 - #1475

4.1.1

  • Restore original behavior of cache-hit output - #1467

4.1.0

  • Ensure cache-hit output is set when a cache is missed - #1404
  • Deprecate save-always input - #1452

4.0.2

  • Fixed restore fail-on-cache-miss not working.

4.0.1

  • Updated isGhes check

4.0.0

  • Updated minimum runner version support from node 12 -> node 20

... (truncated)

Commits
  • d4323d4 Merge pull request #1560 from actions/robherley/v4.2.2
  • da26677 bump @​actions/cache to v4.0.2, prep for v4.2.2 release
  • 7921ae2 Merge pull request #1557 from actions/robherley/ia-workflow-released
  • 3937731 Update publish-immutable-actions.yml
  • 0c907a7 Merge pull request #1554 from actions/robherley/v4.2.1
  • 710893c bump @​actions/cache to v4.0.1
  • 9fa7e61 Update force deletion docs due a recent deprecation (#1500)
  • 36f1e14 docs: Make the "always save prime numbers" example more clear (#1525)
  • 53aa38c Correct GitHub Spelling in caching-strategies.md (#1526)
  • See full diff in compare view

Updates `dart-lang/setup-dart` from 1.7.0 to 1.7.1
Release notes

Sourced from dart-lang/setup-dart's releases.

v1.7.1

  • Roll undici dependency to address CVE-2025-22150.
  • Update to the latest npm dependencies.
  • Recompile the action using the new Dart / JavaScript interop.
Changelog

Sourced from dart-lang/setup-dart's changelog.

v1.7.1

  • Roll undici dependency to address CVE-2025-22150.
  • Update to the latest npm dependencies.
  • Recompile the action using the new Dart / JavaScript interop.

v1.7.0

v1.6.5

  • Fix zip path handling on Windows 11 (#118[])

#118: dart-lang/setup-dart#118

v1.6.4

  • Rebuild JS code.

v1.6.3

v1.6.2

v1.6.1

  • Updated the google storage url for main channel releases.

v1.6.0

  • Enable provisioning of the latest Dart SDK patch release by specifying just the major and minor version (e.g. 3.2).

v1.5.1

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--- .github/workflows/dart.yml | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 20ac674b..014dc199 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -29,7 +29,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: stable - id: checkout @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:analyze" @@ -54,7 +54,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.3.0" - id: checkout @@ -119,7 +119,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:analyze" @@ -129,7 +129,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.4.0" - id: checkout @@ -149,7 +149,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:analyze" @@ -159,7 +159,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.5.0" - id: checkout @@ -179,7 +179,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -189,7 +189,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -272,7 +272,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:format" @@ -282,7 +282,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -365,7 +365,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:test_0" @@ -375,7 +375,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.3.0" - id: checkout @@ -447,7 +447,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_test_handler;commands:test_1" @@ -457,7 +457,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.3.0" - id: checkout @@ -484,7 +484,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" @@ -494,7 +494,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.4.0" - id: checkout @@ -521,7 +521,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" @@ -531,7 +531,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.4.0" - id: checkout @@ -558,7 +558,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:test_0" @@ -568,7 +568,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.5.0" - id: checkout @@ -595,7 +595,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_2" @@ -605,7 +605,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -641,7 +641,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" @@ -651,7 +651,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -687,7 +687,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -697,7 +697,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -787,7 +787,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf_router_generator;commands:test_3" @@ -797,7 +797,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -824,7 +824,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.3.0" - id: checkout @@ -869,7 +869,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.3.0" - id: checkout @@ -896,7 +896,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.4.0" - id: checkout @@ -923,7 +923,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: "3.5.0" - id: checkout @@ -950,7 +950,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout @@ -986,7 +986,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94 + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: sdk: dev - id: checkout From 2af8529640d10a247ebfa4e17e629a2ff5273656 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Tue, 4 Mar 2025 14:54:31 -0800 Subject: [PATCH 14/20] Update publish.yaml (#473) --- .github/workflows/publish.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bf40d5f4..62b46d13 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,3 +13,6 @@ jobs: publish: if: ${{ github.repository_owner == 'dart-lang' }} uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main + permissions: + id-token: write + pull-requests: write From 082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 12:55:19 +0000 Subject: [PATCH 15/20] Bump actions/cache from 4.2.2 to 4.2.3 in the github-actions group (#475) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 1 update: [actions/cache](https://github.com/actions/cache). Updates `actions/cache` from 4.2.2 to 4.2.3
Release notes

Sourced from actions/cache's releases.

v4.2.3

What's Changed

  • Update to use @​actions/cache 4.0.3 package & prepare for new release by @​salmanmkc in actions/cache#1577 (SAS tokens for cache entries are now masked in debug logs)

New Contributors

Full Changelog: https://github.com/actions/cache/compare/v4.2.2...v4.2.3

Changelog

Sourced from actions/cache's changelog.

Releases

4.2.3

  • Bump @actions/cache to v4.0.3 (obfuscates SAS token in debug logs for cache entries)

4.2.2

  • Bump @actions/cache to v4.0.2

4.2.1

  • Bump @actions/cache to v4.0.1

4.2.0

TLDR; The cache backend service has been rewritten from the ground up for improved performance and reliability. actions/cache now integrates with the new cache service (v2) APIs.

The new service will gradually roll out as of February 1st, 2025. The legacy service will also be sunset on the same date. Changes in these release are fully backward compatible.

We are deprecating some versions of this action. We recommend upgrading to version v4 or v3 as soon as possible before February 1st, 2025. (Upgrade instructions below).

If you are using pinned SHAs, please use the SHAs of versions v4.2.0 or v3.4.0

If you do not upgrade, all workflow runs using any of the deprecated actions/cache will fail.

Upgrading to the recommended versions will not break your workflows.

4.1.2

  • Add GitHub Enterprise Cloud instances hostname filters to inform API endpoint choices - #1474
  • Security fix: Bump braces from 3.0.2 to 3.0.3 - #1475

4.1.1

  • Restore original behavior of cache-hit output - #1467

4.1.0

  • Ensure cache-hit output is set when a cache is missed - #1404
  • Deprecate save-always input - #1452

4.0.2

  • Fixed restore fail-on-cache-miss not working.

4.0.1

  • Updated isGhes check

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/cache&package-manager=github_actions&previous-version=4.2.2&new-version=4.2.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--- .github/workflows/dart.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 014dc199..10b075f7 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:analyze" @@ -119,7 +119,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:analyze" @@ -149,7 +149,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:analyze" @@ -179,7 +179,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -272,7 +272,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:format" @@ -365,7 +365,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:test_0" @@ -447,7 +447,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_test_handler;commands:test_1" @@ -484,7 +484,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" @@ -521,7 +521,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" @@ -558,7 +558,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:test_0" @@ -595,7 +595,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_2" @@ -641,7 +641,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" @@ -687,7 +687,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -787,7 +787,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf_router_generator;commands:test_3" From 2a46b4ffe1f095909c3b14bdf62da40cbdbd82e9 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Tue, 5 Aug 2025 11:54:03 -0700 Subject: [PATCH 16/20] Update dependencies across 3 packages (#479) --- .github/workflows/dart.yml | 305 +++++++++++------- pkgs/shelf_router_generator/CHANGELOG.md | 8 + .../example/main.g.dart | 45 +-- pkgs/shelf_router_generator/lib/builder.dart | 6 +- .../lib/src/shelf_router_generator.dart | 292 +++++++++-------- pkgs/shelf_router_generator/pubspec.yaml | 16 +- .../test/server/api.g.dart | 18 +- .../test/server/server.dart | 6 +- .../test/server/service.g.dart | 40 +-- .../test/server_test.dart | 5 +- pkgs/shelf_test_handler/CHANGELOG.md | 4 +- pkgs/shelf_test_handler/pubspec.yaml | 10 +- pkgs/shelf_web_socket/CHANGELOG.md | 2 + pkgs/shelf_web_socket/pubspec.yaml | 6 +- tool/ci.sh | 2 +- 15 files changed, 397 insertions(+), 368 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 10b075f7..d46ba167 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.2 +# Created with package:mono_repo v6.6.3 name: Dart CI on: push: @@ -36,20 +36,20 @@ jobs: name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.2 + run: dart pub global activate mono_repo 6.6.3 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_static; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler + os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -87,15 +87,6 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_shelf_router_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_router - - id: pkgs_shelf_router_generator_pub_upgrade - name: pkgs/shelf_router_generator; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_router_generator - - name: "pkgs/shelf_router_generator; dart analyze --fatal-infos ." - run: dart analyze --fatal-infos . - if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_router_generator - id: pkgs_shelf_static_pub_upgrade name: pkgs/shelf_static; dart pub upgrade run: dart pub upgrade @@ -105,15 +96,6 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_shelf_static_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_static - - id: pkgs_shelf_test_handler_pub_upgrade - name: pkgs/shelf_test_handler; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler - - name: "pkgs/shelf_test_handler; dart analyze --fatal-infos ." - run: dart analyze --fatal-infos . - if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler job_003: name: "analyze_and_format; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest @@ -145,16 +127,16 @@ jobs: if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf job_004: - name: "analyze_and_format; linux; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.5.0; PKGS: pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -165,6 +147,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_test_handler_pub_upgrade + name: pkgs/shelf_test_handler; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler + - name: "pkgs/shelf_test_handler; dart analyze --fatal-infos ." + run: dart analyze --fatal-infos . + if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler - id: pkgs_shelf_web_socket_pub_upgrade name: pkgs/shelf_web_socket; dart pub upgrade run: dart pub upgrade @@ -175,6 +166,36 @@ jobs: if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_web_socket job_005: + name: "analyze_and_format; linux; Dart 3.7.0; PKG: pkgs/shelf_router_generator; `dart analyze --fatal-infos .`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:analyze" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator + os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c + with: + sdk: "3.7.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_router_generator_pub_upgrade + name: pkgs/shelf_router_generator; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_router_generator + - name: "pkgs/shelf_router_generator; dart analyze --fatal-infos ." + run: dart analyze --fatal-infos . + if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_router_generator + job_006: name: "analyze_and_format; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: @@ -267,7 +288,7 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_web_socket - job_006: + job_007: name: "analyze_and_format; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart format --output=none --set-exit-if-changed .`" runs-on: ubuntu-latest steps: @@ -360,17 +381,17 @@ jobs: run: "dart format --output=none --set-exit-if-changed ." if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_web_socket - job_007: - name: "unit_test; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random`" + job_008: + name: "unit_test; linux; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_static; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler + os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -408,15 +429,6 @@ jobs: run: "dart test --test-randomize-ordering-seed=random" if: "always() && steps.pkgs_shelf_router_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_router - - id: pkgs_shelf_router_generator_pub_upgrade - name: pkgs/shelf_router_generator; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_router_generator - - name: "pkgs/shelf_router_generator; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_router_generator - id: pkgs_shelf_static_pub_upgrade name: pkgs/shelf_static; dart pub upgrade run: dart pub upgrade @@ -426,15 +438,6 @@ jobs: run: "dart test --test-randomize-ordering-seed=random" if: "always() && steps.pkgs_shelf_static_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_static - - id: pkgs_shelf_test_handler_pub_upgrade - name: pkgs/shelf_test_handler; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler - - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler needs: - job_001 - job_002 @@ -442,36 +445,37 @@ jobs: - job_004 - job_005 - job_006 - job_008: - name: "unit_test; linux; Dart 3.3.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" + - job_007 + job_009: + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_test_handler;commands:test_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_test_handler - os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.3.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - id: pkgs_shelf_test_handler_pub_upgrade - name: pkgs/shelf_test_handler; dart pub upgrade + - id: pkgs_shelf_pub_upgrade + name: pkgs/shelf; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler - - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random -p chrome" + working-directory: pkgs/shelf + - name: "pkgs/shelf; dart test --test-randomize-ordering-seed=random -p chrome" run: "dart test --test-randomize-ordering-seed=random -p chrome" - if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler + if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf needs: - job_001 - job_002 @@ -479,15 +483,16 @@ jobs: - job_004 - job_005 - job_006 - job_009: - name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`" + - job_007 + job_010: + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" restore-keys: | os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 @@ -505,8 +510,8 @@ jobs: run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" working-directory: pkgs/shelf - - name: "pkgs/shelf; dart test --test-randomize-ordering-seed=random -p chrome" - run: "dart test --test-randomize-ordering-seed=random -p chrome" + - name: "pkgs/shelf; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf needs: @@ -516,36 +521,37 @@ jobs: - job_004 - job_005 - job_006 - job_010: - name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random`" + - job_007 + job_011: + name: "unit_test; linux; Dart 3.5.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler;commands:test_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.4.0" + sdk: "3.5.0" - id: checkout name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - id: pkgs_shelf_pub_upgrade - name: pkgs/shelf; dart pub upgrade + - id: pkgs_shelf_test_handler_pub_upgrade + name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf - - name: "pkgs/shelf; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf + working-directory: pkgs/shelf_test_handler + - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random -p chrome" + run: "dart test --test-randomize-ordering-seed=random -p chrome" + if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler needs: - job_001 - job_002 @@ -553,17 +559,18 @@ jobs: - job_004 - job_005 - job_006 - job_011: - name: "unit_test; linux; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" + - job_007 + job_012: + name: "unit_test; linux; Dart 3.5.0; PKGS: pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_web_socket + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -574,6 +581,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_test_handler_pub_upgrade + name: pkgs/shelf_test_handler; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler + - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" + if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler - id: pkgs_shelf_web_socket_pub_upgrade name: pkgs/shelf_web_socket; dart pub upgrade run: dart pub upgrade @@ -590,7 +606,46 @@ jobs: - job_004 - job_005 - job_006 - job_012: + - job_007 + job_013: + name: "unit_test; linux; Dart 3.7.0; PKG: pkgs/shelf_router_generator; `dart test --test-randomize-ordering-seed=random`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:test_0" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator + os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c + with: + sdk: "3.7.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_router_generator_pub_upgrade + name: pkgs/shelf_router_generator; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_router_generator + - name: "pkgs/shelf_router_generator; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" + if: "always() && steps.pkgs_shelf_router_generator_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_router_generator + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + - job_006 + - job_007 + job_014: name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`" runs-on: ubuntu-latest steps: @@ -636,7 +691,8 @@ jobs: - job_004 - job_005 - job_006 - job_013: + - job_007 + job_015: name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: ubuntu-latest steps: @@ -682,7 +738,8 @@ jobs: - job_004 - job_005 - job_006 - job_014: + - job_007 + job_016: name: "unit_test; linux; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_packages_handler, pkgs/shelf_proxy, pkgs/shelf_router, pkgs/shelf_router_generator, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: @@ -782,7 +839,8 @@ jobs: - job_004 - job_005 - job_006 - job_015: + - job_007 + job_017: name: "unit_test; linux; Dart dev; PKG: pkgs/shelf_router_generator; `dart test --run-skipped -t presubmit-only`" runs-on: ubuntu-latest steps: @@ -819,8 +877,9 @@ jobs: - job_004 - job_005 - job_006 - job_016: - name: "unit_test; windows; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random`" + - job_007 + job_018: + name: "unit_test; windows; Dart 3.3.0; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -848,15 +907,6 @@ jobs: run: "dart test --test-randomize-ordering-seed=random" if: "always() && steps.pkgs_shelf_static_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_static - - id: pkgs_shelf_test_handler_pub_upgrade - name: pkgs/shelf_test_handler; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler - - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random" - run: "dart test --test-randomize-ordering-seed=random" - if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler needs: - job_001 - job_002 @@ -864,26 +914,27 @@ jobs: - job_004 - job_005 - job_006 - job_017: - name: "unit_test; windows; Dart 3.3.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" + - job_007 + job_019: + name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.3.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - id: pkgs_shelf_test_handler_pub_upgrade - name: pkgs/shelf_test_handler; dart pub upgrade + - id: pkgs_shelf_pub_upgrade + name: pkgs/shelf; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler - - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random -p chrome" + working-directory: pkgs/shelf + - name: "pkgs/shelf; dart test --test-randomize-ordering-seed=random -p chrome" run: "dart test --test-randomize-ordering-seed=random -p chrome" - if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf_test_handler + if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf needs: - job_001 - job_002 @@ -891,26 +942,27 @@ jobs: - job_004 - job_005 - job_006 - job_018: - name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/shelf; `dart test --test-randomize-ordering-seed=random -p chrome`" + - job_007 + job_020: + name: "unit_test; windows; Dart 3.5.0; PKG: pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.4.0" + sdk: "3.5.0" - id: checkout name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - id: pkgs_shelf_pub_upgrade - name: pkgs/shelf; dart pub upgrade + - id: pkgs_shelf_test_handler_pub_upgrade + name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/shelf - - name: "pkgs/shelf; dart test --test-randomize-ordering-seed=random -p chrome" + working-directory: pkgs/shelf_test_handler + - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random -p chrome" run: "dart test --test-randomize-ordering-seed=random -p chrome" - if: "always() && steps.pkgs_shelf_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/shelf + if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler needs: - job_001 - job_002 @@ -918,8 +970,9 @@ jobs: - job_004 - job_005 - job_006 - job_019: - name: "unit_test; windows; Dart 3.5.0; PKG: pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" + - job_007 + job_021: + name: "unit_test; windows; Dart 3.5.0; PKGS: pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK @@ -929,6 +982,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - id: pkgs_shelf_test_handler_pub_upgrade + name: pkgs/shelf_test_handler; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler + - name: "pkgs/shelf_test_handler; dart test --test-randomize-ordering-seed=random" + run: "dart test --test-randomize-ordering-seed=random" + if: "always() && steps.pkgs_shelf_test_handler_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/shelf_test_handler - id: pkgs_shelf_web_socket_pub_upgrade name: pkgs/shelf_web_socket; dart pub upgrade run: dart pub upgrade @@ -945,7 +1007,8 @@ jobs: - job_004 - job_005 - job_006 - job_020: + - job_007 + job_022: name: "unit_test; windows; Dart dev; PKGS: pkgs/shelf, pkgs/shelf_test_handler; `dart test --test-randomize-ordering-seed=random -p chrome`" runs-on: windows-latest steps: @@ -981,7 +1044,8 @@ jobs: - job_004 - job_005 - job_006 - job_021: + - job_007 + job_023: name: "unit_test; windows; Dart dev; PKGS: pkgs/shelf_packages_handler, pkgs/shelf_static, pkgs/shelf_test_handler, pkgs/shelf_web_socket; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: @@ -1035,3 +1099,4 @@ jobs: - job_004 - job_005 - job_006 + - job_007 diff --git a/pkgs/shelf_router_generator/CHANGELOG.md b/pkgs/shelf_router_generator/CHANGELOG.md index ca33e6e0..ea47db1e 100644 --- a/pkgs/shelf_router_generator/CHANGELOG.md +++ b/pkgs/shelf_router_generator/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.1.2-wip + +* Require `analyzer: ^7.4.0` +* Require `build: ^3.0.0` +* Require `build_config: ^1.1.0` +* Require `source_gen: ^3.0.0` +* Require `sdk: ^3.7.0` + ## 1.1.1 * Support the latest `package:analyzer` and `package:source_gen` diff --git a/pkgs/shelf_router_generator/example/main.g.dart b/pkgs/shelf_router_generator/example/main.g.dart index 869d8ecb..bb5347d1 100644 --- a/pkgs/shelf_router_generator/example/main.g.dart +++ b/pkgs/shelf_router_generator/example/main.g.dart @@ -8,47 +8,18 @@ part of 'main.dart'; Router _$ServiceRouter(Service service) { final router = Router(); - router.add( - 'GET', - r'/say-hi/', - service._hi, - ); - router.add( - 'GET', - r'/user/', - service._user, - ); - router.add( - 'GET', - r'/wave', - service._wave, - ); - router.mount( - r'/api', - service._api.call, - ); - router.all( - r'/', - service._notFound, - ); + router.add('GET', r'/say-hi/', service._hi); + router.add('GET', r'/user/', service._user); + router.add('GET', r'/wave', service._wave); + router.mount(r'/api', service._api.call); + router.all(r'/', service._notFound); return router; } Router _$ApiRouter(Api service) { final router = Router(); - router.add( - 'GET', - r'/messages', - service._messages, - ); - router.add( - 'GET', - r'/messages/', - service._messages, - ); - router.all( - r'/', - service._notFound, - ); + router.add('GET', r'/messages', service._messages); + router.add('GET', r'/messages/', service._messages); + router.all(r'/', service._notFound); return router; } diff --git a/pkgs/shelf_router_generator/lib/builder.dart b/pkgs/shelf_router_generator/lib/builder.dart index 5fe106a2..b790aed6 100644 --- a/pkgs/shelf_router_generator/lib/builder.dart +++ b/pkgs/shelf_router_generator/lib/builder.dart @@ -29,7 +29,5 @@ import 'src/shelf_router_generator.dart'; /// A [Builder] that generates a `_$Router( service)` /// function for each class `` containing a member annotated with /// [shelf_router.Route]. -Builder shelfRouter(BuilderOptions _) => SharedPartBuilder( - [ShelfRouterGenerator()], - 'shelf_router', - ); +Builder shelfRouter(BuilderOptions _) => + SharedPartBuilder([ShelfRouterGenerator()], 'shelf_router'); diff --git a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart index 0ccf70d2..10bbcbf0 100644 --- a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart +++ b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart @@ -14,16 +14,16 @@ import 'dart:async' show Future; -import 'package:analyzer/dart/element/element.dart' - show ClassElement, ElementKind, ExecutableElement; +import 'package:analyzer/dart/element/element2.dart' + show ClassElement2, ElementKind, ExecutableElement2; import 'package:analyzer/dart/element/type.dart' show ParameterizedType; import 'package:build/build.dart' show BuildStep, log; import 'package:code_builder/code_builder.dart' as code; import 'package:http_methods/http_methods.dart' show isHttpMethod; import 'package:shelf/shelf.dart' as shelf; import 'package:shelf_router/shelf_router.dart' as shelf_router; -// ignore: implementation_imports -import 'package:shelf_router/src/router_entry.dart' show RouterEntry; +import 'package:shelf_router/src/router_entry.dart' // ignore: implementation_imports + show RouterEntry; import 'package:source_gen/source_gen.dart' as g; // Type checkers that we need later @@ -36,93 +36,113 @@ const _stringType = g.TypeChecker.fromRuntime(String); /// A representation of a handler that was annotated with [shelf_router.Route]. class _Handler { final String verb, route; - final ExecutableElement element; + final ExecutableElement2 element; _Handler(this.verb, this.route, this.element); } /// Find members of a class annotated with [shelf_router.Route]. -List getAnnotatedElementsOrderBySourceOffset( - ClassElement cls) => - [ - ...cls.methods.where(_routeType.hasAnnotationOfExact), - ...cls.accessors.where(_routeType.hasAnnotationOfExact) - ]..sort((a, b) => (a.nameOffset).compareTo(b.nameOffset)); +List getAnnotatedElementsOrderBySourceOffset( + ClassElement2 cls, +) => [ + ...cls.methods2.where(_routeType.hasAnnotationOfExact), + ...cls.getters2.where(_routeType.hasAnnotationOfExact), +]..sort( + (a, b) => + (a.firstFragment.nameOffset2!).compareTo(b.firstFragment.nameOffset2!), +); /// Generate a `_$Router( service)` method that returns a /// [shelf_router.Router] configured based on annotated handlers. code.Method _buildRouterMethod({ - required ClassElement classElement, + required ClassElement2 classElement, required List<_Handler> handlers, -}) => - code.Method( - (b) => b - ..name = '_\$${classElement.name}Router' +}) => code.Method( + (b) => + b + ..name = '_\$${classElement.name3}Router' ..requiredParameters.add( - code.Parameter((b) => b - ..name = 'service' - ..type = code.refer(classElement.name)), + code.Parameter( + (b) => + b + ..name = 'service' + ..type = code.refer(classElement.name3!), + ), ) ..returns = code.refer('Router') ..body = code.Block( - (b) => b - ..addExpression( - code - .declareFinal('router') - .assign(code.refer('Router').newInstance([])), - ) - ..statements.addAll(handlers.map((h) => _buildAddHandlerCode( - router: code.refer('router'), - service: code.refer('service'), - handler: h, - ))) - ..addExpression(code.refer('router').returned), + (b) => + b + ..addExpression( + code + .declareFinal('router') + .assign(code.refer('Router').newInstance([])), + ) + ..statements.addAll( + handlers.map( + (h) => _buildAddHandlerCode( + router: code.refer('router'), + service: code.refer('service'), + handler: h, + ), + ), + ) + ..addExpression(code.refer('router').returned), ), - ); +); /// Generate the code statement that adds [handler] from [service] to [router]. code.Code _buildAddHandlerCode({ required code.Reference router, required code.Reference service, required _Handler handler, -}) => - switch (handler.verb) { - r'$mount' => router.property('mount').call([ - code.literalString(handler.route, raw: true), - service.property(handler.element.name).property('call'), - ]).statement, - r'$all' => router.property('all').call([ - code.literalString(handler.route, raw: true), - service.property(handler.element.name), - ]).statement, - _ => router.property('add').call([ - code.literalString(handler.verb.toUpperCase()), - code.literalString(handler.route, raw: true), - service.property(handler.element.name), - ]).statement - }; +}) => switch (handler.verb) { + r'$mount' => + router.property('mount').call([ + code.literalString(handler.route, raw: true), + service.property(handler.element.name3!).property('call'), + ]).statement, + r'$all' => + router.property('all').call([ + code.literalString(handler.route, raw: true), + service.property(handler.element.name3!), + ]).statement, + _ => + router.property('add').call([ + code.literalString(handler.verb.toUpperCase()), + code.literalString(handler.route, raw: true), + service.property(handler.element.name3!), + ]).statement, +}; class ShelfRouterGenerator extends g.Generator { @override Future generate(g.LibraryReader library, BuildStep buildStep) async { // Create a map from ClassElement to list of annotated elements sorted by // offset in source code, this is not type checked yet. - final classes = >{}; + final classes = >{}; for (final cls in library.classes) { final elements = getAnnotatedElementsOrderBySourceOffset(cls); if (elements.isEmpty) { continue; } - log.info('found shelf_router.Route annotations in ${cls.name}'); + log.info('found shelf_router.Route annotations in ${cls.name3}'); - classes[cls] = elements - .map((e) => _routeType.annotationsOfExact(e).map((a) => _Handler( - a.getField('verb')!.toStringValue()!, - a.getField('route')!.toStringValue()!, - e, - ))) - .expand((i) => i) - .toList(); + classes[cls] = + elements + .map( + (e) => _routeType + .annotationsOfExact(e) + .map( + (a) => _Handler( + a.getField('verb')!.toStringValue()!, + a.getField('route')!.toStringValue()!, + e, + ), + ), + ) + .expand((i) => i) + .toList(); } if (classes.isEmpty) { return null; // nothing to do if nothing was annotated @@ -139,13 +159,12 @@ class ShelfRouterGenerator extends g.Generator { } // Build library and emit code with all generate methods. - final methods = classes.entries.map((e) => _buildRouterMethod( - classElement: e.key, - handlers: e.value, - )); - return code.Library((b) => b.body.addAll(methods)) - .accept(code.DartEmitter()) - .toString(); + final methods = classes.entries.map( + (e) => _buildRouterMethod(classElement: e.key, handlers: e.value), + ); + return code.Library( + (b) => b.body.addAll(methods), + ).accept(code.DartEmitter()).toString(); } } @@ -154,32 +173,36 @@ class ShelfRouterGenerator extends g.Generator { void _typeCheckHandler(_Handler h) { if (h.element.isStatic) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation cannot be used on static members', - element: h.element); + 'The shelf_router.Route annotation cannot be used on static members', + element: h.element, + ); } // Check the verb, note that $all is a special value for handling all verbs. if (!isHttpMethod(h.verb) && h.verb != r'$all') { throw g.InvalidGenerationSourceError( - 'The verb "${h.verb}" used in shelf_router.Route annotation must be ' - 'a valid HTTP method', - element: h.element); + 'The verb "${h.verb}" used in shelf_router.Route annotation must be ' + 'a valid HTTP method', + element: h.element, + ); } // Check that this shouldn't have been annotated with Route.mount if (h.element.kind == ElementKind.GETTER) { throw g.InvalidGenerationSourceError( - 'Only the shelf_router.Route.mount annotation can only be used on a ' - 'getter, and only if it returns a shelf_router.Router', - element: h.element); + 'Only the shelf_router.Route.mount annotation can only be used on a ' + 'getter, and only if it returns a shelf_router.Router', + element: h.element, + ); } // Check that this is indeed a method if (h.element.kind != ElementKind.METHOD) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on request ' - 'handling methods', - element: h.element); + 'The shelf_router.Route annotation can only be used on request ' + 'handling methods', + element: h.element, + ); } // Check the route can parse @@ -188,60 +211,63 @@ void _typeCheckHandler(_Handler h) { params = RouterEntry(h.verb, h.route, () => null).params; // ignore: avoid_catching_errors } on ArgumentError catch (e) { - throw g.InvalidGenerationSourceError( - e.toString(), - element: h.element, - ); + throw g.InvalidGenerationSourceError(e.toString(), element: h.element); } // Ensure that the first parameter is shelf.Request - if (h.element.parameters.isEmpty) { + if (h.element.formalParameters.isEmpty) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on shelf request ' - 'handlers accept a shelf.Request parameter', - element: h.element); + 'The shelf_router.Route annotation can only be used on shelf request ' + 'handlers accept a shelf.Request parameter', + element: h.element, + ); } - for (final p in h.element.parameters) { + for (final p in h.element.formalParameters) { if (p.isOptional) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on shelf ' - 'request handlers accept a shelf.Request parameter and/or a ' - 'shelf.Request parameter and all string parameters in the route, ' - 'optional parameters are not permitted', - element: p); + 'The shelf_router.Route annotation can only be used on shelf ' + 'request handlers accept a shelf.Request parameter and/or a ' + 'shelf.Request parameter and all string parameters in the route, ' + 'optional parameters are not permitted', + element: p, + ); } } - if (!_requestType.isExactlyType(h.element.parameters.first.type)) { + if (!_requestType.isExactlyType(h.element.formalParameters.first.type)) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on shelf request ' - 'handlers accept a shelf.Request parameter as first parameter', - element: h.element); + 'The shelf_router.Route annotation can only be used on shelf request ' + 'handlers accept a shelf.Request parameter as first parameter', + element: h.element, + ); } - if (h.element.parameters.length > 1) { - if (h.element.parameters.length != params.length + 1) { + if (h.element.formalParameters.length > 1) { + if (h.element.formalParameters.length != params.length + 1) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on shelf ' - 'request handlers accept a shelf.Request parameter and/or a ' - 'shelf.Request parameter and all string parameters in the route', - element: h.element); + 'The shelf_router.Route annotation can only be used on shelf ' + 'request handlers accept a shelf.Request parameter and/or a ' + 'shelf.Request parameter and all string parameters in the route', + element: h.element, + ); } for (var i = 0; i < params.length; i++) { - final p = h.element.parameters[i + 1]; - if (p.name != params[i]) { + final p = h.element.formalParameters[i + 1]; + if (p.name3 != params[i]) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on shelf ' - 'request handlers accept a shelf.Request parameter and/or a ' - 'shelf.Request parameter and all string parameters in the route, ' - 'the "${p.name}" parameter should be named "${params[i]}"', - element: p); + 'The shelf_router.Route annotation can only be used on shelf ' + 'request handlers accept a shelf.Request parameter and/or a ' + 'shelf.Request parameter and all string parameters in the route, ' + 'the "${p.name3}" parameter should be named "${params[i]}"', + element: p, + ); } if (!_stringType.isExactlyType(p.type)) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on shelf ' - 'request handlers accept a shelf.Request parameter and/or a ' - 'shelf.Request parameter and all string parameters in the route, ' - 'the "${p.name}" parameter is not of type string', - element: p); + 'The shelf_router.Route annotation can only be used on shelf ' + 'request handlers accept a shelf.Request parameter and/or a ' + 'shelf.Request parameter and all string parameters in the route, ' + 'the "${p.name3}" parameter is not of type string', + element: p, + ); } } } @@ -254,10 +280,11 @@ void _typeCheckHandler(_Handler h) { } if (!_responseType.isAssignableFromType(returnType)) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation can only be used on shelf request ' - 'handlers that return shelf.Response, Future or ' - 'FutureOr, and not "${h.element.returnType}"', - element: h.element); + 'The shelf_router.Route annotation can only be used on shelf request ' + 'handlers that return shelf.Response, Future or ' + 'FutureOr, and not "${h.element.returnType}"', + element: h.element, + ); } } @@ -266,36 +293,41 @@ void _typeCheckHandler(_Handler h) { void _typeCheckMount(_Handler h) { if (h.element.isStatic) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route annotation cannot be used on static members', - element: h.element); + 'The shelf_router.Route annotation cannot be used on static members', + element: h.element, + ); } // Check that this should have been annotated with Route.mount if (h.element.kind != ElementKind.GETTER) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route.mount annotation can only be used on a ' - 'getter that returns shelf_router.Router', - element: h.element); + 'The shelf_router.Route.mount annotation can only be used on a ' + 'getter that returns shelf_router.Router', + element: h.element, + ); } // Sanity checks for the prefix if (!h.route.startsWith('/')) { throw g.InvalidGenerationSourceError( - 'The prefix "${h.route}" in shelf_router.Route.mount(prefix) ' - 'annotation must begin with a slash', - element: h.element); + 'The prefix "${h.route}" in shelf_router.Route.mount(prefix) ' + 'annotation must begin with a slash', + element: h.element, + ); } if (h.route.contains('<')) { throw g.InvalidGenerationSourceError( - 'The prefix "${h.route}" in shelf_router.Route.mount(prefix) ' - 'annotation cannot contain <', - element: h.element); + 'The prefix "${h.route}" in shelf_router.Route.mount(prefix) ' + 'annotation cannot contain <', + element: h.element, + ); } if (!_routerType.isAssignableFromType(h.element.returnType)) { throw g.InvalidGenerationSourceError( - 'The shelf_router.Route.mount annotation can only be used on a ' - 'getter that returns shelf_router.Router', - element: h.element); + 'The shelf_router.Route.mount annotation can only be used on a ' + 'getter that returns shelf_router.Router', + element: h.element, + ); } } diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml index e1840d5e..ab1fb542 100644 --- a/pkgs/shelf_router_generator/pubspec.yaml +++ b/pkgs/shelf_router_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_router_generator -version: 1.1.1 +version: 1.1.2-wip description: > A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. @@ -11,21 +11,21 @@ topics: - shelf environment: - sdk: ^3.3.0 + sdk: ^3.7.0 dependencies: - analyzer: '>=4.6.0 <8.0.0' - build: ^2.2.2 - build_config: ^1.0.0 + analyzer: ^7.4.0 + build: ^3.0.0 + build_config: ^1.1.0 code_builder: ^4.2.0 http_methods: ^1.1.0 shelf: ^1.1.0 shelf_router: ^1.1.0 - source_gen: ">=1.2.2 <3.0.0" + source_gen: ^3.0.0 dev_dependencies: - build_runner: ^2.1.9 + build_runner: ^2.6.0 build_verify: ^3.0.0 dart_flutter_team_lints: ^3.0.0 http: ^1.0.0 - test: ^1.21.0 + test: ^1.25.9 diff --git a/pkgs/shelf_router_generator/test/server/api.g.dart b/pkgs/shelf_router_generator/test/server/api.g.dart index 75e9a23c..b2dc9a96 100644 --- a/pkgs/shelf_router_generator/test/server/api.g.dart +++ b/pkgs/shelf_router_generator/test/server/api.g.dart @@ -8,20 +8,8 @@ part of 'api.dart'; Router _$ApiRouter(Api service) { final router = Router(); - router.add( - 'GET', - r'/time', - service._time, - ); - router.add( - 'GET', - r'/to-uppercase/', - service._toUpperCase, - ); - router.add( - 'GET', - r'/$string-escape', - service._stringEscapingWorks, - ); + router.add('GET', r'/time', service._time); + router.add('GET', r'/to-uppercase/', service._toUpperCase); + router.add('GET', r'/$string-escape', service._stringEscapingWorks); return router; } diff --git a/pkgs/shelf_router_generator/test/server/server.dart b/pkgs/shelf_router_generator/test/server/server.dart index ba55082a..70d911be 100644 --- a/pkgs/shelf_router_generator/test/server/server.dart +++ b/pkgs/shelf_router_generator/test/server/server.dart @@ -29,9 +29,5 @@ class Server { Future stop() => _server.close(); - Uri get uri => Uri( - scheme: 'http', - host: 'localhost', - port: _server.port, - ); + Uri get uri => Uri(scheme: 'http', host: 'localhost', port: _server.port); } diff --git a/pkgs/shelf_router_generator/test/server/service.g.dart b/pkgs/shelf_router_generator/test/server/service.g.dart index 07508c26..8140b76e 100644 --- a/pkgs/shelf_router_generator/test/server/service.g.dart +++ b/pkgs/shelf_router_generator/test/server/service.g.dart @@ -8,38 +8,12 @@ part of 'service.dart'; Router _$ServiceRouter(Service service) { final router = Router(); - router.add( - 'GET', - r'/say-hello', - service._sayHello, - ); - router.add( - 'GET', - r'/say-hello/', - service._sayHello, - ); - router.add( - 'GET', - r'/wave', - service._wave, - ); - router.add( - 'GET', - r'/greet/', - service._greet, - ); - router.add( - 'GET', - r'/hi/', - service._hi, - ); - router.mount( - r'/api/', - service._api.call, - ); - router.all( - r'/<_|.*>', - service._index, - ); + router.add('GET', r'/say-hello', service._sayHello); + router.add('GET', r'/say-hello/', service._sayHello); + router.add('GET', r'/wave', service._wave); + router.add('GET', r'/greet/', service._greet); + router.add('GET', r'/hi/', service._hi); + router.mount(r'/api/', service._api.call); + router.all(r'/<_|.*>', service._index); return router; } diff --git a/pkgs/shelf_router_generator/test/server_test.dart b/pkgs/shelf_router_generator/test/server_test.dart index df14559d..bb946eb6 100644 --- a/pkgs/shelf_router_generator/test/server_test.dart +++ b/pkgs/shelf_router_generator/test/server_test.dart @@ -22,10 +22,7 @@ void main() { setUpAll(server.start); tearDownAll(server.stop); - void testGet({ - required String path, - required String result, - }) => + void testGet({required String path, required String result}) => test('GET $path', () async { final result = await http.get(server.uri.resolve(path)); expect(result, equals(result)); diff --git a/pkgs/shelf_test_handler/CHANGELOG.md b/pkgs/shelf_test_handler/CHANGELOG.md index 941ecbc6..cb895460 100644 --- a/pkgs/shelf_test_handler/CHANGELOG.md +++ b/pkgs/shelf_test_handler/CHANGELOG.md @@ -1,6 +1,8 @@ ## 2.0.3-wip -* Require Dart `^3.3.0`. +* Require `shelf: ^1.1.0` +* Require `test: ^1.25.15` +* Require `sdk: ^3.5.0`. ## 2.0.2 diff --git a/pkgs/shelf_test_handler/pubspec.yaml b/pkgs/shelf_test_handler/pubspec.yaml index 35afd903..c8420493 100644 --- a/pkgs/shelf_test_handler/pubspec.yaml +++ b/pkgs/shelf_test_handler/pubspec.yaml @@ -9,15 +9,15 @@ topics: - shelf environment: - sdk: ^3.3.0 + sdk: ^3.5.0 dependencies: http_multi_server: ^3.0.0 - shelf: ^1.0.0 - test: ^1.16.0 + shelf: ^1.1.0 + test: ^1.25.15 dev_dependencies: dart_flutter_team_lints: ^3.0.0 http: ^1.0.0 - shelf_web_socket: ^2.0.0 - web_socket_channel: ^2.0.0 + shelf_web_socket: ^3.0.0 + web_socket_channel: ^3.0.3 diff --git a/pkgs/shelf_web_socket/CHANGELOG.md b/pkgs/shelf_web_socket/CHANGELOG.md index 8a6c40f0..980b77f2 100644 --- a/pkgs/shelf_web_socket/CHANGELOG.md +++ b/pkgs/shelf_web_socket/CHANGELOG.md @@ -1,3 +1,5 @@ +## 3.0.1-wip + ## 3.0.0 * **BREAKING:**: Change the signature of the `webSocketHandler` method's diff --git a/pkgs/shelf_web_socket/pubspec.yaml b/pkgs/shelf_web_socket/pubspec.yaml index deb6656d..9d142ddf 100644 --- a/pkgs/shelf_web_socket/pubspec.yaml +++ b/pkgs/shelf_web_socket/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_web_socket -version: 3.0.0 +version: 3.0.1-wip description: A shelf handler that wires up a listener for every connection. repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_web_socket issue_tracker: https://github.com/dart-lang/shelf/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Ashelf_web_socket @@ -20,7 +20,3 @@ dev_dependencies: dart_flutter_team_lints: ^3.0.0 http: '>=0.13.0 <2.0.0' test: ^1.25.2 - -# TODO(devoncarew): Remove once package:test supports v2+v3 of shelf_web_socket. -dependency_overrides: - test: ^1.25.11 diff --git a/tool/ci.sh b/tool/ci.sh index d576ee0e..c5272b36 100644 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.6.2 +# Created with package:mono_repo v6.6.3 # Support built in commands on windows out of the box. From 400fc396b9fd07b3dced5c6a0d7567072598f2d9 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 11 Aug 2025 19:42:17 -0700 Subject: [PATCH 17/20] [shelf_router_generator] latest deps, prepare release (#480) --- pkgs/shelf_router_generator/CHANGELOG.md | 4 ++-- .../lib/src/shelf_router_generator.dart | 3 +++ pkgs/shelf_router_generator/pubspec.yaml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/shelf_router_generator/CHANGELOG.md b/pkgs/shelf_router_generator/CHANGELOG.md index ea47db1e..90773830 100644 --- a/pkgs/shelf_router_generator/CHANGELOG.md +++ b/pkgs/shelf_router_generator/CHANGELOG.md @@ -1,6 +1,6 @@ -## 1.1.2-wip +## 1.1.2 -* Require `analyzer: ^7.4.0` +* Require `analyzer: '>=7.4.0 <9.0.0'` * Require `build: ^3.0.0` * Require `build_config: ^1.1.0` * Require `source_gen: ^3.0.0` diff --git a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart index 10bbcbf0..27906de0 100644 --- a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart +++ b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +// While we support the older pkg:analyzer version +// ignore_for_file: deprecated_member_use + import 'dart:async' show Future; import 'package:analyzer/dart/element/element2.dart' diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml index ab1fb542..276d2959 100644 --- a/pkgs/shelf_router_generator/pubspec.yaml +++ b/pkgs/shelf_router_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_router_generator -version: 1.1.2-wip +version: 1.1.2 description: > A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. @@ -14,7 +14,7 @@ environment: sdk: ^3.7.0 dependencies: - analyzer: ^7.4.0 + analyzer: '>=7.4.0 <9.0.0' build: ^3.0.0 build_config: ^1.1.0 code_builder: ^4.2.0 From de91a5b8c1de05f622c0c6f1eab38d5f31e0113f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Sep 2025 22:17:22 +0000 Subject: [PATCH 18/20] Bump the github-actions group with 2 updates (#481) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 2 updates: [actions/cache](https://github.com/actions/cache) and [actions/checkout](https://github.com/actions/checkout). Updates `actions/cache` from 4.2.3 to 4.2.4
Release notes

Sourced from actions/cache's releases.

v4.2.4

What's Changed

New Contributors

Full Changelog: https://github.com/actions/cache/compare/v4...v4.2.4

Changelog

Sourced from actions/cache's changelog.

Releases

4.2.4

  • Bump @actions/cache to v4.0.5

4.2.3

  • Bump @actions/cache to v4.0.3 (obfuscates SAS token in debug logs for cache entries)

4.2.2

  • Bump @actions/cache to v4.0.2

4.2.1

  • Bump @actions/cache to v4.0.1

4.2.0

TLDR; The cache backend service has been rewritten from the ground up for improved performance and reliability. actions/cache now integrates with the new cache service (v2) APIs.

The new service will gradually roll out as of February 1st, 2025. The legacy service will also be sunset on the same date. Changes in these release are fully backward compatible.

We are deprecating some versions of this action. We recommend upgrading to version v4 or v3 as soon as possible before February 1st, 2025. (Upgrade instructions below).

If you are using pinned SHAs, please use the SHAs of versions v4.2.0 or v3.4.0

If you do not upgrade, all workflow runs using any of the deprecated actions/cache will fail.

Upgrading to the recommended versions will not break your workflows.

4.1.2

  • Add GitHub Enterprise Cloud instances hostname filters to inform API endpoint choices - #1474
  • Security fix: Bump braces from 3.0.2 to 3.0.3 - #1475

4.1.1

  • Restore original behavior of cache-hit output - #1467

4.1.0

  • Ensure cache-hit output is set when a cache is missed - #1404
  • Deprecate save-always input - #1452

4.0.2

  • Fixed restore fail-on-cache-miss not working.

... (truncated)

Commits
  • 0400d5f Merge pull request #1636 from actions/Link-/release-4.2.4
  • 374a27f Prepare release 4.2.4
  • 358a730 Merge pull request #1634 from actions/Link-/optimise-deps
  • 2ee706e Fix with another approach
  • 94f7b5d Fix bundle exec
  • c36116c Fix the workflow to use licensed from source
  • 320fe7d Update the licensed workflow to use the latest version
  • d81cc47 Add licensed output
  • de24398 Add licensed output
  • e7b6a9c @​protobuf-ts/plugin to dev dependencies
  • Additional commits viewable in compare view

Updates `actions/checkout` from 4.2.2 to 5.0.0
Release notes

Sourced from actions/checkout's releases.

v5.0.0

What's Changed

⚠️ Minimum Compatible Runner Version

v2.327.1
Release Notes

Make sure your runner is updated to this version or newer to use this release.

Full Changelog: https://github.com/actions/checkout/compare/v4...v5.0.0

v4.3.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/checkout/compare/v4...v4.3.0

Changelog

Sourced from actions/checkout's changelog.

Changelog

V5.0.0

V4.3.0

v4.2.2

v4.2.1

v4.2.0

v4.1.7

v4.1.6

v4.1.5

v4.1.4

v4.1.3

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--- .github/workflows/dart.yml | 80 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index d46ba167..d0ae0dc2 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -34,7 +34,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - name: mono_repo self validate run: dart pub global activate mono_repo 6.6.3 - name: mono_repo self validate @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static;commands:analyze" @@ -59,7 +59,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade @@ -101,7 +101,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:analyze" @@ -116,7 +116,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -131,7 +131,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -146,7 +146,7 @@ jobs: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_test_handler_pub_upgrade name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade @@ -170,7 +170,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:analyze" @@ -185,7 +185,7 @@ jobs: sdk: "3.7.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_router_generator_pub_upgrade name: pkgs/shelf_router_generator; dart pub upgrade run: dart pub upgrade @@ -200,7 +200,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -215,7 +215,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -293,7 +293,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:format" @@ -308,7 +308,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -386,7 +386,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static;commands:test_0" @@ -401,7 +401,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade @@ -451,7 +451,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" @@ -466,7 +466,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -489,7 +489,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" @@ -504,7 +504,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -527,7 +527,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler;commands:test_1" @@ -542,7 +542,7 @@ jobs: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_test_handler_pub_upgrade name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade @@ -565,7 +565,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -580,7 +580,7 @@ jobs: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_test_handler_pub_upgrade name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade @@ -612,7 +612,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:test_0" @@ -627,7 +627,7 @@ jobs: sdk: "3.7.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_router_generator_pub_upgrade name: pkgs/shelf_router_generator; dart pub upgrade run: dart pub upgrade @@ -650,7 +650,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_2" @@ -665,7 +665,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -697,7 +697,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" @@ -712,7 +712,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -744,7 +744,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -759,7 +759,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -845,7 +845,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 + uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf_router_generator;commands:test_3" @@ -860,7 +860,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_router_generator_pub_upgrade name: pkgs/shelf_router_generator; dart pub upgrade run: dart pub upgrade @@ -888,7 +888,7 @@ jobs: sdk: "3.3.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade @@ -925,7 +925,7 @@ jobs: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -953,7 +953,7 @@ jobs: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_test_handler_pub_upgrade name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade @@ -981,7 +981,7 @@ jobs: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_test_handler_pub_upgrade name: pkgs/shelf_test_handler; dart pub upgrade run: dart pub upgrade @@ -1018,7 +1018,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_pub_upgrade name: pkgs/shelf; dart pub upgrade run: dart pub upgrade @@ -1055,7 +1055,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkgs_shelf_packages_handler_pub_upgrade name: pkgs/shelf_packages_handler; dart pub upgrade run: dart pub upgrade From f30d65034a868530a9aa9ada7c3067d22fa01185 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Oct 2025 12:10:05 +0000 Subject: [PATCH 19/20] Bump the github-actions group with 3 updates (#483) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 3 updates: [actions/cache](https://github.com/actions/cache), [actions/stale](https://github.com/actions/stale) and [actions/labeler](https://github.com/actions/labeler). Updates `actions/cache` from 4.2.4 to 4.3.0
Release notes

Sourced from actions/cache's releases.

v4.3.0

What's Changed

New Contributors

Full Changelog: https://github.com/actions/cache/compare/v4...v4.3.0

Changelog

Sourced from actions/cache's changelog.

Releases

4.3.0

  • Bump @actions/cache to v4.1.0

4.2.4

  • Bump @actions/cache to v4.0.5

4.2.3

  • Bump @actions/cache to v4.0.3 (obfuscates SAS token in debug logs for cache entries)

4.2.2

  • Bump @actions/cache to v4.0.2

4.2.1

  • Bump @actions/cache to v4.0.1

4.2.0

TLDR; The cache backend service has been rewritten from the ground up for improved performance and reliability. actions/cache now integrates with the new cache service (v2) APIs.

The new service will gradually roll out as of February 1st, 2025. The legacy service will also be sunset on the same date. Changes in these release are fully backward compatible.

We are deprecating some versions of this action. We recommend upgrading to version v4 or v3 as soon as possible before February 1st, 2025. (Upgrade instructions below).

If you are using pinned SHAs, please use the SHAs of versions v4.2.0 or v3.4.0

If you do not upgrade, all workflow runs using any of the deprecated actions/cache will fail.

Upgrading to the recommended versions will not break your workflows.

4.1.2

  • Add GitHub Enterprise Cloud instances hostname filters to inform API endpoint choices - #1474
  • Security fix: Bump braces from 3.0.2 to 3.0.3 - #1475

4.1.1

  • Restore original behavior of cache-hit output - #1467

4.1.0

  • Ensure cache-hit output is set when a cache is missed - #1404
  • Deprecate save-always input - #1452

... (truncated)

Commits
  • 0057852 Merge pull request #1655 from actions/Link-/prepare-4.3.0
  • 4f5ea67 Update licensed cache
  • 9fcad95 Upgrade actions/cache to 4.1.0 and prepare 4.3.0 release
  • 638ed79 Merge pull request #1642 from actions/GhadimiR-patch-1
  • 3862dcc Add note on runner versions
  • See full diff in compare view

Updates `actions/stale` from 9.1.0 to 10.0.0
Release notes

Sourced from actions/stale's releases.

v10.0.0

What's Changed

Breaking Changes

Enhancement

Dependency Upgrades

Documentation changes

New Contributors

Full Changelog: https://github.com/actions/stale/compare/v9...v10.0.0

Commits

Updates `actions/labeler` from 5.0.0 to 6.0.1
Release notes

Sourced from actions/labeler's releases.

v6.0.1

What's Changed

New Contributors

Full Changelog: https://github.com/actions/labeler/compare/v6.0.0...v6.0.1

v6.0.0

What's Changed

Breaking Changes

Dependency Upgrades

Documentation changes

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--- .github/workflows/dart.yml | 34 ++++++++++++------------ .github/workflows/no-response.yml | 2 +- .github/workflows/pull_request_label.yml | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index d0ae0dc2..5e474bf8 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static;commands:analyze" @@ -101,7 +101,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:analyze" @@ -131,7 +131,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -170,7 +170,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:analyze" @@ -200,7 +200,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:analyze" @@ -293,7 +293,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:format" @@ -386,7 +386,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_static;commands:test_0" @@ -451,7 +451,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_1" @@ -489,7 +489,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/shelf;commands:test_0" @@ -527,7 +527,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler;commands:test_1" @@ -565,7 +565,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -612,7 +612,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:test_0" @@ -650,7 +650,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_2" @@ -697,7 +697,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_test_handler;commands:test_1" @@ -744,7 +744,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf-pkgs/shelf_packages_handler-pkgs/shelf_proxy-pkgs/shelf_router-pkgs/shelf_router_generator-pkgs/shelf_static-pkgs/shelf_test_handler-pkgs/shelf_web_socket;commands:test_0" @@ -845,7 +845,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/shelf_router_generator;commands:test_3" diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml index cdc73e11..a8dbc6be 100644 --- a/.github/workflows/no-response.yml +++ b/.github/workflows/no-response.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.repository_owner == 'dart-lang' }} steps: - - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 + - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f with: days-before-stale: -1 days-before-close: 14 diff --git a/.github/workflows/pull_request_label.yml b/.github/workflows/pull_request_label.yml index 54e3df53..3115ed45 100644 --- a/.github/workflows/pull_request_label.yml +++ b/.github/workflows/pull_request_label.yml @@ -16,7 +16,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 + - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b with: repo-token: "${{ secrets.GITHUB_TOKEN }}" sync-labels: true From 710b8cef08f69acf176c807eaf274dfb8656fde0 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 8 Oct 2025 18:57:22 -0700 Subject: [PATCH 20/20] shelf_router_generator: update dependencies, SDK (#484) --- .github/workflows/dart.yml | 20 +-- pkgs/shelf_router_generator/CHANGELOG.md | 8 + .../lib/src/shelf_router_generator.dart | 148 +++++++++--------- pkgs/shelf_router_generator/pubspec.yaml | 16 +- 4 files changed, 102 insertions(+), 90 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 5e474bf8..1c744b16 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -166,23 +166,23 @@ jobs: if: "always() && steps.pkgs_shelf_web_socket_pub_upgrade.conclusion == 'success'" working-directory: pkgs/shelf_web_socket job_005: - name: "analyze_and_format; linux; Dart 3.7.0; PKG: pkgs/shelf_router_generator; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.9.0; PKG: pkgs/shelf_router_generator; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.9.0;packages:pkgs/shelf_router_generator;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator - os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.9.0;packages:pkgs/shelf_router_generator + os:ubuntu-latest;pub-cache-hosted;sdk:3.9.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.7.0" + sdk: "3.9.0" - id: checkout name: Checkout repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 @@ -608,23 +608,23 @@ jobs: - job_006 - job_007 job_013: - name: "unit_test; linux; Dart 3.7.0; PKG: pkgs/shelf_router_generator; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.9.0; PKG: pkgs/shelf_router_generator; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.9.0;packages:pkgs/shelf_router_generator;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:pkgs/shelf_router_generator - os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.9.0;packages:pkgs/shelf_router_generator + os:ubuntu-latest;pub-cache-hosted;sdk:3.9.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.7.0" + sdk: "3.9.0" - id: checkout name: Checkout repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 diff --git a/pkgs/shelf_router_generator/CHANGELOG.md b/pkgs/shelf_router_generator/CHANGELOG.md index 90773830..b1089aa5 100644 --- a/pkgs/shelf_router_generator/CHANGELOG.md +++ b/pkgs/shelf_router_generator/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.1.3-wip + +* Require `analyzer: ^8.1.1` +* Require `build: ^4.0.0` +* Require `build_config: ^1.2.0` +* Require `source_gen: ^4.0.1` +* Require `sdk: ^3.9.0` + ## 1.1.2 * Require `analyzer: '>=7.4.0 <9.0.0'` diff --git a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart index 27906de0..b3c148df 100644 --- a/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart +++ b/pkgs/shelf_router_generator/lib/src/shelf_router_generator.dart @@ -30,11 +30,20 @@ import 'package:shelf_router/src/router_entry.dart' // ignore: implementation_im import 'package:source_gen/source_gen.dart' as g; // Type checkers that we need later -const _routeType = g.TypeChecker.fromRuntime(shelf_router.Route); -const _routerType = g.TypeChecker.fromRuntime(shelf_router.Router); -const _responseType = g.TypeChecker.fromRuntime(shelf.Response); -const _requestType = g.TypeChecker.fromRuntime(shelf.Request); -const _stringType = g.TypeChecker.fromRuntime(String); +const _routeType = g.TypeChecker.typeNamed( + shelf_router.Route, + inPackage: 'shelf_router', +); +const _routerType = g.TypeChecker.typeNamed( + shelf_router.Router, + inPackage: 'shelf_router', +); +const _responseType = g.TypeChecker.typeNamed( + shelf.Response, + inPackage: 'shelf', +); +const _requestType = g.TypeChecker.typeNamed(shelf.Request, inPackage: 'shelf'); +const _stringType = g.TypeChecker.typeNamed(String, inSdk: true); /// A representation of a handler that was annotated with [shelf_router.Route]. class _Handler { @@ -47,13 +56,15 @@ class _Handler { /// Find members of a class annotated with [shelf_router.Route]. List getAnnotatedElementsOrderBySourceOffset( ClassElement2 cls, -) => [ - ...cls.methods2.where(_routeType.hasAnnotationOfExact), - ...cls.getters2.where(_routeType.hasAnnotationOfExact), -]..sort( - (a, b) => - (a.firstFragment.nameOffset2!).compareTo(b.firstFragment.nameOffset2!), -); +) => + [ + ...cls.methods2.where(_routeType.hasAnnotationOfExact), + ...cls.getters2.where(_routeType.hasAnnotationOfExact), + ]..sort( + (a, b) => (a.firstFragment.nameOffset2!).compareTo( + b.firstFragment.nameOffset2!, + ), + ); /// Generate a `_$Router( service)` method that returns a /// [shelf_router.Router] configured based on annotated handlers. @@ -61,37 +72,34 @@ code.Method _buildRouterMethod({ required ClassElement2 classElement, required List<_Handler> handlers, }) => code.Method( - (b) => - b - ..name = '_\$${classElement.name3}Router' - ..requiredParameters.add( - code.Parameter( - (b) => - b - ..name = 'service' - ..type = code.refer(classElement.name3!), + (b) => b + ..name = '_\$${classElement.name3}Router' + ..requiredParameters.add( + code.Parameter( + (b) => b + ..name = 'service' + ..type = code.refer(classElement.name3!), + ), + ) + ..returns = code.refer('Router') + ..body = code.Block( + (b) => b + ..addExpression( + code + .declareFinal('router') + .assign(code.refer('Router').newInstance([])), + ) + ..statements.addAll( + handlers.map( + (h) => _buildAddHandlerCode( + router: code.refer('router'), + service: code.refer('service'), + handler: h, + ), ), ) - ..returns = code.refer('Router') - ..body = code.Block( - (b) => - b - ..addExpression( - code - .declareFinal('router') - .assign(code.refer('Router').newInstance([])), - ) - ..statements.addAll( - handlers.map( - (h) => _buildAddHandlerCode( - router: code.refer('router'), - service: code.refer('service'), - handler: h, - ), - ), - ) - ..addExpression(code.refer('router').returned), - ), + ..addExpression(code.refer('router').returned), + ), ); /// Generate the code statement that adds [handler] from [service] to [router]. @@ -100,22 +108,19 @@ code.Code _buildAddHandlerCode({ required code.Reference service, required _Handler handler, }) => switch (handler.verb) { - r'$mount' => - router.property('mount').call([ - code.literalString(handler.route, raw: true), - service.property(handler.element.name3!).property('call'), - ]).statement, - r'$all' => - router.property('all').call([ - code.literalString(handler.route, raw: true), - service.property(handler.element.name3!), - ]).statement, - _ => - router.property('add').call([ - code.literalString(handler.verb.toUpperCase()), - code.literalString(handler.route, raw: true), - service.property(handler.element.name3!), - ]).statement, + r'$mount' => router.property('mount').call([ + code.literalString(handler.route, raw: true), + service.property(handler.element.name3!).property('call'), + ]).statement, + r'$all' => router.property('all').call([ + code.literalString(handler.route, raw: true), + service.property(handler.element.name3!), + ]).statement, + _ => router.property('add').call([ + code.literalString(handler.verb.toUpperCase()), + code.literalString(handler.route, raw: true), + service.property(handler.element.name3!), + ]).statement, }; class ShelfRouterGenerator extends g.Generator { @@ -131,21 +136,20 @@ class ShelfRouterGenerator extends g.Generator { } log.info('found shelf_router.Route annotations in ${cls.name3}'); - classes[cls] = - elements - .map( - (e) => _routeType - .annotationsOfExact(e) - .map( - (a) => _Handler( - a.getField('verb')!.toStringValue()!, - a.getField('route')!.toStringValue()!, - e, - ), - ), - ) - .expand((i) => i) - .toList(); + classes[cls] = elements + .map( + (e) => _routeType + .annotationsOfExact(e) + .map( + (a) => _Handler( + a.getField('verb')!.toStringValue()!, + a.getField('route')!.toStringValue()!, + e, + ), + ), + ) + .expand((i) => i) + .toList(); } if (classes.isEmpty) { return null; // nothing to do if nothing was annotated diff --git a/pkgs/shelf_router_generator/pubspec.yaml b/pkgs/shelf_router_generator/pubspec.yaml index 276d2959..2e28b510 100644 --- a/pkgs/shelf_router_generator/pubspec.yaml +++ b/pkgs/shelf_router_generator/pubspec.yaml @@ -1,5 +1,5 @@ name: shelf_router_generator -version: 1.1.2 +version: 1.1.3-wip description: > A package:build-compatible builder for generating request routers for the shelf web-framework based on source annotations. @@ -11,21 +11,21 @@ topics: - shelf environment: - sdk: ^3.7.0 + sdk: ^3.9.0 dependencies: - analyzer: '>=7.4.0 <9.0.0' - build: ^3.0.0 - build_config: ^1.1.0 + analyzer: ^8.1.1 + build: ^4.0.0 + build_config: ^1.2.0 code_builder: ^4.2.0 http_methods: ^1.1.0 shelf: ^1.1.0 shelf_router: ^1.1.0 - source_gen: ^3.0.0 + source_gen: ^4.0.1 dev_dependencies: - build_runner: ^2.6.0 + build_runner: ^2.7.2 build_verify: ^3.0.0 dart_flutter_team_lints: ^3.0.0 http: ^1.0.0 - test: ^1.25.9 + test: ^1.26.3