Skip to content

Commit c0c61bc

Browse files
MaryaBelangerMaryaBelanger
authored
Merge branch 'main' into comment-on-limit-concurrency
2 parents beed89f + 9bbda4d commit c0c61bc

File tree

15 files changed

+504
-254
lines changed

15 files changed

+504
-254
lines changed

‎.idx/dev.nix

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# To learn more about how to use Nix to configure your environment
2+
# see: https://developers.google.com/idx/guides/customize-idx-env
3+
{ pkgs, ... }: {
4+
# Which nixpkgs channel to use.
5+
channel = "stable-24.05"; # or "unstable"
6+
7+
# Use https://search.nixos.org/packages to find packages
8+
packages = [
9+
pkgs.nodejs_22
10+
pkgs.pnpm
11+
];
12+
13+
# Sets environment variables in the workspace
14+
env = {};
15+
idx = {
16+
# Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
17+
extensions = [
18+
"Dart-Code.flutter"
19+
"Dart-Code.dart-code"
20+
];
21+
22+
# Enable previews
23+
previews = {
24+
enable = true;
25+
previews = {
26+
web = {
27+
command = ["./dash_site" "serve"];
28+
manager = "web";
29+
env = {
30+
# Environment variables to set for your server
31+
PORT = "$PORT";
32+
};
33+
};
34+
};
35+
};
36+
37+
# Workspace lifecycle hooks
38+
workspace = {
39+
# Runs when a workspace is first created
40+
onCreate = {
41+
get-submodule = "git submodule update --init --recursive";
42+
pnpm-install = "pnpm install";
43+
};
44+
# Runs when the workspace is (re)started
45+
onStart = {
46+
# Example: start a background task to watch and re-build backend code
47+
# watch-backend = "npm run watch-backend";
48+
};
49+
};
50+
};
51+
}

‎README.md

+19-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,21 @@
33
[![Build Status SVG][]][Repo on GitHub Actions]
44
[![OpenSSF Scorecard SVG][]][Scorecard Results]
55

6+
<a href="https://idx.google.com/import?url=https%3A%2F%2Fgithub.com%2Fdart-lang%2Fsite-www">
7+
<picture>
8+
<source
9+
media="(prefers-color-scheme: dark)"
10+
srcset="https://cdn.idx.dev/btn/open_dark_32.svg">
11+
<source
12+
media="(prefers-color-scheme: light)"
13+
srcset="https://cdn.idx.dev/btn/open_light_32.svg">
14+
<img
15+
height="32"
16+
alt="Open in IDX"
17+
src="https://cdn.idx.dev/btn/open_purple_32.svg">
18+
</picture>
19+
</a>
20+
621
The documentation site for the [Dart programming language](https://dart.dev),
722
built with [Eleventy][] and hosted on [Firebase][].
823

@@ -69,7 +84,7 @@ If you prefer, you can use a version manager such as [nvm][],
6984
and run `nvm install` from the repository's root directory.
7085

7186
If you already have Node installed, verify it's available on your path
72-
and already the latest stable version _(currently `20.12` or later)_:
87+
and already the latest stable version _(currently `20.14` or later)_:
7388

7489
```terminal
7590
node --version
@@ -143,7 +158,7 @@ following the instructions in [Get the prerequisites](#get-the-prerequisites).
143158
If you already have `pnpm`, verify you have the latest stable version.
144159
We recommend using [`corepack`][] to install and manage `pnpm` versions,
145160
since it is bundled with most installations of Node.
146-
161+
147162
If you haven't used `corepack` before, you'll need to
148163
first enable it with `corepack enable`.
149164
Then, to install the correct `pnpm` version, from the
@@ -181,7 +196,7 @@ following the instructions in [Get the prerequisites](#get-the-prerequisites).
181196
7. View your changes in the browser by navigating to <http://localhost:4000>.
182197

183198
Note the port might be different if `4000` is taken.
184-
199+
185200
If you want to check the raw, generated HTML output and structure,
186201
view the `_site` directory in a file explorer or an IDE.
187202

@@ -274,7 +289,7 @@ you can build a full version and upload it to Firebase.
274289
./dash_site build
275290
```
276291

277-
This will build the site and copy it to your local `_site` directory.
292+
This builds the site and copy it to your local `_site` directory.
278293
If that directory previously existed, it will be replaced.
279294

280295
3. Deploy to your activated Firebase project's default hosting site:

‎dash_site

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
REQUIRED_DART_VERSION="3.5"
4-
REQUIRED_NODE_VERSION="20.12"
5-
REQUIRED_PNPM_VERSION="9.1"
4+
REQUIRED_NODE_VERSION="20.14"
5+
REQUIRED_PNPM_VERSION="9.4"
66

77
# Check that the 'dart' command is available on the user's path.
88
if ! command -v dart &> /dev/null; then

‎examples/misc/lib/language_tour/built_in_types.dart

+11
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ void miscDeclAnalyzedButNotTested() {
3737
// #enddocregion const-num
3838
}
3939

40+
// Uncomment when feature is stable:
41+
// {
42+
// // #docregion digit-separators
43+
// var n1 = 1_000_000;
44+
// var n2 = 0.000_000_000_01;
45+
// var n3 = 0x00_14_22_01_23_45; // MAC address
46+
// var n4 = 555_123_4567; // US Phone number
47+
// var n5 = 100__000_000__000_000; // one hundred million million!
48+
// // #enddocregion digit-separators
49+
// }
50+
4051
{
4152
// #docregion quoting
4253
var s1 = 'Single quotes work well for string literals.';

‎firebase.json

+76
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,82 @@
241241
{ "source": "/install/**", "destination": "/get-dart", "type": 301 },
242242
{ "source": "/install/archive", "destination": "/get-dart/archive", "type": 301 },
243243
{ "source": "/jobs", "destination": "https://docs.flutter.dev/jobs", "type": 301 },
244+
245+
{ "source": "/keyword", "destination": "/language/keywords", "type": 301 },
246+
{ "source": "/keyword/abstract", "destination": "/language/class-modifiers#abstract", "type": 301 },
247+
{ "source": "/keyword/as", "destination": "/language/operators#type-test-operators", "type": 301 },
248+
{ "source": "/keyword/assert", "destination": "/language/error-handling#assert", "type": 301 },
249+
{ "source": "/keyword/async", "destination": "/language/async", "type": 301 },
250+
{ "source": "/keyword/async-star", "destination": "/language/functions#generators", "type": 301 },
251+
{ "source": "/keyword/await", "destination": "/language/async", "type": 301 },
252+
{ "source": "/keyword/base", "destination": "/language/class-modifiers#base", "type": 301 },
253+
{ "source": "/keyword/break", "destination": "/language/loops#break-and-continue", "type": 301 },
254+
{ "source": "/keyword/case", "destination": "/language/branches#switch", "type": 301 },
255+
{ "source": "/keyword/catch", "destination": "/language/error-handling#catch", "type": 301 },
256+
{ "source": "/keyword/class", "destination": "/language/classes#instance-variables", "type": 301 },
257+
{ "source": "/keyword/const", "destination": "/language/variables#final-and-const", "type": 301 },
258+
{ "source": "/keyword/continue", "destination": "/language/loops#break-and-continue", "type": 301 },
259+
{ "source": "/keyword/covariant", "destination": "/guides/language/sound-problems#the-covariant-keyword", "type": 301 },
260+
{ "source": "/keyword/default", "destination": "/language/branches#switch", "type": 301 },
261+
{ "source": "/keyword/deferred", "destination": "/language/libraries#lazily-loading-a-library", "type": 301 },
262+
{ "source": "/keyword/do", "destination": "/language/loops#while-and-do-while", "type": 301 },
263+
{ "source": "/keyword/dynamic", "destination": "/effective-dart/design#avoid-using-dynamic-unless-you-want-to-disable-static-checking", "type": 301 },
264+
{ "source": "/keyword/else", "destination": "/language/branches#if", "type": 301 },
265+
{ "source": "/keyword/enum", "destination": "/language/enums", "type": 301 },
266+
{ "source": "/keyword/export", "destination": "/guides/libraries/create-packages", "type": 301 },
267+
{ "source": "/keyword/extends", "destination": "/language/extend", "type": 301 },
268+
{ "source": "/keyword/extension", "destination": "/language/extension-methods", "type": 301 },
269+
{ "source": "/keyword/extension-type", "destination": "/language/extension-types", "type": 301 },
270+
{ "source": "/keyword/external", "destination": "/language/functions#external", "type": 301 },
271+
{ "source": "/keyword/factory", "destination": "/language/constructors#factory-constructors", "type": 301 },
272+
{ "source": "/keyword/false", "destination": "/language/built-in-types#booleans", "type": 301 },
273+
{ "source": "/keyword/final", "destination": "/language/variables#final-and-const", "type": 301 },
274+
{ "source": "/keyword/final-var", "destination": "/language/variables#final-and-const", "type": 301 },
275+
{ "source": "/keyword/final-class", "destination": "/language/class-modifiers#final", "type": 301 },
276+
{ "source": "/keyword/finally", "destination": "/language/error-handling#finally", "type": 301 },
277+
{ "source": "/keyword/for", "destination": "/language/loops#for-loops", "type": 301 },
278+
{ "source": "/keyword/Function", "destination": "/language/functions", "type": 301 },
279+
{ "source": "/keyword/get", "destination": "/language/methods#getters-and-setters", "type": 301 },
280+
{ "source": "/keyword/hide", "destination": "/language/libraries#importing-only-part-of-a-library", "type": 301 },
281+
{ "source": "/keyword/if", "destination": "/language/branches#if", "type": 301 },
282+
{ "source": "/keyword/implements", "destination": "/language/classes#implicit-interfaces", "type": 301 },
283+
{ "source": "/keyword/import", "destination": "/language/libraries#using-libraries", "type": 301 },
284+
{ "source": "/keyword/in", "destination": "/language/loops#for-loops", "type": 301 },
285+
{ "source": "/keyword/interface", "destination": "/language/class-modifiers#interface", "type": 301 },
286+
{ "source": "/keyword/is", "destination": "/language/operators#type-test-operators", "type": 301 },
287+
{ "source": "/keyword/late", "destination": "/language/variables#late-variables", "type": 301 },
288+
{ "source": "/keyword/library", "destination": "/language/libraries", "type": 301 },
289+
{ "source": "/keyword/mixin", "destination": "/language/mixins", "type": 301 },
290+
{ "source": "/keyword/new", "destination": "/language/classes#using-constructors", "type": 301 },
291+
{ "source": "/keyword/null", "destination": "/language/variables#default-value", "type": 301 },
292+
{ "source": "/keyword/of", "destination": "/guides/libraries/create-packages#organizing-a-package", "type": 301 },
293+
{ "source": "/keyword/on", "destination": "/language/error-handling#catch", "type": 301 },
294+
{ "source": "/keyword/operator", "destination": "/language/methods#operators", "type": 301 },
295+
{ "source": "/keyword/part", "destination": "/guides/libraries/create-packages#organizing-a-package", "type": 301 },
296+
{ "source": "/keyword/required", "destination": "/language/functions#named-parameters", "type": 301 },
297+
{ "source": "/keyword/rethrow", "destination": "/language/error-handling#catch", "type": 301 },
298+
{ "source": "/keyword/return", "destination": "/language/functions#return-values", "type": 301 },
299+
{ "source": "/keyword/sealed", "destination": "/language/class-modifiers#sealed", "type": 301 },
300+
{ "source": "/keyword/set", "destination": "/language/methods#getters-and-setters", "type": 301 },
301+
{ "source": "/keyword/show", "destination": "/language/libraries#importing-only-part-of-a-library", "type": 301 },
302+
{ "source": "/keyword/static", "destination": "/language/classes#class-variables-and-methods", "type": 301 },
303+
{ "source": "/keyword/super", "destination": "/language/extend", "type": 301 },
304+
{ "source": "/keyword/switch", "destination": "/language/branches#switch", "type": 301 },
305+
{ "source": "/keyword/sync{,-star}", "destination": "/language/functions#generators", "type": 301 },
306+
{ "source": "/keyword/this", "destination": "/language/constructors", "type": 301 },
307+
{ "source": "/keyword/throw", "destination": "/language/error-handling#throw", "type": 301 },
308+
{ "source": "/keyword/true", "destination": "/language/built-in-types#booleans", "type": 301 },
309+
{ "source": "/keyword/try", "destination": "/language/error-handling#catch", "type": 301 },
310+
{ "source": "/keyword/type", "destination": "/language/extension-types", "type": 301 },
311+
{ "source": "/keyword/typedef", "destination": "/language/typedefs", "type": 301 },
312+
{ "source": "/keyword/var", "destination": "/language/variables", "type": 301 },
313+
{ "source": "/keyword/void", "destination": "/language/built-in-types", "type": 301 },
314+
{ "source": "/keyword/when", "destination": "/language/branches#when", "type": 301 },
315+
{ "source": "/keyword/with", "destination": "/language/mixins", "type": 301 },
316+
{ "source": "/keyword/while", "destination": "/language/loops#while-and-do-while", "type": 301 },
317+
{ "source": "/keyword/yield", "destination": "/language/functions#generators", "type": 301 },
318+
{ "source": "/keyword/:page*", "destination": "/language/keywords", "type": 301 },
319+
244320
{ "source": "/language-tour", "destination": "/language", "type": 301 },
245321
{ "source": "/language/basics", "destination": "/language", "type": 301 },
246322
{ "source": "/language/callable-classes", "destination": "/language/callable-objects", "type": 301 },

‎package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,27 @@
1414
"build-site-for-production": "PRODUCTION=true OPTIMIZE=true eleventy"
1515
},
1616
"engines": {
17-
"node": ">=20.12.0",
18-
"pnpm": ">=9.1.0"
17+
"node": ">=20.14.0",
18+
"pnpm": ">=9.4.0"
1919
},
20-
"packageManager": "pnpm@9.10.0",
20+
"packageManager": "pnpm@9.12.3",
2121
"dependencies": {
2222
"bootstrap-scss": "^4.6.2"
2323
},
2424
"devDependencies": {
25-
"@11ty/eleventy": "3.0.0",
26-
"firebase-tools": "^13.23.1",
25+
"@11ty/eleventy": "^3.0.0",
26+
"firebase-tools": "^13.24.1",
2727
"hast-util-from-html": "^2.0.3",
2828
"hast-util-select": "^6.0.3",
2929
"hast-util-to-text": "^4.0.2",
3030
"html-minifier-terser": "^7.2.0",
3131
"js-yaml": "^4.1.0",
32-
"liquidjs": "^10.18.0",
3332
"markdown-it": "^14.1.0",
3433
"markdown-it-anchor": "^9.2.0",
3534
"markdown-it-attrs": "^4.2.0",
3635
"markdown-it-container": "^4.0.0",
3736
"markdown-it-deflist": "^3.0.0",
38-
"sass": "^1.80.5",
37+
"sass": "^1.80.6",
3938
"shiki": "^1.22.2"
4039
}
4140
}

0 commit comments

Comments
 (0)