Skip to content

Commit 42635e4

Browse files
authored
Merge branch 'main' into fix-4175
2 parents ca637d9 + a71e35f commit 42635e4

File tree

12 files changed

+218
-332
lines changed

12 files changed

+218
-332
lines changed

.github/workflows/codeql-analysis.yml

+3-3
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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
36+
uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911
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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
47+
uses: github/codeql-action/autobuild@e8893c57a1f3a2b659b6b55564fdfdbbd2982911
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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
61+
uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911

.github/workflows/scorecards-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141

4242
# Upload the results as artifacts (optional).
4343
- name: "Upload artifact"
44-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
44+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
4545
with:
4646
name: SARIF file
4747
path: results.sarif
4848
retention-days: 5
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
52+
uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911
5353
with:
5454
sarif_file: results.sarif

Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ GEM
7272
mini_portile2 (2.8.5)
7373
minitest (5.21.2)
7474
mutex_m (0.2.0)
75-
nokogiri (1.16.0)
75+
nokogiri (1.16.2)
7676
mini_portile2 (~> 2.8.2)
7777
racc (~> 1.4)
78-
nokogiri (1.16.0-aarch64-linux)
78+
nokogiri (1.16.2-aarch64-linux)
7979
racc (~> 1.4)
80-
nokogiri (1.16.0-x86_64-linux)
80+
nokogiri (1.16.2-x86_64-linux)
8181
racc (~> 1.4)
8282
pathutil (0.16.2)
8383
forwardable-extended (~> 2.6)

_config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ gh: https://github.com
4242
gh-dart:
4343
org: https://github.com/dart-lang
4444
sdk: https://github.com/dart-lang/sdk
45-
site: https://github.com/dart-lang/website
45+
lang: https://github.com/dart-lang/language
46+
site: https://github.com/dart-lang/site-www
4647

4748
show_banner: true
4849

src/_data/side-nav.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,6 @@
336336
- title: Resources
337337
expanded: false
338338
children:
339-
- title: FAQ
340-
permalink: /resources/faq
341339
- title: Breaking changes
342340
permalink: /resources/breaking-changes
343341
- title: Language evolution
@@ -353,6 +351,8 @@
353351
permalink: /guides/language/coming-from/js-to-dart
354352
- title: Swift to Dart
355353
permalink: /guides/language/coming-from/swift-to-dart
354+
- title: FAQ
355+
permalink: /resources/faq
356356
- title: Glossary
357357
permalink: /resources/glossary
358358
- title: Books

src/_sass/site.scss

+4
Original file line numberDiff line numberDiff line change
@@ -884,3 +884,7 @@ body.obsolete {
884884
}
885885
}
886886
}
887+
888+
dd {
889+
margin-left: 1rem;
890+
}

src/guides/whats-new.md

-4
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,6 @@ we made the following changes to this site:
285285
* New library directive section in [The language tour][]
286286
* Improved clarity surrounding Dart's single-threaded or multi-threaded status:
287287
* Removed the outdated `dart:io` page.
288-
* Added two sections to the FAQ:
289-
* [Is Dart single-threaded?][]
290-
* [Is Dart single-threaded on the web?][]
291288
* Expanded on [Dart's web concurrency capabilities][].
292289
* Rearranged and clarified [discussion][] of default values for optional and positional parameters.
293290
* Updated [Concurrency in Dart][] to default to new `Isolate.run()` function.
@@ -307,7 +304,6 @@ we made the following changes to this site:
307304
[Automated publishing of packages to pub.dev]: /tools/pub/automated-publishing
308305
[community resources section]: /community#additional-community-resources
309306
[migration guide]: /null-safety/migration-guide
310-
[Sound null safety]: /null-safety#dart-3-and-null-safety
311307
[unsound null safety]: /null-safety/unsound-null-safety
312308
[Learning Dart as a Swift developer]: /guides/language/coming-from/swift-to-dart
313309
[booleans and equality operators]: /effective-dart/usage#dont-use-true-or-false-in-equality-operations

0 commit comments

Comments
 (0)