Merge branch 'main' into patch-1

Author: Sharra-writes

.github/instructions/code.instructions.md

@@ -9,9 +9,7 @@ on:
     branches:
       - main
     paths:
-      - '**/*.js'
       - '**/*.ts'
-      - '**/*.jsx'
       - '**/*.tsx'
       - '.github/workflows/codeql.yml'
   # This is so that when CodeQL runs on a pull request, it can compare

.github/instructions/content.instructions.md

@@ -9,7 +9,7 @@ on:
   pull_request:
     paths:
       - src/languages/scripts/count-translation-corruptions.ts
-      - src/languages/lib/correct-translation-content.js
+      - src/languages/lib/correct-translation-content.ts
       - .github/workflows/count-translation-corruptions.yml
       - .github/actions/node-npm-setup/action.yml
       - .github/actions/clone-translations/action.yml

.github/workflows/codeql.yml

@@ -28,7 +28,7 @@ jobs:
 
       - uses: ./.github/actions/node-npm-setup
 
-      - name: Run src/ghes-releases/scripts/update-enterprise-dates.js
+      - name: Run src/ghes-releases/scripts/update-enterprise-dates.ts
         run: npm run update-enterprise-dates
         env:
           GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
@@ -42,7 +42,7 @@ jobs:
         with:
           # need to use a token with repo and workflow scopes for this step
           token: ${{ secrets.DOCS_BOT_PAT_BASE }}
-          commit-message: '🤖 ran src/ghes-releases/scripts/update-enterprise-dates.js'
+          commit-message: '🤖 ran src/ghes-releases/scripts/update-enterprise-dates.ts'
           title: 🤖 src/ghes-releases/lib/enterprise-dates.json update
           body:
             "Hello! The GitHub Enterprise Server release dates have changed.\n\n

.github/workflows/count-translation-corruptions.yml

@@ -7,7 +7,7 @@ name: Move content script test
 on:
   pull_request:
     paths:
-      - src/content-render/scripts/move-content.js
+      - src/content-render/scripts/move-content.ts
       - src/content-render/scripts/test-move-content.ts
       - 'src/frame/lib/**/*.js'
       - .github/workflows/move-content.yml

.github/workflows/enterprise-dates.yml

@@ -14,10 +14,10 @@ on:
       - .github/workflows/orphaned-files-check.yml
       # In case any of the dependencies affect the script
       - 'package*.json'
-      - src/assets/scripts/find-orphaned-assets.js
+      - src/assets/scripts/find-orphaned-assets.ts
       - src/content-render/scripts/reusables-cli/find/unused.ts
       - src/workflows/walk-files.ts
-      - src/languages/lib/languages.js
+      - src/languages/lib/languages.ts
       - .github/actions/clone-translations/action.yml
       - .github/actions/node-npm-setup/action.yml
 

.github/workflows/move-content.yml

@@ -37,6 +37,9 @@ jobs:
         run: |
           npm --version
 
+          # Save the current top-level dependencies from package-lock.json
+          node -e "console.log(JSON.stringify(require('./package-lock.json').packages['']))" > /tmp/before.json
+
           # From https://docs.npmjs.com/cli/v7/commands/npm-install
           #
           #   The --package-lock-only argument will only update the
@@ -45,9 +48,16 @@ jobs:
           #
           npm install --package-lock-only --ignore-scripts --include=optional
 
-          # If the package.json (dependencies and devDependencies) is
-          # in correct sync with package-lock.json running the above command
-          # should *not* make an edit to the package-lock.json. I.e.
-          # running `git status` should
-          # say "nothing to commit, working tree clean".
-          git diff --exit-code
+          # Extract the top-level dependencies after regeneration
+          node -e "console.log(JSON.stringify(require('./package-lock.json').packages['']))" > /tmp/after.json
+
+          # Compare only the top-level package dependencies
+          # This ignores platform-specific differences in nested dependency resolution
+          # (like "peer" flags) that don't affect actual installed versions
+          if ! diff /tmp/before.json /tmp/after.json; then
+            echo "ERROR: Top-level dependencies in package-lock.json are out of sync with package.json"
+            echo "Please run 'npm install' locally and commit the updated package-lock.json"
+            exit 1
+          fi
+
+          echo "✓ Top-level dependencies are in sync"

.github/workflows/orphaned-files-check.yml

@@ -15,7 +15,6 @@ on:
       - reopened
       - synchronize
     paths:
-      - '**.js'
       - '**.ts'
       - '**.tsx'
       - '**.scss'

.github/workflows/package-lock-lint.yml

@@ -92,7 +92,7 @@ jobs:
 
           branchCheckout=$(git checkout -b $branchname)
           if [[ ! $? -eq 0 ]]; then
-            echo "Branch $branchname already exists in `github/docs-internal`. Exiting..."
+            echo "Branch $branchname already exists in 'github/docs-internal'. Exiting..."
             exit 0
           fi
           git add .