Merge branch 'main' into availableinworker-6-cases

mdn · Dec 20, 2024 · 3ad738e · 3ad738e
2 parents 9bff25e + 18cef57
commit 3ad738e
Show file tree

Hide file tree

Showing 149 changed files with 4,500 additions and 4,004 deletions.
diff --git a/.env-dist b/.env-dist
@@ -1,6 +1,7 @@
 CONTENT_ROOT=../content/files
 #CONTENT_TRANSLATED_ROOT=../translated-content/files
 #CONTRIBUTOR_SPOTLIGHT_ROOT=../mdn-contributor-spotlight/contributors
+#GENERIC_CONTENT_ROOT=../generic-content/files
 
 REACT_APP_DEV_MODE=true
 

diff --git a/.eslintignore b/.eslintignore
@@ -11,3 +11,4 @@ cloud-function/**/*.js
 filecheck/*.js
 mdn/content/
 tool/*.js
+bins/*.mjs
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -169,6 +169,9 @@ jobs:
           yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json
           yarn tool whatsdeployed $CONTENT_TRANSLATED_ROOT --output client/build/_whatsdeployed/translated-content.json
 
+          # Sort DE search index by en-US popularity.
+          node scripts/reorder-search-index.mjs client/build/en-us/search-index.json client/build/de/search-index.json
+
       - name: Deploy with deployer
         env:
           # Set the CONTENT_ROOT first

diff --git a/.github/workflows/npm-published-simulation.yml b/.github/workflows/npm-published-simulation.yml
@@ -55,7 +55,7 @@ jobs:
           REACT_APP_DISABLE_AUTH: true
           CONTENT_ROOT: testing/content/files
         run: |
-          yarn build:prepare
+          yarn build:legacy:prepare
 
       - name: Build and install tarball
         run: |
@@ -107,7 +107,7 @@ jobs:
       - name: SSR build a page
         working-directory: mdn/content
         run: |
-          yarn build files/en-us/mdn/kitchensink/index.md
+          yarn rari-build -f ${PWD}/files/en-us/mdn/kitchensink/index.md
 
       - name: Debug server's stdout and stderr if tests failed
         if: failure()

diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
@@ -53,8 +53,7 @@ jobs:
           BUILD_GOOGLE_ANALYTICS_MEASUREMENT_ID: G-XXXXXXXX
         run: |
           yarn build:prepare
-          # BUILD_FOLDERSEARCH=mdn/kitchensink yarn build:docs
-          BUILD_FOLDERSEARCH=web/javascript/reference/global_objects/array/foreach yarn build:docs
+          yarn build -f $CONTENT_ROOT/en-us/web/javascript/reference/global_objects/array/foreach -f $CONTENT_ROOT/en-us/mdn/kitchensink
           yarn render:html
 
       - name: Serve and lhci

diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
@@ -89,6 +89,12 @@ jobs:
           lfs: true
           token: ${{ secrets.MDN_STUDIO_PAT }}
 
+      - uses: actions/checkout@v4
+        if: ${{ ! vars.SKIP_BUILD }}
+        with:
+          repository: mdn/generic-content
+          path: mdn/generic-content
+
       - uses: actions/checkout@v4
         if: ${{ ! vars.SKIP_BUILD }}
         with:
@@ -128,6 +134,13 @@ jobs:
           mv mdn/translated-content-de/files/de mdn/translated-content/files/
           rm -rf mdn/translated-content-de
 
+      - name: Clean and commit de
+        if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }}
+        working-directory: mdn/translated-content
+        run: |
+          git add files/de
+          git -c user.name='MDN' -c user.email='mdn-dev@mozilla.com' commit -m 'de'
+
       - uses: actions/checkout@v4
         if: ${{ ! vars.SKIP_BUILD }}
         with:
@@ -145,7 +158,8 @@ jobs:
         if: ${{ ! vars.SKIP_BUILD }}
         run: yarn --frozen-lockfile
         env:
-          # https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
+          # Use a GITHUB_TOKEN to bypass rate limiting for ripgrep and rari.
+          # See https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Python
@@ -189,8 +203,15 @@ jobs:
           CONTRIBUTOR_SPOTLIGHT_ROOT: ${{ github.workspace }}/mdn/mdn-contributor-spotlight/contributors
           BLOG_ROOT: ${{ github.workspace }}/mdn/mdn-studio/content/posts
           CURRICULUM_ROOT: ${{ github.workspace }}/mdn/curriculum
+          GENERIC_CONTENT_ROOT: ${{ github.workspace }}/mdn/generic-content/files
           BASE_URL: "https://developer.mozilla.org"
 
+          # rari
+          BUILD_OUT_ROOT: "client/build"
+          LIVE_SAMPLES_BASE_URL: https://live.mdnplay.dev
+          INTERACTIVE_EXAMPLES_BASE_URL: https://interactive-examples.mdn.mozilla.net
+          ADDITIONAL_LOCALES_FOR_GENERICS_AND_SPAS: de
+
           # The default for this environment variable is geared for writers
           # (aka. local development). Usually defaults are supposed to be for
           # secure production but this is an exception and default
@@ -239,7 +260,7 @@ jobs:
 
           # Surveys.
           REACT_APP_SURVEY_START_HOMEPAGE_FEEDBACK_2024: 1731369600000 # new Date("2024-11-12Z").getTime()
-          REACT_APP_SURVEY_END_HOMEPAGE_FEEDBACK_2024: 1732665600000 # new Date("2024-11-27Z").getTime()
+          REACT_APP_SURVEY_END_HOMEPAGE_FEEDBACK_2024: 1733616000000 # new Date("2024-12-08Z").getTime()
           REACT_APP_SURVEY_RATE_FROM_HOMEPAGE_FEEDBACK_2024: 0.0
           REACT_APP_SURVEY_RATE_TILL_HOMEPAGE_FEEDBACK_2024: 1 # 100%
           REACT_APP_SURVEY_START_WEBDX_EDITING_2024: 1731628800000 # new Date("2024-11-15Z").getTime()
@@ -278,32 +299,17 @@ jobs:
           echo "CONTENT_ROOT=$CONTENT_ROOT"
           echo "CONTENT_TRANSLATED_ROOT=$CONTENT_TRANSLATED_ROOT"
           yarn build:sw
-          yarn build:prepare
-
-          yarn tool sync-translated-content es fr ja ko pt-br ru zh-cn zh-tw
+          yarn build:client
+          yarn build:ssr
+          yarn tool:legacy build-robots-txt
 
-          # Build using one process per locale.
-          # Note: We have 4 cores, but 9 processes is a reasonable number.
-          for locale in en-us de es fr ja ko pt-br ru zh-cn zh-tw; do
-            yarn build:docs --locale $locale 2>&1 | sed "s/^/[$locale] /"   &
-            pids+=($!)
-          done
+          yarn rari content sync-translated-content
+          yarn rari git-history
 
-          for pid in "${pids[@]}"; do
-            wait $pid
-          done
+          yarn rari build --all --issues client/build/issues.json --templ-stats
 
           du -sh client/build
 
-          # Build the blog
-          yarn build:blog
-
-          # Build the curriculum
-          yarn build:curriculum
-
-          # Generate sitemap index file
-          yarn build --sitemap-index
-
           # SSR all pages
           yarn render:html
 
@@ -312,6 +318,9 @@ jobs:
           yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json
           yarn tool whatsdeployed $CONTENT_TRANSLATED_ROOT --output client/build/_whatsdeployed/translated-content.json
 
+          # Sort DE search index by en-US popularity.
+          node scripts/reorder-search-index.mjs client/build/en-us/search-index.json client/build/de/search-index.json
+
       - name: Update search index
         if: ${{ ! vars.SKIP_BUILD }}
         env:

diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
@@ -103,7 +103,7 @@ jobs:
           git checkout main
           git status
           git checkout -
-          git merge main --no-edit
+          git merge main --no-edit || git merge --abort
 
       - uses: actions/checkout@v4
         if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }}
@@ -124,6 +124,12 @@ jobs:
           lfs: true
           token: ${{ secrets.MDN_STUDIO_PAT }}
 
+      - uses: actions/checkout@v4
+        if: ${{ ! vars.SKIP_BUILD }}
+        with:
+          repository: mdn/generic-content
+          path: mdn/generic-content
+
       - uses: actions/checkout@v4
         if: ${{ ! vars.SKIP_BUILD }}
         with:
@@ -151,6 +157,13 @@ jobs:
           mv mdn/translated-content-de/files/de mdn/translated-content/files/
           rm -rf mdn/translated-content-de
 
+      - name: Clean and commit de
+        if: ${{ ! vars.SKIP_BUILD || ! vars.SKIP_FUNCTION }}
+        working-directory: mdn/translated-content
+        run: |
+          git add files/de
+          git -c user.name='MDN' -c user.email='mdn-dev@mozilla.com' commit -m 'de'
+
       - uses: actions/checkout@v4
         if: ${{ ! vars.SKIP_BUILD }}
         with:
@@ -168,7 +181,8 @@ jobs:
         if: ${{ ! vars.SKIP_BUILD }}
         run: yarn --frozen-lockfile
         env:
-          # https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
+          # Use a GITHUB_TOKEN to bypass rate limiting for ripgrep and rari.
+          # See https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Python
@@ -212,8 +226,15 @@ jobs:
           CONTRIBUTOR_SPOTLIGHT_ROOT: ${{ github.workspace }}/mdn/mdn-contributor-spotlight/contributors
           BLOG_ROOT: ${{ github.workspace }}/mdn/mdn-studio/content/posts
           CURRICULUM_ROOT: ${{ github.workspace }}/mdn/curriculum
+          GENERIC_CONTENT_ROOT: ${{ github.workspace }}/mdn/generic-content/files
           BASE_URL: "https://developer.allizom.org"
 
+          # rari
+          BUILD_OUT_ROOT: "client/build"
+          LIVE_SAMPLES_BASE_URL: https://live.mdnyalp.dev
+          INTERACTIVE_EXAMPLES_BASE_URL: https://interactive-examples.mdn.allizom.net
+          ADDITIONAL_LOCALES_FOR_GENERICS_AND_SPAS: de
+
           # The default for this environment variable is geared for writers
           # (aka. local development). Usually defaults are supposed to be for
           # secure production but this is an exception and default
@@ -290,31 +311,14 @@ jobs:
           echo "BLOG_ROOT=$BLOG_ROOT"
           # Build the ServiceWorker first
           yarn build:sw
-          yarn build:prepare
+          yarn build:client
+          yarn build:ssr
+          yarn tool:legacy build-robots-txt
 
-          yarn tool sync-translated-content es fr ja ko pt-br ru zh-cn zh-tw
+          yarn rari content sync-translated-content
+          yarn rari git-history
 
-          # Build using one process per locale.
-          # Note: We have 4 cores, but 9 processes is a reasonable number.
-          for locale in en-us de es fr ja ko pt-br ru zh-cn zh-tw; do
-            yarn build:docs --locale $locale 2>&1 | sed "s/^/[$locale] /"   &
-            pids+=($!)
-          done
-
-          for pid in "${pids[@]}"; do
-            wait $pid
-          done
-
-          du -sh client/build
-
-          # Build the blog
-          yarn build:blog
-
-          # Build the curriculum
-          yarn build:curriculum
-
-          # Generate sitemap index file
-          yarn build --sitemap-index
+          yarn rari build --all --issues client/build/issues.json --templ-stats
 
           # SSR all pages
           yarn render:html
@@ -324,6 +328,9 @@ jobs:
           yarn tool whatsdeployed $CONTENT_ROOT --output client/build/_whatsdeployed/content.json
           yarn tool whatsdeployed $CONTENT_TRANSLATED_ROOT --output client/build/_whatsdeployed/translated-content.json
 
+          # Sort DE search index by en-US popularity.
+          node scripts/reorder-search-index.mjs client/build/en-us/search-index.json client/build/de/search-index.json
+
       - name: Update search index
         if: ${{ ! vars.SKIP_BUILD }}
         env: