Skip to content

Commit c94351e

Browse files
authored
Merge branch 'main' into material_colors_docs_pr170000
2 parents b336f87 + 45498f5 commit c94351e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1316
-723
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ _PRs or commits this PR depends on (if any):_
66

77
## Presubmit checklist
88

9-
- [ ] This PR is marked as draft with an explanation if not meant to land until a future stable release.
10-
- [ ] This PR doesn’t contain automatically generated corrections (Grammarly or similar).
11-
- [ ] This PR follows the [Google Developer Documentation Style Guidelines](https://developers.google.com/style) — for example, it doesn’t use _i.e._ or _e.g._, and it avoids _I_ and _we_ (first person).
12-
- [ ] This PR uses [semantic line breaks](https://github.com/dart-lang/site-shared/blob/main/doc/writing-for-dart-and-flutter-websites.md#semantic-line-breaks) of 80 characters or fewer.
9+
- [ ] **If you are unwilling, or unable, to sign the CLA, even for a _tiny_, one-word PR, please file an issue instead of a PR.** - [ ] If this PR is not meant to land until a future stable release, mark it as draft with an explanation.
10+
- [ ] This PR doesn't contain automatically generated corrections (generated by Grammarly or similar).
11+
- [ ] This PR follows the [Google Developer Documentation Style Guidelines](https://developers.google.com/style)—for example, it doesn't use _i.e._ or _e.g._, and it avoids _I_ and _we_ (first-person pronouns).
12+
- [ ] This PR uses [semantic line breaks](https://github.com/dart-lang/site-shared/blob/main/doc/writing-for-dart-and-flutter-websites.md#semantic-line-breaks)
13+
of 80 characters or fewer.

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858
36+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b
3737
with:
3838
languages: ${{ matrix.language }}
3939
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
4444
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4545
# If this step fails, then you should remove it and run the build manually (see below)
4646
- name: Autobuild
47-
uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858
47+
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b
4848

4949
# ℹ️ Command-line programs to run using the OS shell.
5050
# 📚 https://git.io/JvXDl
@@ -58,4 +58,4 @@ jobs:
5858
# make release
5959

6060
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858
61+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b

dash_site

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

3-
REQUIRED_DART_VERSION="3.7"
4-
REQUIRED_NODE_VERSION="22.11"
5-
REQUIRED_PNPM_VERSION="10.4"
3+
REQUIRED_DART_VERSION="3.8"
4+
REQUIRED_NODE_VERSION="22.12"
5+
REQUIRED_PNPM_VERSION="10.8"
66

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

examples/internationalization/gen_l10n_example/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22

33
// #docregion app-localizations-import
4-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
4+
import 'l10n/app_localizations.dart';
55
// #enddocregion app-localizations-import
66

77
// #docregion localization-delegates-import

firebase.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
{ "source": "/cookbook/games/google-mobile-ads", "destination": "/cookbook/plugins/google-mobile-ads", "type": 301 },
110110
{ "source": "/cookbook/images/cached-images", "destination": "/cookbook/images/network-image", "type": 301 },
111111
{ "source": "/cookbook/effects/photo-filter-carousel", "destination": "/cookbook", "type": 301 },
112+
{ "source": "/cookbook/effects/gradient-bubbles", "destination": "/cookbook", "type": 301 },
112113
{ "source": "/cookbook/networking/named-routes", "destination": "/cookbook/navigation/named-routes", "type": 301 },
113114
{ "source": "/cookbook/testing/integration-test-introduction", "destination": "/cookbook/testing/integration", "type": 301 },
114115
{ "source": "/cookbook/testing/integration-test-profiling", "destination": "/cookbook/testing/integration/profiling", "type": 301 },
@@ -456,6 +457,7 @@
456457
{ "source": "/go/go-router-v13-breaking-changes", "destination": "https://docs.google.com/document/d/1FRdW_p29zH0I3KEMQKW_QMMN7owiQ5Wx-PUhhZpehSg/edit?usp=sharing", "type": 301 },
457458
{ "source": "/go/go-router-v14-breaking-changes", "destination": "https://docs.google.com/document/d/1Z6RYo7rGIdtryvQvAntekF53zoz4iy4XvIamBxRWa4Y/edit?usp=sharing&resourcekey=0-CH_yB7ur4gLvSuqPtB5bZA", "type": 301 },
458459
{ "source": "/go/go-router-v15-breaking-changes", "destination": "https://docs.google.com/document/d/1107edi31gPcr4rIbUBvkLqZJiP999ZLI7d85InLbmIw/edit?usp=sharing", "type": 301 },
460+
{ "source": "/go/go-router-v16-breaking-changes", "destination": "https://docs.google.com/document/d/1E4B5nMDEvsqQiCo-Ki9LohocLFC88X398-AiLXRQhwU/edit?usp=sharing", "type": 301 },
459461
{ "source": "/go/go-router-v2-5-breaking-changes", "destination": "https://docs.google.com/document/d/1MoEM3C6sDvMUuZYCxlYoMI2QJlkONu8i9G53uy5xk-M/edit", "type": 301 },
460462
{ "source": "/go/go-router-v2-breaking-changes", "destination": "https://docs.google.com/document/d/12iXx214phOag-XCetaGbSzziXGaHX82V-wMi_-8W04M/edit", "type": 301 },
461463
{ "source": "/go/go-router-v3-breaking-changes", "destination": "https://docs.google.com/document/d/1TZ8G_TZ6Dqcpz64qXxArGhtHKFECDEPZFEuxYwQjJz4/edit#", "type": 301 },
@@ -685,6 +687,7 @@
685687
{ "source": "/go/web-astral-projections", "destination": "https://docs.google.com/document/d/1pvH-J8opXsjntTpFf1bbsbU8N1vFd8tPKvBgcNn8UKQ", "type": 301 },
686688
{ "source": "/go/web-cleanup-service-worker", "destination": "https://docs.google.com/document/d/1czOm3Hmy_oIq3NJStezb9AjwkKyta3NospkCy_DDv9E/edit", "type": 301 },
687689
{ "source": "/go/web-declarative-bootstrap", "destination": "https://docs.google.com/document/d/1jVXxC0tNDW45ypfVESyHipL2lHCX32GmFyJNO0u9c6Y/edit?resourcekey=0-AQ8z_0_U8Vq3JBdyracNuQ", "type": 301 },
690+
{ "source": "/go/web-development-proxy-server", "destination": "https://docs.google.com/document/d/1Ud9D3F0GxB5Ocoo5NnAy7PH5oo3qxvALxUlAXMCANJ0/edit?usp=sharing", "type": 301 },
688691
{ "source": "/go/web-multiview-js-api", "destination": "https://docs.google.com/document/d/1ixwPBG7YIHEONc15t9SOmrfgDK3gghvkk7it_8AFOmw/edit?resourcekey=0-VQC2nby6Coe5OG-R833yXw", "type": 301 },
689692
{ "source": "/go/web-native-text-editing", "destination": "https://docs.google.com/document/d/1t6qAX46tsR1tdBS42yro6G_5Igtrj7WzmKKiUI_JC-k/edit", "type": 301 },
690693
{ "source": "/go/web-plugins-layout", "destination": "https://docs.google.com/document/d/1PeS-QSAFydHXhjZrqkub-GRPMs83roh8VwhbUScWuGQ", "type": 301 },
@@ -736,6 +739,7 @@
736739
{ "source": "/to/et", "destination": "https://flutter.dev/to/engine-tool", "type": 301 },
737740
{ "source": "/to/experimental-branches", "destination": "https://github.com/flutter/flutter/blob/main/docs/infra/Experimental-Branch.md", "type": 301 },
738741
{ "source": "/to/favorites", "destination": "/packages-and-plugins/favorites", "type": 301 },
742+
{ "source": "/to/feature-flags", "destination": "https://github.com/flutter/flutter/blob/main/docs/contributing/Feature-flags.md", "type": 301 },
739743
{ "source": "/to/federated-plugins", "destination": "/packages-and-plugins/developing-packages#federated-plugins", "type": 301 },
740744
{ "source": "/to/ffi-package", "destination": "/packages-and-plugins/developing-packages#plugin-ffi", "type": 301 },
741745
{ "source": "/to/flutter-gen-deprecation", "destination": "/release/breaking-changes/flutter-generate-i10n-source", "type": 301 },
@@ -755,6 +759,7 @@
755759
{ "source": "/to/integration-testing", "destination": "/cookbook/testing/integration/introduction", "type": 301 },
756760
{ "source": "/to/intellij-setup", "destination": "/tools/android-studio#setup", "type": 301 },
757761
{ "source": "/to/internationalization", "destination": "/ui/accessibility-and-internationalization/internationalization", "type": 301 },
762+
{ "source": "/to/ios-add-to-app-embed-setup", "destination": "/add-to-app/ios/project-setup#embed-a-flutter-module-in-your-ios-app", "type": 301 },
758763
{ "source": "/to/ios-app-signing", "destination": "/deployment/ios#review-xcode-project-settings", "type": 301 },
759764
{ "source": "/to/ios-create-flutter-engine", "destination": "/add-to-app/ios/add-flutter-screen#create-a-flutterengine", "type": 301 },
760765
{ "source": "/to/ios-deploy", "destination": "/deployment/ios", "type": 301 },

package.json

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
"url": "https://github.com/flutter/website.git"
1010
},
1111
"engines": {
12-
"node": ">=22.11.0",
13-
"pnpm": ">=10.4.1"
12+
"node": ">=22.12.0",
13+
"pnpm": ">=10.8.1"
1414
},
15-
"packageManager": "[email protected].1",
15+
"packageManager": "[email protected].4",
1616
"scripts": {
1717
"serve": "PRODUCTION=false tsx node_modules/@11ty/eleventy/cmd.cjs --serve --config=eleventy.config.ts",
1818
"build-site-for-staging": "PRODUCTION=false OPTIMIZE=true tsx node_modules/@11ty/eleventy/cmd.cjs --config=eleventy.config.ts",
1919
"build-site-for-production": "PRODUCTION=true OPTIMIZE=true tsx node_modules/@11ty/eleventy/cmd.cjs --config=eleventy.config.ts"
2020
},
2121
"devDependencies": {
22-
"@11ty/eleventy": "3.1.1",
23-
"@swc/html": "^1.12.0",
22+
"@11ty/eleventy": "3.1.2",
23+
"@swc/html": "^1.12.7",
2424
"@types/hast": "^3.0.4",
2525
"@types/markdown-it": "^14.1.2",
26-
"@types/node": "^22.15.31",
26+
"@types/node": "^22.15.33",
2727
"hast-util-from-html": "^2.0.3",
2828
"hast-util-select": "^6.0.4",
2929
"hast-util-to-html": "^9.0.5",
@@ -36,13 +36,7 @@
3636
"markdown-it-deflist": "^3.0.0",
3737
"markdown-it-footnote": "^4.0.0",
3838
"sass": "^1.89.2",
39-
"shiki": "^3.6.0",
39+
"shiki": "^3.7.0",
4040
"tsx": "4.19.4"
41-
},
42-
"pnpm": {
43-
"onlyBuiltDependencies": [
44-
"@parcel/watcher",
45-
"esbuild"
46-
]
4741
}
4842
}

0 commit comments

Comments
 (0)