Merge sync 202605

.github/CONTRIBUTING.md

@@ -8,8 +8,7 @@ page please create an issue first.
 
 Start by ensuring that you have Node.js installed and forking the repository:
 
-- Install [Node.js][1] if you have not already.
-- Install [Yarn][13] if you have not already. Yarn is an alternative to npm, and it is required for building the site as we use `yarn` specific features like `resolutions` which are not available in other package managers like `pnpm`.
+- Install [Node.js][1] if you have not already. npm ships with Node.js, so no separate package manager installation is required.
 - Fork the **webpack.js.org** repo from [the main repository][2].
 - `git clone <your-clone-url> && cd webpack.js.org`
 
@@ -21,18 +20,18 @@ Start by ensuring that you have Node.js installed and forking the repository:
 
 Once you are in the project directory, run the following commands:
 
-- `yarn` to pull all dependencies.
-- `GITHUB_TOKEN=<your-token-here> yarn fetch-all` - Fetches all updated website content from GitHub.
-- `yarn build` to create a production version of the site.
-- `yarn start` to develop on a local webpack-dev-server: [localhost:3000][3].
+- `npm install` to pull all dependencies.
+- `GITHUB_TOKEN=<your-token-here> npm run fetch-all` - Fetches all updated website content from GitHub.
+- `npm run build` to create a production version of the site.
+- `npm start` to develop on a local webpack-dev-server: [localhost:3000][3].
 
 **Note:** The `fetch` and `fetch-repos` commands must be run before building the site as they populate necessary data for the build process.
 
-> NOTE: run `yarn fetch-repos` and then `yarn fetch` before running `yarn start` command for the first time
+> NOTE: run `npm run fetch-repos` and then `npm run fetch` before running `npm start` command for the first time
 
-- `yarn fetch` to retrieve external documentation/data.
+- `npm run fetch` to retrieve external documentation/data.
 
-The final command, `yarn fetch`, is optional as both `yarn build` and `yarn start`
+The final command, `npm run fetch`, is optional as both `npm run build` and `npm start`
 will do this automatically. This step pulls in documentation for loaders/plugins hosted
 in separate repositories such as the ones found in the [webpack-contrib][4] organization.
 See the `package.json` for the full list of `scripts`.
@@ -60,13 +59,13 @@ you've [installed the plugin][7] if your text editor needs one.
 Run the full test suite (lint + Jest) with:
 
 ```bash
-yarn test
+npm test
 ```
 
 To run only Jest tests:
 
 ```bash
-yarn jest
+npm run jest
 ```
 
 To update snapshots after intentional UI changes:
@@ -148,5 +147,4 @@ any time spent fixing typos or clarifying sections in the documentation.
 [9]: https://help.github.com/articles/proposing-changes-to-your-work-with-pull-requests/
 [10]: http://conventionalcommits.org/
 [11]: https://github.com/conventional-changelog/standard-version
-[13]: https://yarnpkg.com/lang/en/docs/install
 [14]: https://dev.to/matks/what-it-means-to-rebase-a-pull-request-submitted-on-github-5717

.github/actions/webpack-persistent-cache/action.yml

@@ -13,7 +13,7 @@ runs:
       id: build-webpack-persistent-cache
       with:
         path: node_modules/.cache
-        key: build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }}
+        key: build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |-
-          build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/yarn.lock') }}
+          build-${{ hashFiles('**/webpack.*.mjs') }}-${{ hashFiles('**/package-lock.json') }}
           build-${{ hashFiles('**/webpack.*.mjs') }}-

.github/workflows/dependabot.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.actor == 'dependabot[bot]'
     steps:
       - name: Generate Token
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         id: app-token
         with:
           app-id: ${{ secrets.BOT_APP_ID }}

.github/workflows/dependency-review.yml

@@ -11,4 +11,4 @@ jobs:
       - name: "Checkout Repository"
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0
+        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0

.github/workflows/deploy.yml

@@ -21,18 +21,18 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
+          cache: npm
 
       - name: Enable webpack persistent caching
         uses: ./.github/actions/webpack-persistent-cache
 
-      - run: yarn --frozen-lockfile
+      - run: npm ci
       - name: Build site
-        run: yarn build
+        run: npm run build
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           OPENCOLLECTIVE_API_KEY: ${{secrets.OPENCOLLECTIVE_API_KEY}}
-      - run: yarn lint:links
+      - run: npm run lint:links
 
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@d92aa235d04922e8f08b40ce78cc5442fcfbfa2f # v4.8.0

.github/workflows/pr-quality.yml

@@ -0,0 +1,14 @@
+name: PR Quality
+
+permissions:
+  contents: read
+  issues: read
+  pull-requests: write
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+jobs:
+  anti-slop:
+    uses: webpack/.github/.github/workflows/pr-quality.yml@a03552c758d8c244b3cfc2985aff7020469e0473

.github/workflows/testing.yml

@@ -22,10 +22,10 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
+          cache: npm
 
-      - run: yarn --frozen-lockfile
-      - run: yarn jest
+      - run: npm ci
+      - run: npm run jest
 
   lint:
     name: Lint
@@ -41,12 +41,12 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
+          cache: npm
 
-      - run: yarn --frozen-lockfile
-      - run: yarn lint:js
-      - run: yarn lint:prettier
-      - run: yarn lint:markdown
+      - run: npm ci
+      - run: npm run lint:js
+      - run: npm run lint:prettier
+      - run: npm run lint:markdown
 
   proseLint:
     name: Proselint
@@ -62,13 +62,13 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
+          cache: npm
 
       - name: Install MDX Parser
         run: npm install -g mdx2vast
 
       - name: Vale
-        uses: errata-ai/vale-action@d89dee975228ae261d22c15adcd03578634d429c # v2.1.1
+        uses: errata-ai/vale-action@85f9f7f2c5f449ac0ae5b66662961bae3f77ca6a # v2.1.2
         with:
           files: src/content
         env:
@@ -88,22 +88,22 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
+          cache: npm
 
-      - run: yarn --frozen-lockfile
+      - run: npm ci
 
       - name: Enable webpack persistent caching
         uses: ./.github/actions/webpack-persistent-cache
 
       - name: Cypress run
-        uses: cypress-io/github-action@783cb3f07983868532cabaedaa1e6c00ff4786a8 # v7.1.9
+        uses: cypress-io/github-action@dace029018fcdf86e0df89a31bc3cfa5b32570d8 # v7.3.0
         with:
           browser: chrome
           config-file: cypress.config.js
-          build: yarn build
-          start: yarn serve-dist
-          command: yarn cypress:run
+          build: npm run build
+          start: npm run serve-dist
+          command: npm run cypress:run
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-      - run: yarn lint:links
+      - run: npm run lint:links

.gitignore

@@ -4,12 +4,11 @@ dist
 !examples/**/dist
 src/**/_*.json
 src/**/_*.mdx
+src/content/contribute/Governance-*.mdx
 .vscode
 .idea
 .DS_Store
 npm-debug.log
-yarn-error.log
-package-lock.json
 .cache
 internal-links.tap
 stats.json

examples/module-federation/README.md

@@ -5,8 +5,8 @@
 Run the following commands in the root directory.
 
 ```bash
-yarn
-yarn start
+npm install
+npm start
 ```
 
 Both `app1` and `app2` are independently deployed apps:

examples/module-federation/lerna.json

@@ -1,5 +1,5 @@
 {
   "version": "1.0.0",
-  "npmClient": "yarn",
+  "npmClient": "npm",
   "useWorkspaces": true
 }