Skip to content

Merge marketing site into sites/www#13373

Draft
parlough wants to merge 22 commits into
mainfrom
feat/merge-website-cms
Draft

Merge marketing site into sites/www#13373
parlough wants to merge 22 commits into
mainfrom
feat/merge-website-cms

Conversation

@parlough
Copy link
Copy Markdown
Member

@parlough parlough commented May 7, 2026

Focused changes after merge: https://github.com/flutter/website/pull/13373/changes/9b4960f53296de3f5393b0b437c339e34703adad..152adca768e3b8eba67e9e2afec7a6aa15815bd8

This PR merges the old flutter/website-cms marketing site into this repository as the sites/www directory, resulting in flutter.dev living alongside docs.flutter.dev in the shared Dart pub workspace.

It updates the shared dash_site tooling so both sites can be built, served, cleaned, checked, staged, and deployed with a shared and consistent setup. The Cloud Build staging/deploy flows have been been migrated from Bash scripts to Dart commands within dash_site for easier maintainence since their logic got more complicated. The GitHub Actions workflows are now split for docs site, marketing site, and Dart tests.

TODO: Move trigger for marketing site from flutter/website-cms to this repository and set the _SITE custom substitution to www.

@google-cla
Copy link
Copy Markdown

google-cla Bot commented May 7, 2026

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.

@flutter-website-bot
Copy link
Copy Markdown
Collaborator

flutter-website-bot commented May 7, 2026

Visit the preview URL for this PR (updated for commit 531a113):

https://flutter-docs-prod--pr13373-feat-merge-website-cms-fq38782n.web.app

Copy link
Copy Markdown
Contributor

@sfshaza2 sfshaza2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 parlough force-pushed the feat/merge-website-cms branch from 7c6f98e to 9b4960f Compare May 12, 2026 20:57
@flutter-website-bot
Copy link
Copy Markdown
Collaborator

flutter-website-bot commented May 14, 2026

Staged preview of the updated docs.flutter.dev site (updated for commit 152adca):

https://flutter-docs-prod--docs-pr13373-feat-merge-website-cms-ag6mn5jc.web.app

@parlough parlough changed the title [WIP] Merge flutter/website-cms repository into sites/www Merge flutter/website-cms repository into sites/www May 14, 2026
@parlough parlough changed the title Merge flutter/website-cms repository into sites/www Merge marketing site into sites/www May 14, 2026
@parlough parlough requested a review from johnpryan May 14, 2026 21:20
@parlough parlough removed the request for review from johnpryan May 14, 2026 21:49
@antfitch antfitch self-requested a review May 14, 2026 22:17
Copy link
Copy Markdown
Contributor

@antfitch antfitch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huge win!

@antfitch
Copy link
Copy Markdown
Contributor

@abdallahshaban557 can you look over?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants