Merge branch 'main' into ci/fix-corepack-enable-error

btea · web-flow · commit d8fb1341627d · 2025-02-28T16:12:50.000+08:00
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -22,6 +22,7 @@ jobs:
         with:
           node-version: 22
       - run: |
+          npm install --global corepack
           corepack enable
           corepack prepare pnpm@next-9 --activate
           corepack prepare yarn@stable --activate
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install pnpm
         run: |
           npm i -g --force corepack && corepack enable
-          corepack prepare pnpm@next-9 --activate
+          corepack prepare pnpm@next-10 --activate
       - name: Install dependencies
         run: pnpm install
       - name: Build
diff --git a/benchmarks/results/npm/11.1.0/alotta-files.yaml b/benchmarks/results/npm/11.1.0/alotta-files.yaml
@@ -25,3 +25,84 @@
   withWarmModulesAndLockfile: 1391
   withWarmModules: 1697
   updatedDependencies: 7520
+- firstInstall: 38379
+  repeatInstall: 1471
+  withWarmCacheAndLockfile: 8203
+  withWarmCache: 12461
+  withLockfile: 11341
+  withWarmCacheAndModules: 1732
+  withWarmModulesAndLockfile: 1398
+  withWarmModules: 1750
+  updatedDependencies: 7914
+- firstInstall: 35886
+  repeatInstall: 1485
+  withWarmCacheAndLockfile: 8290
+  withWarmCache: 12598
+  withLockfile: 11295
+  withWarmCacheAndModules: 1724
+  withWarmModulesAndLockfile: 1407
+  withWarmModules: 1708
+  updatedDependencies: 9932
+- firstInstall: 33654
+  repeatInstall: 1495
+  withWarmCacheAndLockfile: 8280
+  withWarmCache: 12622
+  withLockfile: 11244
+  withWarmCacheAndModules: 1746
+  withWarmModulesAndLockfile: 1418
+  withWarmModules: 1726
+  updatedDependencies: 8644
+- firstInstall: 34814
+  repeatInstall: 1511
+  withWarmCacheAndLockfile: 7984
+  withWarmCache: 12052
+  withLockfile: 10650
+  withWarmCacheAndModules: 1667
+  withWarmModulesAndLockfile: 1401
+  withWarmModules: 1672
+  updatedDependencies: 7106
+- firstInstall: 28907
+  repeatInstall: 1465
+  withWarmCacheAndLockfile: 7916
+  withWarmCache: 12119
+  withLockfile: 10725
+  withWarmCacheAndModules: 1685
+  withWarmModulesAndLockfile: 1377
+  withWarmModules: 1692
+  updatedDependencies: 6798
+- firstInstall: 31879
+  repeatInstall: 1491
+  withWarmCacheAndLockfile: 7948
+  withWarmCache: 12137
+  withLockfile: 10770
+  withWarmCacheAndModules: 1677
+  withWarmModulesAndLockfile: 1388
+  withWarmModules: 1691
+  updatedDependencies: 8487
+- firstInstall: 39445
+  repeatInstall: 1457
+  withWarmCacheAndLockfile: 7982
+  withWarmCache: 12143
+  withLockfile: 10804
+  withWarmCacheAndModules: 1694
+  withWarmModulesAndLockfile: 1376
+  withWarmModules: 1716
+  updatedDependencies: 8312
+- firstInstall: 33007
+  repeatInstall: 1416
+  withWarmCacheAndLockfile: 7988
+  withWarmCache: 12255
+  withLockfile: 10798
+  withWarmCacheAndModules: 1680
+  withWarmModulesAndLockfile: 1388
+  withWarmModules: 1704
+  updatedDependencies: 6944
+- firstInstall: 32747
+  repeatInstall: 1434
+  withWarmCacheAndLockfile: 8040
+  withWarmCache: 12198
+  withLockfile: 10739
+  withWarmCacheAndModules: 1699
+  withWarmModulesAndLockfile: 1370
+  withWarmModules: 1689
+  updatedDependencies: 9269
diff --git a/benchmarks/results/pnpm/10.4.0/alotta-files.yaml b/benchmarks/results/pnpm/10.4.0/alotta-files.yaml
@@ -0,0 +1,9 @@
+- firstInstall: 9495
+  repeatInstall: 895
+  withWarmCacheAndLockfile: 2585
+  withWarmCache: 5956
+  withLockfile: 5228
+  withWarmCacheAndModules: 2208
+  withWarmModulesAndLockfile: 886
+  withWarmModules: 5939
+  updatedDependencies: 3539
diff --git a/benchmarks/results/pnpm/10.4.1/alotta-files.yaml b/benchmarks/results/pnpm/10.4.1/alotta-files.yaml
@@ -0,0 +1,63 @@
+- firstInstall: 8602
+  repeatInstall: 921
+  withWarmCacheAndLockfile: 2617
+  withWarmCache: 5827
+  withLockfile: 5174
+  withWarmCacheAndModules: 2216
+  withWarmModulesAndLockfile: 900
+  withWarmModules: 5421
+  updatedDependencies: 3616
+- firstInstall: 8361
+  repeatInstall: 878
+  withWarmCacheAndLockfile: 2477
+  withWarmCache: 5648
+  withLockfile: 5019
+  withWarmCacheAndModules: 2220
+  withWarmModulesAndLockfile: 896
+  withWarmModules: 5531
+  updatedDependencies: 3707
+- firstInstall: 7936
+  repeatInstall: 881
+  withWarmCacheAndLockfile: 2495
+  withWarmCache: 5558
+  withLockfile: 4973
+  withWarmCacheAndModules: 2145
+  withWarmModulesAndLockfile: 883
+  withWarmModules: 5067
+  updatedDependencies: 3194
+- firstInstall: 7835
+  repeatInstall: 892
+  withWarmCacheAndLockfile: 2467
+  withWarmCache: 5507
+  withLockfile: 4969
+  withWarmCacheAndModules: 2139
+  withWarmModulesAndLockfile: 892
+  withWarmModules: 4931
+  updatedDependencies: 3248
+- firstInstall: 9105
+  repeatInstall: 906
+  withWarmCacheAndLockfile: 2495
+  withWarmCache: 5814
+  withLockfile: 5259
+  withWarmCacheAndModules: 2097
+  withWarmModulesAndLockfile: 884
+  withWarmModules: 5531
+  updatedDependencies: 3565
+- firstInstall: 8671
+  repeatInstall: 904
+  withWarmCacheAndLockfile: 2535
+  withWarmCache: 5771
+  withLockfile: 5172
+  withWarmCacheAndModules: 2141
+  withWarmModulesAndLockfile: 906
+  withWarmModules: 5266
+  updatedDependencies: 3579
+- firstInstall: 8452
+  repeatInstall: 898
+  withWarmCacheAndLockfile: 2474
+  withWarmCache: 5691
+  withLockfile: 5336
+  withWarmCacheAndModules: 2315
+  withWarmModulesAndLockfile: 895
+  withWarmModules: 5381
+  updatedDependencies: 3643
diff --git a/benchmarks/results/yarn/4.6.0/alotta-files.yaml b/benchmarks/results/yarn/4.6.0/alotta-files.yaml
@@ -241,3 +241,30 @@
   withWarmModulesAndLockfile: 5210
   withWarmModules: 9461
   updatedDependencies: 6340
+- firstInstall: 16188
+  repeatInstall: 5227
+  withWarmCacheAndLockfile: 5570
+  withWarmCache: 9814
+  withLockfile: 5759
+  withWarmCacheAndModules: 9615
+  withWarmModulesAndLockfile: 5246
+  withWarmModules: 9430
+  updatedDependencies: 7251
+- firstInstall: 9756
+  repeatInstall: 5177
+  withWarmCacheAndLockfile: 5485
+  withWarmCache: 9799
+  withLockfile: 5539
+  withWarmCacheAndModules: 9496
+  withWarmModulesAndLockfile: 5172
+  withWarmModules: 9570
+  updatedDependencies: 6695
+- firstInstall: 9790
+  repeatInstall: 5281
+  withWarmCacheAndLockfile: 5384
+  withWarmCache: 9964
+  withLockfile: 5549
+  withWarmCacheAndModules: 9574
+  withWarmModulesAndLockfile: 5172
+  withWarmModules: 9437
+  updatedDependencies: 6373
diff --git a/benchmarks/results/yarn_pnp/4.6.0/alotta-files.yaml b/benchmarks/results/yarn_pnp/4.6.0/alotta-files.yaml
@@ -241,3 +241,30 @@
   withWarmModulesAndLockfile: 0
   withWarmModules: 0
   updatedDependencies: 5332
+- firstInstall: 6003
+  repeatInstall: 0
+  withWarmCacheAndLockfile: 1369
+  withWarmCache: 5429
+  withLockfile: 1354
+  withWarmCacheAndModules: 0
+  withWarmModulesAndLockfile: 0
+  withWarmModules: 0
+  updatedDependencies: 5400
+- firstInstall: 5956
+  repeatInstall: 0
+  withWarmCacheAndLockfile: 1353
+  withWarmCache: 5435
+  withLockfile: 1348
+  withWarmCacheAndModules: 0
+  withWarmModulesAndLockfile: 0
+  withWarmModules: 0
+  updatedDependencies: 5427
+- firstInstall: 9555
+  repeatInstall: 0
+  withWarmCacheAndLockfile: 1329
+  withWarmCache: 5293
+  withLockfile: 1352
+  withWarmCacheAndModules: 0
+  withWarmModulesAndLockfile: 0
+  withWarmModules: 0
+  updatedDependencies: 5952
diff --git a/blog/2020-05-27-flat-node-modules-is-not-the-only-way.md b/blog/2020-05-27-flat-node-modules-is-not-the-only-way.md
@@ -1,8 +1,6 @@
 ---
 title: Flat node_modules is not the only way
-author: Zoltan Kochan
-authorURL: "http://twitter.com/zoltankochan"
-authorImageURL: "https://gravatar.com/avatar/1f59f040fb37d5799e3879fa678c2373?s=48"
+authors: zkochan
 ---
 
 New users of pnpm frequently ask me about the weird structure of `node_modules` that pnpm creates. Why is it not flat? Where are all the sub-dependencies?
diff --git a/blog/2020-10-17-node-modules-configuration-options-with-pnpm.md b/blog/2020-10-17-node-modules-configuration-options-with-pnpm.md
@@ -1,8 +1,6 @@
 ---
 title: Node-Modules configuration options with pnpm
-author: Zoltan Kochan
-authorURL: "http://twitter.com/zoltankochan"
-authorImageURL: "https://gravatar.com/avatar/1f59f040fb37d5799e3879fa678c2373?s=48"
+authors: zkochan
 ---
 
 There are many ways to create a node_modules directory.
diff --git a/blog/2021-12-29-yearly-update.md b/blog/2021-12-29-yearly-update.md
@@ -1,8 +1,6 @@
 ---
 title: The year 2021 for pnpm
-author: Zoltan Kochan
-authorURL: "http://twitter.com/zoltankochan"
-authorImageURL: "https://gravatar.com/avatar/1f59f040fb37d5799e3879fa678c2373?s=48"
+authors: zkochan
 ---
 
 It is the end of the year and it was a good year for pnpm, so let's see how it went.
diff --git a/blog/2022-12-30-yearly-update.md b/blog/2022-12-30-yearly-update.md
@@ -1,8 +1,6 @@
 ---
 title: The year 2022 for pnpm
-author: Zoltan Kochan
-authorURL: "http://twitter.com/zoltankochan"
-authorImageURL: "https://gravatar.com/avatar/1f59f040fb37d5799e3879fa678c2373?s=48"
+authors: zkochan
 image: "/img/blog/2022-review.png"
 ---
 
diff --git a/blog/authors.yml b/blog/authors.yml
@@ -0,0 +1,9 @@
+zkochan:
+  name: Zoltan Kochan
+  title: Lead maintainer of pnpm
+  url: https://www.kochan.io/
+  image_url: "https://gravatar.com/avatar/1f59f040fb37d5799e3879fa678c2373?s=48"
+  socials:
+    x: ZoltanKochan
+    github: zkochan
+
diff --git a/crowdin.yaml b/crowdin.yaml
@@ -1,5 +1,3 @@
-project_id: 302994
-api_token: 90c94c6aa5fb02574320b67fbff124ab87a33b1d959ea4afd627a75c4799d8a4f351fe14df1020df
 preserve_hierarchy: true
 
 languages_mapping: &languages_mapping
diff --git a/docs/cli/add.md b/docs/cli/add.md
@@ -211,6 +211,21 @@ Install a package globally.
 
 Only adds the new dependency if it is found in the workspace.
 
+
+### --allow-build
+
+Added in: v10.4.0
+
+A list of package names that are allowed to run postinstall scripts during installation.
+
+Example:
+
+```
+pnpm --allow-build=esbuild add my-bundler
+```
+
+This will run `esbuild`'s postinstall script and also add it to the `pnpm.onlyBuiltDependencies` field of `package.json`. So, `esbuild` will always be allowed to run its scripts in the future.
+
 ### --filter &lt;package_selector\>
 
 [Read more about filtering.](../filtering.md)
diff --git a/docs/cli/approve-builds.md b/docs/cli/approve-builds.md
@@ -6,3 +6,12 @@ title: pnpm approve-builds
 Added in: v10.1.0
 
 Approve dependencies for running scripts during installation.
+
+## Options
+
+### --global, -g
+
+Added in: v10.4.0
+
+Approve dependencies of globally installed packages.
+
diff --git a/docs/cli/fetch.md b/docs/cli/fetch.md
@@ -20,10 +20,10 @@ FROM node:20
 
 WORKDIR /path/to/somewhere
 
-RUN corepack enable pnpm && corepack install -g pnpm@latest-9
+RUN corepack enable pnpm && corepack install -g pnpm@latest-10
 
 # Files required by pnpm install
-COPY .npmrc package.json pnpm-lock.yaml .pnpmfile.cjs ./
+COPY .npmrc package.json pnpm-lock.yaml pnpm-workspace.yaml .pnpmfile.cjs ./
 
 # If you patched any package, include patches before install too
 COPY patches patches
@@ -37,7 +37,7 @@ EXPOSE 8080
 CMD [ "node", "server.js" ]
 ```
 
-As long as there are no changes to `.npmrc`, `package.json`, `pnpm-lock.yaml`,
+As long as there are no changes to `.npmrc`, `package.json`, `pnpm-lock.yaml`, `pnpm-workspace.yaml`,
 `.pnpmfile.cjs`, docker build cache is still valid up to the layer of
 `RUN pnpm install --frozen-lockfile --prod`, which cost most of the time
 when building a docker image.
@@ -55,10 +55,10 @@ FROM node:20
 
 WORKDIR /path/to/somewhere
 
-RUN corepack enable pnpm && corepack install -g pnpm@latest-9
+RUN corepack enable pnpm && corepack install -g pnpm@latest-10
 
 # Files required by pnpm install
-COPY .npmrc package.json pnpm-lock.yaml .pnpmfile.cjs ./
+COPY .npmrc package.json pnpm-lock.yaml pnpm-workspace.yaml .pnpmfile.cjs ./
 
 # If you patched any package, include patches before install too
 COPY patches patches
@@ -82,17 +82,17 @@ As you can see, the Dockerfile has to be updated when you add or remove
 sub-packages.
 
 `pnpm fetch` solves the above problem perfectly by providing the ability
-to load packages into the virtual store using only information from a lockfile.
+to load packages into the virtual store using only information from a lockfile and a configuration file (`pnpm-workspace.yaml`).
 
 ```Dockerfile
 FROM node:20
 
 WORKDIR /path/to/somewhere
 
-RUN corepack enable pnpm && corepack install -g pnpm@latest-9
+RUN corepack enable pnpm && corepack install -g pnpm@latest-10
 
 # pnpm fetch does require only lockfile
-COPY pnpm-lock.yaml ./
+COPY pnpm-lock.yaml pnpm-workspace.yaml ./
 
 # If you patched any package, include patches before running pnpm fetch
 COPY patches patches
diff --git a/docs/cli/install.md b/docs/cli/install.md
diff --git a/docs/docker.md b/docs/docker.md
diff --git a/docs/npmrc.md b/docs/npmrc.md
diff --git a/docs/using-changesets.md b/docs/using-changesets.md
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/pages/benchmarks.md b/src/pages/benchmarks.md
diff --git a/static/img/benchmarks/alotta-files.svg b/static/img/benchmarks/alotta-files.svg

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-project_id: 302994`
`2`		`-api_token: 90c94c6aa5fb02574320b67fbff124ab87a33b1d959ea4afd627a75c4799d8a4f351fe14df1020df`
`3`	`1`	`preserve_hierarchy: true`
`4`	`2`
`5`	`3`	`languages_mapping: &languages_mapping`