Skip to content

Commit

Permalink
Merge branch 'main' into promo-code-exc
Browse files Browse the repository at this point in the history
  • Loading branch information
parlough committed Feb 11, 2024
2 parents 3eb4159 + c8db037 commit 19f966e
Show file tree
Hide file tree
Showing 470 changed files with 15,548 additions and 9,741 deletions.
7 changes: 0 additions & 7 deletions .devcontainer/devcontainer.json

This file was deleted.

6 changes: 0 additions & 6 deletions .dockerignore

This file was deleted.

4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Fixes <Replace with issue link>
---

- [ ] I’ve reviewed the contributor guide and applied the relevant portions to this PR.
- [ ] This PR doesnt contain automatically generated corrections or text (Grammarly, LLMs, and similar).
- [ ] This PR follows the [Google Developer Documentation Style Guidelines](https://developers.google.com/style) — for example, it doesnt use _i.e._ or _e.g._, and it avoids _I_ and _we_ (first person).
- [ ] This PR doesn't contain automatically generated corrections or text (Grammarly, LLMs, and similar).
- [ ] 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).
- [ ] 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.

<details>
Expand Down
25 changes: 5 additions & 20 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
# Set update schedule for GitHub Actions
# See https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
# See https://docs.github.com/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot

version: 2
updates:
- package-ecosystem: "bundler"
directory: "/"
schedule:
interval: "daily"
labels:
- "auto.dependencies"
- "auto.bundler"
- "lang.ruby"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
labels:
- "auto.dependencies"
- "auto.docker"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand All @@ -31,15 +16,15 @@ updates:
schedule:
interval: "daily"
allow:
- dependency-type: "production"
- dependency-type: "direct"
labels:
- "auto.dependencies"
- "auto.npm"
- "lang.javascript"
- package-ecosystem: 'gitsubmodule'
directory: '/'
- package-ecosystem: "gitsubmodule"
directory: "/"
schedule:
interval: 'daily'
interval: "daily"
labels:
- "auto.dependencies"
- "auto.submodules"
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'ruby' ]
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

Expand All @@ -33,7 +33,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911
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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
uses: github/codeql-action/autobuild@e8893c57a1f3a2b659b6b55564fdfdbbd2982911

# ℹ️ 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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911
4 changes: 2 additions & 2 deletions .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:

# Upload the results as artifacts (optional).
- name: "Upload artifact"
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911
with:
sarif_file: results.sarif
39 changes: 28 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
with:
sdk: ${{ matrix.sdk }}
- name: Fetch packages
- name: Fetch Dart packages
run: dart pub get
- name: Check Dart code formatting
run: dart run dart_site format-dart --check
Expand All @@ -57,25 +57,42 @@ jobs:
linkcheck:
name: Build site and check links
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
submodules: recursive
- run: make build
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
with:
sdk: stable
- name: Fetch packages
- name: Fetch Dart packages
run: dart pub get
- name: Check for broken Markdown links
run: dart run dart_site check-link-references
- name: Validate the firebase.json file
run: dart run dart_site verify-firebase-json
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
- uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d
with:
version: 8
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
with:
node-version: ${{ env.NODE_VERSION }}
- run: npm install -g firebase-tools@13.0.2
cache: 'pnpm'
- name: Install node dependencies
run: pnpm install
- name: Build site
run: dart run dart_site build
- name: Check for broken Markdown links
run: dart run dart_site check-link-references
- name: Check internal site links are functional
run: dart run dart_site check-links

firebase-validate:
name: Validate Firebase configuration
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
submodules: recursive
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
with:
sdk: stable
- name: Fetch Dart packages
run: dart pub get
- name: Validate the firebase.json file
run: dart run dart_site verify-firebase-json
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
_asset_bundler_cache
_bookhtml
_cache/
_site/
.*-cache
Expand All @@ -10,8 +8,6 @@ _site/
.env*
.firebase
.idea
.packages
.pub
.spelling
.vscode
*.cache
Expand All @@ -25,6 +21,7 @@ build
firebase-debug.log
node_modules
pubspec.lock
package-lock.json
tmp

# Misc
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Chris Buckett <chrisbuckett@gmail.com>
Michael Haubenwallner <michael.haubenwallner@gmail.com>
Victor Berchet <victor.berchet@gmail.com>
Pradumna Saraf <pradumnasaraf@gmail.com>
Parker Lougheed <parlough@gmail.com>
29 changes: 16 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ You can contribute in a few ways.

* **[Report issues][].**

* **Fix known issues** (especially ones with the label **[help wanted][]** or
**[beginner][]**). These issues may or may not be easy to fix. Sometimes
* **Fix known issues.** These issues may or may not be easy to fix. Sometimes
they're issues that we don't have the expertise to fix, and we'd love to
work with a contributor who has the right skills.

Expand All @@ -37,11 +36,9 @@ More info:
* For more ways to contribute to Dart, see the
[dart-lang/sdk Contributing page][].

[beginner]: https://github.com/dart-lang/site-www/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20label%3A%22help%20wanted%22%20label%3Abeginner%20
[dart-lang/sdk Contributing page]: https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md
[GitHub pull request]: https://docs.github.com/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
[GitHub pull request]: https://docs.github.com/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
[Google Developer Documentation Style Guide]: https://developers.google.com/style/
[help wanted]: https://github.com/dart-lang/site-www/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22help%20wanted%22%20
[in the site-shared repo]: https://github.com/dart-lang/site-shared/blob/main/doc
[issue tracker]: https://github.com/dart-lang/site-www/issues
[on Flutter's Discord server]: https://github.com/flutter/flutter/wiki/Chat
Expand All @@ -62,29 +59,35 @@ you'll probably need to change the code in two places:
For example, say you want to change the following code in the
[Variables documentation](https://dart.dev/language/variables):

```
````
<?code-excerpt "misc/lib/language_tour/variables.dart (var-decl)"?>
{% prettify dart tag=pre+code %}
```dart
var name = 'Bob';
{% endprettify %}
```
````

Besides editing
[/src/language/variables.md][]
[`/src/language/variables.md`][]
(which you can find by clicking the GitHub icon at the top right of the page),
you'll also need to edit the `var-decl` region of
[/examples/misc/lib/language_tour/variables.dart][].
[`/examples/misc/lib/language_tour/variables.dart`][].

If you create a PR but forget to edit the Dart file,
or if your changes don't analyze/test cleanly,
the [GitHub Actions][] CI build will fail.
Just update the PR, and GitHub Actions will run again.

If you followed the setup in the README,
you can instead run `dart run dart_site refresh-excerpts`
from the root directory of the repository to update the Markdown files.

[GitHub Actions]: https://docs.github.com/actions/learn-github-actions/understanding-github-actions
[/src/language/variables.md]: https://github.com/dart-lang/site-www/blob/main/src/language/variables.md
[/examples/misc/lib/language_tour/variables.dart]: https://github.com/dart-lang/site-www/blob/main/examples/misc/lib/language_tour/variables.dart
[`/src/language/variables.md`]: https://github.com/dart-lang/site-www/blob/main/src/language/variables.md
[`/examples/misc/lib/language_tour/variables.dart`]: https://github.com/dart-lang/site-www/blob/main/examples/misc/lib/language_tour/variables.dart

## A word about conduct

We pledge to maintain an open and welcoming environment.
For details, see our [code of conduct](https://dart.dev/community/code-of-conduct).
For details, see our [code of conduct][].

[code of conduct]: https://dart.dev/community/code-of-conduct

0 comments on commit 19f966e

Please sign in to comment.