From fbd994bfb7ee8f595fa02a508112aa4454b7f8bf Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Sun, 17 Nov 2024 14:02:56 +0800 Subject: [PATCH 1/2] Remove unused SDK channel config --- src/_data/site.yml | 4 +--- src/_includes/page-github-links.html | 2 +- src/content/get-dart/archive/index.md | 3 +-- src/content/tools/linter-rules/all.md | 2 +- src/content/tools/linter-rules/index.md | 2 +- src/content/tools/sdk.md | 7 +++---- src/content/tutorials/server/cmdline.md | 9 ++++----- tool/config/site_variable_scanner.yaml | 1 - 8 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/_data/site.yml b/src/_data/site.yml index 8b081a23b4..7b962dc8f9 100644 --- a/src/_data/site.yml +++ b/src/_data/site.yml @@ -40,6 +40,4 @@ show_banner: true # in the `firebase.json` redirect rule.) og_image_vers: "?2" -sdkInfo: - channel: stable - version: 3.5.3 +sdkVersion: 3.5.4 diff --git a/src/_includes/page-github-links.html b/src/_includes/page-github-links.html index b7e5879313..7f1ac9e5a0 100644 --- a/src/_includes/page-github-links.html +++ b/src/_includes/page-github-links.html @@ -4,7 +4,7 @@ {% assign url = site.url | append: page.url -%}

- Unless stated otherwise, the documentation on this site reflects Dart {{site.sdkInfo.version}}. Page last updated on {{page.date | toSimpleDate}}. + Unless stated otherwise, the documentation on this site reflects Dart {{site.sdkVersion}}. Page last updated on {{page.date | toSimpleDate}}. View source or report an issue. diff --git a/src/content/get-dart/archive/index.md b/src/content/get-dart/archive/index.md index ae7d0298af..0db412ed9f 100644 --- a/src/content/get-dart/archive/index.md +++ b/src/content/get-dart/archive/index.md @@ -11,8 +11,7 @@ js: Use this archive to download [specific versions](/get-dart#release-channels) of the -[Dart SDK](/tools/sdk) -and the [Dart API documentation.]({{site.dart-api}}/{{site.sdkInfo.channel}}) +[Dart SDK](/tools/sdk) and the [Dart API documentation]({{site.dart-api}}). Want to install Dart with your OS's package manager? [Get Dart.](/get-dart) diff --git a/src/content/tools/linter-rules/all.md b/src/content/tools/linter-rules/all.md index 0b5c844f9c..bf69a87c22 100644 --- a/src/content/tools/linter-rules/all.md +++ b/src/content/tools/linter-rules/all.md @@ -6,7 +6,7 @@ show_breadcrumbs: true --- The following is an auto-generated list of all linter rules -available in the Dart SDK as of version `{{site.sdkInfo.version}}`. +available in the Dart SDK as of version `{{site.sdkVersion}}`. Add them to your [`analysis_options.yaml`](/tools/analysis) file and adjust as you see fit. diff --git a/src/content/tools/linter-rules/index.md b/src/content/tools/linter-rules/index.md index 3a384a0c78..d5b6aada3a 100644 --- a/src/content/tools/linter-rules/index.md +++ b/src/content/tools/linter-rules/index.md @@ -113,7 +113,7 @@ To learn more about each rule, click on its name. For an auto-generated list containing all linter rules -in Dart `{{site.sdkInfo.version}}`, +in Dart `{{site.sdkVersion}}`, check out [All linter rules](/tools/linter-rules/all). {% render 'linter-rules-section.md', linter_rules:linter_rules %} diff --git a/src/content/tools/sdk.md b/src/content/tools/sdk.md index e8486b86ad..d6b7841bd7 100644 --- a/src/content/tools/sdk.md +++ b/src/content/tools/sdk.md @@ -13,9 +13,9 @@ To learn about other tools you can use for Dart development, check out the [Dart tools](/tools) page. :::version-note -This site's documentation and examples use -{% if site.sdkInfo.channel == 'dev' %} the **dev channel** {% endif -%} -version [{{site.sdkInfo.version}}][site SDK version] of the **Dart SDK**. +Unless stated otherwise, +this site's documentation and examples assume +version `{{site.sdkVersion}}` of the **Dart SDK**. ::: {% comment %} @@ -49,6 +49,5 @@ go to [the SDK issue tracker][sdk-issues]. [Dart libraries]: /libraries [flutter]: {{site.flutter-docs}}/get-started/install -[site SDK version]: {{site.dart-api}}/{{site.sdkInfo.version}}/index.html [readme]: {{site.repo.dart.sdk}}/blob/main/README.dart-sdk [sdk-issues]: {{site.repo.dart.sdk}}/issues diff --git a/src/content/tutorials/server/cmdline.md b/src/content/tutorials/server/cmdline.md index 9203a795e6..1c513bf237 100644 --- a/src/content/tutorials/server/cmdline.md +++ b/src/content/tutorials/server/cmdline.md @@ -9,9 +9,8 @@ prevpage: title: "Get started: Command-line and server apps" --- -{% assign _api = site.dart-api | append: '/' | append: site.sdkInfo.channel -%} {% assign argsAPI = site.pub-api | append: '/args/latest/args' -%} -{% assign ioAPI = _api | append: '/dart-io' -%} +{% assign ioAPI = site.dart-api | append: '/dart-io' -%} @@ -27,8 +26,8 @@ prevpage: :::note This tutorial uses the `async` and `await` language features, which rely on -the [`Future`]({{_api}}/dart-async/Future-class.html) and -[`Stream`]({{_api}}/dart-async/Stream-class.html) +the [`Future`]({{site.dart-api}}/dart-async/Future-class.html) and +[`Stream`]({{_site.dart-api}}/dart-async/Stream-class.html) classes for asynchronous support. To learn more about these features, see the [asynchronous programming tutorial](/libraries/async/async-await) and the @@ -191,7 +190,7 @@ $ dart run bin/dcat.dart -n pubspec.yaml 4 # repository: https://github.com/my_org/my_repo 5 6 environment: -7 sdk: ^3.5.3 +7 sdk: ^3.5.4 8 9 # Add regular dependencies here. 10 dependencies: diff --git a/tool/config/site_variable_scanner.yaml b/tool/config/site_variable_scanner.yaml index ea66fd866c..d5aa392c70 100644 --- a/tool/config/site_variable_scanner.yaml +++ b/tool/config/site_variable_scanner.yaml @@ -22,7 +22,6 @@ yaml_variable_scanner: - ^site\.branch$ - ^site\.show_banner$ - ^site\.og_image_vers$ - - ^site\.sdkInfo\. # File path for check file contents # From bc76c7cf585931d7ff26c935bbe737dbf5d4609d Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Sun, 17 Nov 2024 19:14:05 +0800 Subject: [PATCH 2/2] Fix link to Stream API docs --- src/content/tutorials/server/cmdline.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/tutorials/server/cmdline.md b/src/content/tutorials/server/cmdline.md index 1c513bf237..2a91979f09 100644 --- a/src/content/tutorials/server/cmdline.md +++ b/src/content/tutorials/server/cmdline.md @@ -27,7 +27,7 @@ prevpage: :::note This tutorial uses the `async` and `await` language features, which rely on the [`Future`]({{site.dart-api}}/dart-async/Future-class.html) and -[`Stream`]({{_site.dart-api}}/dart-async/Stream-class.html) +[`Stream`]({{site.dart-api}}/dart-async/Stream-class.html) classes for asynchronous support. To learn more about these features, see the [asynchronous programming tutorial](/libraries/async/async-await) and the