Merge marketing site into sites/www#13373
Draft
parlough wants to merge 26 commits into
Draft
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Collaborator
|
Visit the preview URL for this PR (updated for commit 531a113): https://flutter-docs-prod--pr13373-feat-merge-website-cms-fq38782n.web.app |
sfshaza2
approved these changes
May 7, 2026
Contributor
sfshaza2
left a comment
sfshaza2
left a comment
There was a problem hiding this comment.
I know it's in draft, but lgtm
Co-authored-by: Abdallah Shaban <abdallahshaban@google.com> Co-authored-by: Alvaro Andrés Rodríguez Scelza <alvaroscelza@gmail.com> Co-authored-by: Brian Tobin <brianjtobin@gmail.com> Co-authored-by: Connie Ooi <connieooi@google.com> Co-authored-by: Craig Labenz <craig.labenz@gmail.com> Co-authored-by: Drew Roen <102626803+drewroengoogle@users.noreply.github.com> Co-authored-by: Emma Twersky <pokepsi@gmail.com> Co-authored-by: Eric Windmill <ewindmill@google.com> Co-authored-by: Jhon Aires <82902331+Jhon-Aires@users.noreply.github.com> Co-authored-by: John Ryan <ryjohn@google.com> Co-authored-by: Kate Lovett <katelovett@google.com> Co-authored-by: Kevin Moore <kevmoo@users.noreply.github.com> Co-authored-by: Khanh Nguyen <khanhnwin@gmail.com> Co-authored-by: Kilian Schulte <git@schultek.dev> Co-authored-by: Martin D'Uva <martin.duva@verygood.ventures> Co-authored-by: Matan Lurey <matanlurey@users.noreply.github.com> Co-authored-by: Parker Lougheed <parlough@gmail.com> Co-authored-by: Pierre <6655696+guidezpl@users.noreply.github.com> Co-authored-by: Tom Arra <tarra3@gmail.com> Co-authored-by: Victoria Duran <37369214+vickyduran@users.noreply.github.com> Co-authored-by: btobin <brianjtobin@gmail.com> Co-authored-by: godofredoc <godofredoc@google.com> Co-authored-by: htrolle-epam <htrolle@google.com>
parlough
force-pushed
the
feat/merge-website-cms
branch
from
7c6f98e to
9b4960f
Compare
Collaborator
|
Staged preview of the updated docs.flutter.dev site (updated for commit 9c9faad): https://flutter-docs-prod--docs-pr13373-feat-merge-website-cms-pvxy7oh9.web.app |
parlough
changed the title
flutter/website-cms repository into sites/wwwflutter/website-cms repository into sites/www
parlough
changed the title
flutter/website-cms repository into sites/wwwsites/www
Contributor
|
@abdallahshaban557 can you look over? |
# Conflicts: # .github/workflows/dart.yml # .github/workflows/docs.yml # cloud_build/deploy.yaml # cloud_build/firebase-ghcli/README.md # cloud_build/stage.yaml # tool/dash_site/lib/src/commands/build.dart # tool/dash_site/lib/src/commands/check_link_references.dart # tool/dash_site/lib/src/commands/check_links.dart # tool/dash_site/lib/src/commands/clean.dart # tool/dash_site/lib/src/commands/deploy.dart # tool/dash_site/lib/src/commands/serve.dart # tool/dash_site/lib/src/commands/stage_preview.dart # tool/dash_site/lib/src/commands/test_dart.dart # tool/dash_site/lib/src/commands/verify_firebase_json.dart # tool/dash_site/lib/src/sites.dart # tool/dash_site/pubspec.yaml
parlough
force-pushed
the
feat/merge-website-cms
branch
from
a4977bf to
5fc6c00
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Focused changes after content merge: https://github.com/flutter/website/pull/13373/changes/9b4960f53296de3f5393b0b437c339e34703adad..5fc6c00dd6079c3d8d53cebc4d43ebb9142e1f63
This PR merges the old
flutter/website-cmsmarketing site into this repository as thesites/wwwdirectory, resulting influtter.devliving alongsidedocs.flutter.devin the shared Dart pub workspace.As part of #13148 I already extracted changes from this work to prepare the repository, its tooling, and checks to support multiple sites. See the PRs linked to that issue for more information.
TODO: Move trigger for marketing site from
flutter/website-cmsto this repository and set the_SITEcustom substitution towww.