Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pnpm for openSUSE:Factory checked in
at 2025-07-10 22:12:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pnpm (Old)
and /work/SRC/openSUSE:Factory/.pnpm.new.7373 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pnpm"
Thu Jul 10 22:12:03 2025 rev:43 rq:1291568 version:10.13.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/pnpm/pnpm.changes 2025-07-02
12:15:14.605070189 +0200
+++ /work/SRC/openSUSE:Factory/.pnpm.new.7373/pnpm.changes 2025-07-10
22:12:07.627661896 +0200
@@ -1,0 +2,30 @@
+Wed Jul 9 11:02:45 UTC 2025 - Johannes Kastl
<opensuse_buildserv...@ojkastl.de>
+
+- update to 10.13.1:
+ * Patch Changes
+ - Run user defined pnpmfiles after pnpmfiles of plugins.
+- update to 10.13.0:
+ * Minor Changes
+ - Added the possibility to load multiple pnpmfiles. The pnpmfile
+ setting can now accept a list of pnpmfile locations #9702.
+ - pnpm will now automatically load the pnpmfile.cjs file from any
+ config dependency named @pnpm/plugin-* or pnpm-plugin-* #9729.
+ - The order in which config dependencies are initialized should
+ not matter — they are initialized in alphabetical order. If a
+ specific order is needed, the paths to the pnpmfile.cjs files in
+ the config dependencies can be explicitly listed using the
+ pnpmfile setting in pnpm-workspace.yaml.
+ * Patch Changes
+ - When patching dependencies installed via pkg.pr.new, treat them
+ as Git tarball URLs #9694.
+ - Prevent conflicts between local projects' config and the global
+ config in dangerouslyAllowAllBuilds, onlyBuiltDependencies,
+ onlyBuiltDependenciesFile, and neverBuiltDependencies #9628.
+ - Sort keys in pnpm-workspace.yaml with deep #9701.
+ - The pnpm rebuild command should not add pkgs included in
+ ignoredBuiltDependencies to ignoredBuilds in
+ node_modules/.modules.yaml #9338.
+ - Replaced shell-quote with shlex for quoting command arguments
+ #9381.
+
+-------------------------------------------------------------------
Old:
----
pnpm-10.12.4.tgz
New:
----
pnpm-10.13.1.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pnpm.spec ++++++
--- /var/tmp/diff_new_pack.cpDLku/_old 2025-07-10 22:12:08.203685854 +0200
+++ /var/tmp/diff_new_pack.cpDLku/_new 2025-07-10 22:12:08.207686020 +0200
@@ -23,7 +23,7 @@
%global __nodejs_provides %{nil}
%global __nodejs_requires %{nil}
Name: pnpm
-Version: 10.12.4
+Version: 10.13.1
Release: 0
Summary: Fast, disk space efficient package manager
License: MIT
++++++ pnpm-10.12.4.tgz -> pnpm-10.13.1.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/README.md new/package/README.md
--- old/package/README.md 1985-10-26 09:15:00.000000000 +0100
+++ new/package/README.md 1985-10-26 09:15:00.000000000 +0100
@@ -27,7 +27,6 @@
> Microsoft uses pnpm in Rush repos with hundreds of projects and hundreds of
> PRs per day, and we’ve found it to be very fast and reliable.
[](https://github.com/pnpm/pnpm/releases/latest)
-[](https://r.pnpm.io/chat)
[](https://opencollective.com/pnpm)
[](https://opencollective.com/pnpm)
[](https://x.com/intent/follow?screen_name=pnpmjs®ion=follow_link)
@@ -213,7 +212,6 @@
## Support
- [Frequently Asked Questions](https://pnpm.io/faq)
-- [Chat](https://r.pnpm.io/chat)
- [X](https://x.com/pnpmjs)
- [Bluesky](https://bsky.app/profile/pnpm.io)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/dist/node_modules/.modules.yaml
new/package/dist/node_modules/.modules.yaml
--- old/package/dist/node_modules/.modules.yaml 1985-10-26 09:15:00.000000000
+0100
+++ new/package/dist/node_modules/.modules.yaml 1985-10-26 09:15:00.000000000
+0100
@@ -13,12 +13,12 @@
- node_modules/@pkgjs/parseargs
abbrev@3.0.1:
- node_modules/abbrev
- agent-base@7.1.3:
+ agent-base@7.1.4:
- node_modules/agent-base
ansi-regex@5.0.1:
- - node_modules/string-width-cjs/node_modules/ansi-regex
- - node_modules/wrap-ansi-cjs/node_modules/ansi-regex
- node_modules/strip-ansi-cjs/node_modules/ansi-regex
+ - node_modules/wrap-ansi-cjs/node_modules/ansi-regex
+ - node_modules/string-width-cjs/node_modules/ansi-regex
ansi-regex@6.1.0:
- node_modules/ansi-regex
ansi-styles@4.3.0:
@@ -44,8 +44,8 @@
eastasianwidth@0.2.0:
- node_modules/eastasianwidth
emoji-regex@8.0.0:
- - node_modules/string-width-cjs/node_modules/emoji-regex
- node_modules/wrap-ansi-cjs/node_modules/emoji-regex
+ - node_modules/string-width-cjs/node_modules/emoji-regex
emoji-regex@9.2.2:
- node_modules/emoji-regex
encoding@0.1.13:
@@ -103,8 +103,8 @@
minipass-sized@1.0.3:
- node_modules/minipass-sized
minipass@3.3.6:
- - node_modules/minipass-flush/node_modules/minipass
- node_modules/minipass-pipeline/node_modules/minipass
+ - node_modules/minipass-flush/node_modules/minipass
- node_modules/minipass-sized/node_modules/minipass
minipass@7.1.2:
- node_modules/minipass
@@ -160,8 +160,8 @@
string-width@5.1.2:
- node_modules/string-width
strip-ansi@6.0.1:
- - node_modules/string-width-cjs/node_modules/strip-ansi
- node_modules/wrap-ansi-cjs/node_modules/strip-ansi
+ - node_modules/string-width-cjs/node_modules/strip-ansi
- node_modules/strip-ansi-cjs
strip-ansi@7.1.0:
- node_modules/strip-ansi
@@ -182,8 +182,8 @@
wrap-ansi@8.1.0:
- node_modules/wrap-ansi
yallist@4.0.0:
- - node_modules/minipass-flush/node_modules/yallist
- node_modules/minipass-pipeline/node_modules/yallist
+ - node_modules/minipass-flush/node_modules/yallist
- node_modules/minipass-sized/node_modules/yallist
yallist@5.0.0:
- node_modules/yallist
@@ -196,7 +196,7 @@
nodeLinker: hoisted
packageManager: pnpm@10.12.1
pendingBuilds: []
-prunedAt: Thu, 26 Jun 2025 17:13:15 GMT
+prunedAt: Wed, 09 Jul 2025 10:15:08 GMT
publicHoistPattern: []
registries:
'@jsr': https://npm.jsr.io/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/dist/node_modules/.pnpm/lock.yaml
new/package/dist/node_modules/.pnpm/lock.yaml
--- old/package/dist/node_modules/.pnpm/lock.yaml 1985-10-26
09:15:00.000000000 +0100
+++ new/package/dist/node_modules/.pnpm/lock.yaml 1985-10-26
09:15:00.000000000 +0100
@@ -71,8 +71,8 @@
resolution: {integrity:
sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==}
engines: {node: ^18.17.0 || >=20.5.0}
- agent-base@7.1.3:
- resolution: {integrity:
sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==}
+ agent-base@7.1.4:
+ resolution: {integrity:
sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
engines: {node: '>= 14'}
ansi-regex@5.0.1:
@@ -408,7 +408,7 @@
'@npmcli/agent@3.0.0':
dependencies:
- agent-base: 7.1.3
+ agent-base: 7.1.4
http-proxy-agent: 7.0.2
https-proxy-agent: 7.0.6
lru-cache: 10.4.3
@@ -428,7 +428,7 @@
abbrev@3.0.1:
optional: true
- agent-base@7.1.3:
+ agent-base@7.1.4:
optional: true
ansi-regex@5.0.1:
@@ -544,7 +544,7 @@
http-proxy-agent@7.0.2:
dependencies:
- agent-base: 7.1.3
+ agent-base: 7.1.4
debug: 4.4.1
transitivePeerDependencies:
- supports-color
@@ -552,7 +552,7 @@
https-proxy-agent@7.0.6:
dependencies:
- agent-base: 7.1.3
+ agent-base: 7.1.4
debug: 4.4.1
transitivePeerDependencies:
- supports-color
@@ -737,7 +737,7 @@
socks-proxy-agent@8.0.5:
dependencies:
- agent-base: 7.1.3
+ agent-base: 7.1.4
debug: 4.4.1
socks: 2.8.5
transitivePeerDependencies:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/dist/node_modules/.pnpm-workspace-state.json
new/package/dist/node_modules/.pnpm-workspace-state.json
--- old/package/dist/node_modules/.pnpm-workspace-state.json 1985-10-26
09:15:00.000000000 +0100
+++ new/package/dist/node_modules/.pnpm-workspace-state.json 1985-10-26
09:15:00.000000000 +0100
@@ -1,5 +1,5 @@
{
- "lastValidatedTimestamp": 1750957995953,
+ "lastValidatedTimestamp": 1752056108561,
"projects": {},
"pnpmfileExists": false,
"settings": {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/package/dist/node_modules/agent-base/dist/index.d.ts.map
new/package/dist/node_modules/agent-base/dist/index.d.ts.map
--- old/package/dist/node_modules/agent-base/dist/index.d.ts.map
1985-10-26 09:15:00.000000000 +0100
+++ new/package/dist/node_modules/agent-base/dist/index.d.ts.map
1985-10-26 09:15:00.000000000 +0100
@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,cAAc,WAAW,CAAC;AAE1B,UAAU,eAAgB,SAAQ,GAAG,CAAC,iBAAiB;IACtD,cAAc,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,gBAAiB,SAAQ,GAAG,CAAC,iBAAiB;IACvD,cAAc,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAElE,QAAA,MAAM,QAAQ,eAAmC,CAAC;AAQlD,8BAAsB,KAAM,SAAQ,IAAI,CAAC,KAAK;IAC7C,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAgB;IAGlC,OAAO,EAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjE,SAAS,EAAG,OAAO,CAAC;gBAER,IAAI,CAAC,EAAE,IAAI,CAAC,YAAY;IAKpC,QAAQ,CAAC,OAAO,CACf,GAAG,EAAE,IAAI,CAAC,aAAa,EACvB,OAAO,EAAE,gBAAgB,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK;IAErD;;OAEG;IACH,gBAAgB,CAAC,OAAO,CAAC,EAAE,g
BAAgB,GAAG,OAAO;IAqCrD,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;IAa1C,YAAY,CACX,GAAG,EAAE,IAAI,CAAC,aAAa,EACvB,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI;IAgC5C,gBAAgB,IAAI,MAAM;IAW1B,IAAI,WAAW,IAAI,MAAM,CAKxB;IAED,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,EAIxB;IAED,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAIrB;CACD"}
\ No newline at end of file
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,cAAc,WAAW,CAAC;AAE1B,UAAU,eAAgB,SAAQ,GAAG,CAAC,iBAAiB;IACtD,cAAc,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,gBAAiB,SAAQ,GAAG,CAAC,iBAAiB;IACvD,cAAc,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAElE,QAAA,MAAM,QAAQ,eAAmC,CAAC;AAQlD,8BAAsB,KAAM,SAAQ,IAAI,CAAC,KAAK;IAC7C,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAgB;IAGlC,OAAO,EAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjE,SAAS,EAAG,OAAO,CAAC;gBAER,IAAI,CAAC,EAAE,IAAI,CAAC,YAAY;IAKpC,QAAQ,CAAC,OAAO,CACf,GAAG,EAAE,IAAI,CAAC,aAAa,EACvB,OAAO,EAAE,gBAAgB,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK;IAErD;;OAEG;IACH,gBAAgB,CAAC,OAAO,CAAC,EAAE,g
BAAgB,GAAG,OAAO;IAqCrD,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,MAAM;IAU3C,YAAY,CACX,GAAG,EAAE,IAAI,CAAC,aAAa,EACvB,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI;IAgC5C,gBAAgB,IAAI,MAAM;IAW1B,IAAI,WAAW,IAAI,MAAM,CAKxB;IAED,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,EAIxB;IAED,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAIrB;CACD"}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/dist/node_modules/agent-base/dist/index.js
new/package/dist/node_modules/agent-base/dist/index.js
--- old/package/dist/node_modules/agent-base/dist/index.js 1985-10-26
09:15:00.000000000 +0100
+++ new/package/dist/node_modules/agent-base/dist/index.js 1985-10-26
09:15:00.000000000 +0100
@@ -111,9 +111,7 @@
// In order to properly update the socket pool, we need to call
`getName()` on
// the core `https.Agent` if it is a secureEndpoint.
getName(options) {
- const secureEndpoint = typeof options.secureEndpoint === 'boolean'
- ? options.secureEndpoint
- : this.isSecureEndpoint(options);
+ const secureEndpoint = this.isSecureEndpoint(options);
if (secureEndpoint) {
// @ts-expect-error `getName()` isn't defined in `@types/node`
return https_1.Agent.prototype.getName.call(this, options);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/package/dist/node_modules/agent-base/dist/index.js.map
new/package/dist/node_modules/agent-base/dist/index.js.map
--- old/package/dist/node_modules/agent-base/dist/index.js.map 1985-10-26
09:15:00.000000000 +0100
+++ new/package/dist/node_modules/agent-base/dist/index.js.map 1985-10-26
09:15:00.000000000 +0100
@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/dist/node_modules/agent-base/package.json
new/package/dist/node_modules/agent-base/package.json
--- old/package/dist/node_modules/agent-base/package.json 1985-10-26
09:15:00.000000000 +0100
+++ new/package/dist/node_modules/agent-base/package.json 1985-10-26
09:15:00.000000000 +0100
@@ -1,6 +1,6 @@
{
"name": "agent-base",
- "version": "7.1.3",
+ "version": "7.1.4",
"description": "Turn a function into an `http.Agent` instance",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/dist/pnpm.cjs new/package/dist/pnpm.cjs
--- old/package/dist/pnpm.cjs 1985-10-26 09:15:00.000000000 +0100
+++ new/package/dist/pnpm.cjs 1985-10-26 09:15:00.000000000 +0100
@@ -5754,7 +5754,7 @@
var load_json_file_1 = __importDefault2(require_load_json_file());
var defaultManifest = {
name: true ? "pnpm" : "pnpm",
- version: true ? "10.12.4" : "0.0.0"
+ version: true ? "10.13.1" : "0.0.0"
};
var pkgJson;
if (require.main == null) {
@@ -16673,6 +16673,32 @@
}
});
+// ../config/config/lib/dependencyBuildOptions.js
+var require_dependencyBuildOptions = __commonJS({
+ "../config/config/lib/dependencyBuildOptions.js"(exports2) {
+ "use strict";
+ Object.defineProperty(exports2, "__esModule", { value: true });
+ exports2.hasDependencyBuildOptions = exports2.DEPS_BUILD_CONFIG_KEYS =
void 0;
+ exports2.extractAndRemoveDependencyBuildOptions =
extractAndRemoveDependencyBuildOptions;
+ exports2.DEPS_BUILD_CONFIG_KEYS = [
+ "dangerouslyAllowAllBuilds",
+ "onlyBuiltDependencies",
+ "onlyBuiltDependenciesFile",
+ "neverBuiltDependencies"
+ ];
+ var hasDependencyBuildOptions = (config) =>
exports2.DEPS_BUILD_CONFIG_KEYS.some((key) => config[key] != null);
+ exports2.hasDependencyBuildOptions = hasDependencyBuildOptions;
+ function extractAndRemoveDependencyBuildOptions(targetConfig) {
+ const depsBuildConfig = {};
+ for (const key of exports2.DEPS_BUILD_CONFIG_KEYS) {
+ depsBuildConfig[key] = targetConfig[key];
+ delete targetConfig[key];
+ }
+ return depsBuildConfig;
+ }
+ }
+});
+
// ../config/config/lib/getNetworkConfigs.js
var require_getNetworkConfigs = __commonJS({
"../config/config/lib/getNetworkConfigs.js"(exports2) {
@@ -18773,6 +18799,7 @@
var which_1 = __importDefault2(require_lib17());
var auth_1 = require_auth();
var checkGlobalBinDir_1 = require_checkGlobalBinDir();
+ var dependencyBuildOptions_1 = require_dependencyBuildOptions();
var getNetworkConfigs_1 = require_getNetworkConfigs();
var transformPath_1 = require_transformPath();
var dirs_1 = require_dirs();
@@ -18943,7 +18970,9 @@
process.execPath = originalExecPath;
const rcOptions = Object.keys(rcOptionsTypes);
const configFromCliOpts =
Object.fromEntries(Object.entries(cliOptions).filter(([_, value]) => typeof
value !== "undefined").map(([name, value]) => [(0, camelcase_1.default)(name, {
locale: "en-US" }), value]));
- const pnpmConfig =
Object.assign(Object.fromEntries(rcOptions.map((configKey) => [(0,
camelcase_1.default)(configKey, { locale: "en-US" }),
npmConfig.get(configKey)])), configFromCliOpts);
+ const pnpmConfig = Object.fromEntries(rcOptions.map((configKey) => [(0,
camelcase_1.default)(configKey, { locale: "en-US" }),
npmConfig.get(configKey)]));
+ const globalDepsBuildConfig = (0,
dependencyBuildOptions_1.extractAndRemoveDependencyBuildOptions)(pnpmConfig);
+ Object.assign(pnpmConfig, configFromCliOpts);
const cwd = fs_1.default.realpathSync((0,
better_path_resolve_1.default)(cliOptions.dir ?? npmConfig.localPrefix));
pnpmConfig.maxSockets = npmConfig.maxsockets;
delete pnpmConfig["maxsockets"];
@@ -19078,6 +19107,14 @@
}
}
}
+ if (opts.cliOptions["global"]) {
+ (0,
dependencyBuildOptions_1.extractAndRemoveDependencyBuildOptions)(pnpmConfig);
+ Object.assign(pnpmConfig, globalDepsBuildConfig);
+ } else {
+ if (!(0,
dependencyBuildOptions_1.hasDependencyBuildOptions)(pnpmConfig)) {
+ Object.assign(pnpmConfig, globalDepsBuildConfig);
+ }
+ }
if (opts.cliOptions["save-peer"]) {
if (opts.cliOptions["save-prod"]) {
throw new
error_1.PnpmError("CONFIG_CONFLICT_PEER_CANNOT_BE_PROD_DEP", "A package cannot
be a peer dependency and a prod dependency at the same time");
@@ -54778,6 +54815,7 @@
exports2.createShortHash = createShortHash;
exports2.createHexHash = createHexHash;
exports2.createHash = createHash;
+ exports2.createHashFromMultipleFiles = createHashFromMultipleFiles;
exports2.createHashFromFile = createHashFromFile;
exports2.createHexHashFromFile = createHexHashFromFile;
exports2.getTarballIntegrity = getTarballIntegrity;
@@ -54794,6 +54832,13 @@
function createHash(input) {
return `sha256-${crypto5.hash("sha256", input, "base64")}`;
}
+ async function createHashFromMultipleFiles(files) {
+ if (files.length === 1) {
+ return createHashFromFile(files[0]);
+ }
+ const hashes = await Promise.all(files.map(createHashFromFile));
+ return createHash(hashes.join(","));
+ }
async function createHashFromFile(file) {
return createHash(await readNormalizedFile(file));
}
@@ -91079,233 +91124,202 @@
}
});
-// ../node_modules/.pnpm/shell-quote@1.8.2/node_modules/shell-quote/quote.js
-var require_quote = __commonJS({
-
"../node_modules/.pnpm/shell-quote@1.8.2/node_modules/shell-quote/quote.js"(exports2,
module2) {
+// ../node_modules/.pnpm/shlex@2.1.2/node_modules/shlex/shlex.js
+var require_shlex = __commonJS({
+ "../node_modules/.pnpm/shlex@2.1.2/node_modules/shlex/shlex.js"(exports2) {
"use strict";
- module2.exports = function quote(xs) {
- return xs.map(function(s) {
- if (s === "") {
- return "''";
- }
- if (s && typeof s === "object") {
- return s.op.replace(/(.)/g, "\\$1");
- }
- if (/["\s]/.test(s) && !/'/.test(s)) {
- return "'" + s.replace(/(['\\])/g, "\\$1") + "'";
- }
- if (/["'\s]/.test(s)) {
- return '"' + s.replace(/(["\\$`!])/g, "\\$1") + '"';
+ var Shlexer = class {
+ constructor(string) {
+ this.i = 0;
+ this.string = string;
+ this.whitespace = " \r\n";
+ this.quotes = `'"`;
+ this.escapes = "\\";
+ this.escapedQuotes = '"';
+ this.ansiCQuotes = true;
+ this.localeQuotes = true;
+ this.debug = false;
+ }
+ readChar() {
+ return this.string.charAt(this.i++);
+ }
+ processEscapes(string, quote, isAnsiCQuote) {
+ if (!isAnsiCQuote && !this.escapedQuotes.includes(quote)) {
+ return string;
+ }
+ const anyEscape = "[" + this.escapes.replace(/(.)/g, "\\$1") + "]";
+ if (!isAnsiCQuote && this.escapedQuotes.includes(quote)) {
+ const re = new RegExp(
+ anyEscape + "(" + anyEscape + "|\\" + quote + ")",
+ "g"
+ );
+ return string.replace(re, "$1");
}
- return
String(s).replace(/([A-Za-z]:)?([#!"$&'()*,:;<=>?@[\\\]^`{|}])/g, "$1\\$2");
- }).join(" ");
- };
- }
-});
-
-// ../node_modules/.pnpm/shell-quote@1.8.2/node_modules/shell-quote/parse.js
-var require_parse8 = __commonJS({
-
"../node_modules/.pnpm/shell-quote@1.8.2/node_modules/shell-quote/parse.js"(exports2,
module2) {
- "use strict";
- var CONTROL = "(?:" + [
- "\\|\\|",
- "\\&\\&",
- ";;",
- "\\|\\&",
- "\\<\\(",
- "\\<\\<\\<",
- ">>",
- ">\\&",
- "<\\&",
- "[&;()|<>]"
- ].join("|") + ")";
- var controlRE = new RegExp("^" + CONTROL + "$");
- var META = "|&;()<> \\t";
- var SINGLE_QUOTE = '"((\\\\"|[^"])*?)"';
- var DOUBLE_QUOTE = "'((\\\\'|[^'])*?)'";
- var hash = /^#$/;
- var SQ = "'";
- var DQ = '"';
- var DS = "$";
- var TOKEN = "";
- var mult = 4294967296;
- for (i = 0; i < 4; i++) {
- TOKEN += (mult * Math.random()).toString(16);
- }
- var i;
- var startsWithToken = new RegExp("^" + TOKEN);
- function matchAll(s, r) {
- var origIndex = r.lastIndex;
- var matches = [];
- var matchObj;
- while (matchObj = r.exec(s)) {
- matches.push(matchObj);
- if (r.lastIndex === matchObj.index) {
- r.lastIndex += 1;
+ if (isAnsiCQuote) {
+ const patterns = {
+ // Literal characters
+ "([\\\\'\"?])": (x) => x,
+ // Non-printable ASCII characters
+ "a": () => "\x07",
+ "b": () => "\b",
+ "e|E": () => "\x1B",
+ "f": () => "\f",
+ "n": () => "\n",
+ "r": () => "\r",
+ "t": () => " ",
+ "v": () => "\v",
+ // Octal bytes
+ "([0-7]{1,3})": (x) => String.fromCharCode(parseInt(x, 8)),
+ // Hexadecimal bytes
+ "x([0-9a-fA-F]{1,2})": (x) => String.fromCharCode(parseInt(x, 16)),
+ // Unicode code units
+ "u([0-9a-fA-F]{1,4})": (x) => String.fromCharCode(parseInt(x, 16)),
+ "U([0-9a-fA-F]{1,8})": (x) => String.fromCharCode(parseInt(x, 16)),
+ // Control characters
+ //
https://en.wikipedia.org/wiki/Control_character#How_control_characters_map_to_keyboards
+ "c(.)": (x) => {
+ if (x === "?") {
+ return "\x7F";
+ } else if (x === "@") {
+ return "\0";
+ } else {
+ return String.fromCharCode(x.charCodeAt(0) & 31);
+ }
+ }
+ };
+ const re = new RegExp(
+ anyEscape + "(" + Object.keys(patterns).join("|") + ")",
+ "g"
+ );
+ return string.replace(re, function(m, p1) {
+ for (const matched in patterns) {
+ const mm = new RegExp("^" + matched + "$").exec(p1);
+ if (mm === null) {
+ continue;
+ }
+ return patterns[matched].apply(null, mm.slice(1));
+ }
+ });
}
+ return void 0;
}
- r.lastIndex = origIndex;
- return matches;
- }
- function getVar(env, pre, key) {
- var r = typeof env === "function" ? env(key) : env[key];
- if (typeof r === "undefined" && key != "") {
- r = "";
- } else if (typeof r === "undefined") {
- r = "$";
- }
- if (typeof r === "object") {
- return pre + TOKEN + JSON.stringify(r) + TOKEN;
- }
- return pre + r;
- }
- function parseInternal(string, env, opts) {
- if (!opts) {
- opts = {};
- }
- var BS = opts.escape || "\\";
- var BAREWORD = "(\\" + BS + `['"` + META + `]|[^\\s'"` + META + "])+";
- var chunker = new RegExp([
- "(" + CONTROL + ")",
- // control chars
- "(" + BAREWORD + "|" + SINGLE_QUOTE + "|" + DOUBLE_QUOTE + ")+"
- ].join("|"), "g");
- var matches = matchAll(string, chunker);
- if (matches.length === 0) {
- return [];
- }
- if (!env) {
- env = {};
- }
- var commented = false;
- return matches.map(function(match) {
- var s = match[0];
- if (!s || commented) {
- return void 0;
- }
- if (controlRE.test(s)) {
- return { op: s };
+ *[Symbol.iterator]() {
+ let inQuote = false;
+ let inDollarQuote = false;
+ let escaped = false;
+ let lastDollar = -2;
+ let token;
+ if (this.debug) {
+ console.log("full input:", ">" + this.string + "<");
}
- var quote = false;
- var esc = false;
- var out = "";
- var isGlob = false;
- var i2;
- function parseEnvVar() {
- i2 += 1;
- var varend;
- var varname;
- var char = s.charAt(i2);
- if (char === "{") {
- i2 += 1;
- if (s.charAt(i2) === "}") {
- throw new Error("Bad substitution: " + s.slice(i2 - 2, i2 + 1));
- }
- varend = s.indexOf("}", i2);
- if (varend < 0) {
- throw new Error("Bad substitution: " + s.slice(i2));
- }
- varname = s.slice(i2, varend);
- i2 = varend;
- } else if (/[*@#?$!_-]/.test(char)) {
- varname = char;
- i2 += 1;
- } else {
- var slicedFromI = s.slice(i2);
- varend = slicedFromI.match(/[^\w\d_]/);
- if (!varend) {
- varname = slicedFromI;
- i2 = s.length;
- } else {
- varname = slicedFromI.slice(0, varend.index);
- i2 += varend.index - 1;
- }
- }
- return getVar(env, "", varname);
- }
- for (i2 = 0; i2 < s.length; i2++) {
- var c = s.charAt(i2);
- isGlob = isGlob || !quote && (c === "*" || c === "?");
- if (esc) {
- out += c;
- esc = false;
- } else if (quote) {
- if (c === quote) {
- quote = false;
- } else if (quote == SQ) {
- out += c;
- } else {
- if (c === BS) {
- i2 += 1;
- c = s.charAt(i2);
- if (c === DQ || c === BS || c === DS) {
- out += c;
- } else {
- out += BS + c;
- }
- } else if (c === DS) {
- out += parseEnvVar();
+ while (true) {
+ const pos = this.i;
+ const char = this.readChar();
+ if (this.debug) {
+ console.log(
+ "position:",
+ pos,
+ "input:",
+ ">" + char + "<",
+ "accumulated:",
+ token,
+ "inQuote:",
+ inQuote,
+ "inDollarQuote:",
+ inDollarQuote,
+ "lastDollar:",
+ lastDollar,
+ "escaped:",
+ escaped
+ );
+ }
+ if (char === "") {
+ if (inQuote) {
+ throw new Error("Got EOF while in a quoted string");
+ }
+ if (escaped) {
+ throw new Error("Got EOF while in an escape sequence");
+ }
+ if (token !== void 0) {
+ yield token;
+ }
+ return;
+ }
+ if (escaped) {
+ if (char === "\n") {
+ } else if (inQuote) {
+ token = (token || "") + escaped + char;
+ } else {
+ token = (token || "") + char;
+ }
+ escaped = false;
+ continue;
+ }
+ if (this.escapes.includes(char)) {
+ if (!inQuote || inDollarQuote !== false ||
this.escapedQuotes.includes(inQuote)) {
+ escaped = char;
+ continue;
+ } else {
+ }
+ }
+ if (inQuote !== false) {
+ if (char === inQuote) {
+ token = this.processEscapes(token, inQuote, inDollarQuote ===
"'");
+ inQuote = false;
+ inDollarQuote = false;
+ continue;
+ }
+ token = (token || "") + char;
+ continue;
+ }
+ if (this.quotes.includes(char)) {
+ inQuote = char;
+ if (lastDollar === pos - 1) {
+ if (char === "'" && !this.ansiCQuotes) {
+ } else if (char === '"' && !this.localeQuotes) {
} else {
- out += c;
+ inDollarQuote = char;
}
}
- } else if (c === DQ || c === SQ) {
- quote = c;
- } else if (controlRE.test(c)) {
- return { op: s };
- } else if (hash.test(c)) {
- commented = true;
- var commentObj = { comment: string.slice(match.index + i2 + 1) };
- if (out.length) {
- return [out, commentObj];
+ token = token || "";
+ if (inDollarQuote !== false) {
+ token = token.slice(0, -1);
}
- return [commentObj];
- } else if (c === BS) {
- esc = true;
- } else if (c === DS) {
- out += parseEnvVar();
- } else {
- out += c;
+ continue;
}
- }
- if (isGlob) {
- return { op: "glob", pattern: out };
- }
- return out;
- }).reduce(function(prev, arg) {
- return typeof arg === "undefined" ? prev : prev.concat(arg);
- }, []);
- }
- module2.exports = function parse2(s, env, opts) {
- var mapped = parseInternal(s, env, opts);
- if (typeof env !== "function") {
- return mapped;
- }
- return mapped.reduce(function(acc, s2) {
- if (typeof s2 === "object") {
- return acc.concat(s2);
- }
- var xs = s2.split(RegExp("(" + TOKEN + ".*?" + TOKEN + ")", "g"));
- if (xs.length === 1) {
- return acc.concat(xs[0]);
- }
- return acc.concat(xs.filter(Boolean).map(function(x) {
- if (startsWithToken.test(x)) {
- return JSON.parse(x.split(TOKEN)[1]);
+ if (inQuote === false && char === "$") {
+ lastDollar = pos;
}
- return x;
- }));
- }, []);
+ if (this.whitespace.includes(char)) {
+ if (token !== void 0) {
+ yield token;
+ }
+ token = void 0;
+ continue;
+ }
+ token = (token || "") + char;
+ }
+ }
+ };
+ exports2.split = function(s) {
+ return Array.from(new Shlexer(s));
+ };
+ exports2.quote = function(s) {
+ if (s === "") {
+ return "''";
+ }
+ const unsafeRe = /[^\w@%\-+=:,./]/;
+ if (!unsafeRe.test(s)) {
+ return s;
+ }
+ return ("'" + s.replace(/('+)/g, `'"$1"'`) + "'").replace(/^''|''$/g,
"");
+ };
+ exports2.join = function(args) {
+ if (!Array.isArray(args)) {
+ throw new TypeError("args should be an array");
+ }
+ return args.map(exports2.quote).join(" ");
};
- }
-});
-
-// ../node_modules/.pnpm/shell-quote@1.8.2/node_modules/shell-quote/index.js
-var require_shell_quote = __commonJS({
-
"../node_modules/.pnpm/shell-quote@1.8.2/node_modules/shell-quote/index.js"(exports2)
{
- "use strict";
- exports2.quote = require_quote();
- exports2.parse = require_parse8();
}
});
@@ -91325,7 +91339,7 @@
var error_1 = require_lib6();
var fs_1 = require("fs");
var is_windows_1 = __importDefault2(require_is_windows());
- var shell_quote_1 = require_shell_quote();
+ var shlex_1 = require_shlex();
function noop() {
}
async function runLifecycleHook(stage, manifest, opts) {
@@ -91356,7 +91370,7 @@
break;
}
if (opts.args?.length && m.scripts?.[stage]) {
- const escapedArgs = (0, is_windows_1.default)() ? opts.args.map((arg)
=> JSON.stringify(arg)).join(" ") : (0, shell_quote_1.quote)(opts.args);
+ const escapedArgs = (0, is_windows_1.default)() ? opts.args.map((arg)
=> JSON.stringify(arg)).join(" ") : (0, shlex_1.join)(opts.args);
m.scripts[stage] = `${m.scripts[stage]} ${escapedArgs}`;
}
if (m.scripts[stage] === "npx only-allow pnpm" || !m.scripts[stage])
@@ -92933,7 +92947,7 @@
});
// ../node_modules/.pnpm/picomatch@4.0.2/node_modules/picomatch/lib/parse.js
-var require_parse9 = __commonJS({
+var require_parse8 = __commonJS({
"../node_modules/.pnpm/picomatch@4.0.2/node_modules/picomatch/lib/parse.js"(exports2,
module2) {
"use strict";
var constants = require_constants13();
@@ -93705,7 +93719,7 @@
"../node_modules/.pnpm/picomatch@4.0.2/node_modules/picomatch/lib/picomatch.js"(exports2,
module2) {
"use strict";
var scan = require_scan4();
- var parse2 = require_parse9();
+ var parse2 = require_parse8();
var utils = require_utils10();
var constants = require_constants13();
var isObject = (val) => val && typeof val === "object" &&
!Array.isArray(val);
@@ -97131,7 +97145,7 @@
var child_process_1 = require("child_process");
var is_windows_1 = __importDefault2(require_is_windows());
var p_limit_12 = __importDefault2(require_p_limit());
- var shell_quote_1 = require_shell_quote();
+ var shlex_1 = require_shlex();
var workerPool;
async function restartWorkerPool() {
await finishWorkers();
@@ -97327,7 +97341,7 @@
}
function isDriveExFat(drive) {
try {
- const output = (0, child_process_1.execSync)(`wmic logicaldisk where
${(0, shell_quote_1.quote)([`DeviceID='${drive}'`])} get
FileSystem`).toString();
+ const output = (0, child_process_1.execSync)(`wmic logicaldisk where
${(0, shlex_1.join)([`DeviceID='${drive}'`])} get FileSystem`).toString();
const lines = output.trim().split("\n");
const name = lines.length > 1 ? lines[1].trim() : "";
return name === "exFAT";
@@ -102372,7 +102386,7 @@
async function writeManifestFile(dir, manifest) {
manifest = (0, object_key_sorting_1.sortKeysByPriority)({
priority: { packages: 0 },
- deep: false
+ deep: true
}, manifest);
return (0, write_yaml_file_1.default)(path_1.default.join(dir,
constants_1.WORKSPACE_MANIFEST_FILENAME), manifest, {
lineWidth: -1,
@@ -103405,27 +103419,6 @@
}
});
-// ../hooks/pnpmfile/lib/getPnpmfilePath.js
-var require_getPnpmfilePath = __commonJS({
- "../hooks/pnpmfile/lib/getPnpmfilePath.js"(exports2) {
- "use strict";
- var __importDefault2 = exports2 && exports2.__importDefault ||
function(mod) {
- return mod && mod.__esModule ? mod : { "default": mod };
- };
- Object.defineProperty(exports2, "__esModule", { value: true });
- exports2.getPnpmfilePath = getPnpmfilePath;
- var path_1 = __importDefault2(require("path"));
- function getPnpmfilePath(prefix, pnpmfile) {
- if (!pnpmfile) {
- pnpmfile = ".pnpmfile.cjs";
- } else if (path_1.default.isAbsolute(pnpmfile)) {
- return pnpmfile;
- }
- return path_1.default.join(prefix, pnpmfile);
- }
- }
-});
-
// ../hooks/pnpmfile/lib/requirePnpmfile.js
var require_requirePnpmfile = __commonJS({
"../hooks/pnpmfile/lib/requirePnpmfile.js"(exports2) {
@@ -103467,7 +103460,7 @@
message: `Ignoring the pnpmfile at "${pnpmFilePath}". It exports
"undefined".`,
prefix
});
- return void 0;
+ return { pnpmfileModule: void 0 };
}
if (pnpmfile?.hooks?.readPackage && typeof pnpmfile.hooks.readPackage
!== "function") {
throw new TypeError("hooks.readPackage should be a function");
@@ -103492,11 +103485,11 @@
return newPkg;
};
}
- pnpmfile.filename = pnpmFilePath;
- return pnpmfile;
+ return { pnpmfileModule: pnpmfile };
} catch (err) {
if (err instanceof SyntaxError) {
- console.error(chalk_1.default.red("A syntax error in the
.pnpmfile.cjs\n"));
+ console.error(chalk_1.default.red(`A syntax error in the
"${pnpmFilePath}"
+`));
console.error(err);
process.exit(1);
}
@@ -103527,78 +103520,131 @@
var core_loggers_1 = require_lib24();
var crypto_hash_1 = require_lib34();
var path_absolute_1 = __importDefault2(require_path_absolute());
- var getPnpmfilePath_1 = require_getPnpmfilePath();
var requirePnpmfile_1 = require_requirePnpmfile();
function requireHooks(prefix, opts) {
- const globalPnpmfile = opts.globalPnpmfile ? (0,
requirePnpmfile_1.requirePnpmfile)((0,
path_absolute_1.default)(opts.globalPnpmfile, prefix), prefix) : void 0;
- let globalHooks = globalPnpmfile?.hooks;
- const pnpmfilePath = (0, getPnpmfilePath_1.getPnpmfilePath)(prefix,
opts.pnpmfile);
- const pnpmFile = (0, requirePnpmfile_1.requirePnpmfile)(pnpmfilePath,
prefix);
- let hooks = pnpmFile?.hooks;
- if (!globalHooks && !hooks)
- return { afterAllResolved: [], filterLog: [], readPackage: [] };
- const calculatePnpmfileChecksum = hooks ? () => (0,
crypto_hash_1.createHashFromFile)(pnpmfilePath) : void 0;
- globalHooks = globalHooks ?? {};
- hooks = hooks ?? {};
+ const pnpmfiles = [];
+ if (opts.globalPnpmfile) {
+ pnpmfiles.push({
+ path: opts.globalPnpmfile,
+ includeInChecksum: false
+ });
+ }
+ if (opts.tryLoadDefaultPnpmfile) {
+ pnpmfiles.push({
+ path: ".pnpmfile.cjs",
+ includeInChecksum: true,
+ optional: true
+ });
+ }
+ if (opts.pnpmfiles) {
+ for (const pnpmfile of opts.pnpmfiles) {
+ pnpmfiles.push({
+ path: pnpmfile,
+ includeInChecksum: true
+ });
+ }
+ }
+ const entries = [];
+ const loadedFiles = [];
+ for (const { path: path2, includeInChecksum, optional } of pnpmfiles) {
+ const file = (0, path_absolute_1.default)(path2, prefix);
+ if (!loadedFiles.includes(file)) {
+ loadedFiles.push(file);
+ const requirePnpmfileResult = (0,
requirePnpmfile_1.requirePnpmfile)(file, prefix);
+ if (requirePnpmfileResult != null) {
+ entries.push({
+ file,
+ includeInChecksum,
+ hooks: requirePnpmfileResult.pnpmfileModule?.hooks
+ });
+ } else if (!optional) {
+ throw new error_1.PnpmError("PNPMFILE_NOT_FOUND", `pnpmfile at
"${file}" is not found`);
+ }
+ }
+ }
const cookedHooks = {
+ readPackage: [],
+ preResolution: [],
afterAllResolved: [],
filterLog: [],
- readPackage: [],
- calculatePnpmfileChecksum
+ updateConfig: []
};
- for (const hookName of ["readPackage", "afterAllResolved"]) {
- if (globalHooks[hookName]) {
- const globalHook = globalHooks[hookName];
- const context =
createReadPackageHookContext(globalPnpmfile.filename, prefix, hookName);
- cookedHooks[hookName].push((pkg) => globalHook(pkg, context));
+ if (entries.some((entry) => entry.hooks != null)) {
+ cookedHooks.calculatePnpmfileChecksum = async () => {
+ const filesToIncludeInHash = [];
+ for (const { includeInChecksum, file } of entries) {
+ if (includeInChecksum) {
+ filesToIncludeInHash.push(file);
+ }
+ }
+ filesToIncludeInHash.sort();
+ return (0,
crypto_hash_1.createHashFromMultipleFiles)(filesToIncludeInHash);
+ };
+ }
+ let importProvider;
+ let fetchersProvider;
+ for (const { hooks, file } of entries) {
+ const fileHooks = hooks ?? {};
+ for (const hookName of ["readPackage", "afterAllResolved"]) {
+ const fn = fileHooks[hookName];
+ if (fn) {
+ const context = createReadPackageHookContext(file, prefix,
hookName);
+ cookedHooks[hookName].push((pkg) => fn(pkg, context));
+ }
}
- if (hooks[hookName]) {
- const hook = hooks[hookName];
- const context = createReadPackageHookContext(pnpmFile.filename,
prefix, hookName);
- cookedHooks[hookName].push((pkg) => hook(pkg, context));
+ if (fileHooks.filterLog) {
+ cookedHooks.filterLog.push(fileHooks.filterLog);
}
- }
- if (globalHooks.filterLog != null) {
- cookedHooks.filterLog.push(globalHooks.filterLog);
- }
- if (hooks.filterLog != null) {
- cookedHooks.filterLog.push(hooks.filterLog);
- }
- cookedHooks.importPackage = hooks.importPackage ??
globalHooks.importPackage;
- const preResolutionHook = hooks.preResolution ??
globalHooks.preResolution;
- cookedHooks.preResolution = preResolutionHook ? (ctx) =>
preResolutionHook(ctx, createPreResolutionHookLogger(prefix)) : void 0;
- cookedHooks.fetchers = hooks.fetchers ?? globalHooks.fetchers;
- if (hooks.updateConfig != null) {
- const updateConfig = hooks.updateConfig;
- cookedHooks.updateConfig = (config) => {
- const updatedConfig = updateConfig(config);
- if (updatedConfig == null) {
- throw new error_1.PnpmError("CONFIG_IS_UNDEFINED", "The
updateConfig hook returned undefined");
+ if (fileHooks.updateConfig) {
+ const updateConfig = fileHooks.updateConfig;
+ cookedHooks.updateConfig.push((config) => {
+ const updated = updateConfig(config);
+ if (updated == null) {
+ throw new error_1.PnpmError("CONFIG_IS_UNDEFINED", "The
updateConfig hook returned undefined");
+ }
+ return updated;
+ });
+ }
+ if (fileHooks.preResolution) {
+ const preRes = fileHooks.preResolution;
+ cookedHooks.preResolution.push((ctx) => preRes(ctx,
createPreResolutionHookLogger(prefix)));
+ }
+ if (fileHooks.importPackage) {
+ if (importProvider) {
+ throw new error_1.PnpmError("MULTIPLE_IMPORT_PACKAGE",
`importPackage hook defined in both ${importProvider} and ${file}`);
}
- return updatedConfig;
- };
+ importProvider = file;
+ cookedHooks.importPackage = fileHooks.importPackage;
+ }
+ if (fileHooks.fetchers) {
+ if (fetchersProvider) {
+ throw new error_1.PnpmError("MULTIPLE_FETCHERS", `fetchers hook
defined in both ${fetchersProvider} and ${file}`);
+ }
+ fetchersProvider = file;
+ cookedHooks.fetchers = fileHooks.fetchers;
+ }
}
- return cookedHooks;
+ return {
+ hooks: cookedHooks,
+ resolvedPnpmfilePaths: entries.map(({ file }) => file)
+ };
}
function createReadPackageHookContext(calledFrom, prefix, hook) {
return {
log: (message) => {
- core_loggers_1.hookLogger.debug({
- from: calledFrom,
- hook,
- message,
- prefix
- });
+ core_loggers_1.hookLogger.debug({ from: calledFrom, hook, message,
prefix });
}
};
}
function createPreResolutionHookLogger(prefix) {
const hook = "preResolution";
return {
- info: (message) => core_loggers_1.hookLogger.info({ message, prefix,
hook }),
- // eslint-disable-line
- warn: (message) => core_loggers_1.hookLogger.warn({ message, prefix,
hook })
- // eslint-disable-line
+ info: (message) => {
+ core_loggers_1.hookLogger.info({ message, prefix, hook });
+ },
+ warn: (message) => {
+ core_loggers_1.hookLogger.warn({ message, prefix, hook });
+ }
};
}
}
@@ -103609,19 +103655,12 @@
"../hooks/pnpmfile/lib/index.js"(exports2) {
"use strict";
Object.defineProperty(exports2, "__esModule", { value: true });
- exports2.BadReadPackageHookError = exports2.requirePnpmfile =
exports2.requireHooks = exports2.getPnpmfilePath = void 0;
- var getPnpmfilePath_1 = require_getPnpmfilePath();
- Object.defineProperty(exports2, "getPnpmfilePath", { enumerable: true,
get: function() {
- return getPnpmfilePath_1.getPnpmfilePath;
- } });
+ exports2.BadReadPackageHookError = exports2.requireHooks = void 0;
var requireHooks_1 = require_requireHooks();
Object.defineProperty(exports2, "requireHooks", { enumerable: true, get:
function() {
return requireHooks_1.requireHooks;
} });
var requirePnpmfile_1 = require_requirePnpmfile();
- Object.defineProperty(exports2, "requirePnpmfile", { enumerable: true,
get: function() {
- return requirePnpmfile_1.requirePnpmfile;
- } });
Object.defineProperty(exports2, "BadReadPackageHookError", { enumerable:
true, get: function() {
return requirePnpmfile_1.BadReadPackageHookError;
} });
@@ -103632,14 +103671,19 @@
var require_getConfig = __commonJS({
"../cli/cli-utils/lib/getConfig.js"(exports2) {
"use strict";
+ var __importDefault2 = exports2 && exports2.__importDefault ||
function(mod) {
+ return mod && mod.__esModule ? mod : { "default": mod };
+ };
Object.defineProperty(exports2, "__esModule", { value: true });
exports2.getConfig = getConfig;
+ var path_1 = __importDefault2(require("path"));
var cli_meta_1 = require_lib4();
var config_1 = require_lib20();
var default_reporter_1 = require_lib23();
var store_connection_manager_1 = require_lib87();
var config_deps_installer_1 = require_lib94();
var pnpmfile_1 = require_lib95();
+ var util_lex_comparator_1 = require_dist4();
async function getConfig(cliOptions, opts) {
let { config, warnings } = await (0, config_1.getConfig)({
cliOptions,
@@ -103660,10 +103704,24 @@
});
}
if (!config.ignorePnpmfile) {
- config.hooks = (0, pnpmfile_1.requireHooks)(config.lockfileDir ??
config.dir, config);
+ config.tryLoadDefaultPnpmfile = config.pnpmfile == null;
+ const pnpmfiles = config.pnpmfile == null ? [] :
Array.isArray(config.pnpmfile) ? config.pnpmfile : [config.pnpmfile];
+ if (config.configDependencies) {
+ const configModulesDir = path_1.default.join(config.lockfileDir ??
config.rootProjectManifestDir, "node_modules/.pnpm-config");
+ pnpmfiles.unshift(...calcPnpmfilePathsOfPluginDeps(configModulesDir,
config.configDependencies));
+ }
+ const { hooks, resolvedPnpmfilePaths } = (0,
pnpmfile_1.requireHooks)(config.lockfileDir ?? config.dir, {
+ globalPnpmfile: config.globalPnpmfile,
+ pnpmfiles,
+ tryLoadDefaultPnpmfile: config.tryLoadDefaultPnpmfile
+ });
+ config.hooks = hooks;
+ config.pnpmfile = resolvedPnpmfilePaths;
if (config.hooks?.updateConfig) {
- const updateConfigResult = config.hooks.updateConfig(config);
- config = updateConfigResult instanceof Promise ? await
updateConfigResult : updateConfigResult;
+ for (const updateConfig of config.hooks.updateConfig) {
+ const updateConfigResult = updateConfig(config);
+ config = updateConfigResult instanceof Promise ? await
updateConfigResult : updateConfigResult;
+ }
}
}
if (opts.excludeReporter) {
@@ -103674,6 +103732,13 @@
}
return config;
}
+ function* calcPnpmfilePathsOfPluginDeps(configModulesDir,
configDependencies) {
+ for (const configDepName of
Object.keys(configDependencies).sort(util_lex_comparator_1.lexCompare)) {
+ if (configDepName.startsWith("@pnpm/plugin-") ||
configDepName.startsWith("pnpm-plugin-")) {
+ yield path_1.default.join(configModulesDir, configDepName,
"pnpmfile.cjs");
+ }
+ }
+ }
}
});
@@ -125987,7 +126052,9 @@
const allowBuild = (pkgName) => {
if (_allowBuild(pkgName))
return true;
- ignoredPkgs.push(pkgName);
+ if (!opts.ignoredBuiltDependencies?.includes(pkgName)) {
+ ignoredPkgs.push(pkgName);
+ }
return false;
};
const builtDepPaths = /* @__PURE__ */ new Set();
@@ -136022,7 +136089,7 @@
Object.defineProperty(exports2, "__esModule", { value: true });
exports2.getFilePath = void 0;
var path_1 = __importDefault2(require("path"));
- var getFilePath = (workspaceDir) => path_1.default.join(workspaceDir,
"node_modules", ".pnpm-workspace-state.json");
+ var getFilePath = (workspaceDir) => path_1.default.join(workspaceDir,
"node_modules", ".pnpm-workspace-state-v1.json");
exports2.getFilePath = getFilePath;
}
});
@@ -136076,7 +136143,7 @@
version: project.manifest.version
}
])),
- pnpmfileExists: opts.pnpmfileExists,
+ pnpmfiles: opts.pnpmfiles,
settings: (0, pick_1.default)([
"autoInstallPeers",
"catalogs",
@@ -137042,7 +137109,7 @@
});
//
../node_modules/.pnpm/@pnpm+ramda@0.28.1/node_modules/@pnpm/ramda/src/internal/_quote.js
-var require_quote2 = __commonJS({
+var require_quote = __commonJS({
"../node_modules/.pnpm/@pnpm+ramda@0.28.1/node_modules/@pnpm/ramda/src/internal/_quote.js"(exports2,
module2) {
function _quote(s) {
var escaped = s.replace(/\\/g, "\\\\").replace(/[\b]/g,
"\\b").replace(/\f/g, "\\f").replace(/\n/g, "\\n").replace(/\r/g,
"\\r").replace(/\t/g, "\\t").replace(/\v/g, "\\v").replace(/\0/g, "\\0");
@@ -137072,7 +137139,7 @@
"../node_modules/.pnpm/@pnpm+ramda@0.28.1/node_modules/@pnpm/ramda/src/internal/_toString.js"(exports2,
module2) {
var _includes = require_includes();
var _map = require_map2();
- var _quote = require_quote2();
+ var _quote = require_quote();
var _toISOString = require_toISOString();
var keys = require_keys();
var reject = require_reject();
@@ -141080,7 +141147,6 @@
var lockfile_verification_1 = require_lib137();
var logger_1 = require_lib19();
var parse_overrides_1 = require_lib140();
- var pnpmfile_1 = require_lib95();
var workspace_find_packages_1 = require_lib98();
var workspace_read_manifest_1 = require_lib18();
var workspace_state_1 = require_lib141();
@@ -141207,12 +141273,12 @@
logger_1.logger.debug({ msg: "No manifest files were modified since
the last validation. Exiting check." });
return { upToDate: true, workspaceState };
}
- const issue = await patchesAreModified({
+ const issue = await patchesOrHooksAreModified({
rootManifestOptions,
rootDir: rootProjectManifestDir,
lastValidatedTimestamp: workspaceState.lastValidatedTimestamp,
- pnpmfile: opts.pnpmfile,
- hadPnpmfile: workspaceState.pnpmfileExists
+ currentPnpmfiles: opts.pnpmfile,
+ previousPnpmfiles: workspaceState.pnpmfiles
});
if (issue) {
return { upToDate: false, issue, workspaceState };
@@ -141292,7 +141358,7 @@
await (0, workspace_state_1.updateWorkspaceState)({
allProjects,
workspaceDir,
- pnpmfileExists: workspaceState.pnpmfileExists,
+ pnpmfiles: workspaceState.pnpmfiles,
settings: opts,
filteredInstall: workspaceState.filteredInstall
});
@@ -141325,12 +141391,12 @@
]);
if (!wantedLockfileStats)
return throwLockfileNotFound(rootProjectManifestDir);
- const issue = await patchesAreModified({
+ const issue = await patchesOrHooksAreModified({
rootManifestOptions,
rootDir: rootProjectManifestDir,
lastValidatedTimestamp: wantedLockfileStats.mtime.valueOf(),
- pnpmfile: opts.pnpmfile,
- hadPnpmfile: workspaceState.pnpmfileExists
+ currentPnpmfiles: opts.pnpmfile,
+ previousPnpmfiles: workspaceState.pnpmfiles
});
if (issue) {
return { upToDate: false, issue, workspaceState };
@@ -141437,7 +141503,7 @@
hint: "Run `pnpm install` to create the lockfile"
});
}
- async function patchesAreModified(opts) {
+ async function patchesOrHooksAreModified(opts) {
if (opts.rootManifestOptions?.patchedDependencies) {
const allPatchStats = await
Promise.all(Object.values(opts.rootManifestOptions.patchedDependencies).map((patchFile)
=> {
return (0,
safeStat_1.safeStat)(path_1.default.relative(opts.rootDir, patchFile));
@@ -141446,16 +141512,17 @@
return "Patches were modified";
}
}
- const pnpmfilePath = (0, pnpmfile_1.getPnpmfilePath)(opts.rootDir,
opts.pnpmfile);
- const pnpmfileStats = (0, safeStat_1.safeStatSync)(pnpmfilePath);
- if (pnpmfileStats != null && pnpmfileStats.mtime.valueOf() >
opts.lastValidatedTimestamp) {
- return `pnpmfile at "${pnpmfilePath}" was modified`;
- }
- if (opts.hadPnpmfile && pnpmfileStats == null) {
- return `pnpmfile at "${pnpmfilePath}" was removed`;
+ if (!(0, equals_1.default)(opts.currentPnpmfiles,
opts.previousPnpmfiles)) {
+ return "The list of pnpmfiles changed.";
}
- if (!opts.hadPnpmfile && pnpmfileStats != null) {
- return `pnpmfile at "${pnpmfilePath}" was added`;
+ for (const pnpmfilePath of opts.currentPnpmfiles) {
+ const pnpmfileStats = (0, safeStat_1.safeStatSync)(pnpmfilePath);
+ if (pnpmfileStats == null) {
+ return `pnpmfile at "${pnpmfilePath}" was removed`;
+ }
+ if (pnpmfileStats.mtime.valueOf() > opts.lastValidatedTimestamp) {
+ return `pnpmfile at "${pnpmfilePath}" was modified`;
+ }
}
return void 0;
}
@@ -141849,7 +141916,7 @@
});
//
../node_modules/.pnpm/@pnpm+patch-package@0.0.1/node_modules/@pnpm/patch-package/dist/patch/parse.js
-var require_parse10 = __commonJS({
+var require_parse9 = __commonJS({
"../node_modules/.pnpm/@pnpm+patch-package@0.0.1/node_modules/@pnpm/patch-package/dist/patch/parse.js"(exports2)
{
"use strict";
Object.defineProperty(exports2, "__esModule", { value: true });
@@ -142155,7 +142222,7 @@
"use strict";
Object.defineProperty(exports2, "__esModule", { value: true });
exports2.reversePatch = void 0;
- var parse_1 = require_parse10();
+ var parse_1 = require_parse9();
var assertNever_1 = require_assertNever();
function reverseHunk(hunk) {
const header = {
@@ -142262,7 +142329,7 @@
var fs_extra_1 = require_lib38();
var path_1 = require_path6();
var path_2 = require("path");
- var parse_1 = require_parse10();
+ var parse_1 = require_parse9();
function readPatch({ patchFilePath, packageDetails, patchDir }) {
try {
return (0, parse_1.parsePatchFile)((0,
fs_extra_1.readFileSync)(patchFilePath).toString());
@@ -157391,15 +157458,17 @@
}
}
if (opts.hooks.preResolution) {
- await opts.hooks.preResolution({
- currentLockfile: ctx.currentLockfile,
- wantedLockfile: ctx.wantedLockfile,
- existsCurrentLockfile: ctx.existsCurrentLockfile,
- existsNonEmptyWantedLockfile: ctx.existsNonEmptyWantedLockfile,
- lockfileDir: ctx.lockfileDir,
- storeDir: ctx.storeDir,
- registries: ctx.registries
- });
+ for (const preResolution of opts.hooks.preResolution) {
+ await preResolution({
+ currentLockfile: ctx.currentLockfile,
+ wantedLockfile: ctx.wantedLockfile,
+ existsCurrentLockfile: ctx.existsCurrentLockfile,
+ existsNonEmptyWantedLockfile: ctx.existsNonEmptyWantedLockfile,
+ lockfileDir: ctx.lockfileDir,
+ storeDir: ctx.storeDir,
+ registries: ctx.registries
+ });
+ }
}
const pruneVirtualStore = !opts.enableGlobalVirtualStore &&
(ctx.modulesFile?.prunedAt && opts.modulesCacheMaxAge > 0 ?
cacheExpired(ctx.modulesFile.prunedAt, opts.modulesCacheMaxAge) : true);
if (!maybeOpts.ignorePackageManifest) {
@@ -158779,7 +158848,7 @@
const limitInstallation = (0, p_limit_12.default)((0,
config_1.getWorkspaceConcurrency)(opts.workspaceConcurrency));
await Promise.all(pkgPaths.map(async (rootDir) =>
limitInstallation(async () => {
const hooks = opts.ignorePnpmfile ? {} : (() => {
- const pnpmfileHooks = (0, pnpmfile_1.requireHooks)(rootDir, opts);
+ const { hooks: pnpmfileHooks } = (0,
pnpmfile_1.requireHooks)(rootDir, opts);
return {
...opts.hooks,
...pnpmfileHooks,
@@ -159175,7 +159244,7 @@
allProjects,
settings: opts,
workspaceDir: opts.workspaceDir ?? opts.lockfileDir ?? opts.dir,
- pnpmfileExists: opts.hooks?.calculatePnpmfileChecksum != null,
+ pnpmfiles: opts.pnpmfile,
filteredInstall: allProjects.length !==
Object.keys(opts.selectedProjectsGraph ?? {}).length,
configDependencies: opts.configDependencies
});
@@ -159234,7 +159303,7 @@
allProjects,
settings: opts,
workspaceDir: opts.workspaceDir ?? opts.lockfileDir ?? opts.dir,
- pnpmfileExists: opts.hooks?.calculatePnpmfileChecksum != null,
+ pnpmfiles: opts.pnpmfile,
filteredInstall: allProjects.length !==
Object.keys(opts.selectedProjectsGraph ?? {}).length,
configDependencies: opts.configDependencies
});
@@ -159254,7 +159323,7 @@
allProjects,
settings: opts,
workspaceDir: opts.workspaceDir,
- pnpmfileExists: opts.hooks?.calculatePnpmfileChecksum != null,
+ pnpmfiles: opts.pnpmfile,
filteredInstall: allProjects.length !==
Object.keys(opts.selectedProjectsGraph ?? {}).length,
configDependencies: opts.configDependencies
});
@@ -186584,6 +186653,7 @@
};
Object.defineProperty(exports2, "__esModule", { value: true });
exports2.getPatchedDependency = getPatchedDependency;
+ exports2.isPkgPrNewUrl = isPkgPrNewUrl;
exports2.getVersionsFromLockfile = getVersionsFromLockfile;
var path_1 = __importDefault2(require("path"));
var parse_wanted_dependency_1 = require_lib93();
@@ -186628,13 +186698,23 @@
};
} else {
const preferred = preferredVersions[0];
+ if (preferred.gitTarballUrl) {
+ return {
+ ...opts,
+ applyToAll: false,
+ bareSpecifier: preferred.gitTarballUrl
+ };
+ }
return {
...dep,
applyToAll: !dep.bareSpecifier,
- bareSpecifier: preferred.gitTarballUrl ?? preferred.version
+ bareSpecifier: preferred.version
};
}
}
+ function isPkgPrNewUrl(url) {
+ return url.startsWith("https://pkg.pr.new/";);
+ }
async function getVersionsFromLockfile(dep, opts) {
const modulesDir = await (0,
realpath_missing_1.default)(path_1.default.join(opts.lockfileDir,
opts.modulesDir ?? "node_modules"));
const lockfile = await (0,
lockfile_fs_1.readCurrentLockfile)(path_1.default.join(modulesDir, ".pnpm"), {
@@ -186650,7 +186730,7 @@
const tarball = pkgSnapshot.resolution?.tarball ?? "";
return {
...(0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath,
pkgSnapshot),
- gitTarballUrl: (0, pick_fetcher_1.isGitHostedPkgUrl)(tarball) ?
tarball : void 0
+ gitTarballUrl: (0, pick_fetcher_1.isGitHostedPkgUrl)(tarball) ||
isPkgPrNewUrl(tarball) ? tarball : void 0
};
}).filter(({ name }) => name === pkgName).sort((v12, v2) =>
semver_12.default.compare(v12.version, v2.version));
return {
@@ -186956,7 +187036,7 @@
if (!applyToAll) {
gitTarballUrl = await getGitTarballUrlFromLockfile({
alias: patchedPkgManifest.name,
- bareSpecifier: patchedPkgManifest.version
+ bareSpecifier: patchedPkgManifest.version || void 0
}, {
lockfileDir,
modulesDir: opts.modulesDir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/package/package.json new/package/package.json
--- old/package/package.json 1985-10-26 09:15:00.000000000 +0100
+++ new/package/package.json 1985-10-26 09:15:00.000000000 +0100
@@ -1,6 +1,6 @@
{
"name": "pnpm",
- "version": "10.12.4",
+ "version": "10.13.1",
"description": "Fast, disk space efficient package manager",
"keywords": [
"pnpm",
