Skip to content

Commit

Permalink
Merge branch 'main' into dartcheatsheet-exceptions-update
Browse files Browse the repository at this point in the history
  • Loading branch information
MaryaBelanger authored Jan 6, 2025
2 parents 29aabb5 + 283a3ac commit d1e8bfe
Show file tree
Hide file tree
Showing 30 changed files with 890 additions and 187 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -44,7 +44,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Thanks for thinking about helping with [dart.dev][www]!
You can contribute in a few ways.

* **Fix typos.** The GitHub UI makes it easy to contribute small fixes, and
you'll get credit for your contribution! To start, click the **page icon**
you'll get credit for your contribution! To begin, click the **page icon**
at the upper right of the page. Then click the **pencil icon** to start
editing the file. Once you've fixed the typo, commit your changes to a new
branch and create a **pull request.**
branch in your forked repository and create a **pull request.**

Once we've reviewed and approved your change, we'll merge it. Normally, we'll
review your fix within one working day, and your fix will appear online less
Expand Down
10 changes: 7 additions & 3 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
{ "source": "/articles/idiomatic-dart{,/**}", "destination": "/effective-dart", "type": 301 },
{ "source": "/articles/io", "destination": "/articles/libraries/dart-io", "type": 301 },
{ "source": "/articles/js-dart-interop", "destination": "/interop/js-interop", "type": 301 },
{ "source": "/articles/json-web-service", "destination": "/guides/json", "type": 301 },
{ "source": "/articles/json-web-service", "destination": "/libraries/serialization/json", "type": 301 },
{ "source": "/articles/language", "destination": "/language", "type": 301 },
{ "source": "/articles/language/await-async", "destination": "/libraries/async/async-await", "type": 301 },
{ "source": "/articles/language/mixins", "destination": "/language/mixins", "type": 301 },
Expand All @@ -82,7 +82,7 @@
{ "source": "/articles/native-extensions-for-standalone-dart-vm", "destination": "/server/c-interop-native-extensions", "type": 301 },
{ "source": "/articles/numeric-computation", "destination": "/resources/language/number-representation", "type": 301 },
{ "source": "/articles/optional-types", "destination": "/language/type-system", "type": 301 },
{ "source": "/articles/serialization", "destination": "/guides/json", "type": 301 },
{ "source": "/articles/serialization", "destination": "/libraries/serialization/json", "type": 301 },
{ "source": "/articles/server/native-extensions", "destination": "/server/c-interop-native-extensions", "type": 301 },
{ "source": "/articles/server{,/**}", "destination": "/server", "type": 301 },
{ "source": "/articles/snapshots", "destination": "/tools/dart-compile", "type": 301 },
Expand Down Expand Up @@ -208,8 +208,10 @@
{ "source": "/go/unsound-null-safety", "destination": "/null-safety/unsound-null-safety", "type": 301 },

{ "source": "/googleapis", "destination": "https://github.com/dart-lang/googleapis", "type": 301 },
{ "source": "/guides/environment-declarations", "destination": "/libraries/core/environment-declarations", "type": 301 },
{ "source": "/guides/get-started", "destination": "/overview", "type": 301 },
{ "source": "/guides/google-apis", "destination": "/resources/google-apis", "type": 301 },
{ "source": "/guides/json", "destination": "/libraries/serialization/json", "type": 301 },
{ "source": "/guides/language", "destination": "/language", "type": 301 },
{ "source": "/guides/language/analysis-options", "destination": "/tools/analysis", "type": 301 },
{ "source": "/guides/language/cheatsheet", "destination": "/language", "type": 301 },
Expand Down Expand Up @@ -246,6 +248,7 @@
{ "source": "/guides/libraries/useful-libraries", "destination": "/resources/useful-packages", "type": 301 },
{ "source": "/guides/packages", "destination": "/tools/pub/packages", "type": 301 },
{ "source": "/guides/platforms", "destination": "/overview#platform", "type": 301 },
{ "source": "/guides/testing", "destination": "/tools/testing", "type": 301 },
{ "source": "/guides/whats-new", "destination": "/resources/whats-new", "type": 301 },
{ "source": "/install", "destination": "/get-dart", "type": 301 },
{ "source": "/install/**", "destination": "/get-dart", "type": 301 },
Expand All @@ -266,7 +269,7 @@
{ "source": "/keyword/class", "destination": "/language/classes#instance-variables", "type": 301 },
{ "source": "/keyword/const", "destination": "/language/variables#final-and-const", "type": 301 },
{ "source": "/keyword/continue", "destination": "/language/loops#break-and-continue", "type": 301 },
{ "source": "/keyword/covariant", "destination": "/deprecated/sound-problems#the-covariant-keyword", "type": 301 },
{ "source": "/keyword/covariant", "destination": "/language/type-system#covariant-keyword", "type": 301 },
{ "source": "/keyword/default", "destination": "/language/branches#switch", "type": 301 },
{ "source": "/keyword/deferred", "destination": "/language/libraries#lazily-loading-a-library", "type": 301 },
{ "source": "/keyword/do", "destination": "/language/loops#while-and-do-while", "type": 301 },
Expand Down Expand Up @@ -334,6 +337,7 @@
{ "source": "/language/control-flow", "destination": "/language/loops", "type": 301 },
{ "source": "/language/enum", "destination": "/language/enums", "type": 301 },
{ "source": "/language/generators", "destination": "/language/functions#generators", "type": 301 },
{ "source": "/libraries/serialization", "destination": "/libraries/serialization/json", "type": 301 },
{ "source": "/linter/lints/:lint*", "destination": "/tools/linter-rules/:lint", "type": 301 },
{ "source": "/lints", "destination": "/tools/linter-rules", "type": 301 },
{ "source": "/lints/:lint*", "destination": "/tools/linter-rules/:lint", "type": 301 },
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@11ty/eleventy": "^3.0.0",
"@types/hast": "^3.0.4",
"@types/markdown-it": "^14.1.2",
"@types/node": "^22.10.2",
"@types/node": "^22.10.3",
"firebase-tools": "^13.29.1",
"hast-util-from-html": "^2.0.3",
"hast-util-select": "^6.0.3",
Expand All @@ -34,11 +34,11 @@
"js-yaml": "^4.1.0",
"markdown-it": "^14.1.0",
"markdown-it-anchor": "^9.2.0",
"markdown-it-attrs": "^4.3.0",
"markdown-it-attrs": "^4.3.1",
"markdown-it-container": "^4.0.0",
"markdown-it-deflist": "^3.0.0",
"sass": "^1.83.0",
"shiki": "^1.24.2",
"shiki": "^1.25.1",
"tsx": "^4.19.2"
}
}
Loading

0 comments on commit d1e8bfe

Please sign in to comment.