pnpm 8.12.0 → 8.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/node_modules/.modules.yaml +8 -3
- package/dist/pnpm.cjs +160 -60
- package/dist/reflink.darwin-arm64-UVWNQWTH.node +0 -0
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/dist/reflink.darwin-arm64-GG6FQZPL.node +0 -0
- package/dist/reflink.darwin-x64-Z425N3TX.node +0 -0
- package/dist/reflink.win32-arm64-msvc-Y6LSPWJC.node +0 -0
- package/dist/reflink.win32-x64-msvc-R5EFGPHQ.node +0 -0
|
@@ -202,7 +202,7 @@ included:
|
|
|
202
202
|
injectedDeps: {}
|
|
203
203
|
layoutVersion: 5
|
|
204
204
|
nodeLinker: hoisted
|
|
205
|
-
packageManager: pnpm@8.
|
|
205
|
+
packageManager: pnpm@8.12.1
|
|
206
206
|
pendingBuilds:
|
|
207
207
|
- /node-gyp/9.4.1
|
|
208
208
|
- /env-paths/2.2.1
|
|
@@ -300,12 +300,17 @@ pendingBuilds:
|
|
|
300
300
|
- /imurmurhash/0.1.4
|
|
301
301
|
- /safer-buffer/2.1.2
|
|
302
302
|
- /safe-buffer/5.2.1
|
|
303
|
-
prunedAt:
|
|
303
|
+
prunedAt: Thu, 14 Dec 2023 15:38:16 GMT
|
|
304
304
|
publicHoistPattern:
|
|
305
305
|
- '*eslint*'
|
|
306
306
|
- '*prettier*'
|
|
307
307
|
registries:
|
|
308
|
+
'@bit': https://node-registry.bit.cloud/
|
|
309
|
+
'@bitdev': https://node-registry.bit.cloud/
|
|
310
|
+
'@ci': http://localhost:4873/
|
|
311
|
+
'@teambit': https://node-registry.bit.cloud/
|
|
312
|
+
'@zoltan': https://node-registry.bit.cloud/
|
|
308
313
|
default: https://registry.npmjs.org/
|
|
309
314
|
skipped: []
|
|
310
|
-
storeDir: /
|
|
315
|
+
storeDir: /Users/zoltan/Library/pnpm/store/v3
|
|
311
316
|
virtualStoreDir: .pnpm
|
package/dist/pnpm.cjs
CHANGED
|
@@ -3323,7 +3323,7 @@ var require_lib4 = __commonJS({
|
|
|
3323
3323
|
var load_json_file_1 = __importDefault3(require_load_json_file());
|
|
3324
3324
|
var defaultManifest = {
|
|
3325
3325
|
name: true ? "pnpm" : "pnpm",
|
|
3326
|
-
version: true ? "8.
|
|
3326
|
+
version: true ? "8.13.0" : "0.0.0"
|
|
3327
3327
|
};
|
|
3328
3328
|
var pkgJson;
|
|
3329
3329
|
if (require.main == null) {
|
|
@@ -27746,6 +27746,7 @@ var require_lib21 = __commonJS({
|
|
|
27746
27746
|
"deploy-all-files": Boolean,
|
|
27747
27747
|
"dedupe-peer-dependents": Boolean,
|
|
27748
27748
|
"dedupe-direct-deps": Boolean,
|
|
27749
|
+
"dedupe-injected-deps": Boolean,
|
|
27749
27750
|
dev: [null, true],
|
|
27750
27751
|
dir: String,
|
|
27751
27752
|
"disallow-workspace-cycles": Boolean,
|
|
@@ -27875,6 +27876,7 @@ var require_lib21 = __commonJS({
|
|
|
27875
27876
|
"deploy-all-files": false,
|
|
27876
27877
|
"dedupe-peer-dependents": true,
|
|
27877
27878
|
"dedupe-direct-deps": false,
|
|
27879
|
+
"dedupe-injected-deps": false,
|
|
27878
27880
|
"disallow-workspace-cycles": false,
|
|
27879
27881
|
"enable-modules-dir": true,
|
|
27880
27882
|
"exclude-links-from-lockfile": false,
|
|
@@ -81999,9 +82001,9 @@ var require_importIndexedDir = __commonJS({
|
|
|
81999
82001
|
}
|
|
82000
82002
|
});
|
|
82001
82003
|
|
|
82002
|
-
// ../node_modules/.pnpm/@reflink+reflink@0.1.
|
|
82004
|
+
// ../node_modules/.pnpm/@reflink+reflink@0.1.15/node_modules/@reflink/reflink/index.js
|
|
82003
82005
|
var require_reflink = __commonJS({
|
|
82004
|
-
"../node_modules/.pnpm/@reflink+reflink@0.1.
|
|
82006
|
+
"../node_modules/.pnpm/@reflink+reflink@0.1.15/node_modules/@reflink/reflink/index.js"(exports2, module2) {
|
|
82005
82007
|
var { existsSync, readFileSync } = require("fs");
|
|
82006
82008
|
var { join } = require("path");
|
|
82007
82009
|
var { platform, arch } = process;
|
|
@@ -82062,7 +82064,7 @@ var require_reflink = __commonJS({
|
|
|
82062
82064
|
if (localFileExisted) {
|
|
82063
82065
|
nativeBinding = require("./reflink.win32-x64-msvc.node");
|
|
82064
82066
|
} else {
|
|
82065
|
-
nativeBinding = require("
|
|
82067
|
+
nativeBinding = require("@reflink/reflink-win32-x64-msvc");
|
|
82066
82068
|
}
|
|
82067
82069
|
} catch (e) {
|
|
82068
82070
|
loadError = e;
|
|
@@ -82090,7 +82092,7 @@ var require_reflink = __commonJS({
|
|
|
82090
82092
|
if (localFileExisted) {
|
|
82091
82093
|
nativeBinding = require("./reflink.win32-arm64-msvc.node");
|
|
82092
82094
|
} else {
|
|
82093
|
-
nativeBinding = require("
|
|
82095
|
+
nativeBinding = require("@reflink/reflink-win32-arm64-msvc");
|
|
82094
82096
|
}
|
|
82095
82097
|
} catch (e) {
|
|
82096
82098
|
loadError = e;
|
|
@@ -82118,7 +82120,7 @@ var require_reflink = __commonJS({
|
|
|
82118
82120
|
if (localFileExisted) {
|
|
82119
82121
|
nativeBinding = require("./reflink.darwin-x64.node");
|
|
82120
82122
|
} else {
|
|
82121
|
-
nativeBinding = require("
|
|
82123
|
+
nativeBinding = require("@reflink/reflink-darwin-x64");
|
|
82122
82124
|
}
|
|
82123
82125
|
} catch (e) {
|
|
82124
82126
|
loadError = e;
|
|
@@ -82132,7 +82134,7 @@ var require_reflink = __commonJS({
|
|
|
82132
82134
|
if (localFileExisted) {
|
|
82133
82135
|
nativeBinding = require("./reflink.darwin-arm64.node");
|
|
82134
82136
|
} else {
|
|
82135
|
-
nativeBinding = require("./reflink.darwin-arm64-
|
|
82137
|
+
nativeBinding = require("./reflink.darwin-arm64-UVWNQWTH.node");
|
|
82136
82138
|
}
|
|
82137
82139
|
} catch (e) {
|
|
82138
82140
|
loadError = e;
|
|
@@ -82350,7 +82352,7 @@ var require_lib51 = __commonJS({
|
|
|
82350
82352
|
return void 0;
|
|
82351
82353
|
}
|
|
82352
82354
|
function createCloneFunction() {
|
|
82353
|
-
if (process.platform === "darwin") {
|
|
82355
|
+
if (process.platform === "darwin" || process.platform === "win32") {
|
|
82354
82356
|
const { reflinkFileSync } = require_reflink();
|
|
82355
82357
|
return (fr, to) => {
|
|
82356
82358
|
try {
|
|
@@ -82542,9 +82544,9 @@ var require_lib52 = __commonJS({
|
|
|
82542
82544
|
}
|
|
82543
82545
|
});
|
|
82544
82546
|
|
|
82545
|
-
// ../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@
|
|
82547
|
+
// ../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@18.14.6/node_modules/@rushstack/worker-pool/lib/WorkerPool.js
|
|
82546
82548
|
var require_WorkerPool = __commonJS({
|
|
82547
|
-
"../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@
|
|
82549
|
+
"../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@18.14.6/node_modules/@rushstack/worker-pool/lib/WorkerPool.js"(exports2) {
|
|
82548
82550
|
"use strict";
|
|
82549
82551
|
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
82550
82552
|
exports2.WorkerPool = exports2.WORKER_ID_SYMBOL = void 0;
|
|
@@ -111872,7 +111874,15 @@ var require_pkgSnapshotToResolution = __commonJS({
|
|
|
111872
111874
|
return pkgSnapshot.resolution;
|
|
111873
111875
|
}
|
|
111874
111876
|
const { name } = (0, nameVerFromPkgSnapshot_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
|
|
111875
|
-
|
|
111877
|
+
let registry = "";
|
|
111878
|
+
if (name != null) {
|
|
111879
|
+
if (name.startsWith("@")) {
|
|
111880
|
+
registry = registries[name.split("/")[0]];
|
|
111881
|
+
}
|
|
111882
|
+
}
|
|
111883
|
+
if (!registry) {
|
|
111884
|
+
registry = registries.default;
|
|
111885
|
+
}
|
|
111876
111886
|
let tarball;
|
|
111877
111887
|
if (!pkgSnapshot.resolution.tarball) {
|
|
111878
111888
|
tarball = getTarball(registry);
|
|
@@ -125305,7 +125315,7 @@ var require_extendRebuildOptions = __commonJS({
|
|
|
125305
125315
|
shellEmulator: false,
|
|
125306
125316
|
sideEffectsCacheRead: false,
|
|
125307
125317
|
storeDir: opts.storeDir,
|
|
125308
|
-
unsafePerm: process.platform === "win32" || process.platform === "cygwin" || !process.setgid || process.getuid() !== 0,
|
|
125318
|
+
unsafePerm: process.platform === "win32" || process.platform === "cygwin" || !process.setgid || process.getuid?.() !== 0,
|
|
125309
125319
|
useLockfile: true,
|
|
125310
125320
|
userAgent: `${packageManager.name}/${packageManager.version} npm/? node/${process.version} ${process.platform} ${process.arch}`
|
|
125311
125321
|
};
|
|
@@ -132462,7 +132472,10 @@ var require_prune2 = __commonJS({
|
|
|
132462
132472
|
});
|
|
132463
132473
|
}));
|
|
132464
132474
|
await Promise.all(Array.from(removedFromScopes).map((scope) => (0, removeDirectDependency_1.removeIfEmpty)(path_1.default.join(modulesDir, scope))));
|
|
132465
|
-
|
|
132475
|
+
try {
|
|
132476
|
+
await (0, removeDirectDependency_1.removeIfEmpty)(modulesDir);
|
|
132477
|
+
} catch {
|
|
132478
|
+
}
|
|
132466
132479
|
}));
|
|
132467
132480
|
const selectedImporterIds = importers.map((importer) => importer.id).sort();
|
|
132468
132481
|
const currentPkgIdsByDepPaths = (0, equals_1.default)(selectedImporterIds, Object.keys(opts.wantedLockfile.importers)) ? getPkgsDepPaths(opts.registries, opts.currentLockfile.packages ?? {}, opts.skipped) : getPkgsDepPathsOwnedOnlyByImporters(selectedImporterIds, opts.registries, opts.currentLockfile, opts.include, opts.skipped);
|
|
@@ -182193,7 +182206,7 @@ var require_lib136 = __commonJS({
|
|
|
182193
182206
|
});
|
|
182194
182207
|
}
|
|
182195
182208
|
const depNodes = Object.values(graph);
|
|
182196
|
-
const added = depNodes.length;
|
|
182209
|
+
const added = depNodes.filter(({ fetching }) => fetching).length;
|
|
182197
182210
|
core_loggers_1.statsLogger.debug({
|
|
182198
182211
|
added,
|
|
182199
182212
|
prefix: lockfileDir
|
|
@@ -184096,7 +184109,7 @@ var require_resolveDependencies = __commonJS({
|
|
|
184096
184109
|
const depIsLinked = Boolean(
|
|
184097
184110
|
// if package is not in `node_modules/.pnpm-lock.yaml`
|
|
184098
184111
|
// we can safely assume that it doesn't exist in `node_modules`
|
|
184099
|
-
currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath), "node_modules", currentPkg.name, "package.json"))
|
|
184112
|
+
currentLockfileContainsTheDep && currentPkg.depPath && currentPkg.dependencyLockfile && currentPkg.name && await (0, path_exists_1.default)(path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(currentPkg.depPath), "node_modules", currentPkg.name, "package.json"))
|
|
184100
184113
|
);
|
|
184101
184114
|
if (!options.update && !options.proceed && currentPkg.resolution != null && depIsLinked) {
|
|
184102
184115
|
return null;
|
|
@@ -184759,6 +184772,79 @@ var require_scan4 = __commonJS({
|
|
|
184759
184772
|
}
|
|
184760
184773
|
});
|
|
184761
184774
|
|
|
184775
|
+
// ../pkg-manager/resolve-dependencies/lib/dedupeInjectedDeps.js
|
|
184776
|
+
var require_dedupeInjectedDeps = __commonJS({
|
|
184777
|
+
"../pkg-manager/resolve-dependencies/lib/dedupeInjectedDeps.js"(exports2) {
|
|
184778
|
+
"use strict";
|
|
184779
|
+
var __importDefault3 = exports2 && exports2.__importDefault || function(mod) {
|
|
184780
|
+
return mod && mod.__esModule ? mod : { "default": mod };
|
|
184781
|
+
};
|
|
184782
|
+
Object.defineProperty(exports2, "__esModule", { value: true });
|
|
184783
|
+
exports2.dedupeInjectedDeps = void 0;
|
|
184784
|
+
var path_1 = __importDefault3(require("path"));
|
|
184785
|
+
var normalize_path_1 = __importDefault3(require_normalize_path());
|
|
184786
|
+
function dedupeInjectedDeps(opts) {
|
|
184787
|
+
const injectedDepsByProjects = getInjectedDepsByProjects(opts);
|
|
184788
|
+
const dedupeMap = getDedupeMap(injectedDepsByProjects, opts);
|
|
184789
|
+
applyDedupeMap(dedupeMap, opts);
|
|
184790
|
+
}
|
|
184791
|
+
exports2.dedupeInjectedDeps = dedupeInjectedDeps;
|
|
184792
|
+
function getInjectedDepsByProjects(opts) {
|
|
184793
|
+
const injectedDepsByProjects = /* @__PURE__ */ new Map();
|
|
184794
|
+
for (const project of opts.projects) {
|
|
184795
|
+
for (const [alias, nodeId] of Object.entries(project.directNodeIdsByAlias)) {
|
|
184796
|
+
const depPath = opts.pathsByNodeId.get(nodeId);
|
|
184797
|
+
if (!depPath.startsWith("file:"))
|
|
184798
|
+
continue;
|
|
184799
|
+
const id = opts.depGraph[depPath].id.substring(5);
|
|
184800
|
+
if (opts.projects.some((project2) => project2.id === id)) {
|
|
184801
|
+
if (!injectedDepsByProjects.has(project.id))
|
|
184802
|
+
injectedDepsByProjects.set(project.id, /* @__PURE__ */ new Map());
|
|
184803
|
+
injectedDepsByProjects.get(project.id).set(alias, { depPath, id });
|
|
184804
|
+
}
|
|
184805
|
+
}
|
|
184806
|
+
}
|
|
184807
|
+
return injectedDepsByProjects;
|
|
184808
|
+
}
|
|
184809
|
+
function getDedupeMap(injectedDepsByProjects, opts) {
|
|
184810
|
+
const toDedupe = /* @__PURE__ */ new Map();
|
|
184811
|
+
for (const [id, deps] of injectedDepsByProjects.entries()) {
|
|
184812
|
+
const dedupedInjectedDeps = /* @__PURE__ */ new Map();
|
|
184813
|
+
for (const [alias, dep] of deps.entries()) {
|
|
184814
|
+
const isSubset = Object.entries(opts.depGraph[dep.depPath].children).every(([alias2, depPath]) => opts.dependenciesByProjectId[dep.id][alias2] === depPath);
|
|
184815
|
+
if (isSubset) {
|
|
184816
|
+
dedupedInjectedDeps.set(alias, dep.id);
|
|
184817
|
+
}
|
|
184818
|
+
}
|
|
184819
|
+
toDedupe.set(id, dedupedInjectedDeps);
|
|
184820
|
+
}
|
|
184821
|
+
return toDedupe;
|
|
184822
|
+
}
|
|
184823
|
+
function applyDedupeMap(dedupeMap, opts) {
|
|
184824
|
+
for (const [id, aliases] of dedupeMap.entries()) {
|
|
184825
|
+
for (const [alias, dedupedProjectId] of aliases.entries()) {
|
|
184826
|
+
delete opts.dependenciesByProjectId[id][alias];
|
|
184827
|
+
const index = opts.resolvedImporters[id].directDependencies.findIndex((dep) => dep.alias === alias);
|
|
184828
|
+
const prev = opts.resolvedImporters[id].directDependencies[index];
|
|
184829
|
+
const depPath = `link:${(0, normalize_path_1.default)(path_1.default.relative(id, dedupedProjectId))}`;
|
|
184830
|
+
const linkedDep = {
|
|
184831
|
+
...prev,
|
|
184832
|
+
isLinkedDependency: true,
|
|
184833
|
+
depPath,
|
|
184834
|
+
pkgId: depPath,
|
|
184835
|
+
resolution: {
|
|
184836
|
+
type: "directory",
|
|
184837
|
+
directory: path_1.default.join(opts.lockfileDir, dedupedProjectId)
|
|
184838
|
+
}
|
|
184839
|
+
};
|
|
184840
|
+
opts.resolvedImporters[id].directDependencies[index] = linkedDep;
|
|
184841
|
+
opts.resolvedImporters[id].linkedDependencies.push(linkedDep);
|
|
184842
|
+
}
|
|
184843
|
+
}
|
|
184844
|
+
}
|
|
184845
|
+
}
|
|
184846
|
+
});
|
|
184847
|
+
|
|
184762
184848
|
// ../pkg-manager/resolve-dependencies/lib/resolvePeers.js
|
|
184763
184849
|
var require_resolvePeers = __commonJS({
|
|
184764
184850
|
"../pkg-manager/resolve-dependencies/lib/resolvePeers.js"(exports2) {
|
|
@@ -184779,6 +184865,7 @@ var require_resolvePeers = __commonJS({
|
|
|
184779
184865
|
var scan_1 = __importDefault3(require_scan4());
|
|
184780
184866
|
var mergePeers_1 = require_mergePeers();
|
|
184781
184867
|
var nodeIdUtils_1 = require_nodeIdUtils();
|
|
184868
|
+
var dedupeInjectedDeps_1 = require_dedupeInjectedDeps();
|
|
184782
184869
|
function resolvePeers(opts) {
|
|
184783
184870
|
const depGraph = {};
|
|
184784
184871
|
const pathsByNodeId = /* @__PURE__ */ new Map();
|
|
@@ -184818,6 +184905,16 @@ var require_resolvePeers = __commonJS({
|
|
|
184818
184905
|
for (const { directNodeIdsByAlias, id } of opts.projects) {
|
|
184819
184906
|
dependenciesByProjectId[id] = (0, map_1.default)((nodeId) => pathsByNodeId.get(nodeId), directNodeIdsByAlias);
|
|
184820
184907
|
}
|
|
184908
|
+
if (opts.dedupeInjectedDeps) {
|
|
184909
|
+
(0, dedupeInjectedDeps_1.dedupeInjectedDeps)({
|
|
184910
|
+
dependenciesByProjectId,
|
|
184911
|
+
projects: opts.projects,
|
|
184912
|
+
depGraph,
|
|
184913
|
+
pathsByNodeId,
|
|
184914
|
+
lockfileDir: opts.lockfileDir,
|
|
184915
|
+
resolvedImporters: opts.resolvedImporters
|
|
184916
|
+
});
|
|
184917
|
+
}
|
|
184821
184918
|
if (opts.dedupePeerDependents) {
|
|
184822
184919
|
const duplicates = Array.from(depPathsByPkgId.values()).filter((item) => item.size > 1);
|
|
184823
184920
|
const allDepPathsMap = deduplicateAll(depGraph, duplicates);
|
|
@@ -185950,41 +186047,8 @@ var require_lib140 = __commonJS({
|
|
|
185950
186047
|
allowNonAppliedPatches: opts.allowNonAppliedPatches
|
|
185951
186048
|
});
|
|
185952
186049
|
}
|
|
185953
|
-
const
|
|
185954
|
-
const projectsToLink = await Promise.all(projectsToResolve.map(async (project, index) => {
|
|
186050
|
+
const projectsToLink = await Promise.all(projectsToResolve.map(async (project) => {
|
|
185955
186051
|
const resolvedImporter = resolvedImporters[project.id];
|
|
185956
|
-
linkedDependenciesByProjectId[project.id] = resolvedImporter.linkedDependencies;
|
|
185957
|
-
let updatedManifest = project.manifest;
|
|
185958
|
-
let updatedOriginalManifest = project.originalManifest;
|
|
185959
|
-
if (project.updatePackageManifest) {
|
|
185960
|
-
const manifests = await (0, updateProjectManifest_1.updateProjectManifest)(project, {
|
|
185961
|
-
directDependencies: resolvedImporter.directDependencies,
|
|
185962
|
-
preserveWorkspaceProtocol: opts.preserveWorkspaceProtocol,
|
|
185963
|
-
saveWorkspaceProtocol: opts.saveWorkspaceProtocol
|
|
185964
|
-
});
|
|
185965
|
-
updatedManifest = manifests[0];
|
|
185966
|
-
updatedOriginalManifest = manifests[1];
|
|
185967
|
-
} else {
|
|
185968
|
-
core_loggers_1.packageManifestLogger.debug({
|
|
185969
|
-
prefix: project.rootDir,
|
|
185970
|
-
updated: project.manifest
|
|
185971
|
-
});
|
|
185972
|
-
}
|
|
185973
|
-
if (updatedManifest != null) {
|
|
185974
|
-
if (opts.autoInstallPeers) {
|
|
185975
|
-
if (updatedManifest.peerDependencies) {
|
|
185976
|
-
const allDeps = (0, manifest_utils_1.getAllDependenciesFromManifest)(updatedManifest);
|
|
185977
|
-
for (const [peerName, peerRange] of Object.entries(updatedManifest.peerDependencies)) {
|
|
185978
|
-
if (allDeps[peerName])
|
|
185979
|
-
continue;
|
|
185980
|
-
updatedManifest.dependencies ??= {};
|
|
185981
|
-
updatedManifest.dependencies[peerName] = peerRange;
|
|
185982
|
-
}
|
|
185983
|
-
}
|
|
185984
|
-
}
|
|
185985
|
-
const projectSnapshot = opts.wantedLockfile.importers[project.id];
|
|
185986
|
-
opts.wantedLockfile.importers[project.id] = addDirectDependenciesToLockfile(updatedManifest, projectSnapshot, resolvedImporter.linkedDependencies, resolvedImporter.directDependencies, opts.registries, opts.excludeLinksFromLockfile);
|
|
185987
|
-
}
|
|
185988
186052
|
const topParents = project.manifest ? await getTopParents((0, difference_1.default)(Object.keys((0, manifest_utils_1.getAllDependenciesFromManifest)(project.manifest)), resolvedImporter.directDependencies.map(({ alias }) => alias) || []), project.modulesDir) : [];
|
|
185989
186053
|
resolvedImporter.linkedDependencies.forEach((linkedDependency) => {
|
|
185990
186054
|
const target = !opts.excludeLinksFromLockfile || (0, is_subdir_1.default)(opts.lockfileDir, linkedDependency.resolution.directory) ? linkedDependency.resolution.directory : path_1.default.join(project.modulesDir, linkedDependency.alias);
|
|
@@ -185995,8 +186059,6 @@ var require_lib140 = __commonJS({
|
|
|
185995
186059
|
linkedDir
|
|
185996
186060
|
});
|
|
185997
186061
|
});
|
|
185998
|
-
const manifest = updatedOriginalManifest ?? project.originalManifest ?? project.manifest;
|
|
185999
|
-
importers[index].manifest = manifest;
|
|
186000
186062
|
return {
|
|
186001
186063
|
binsDir: project.binsDir,
|
|
186002
186064
|
directNodeIdsByAlias: resolvedImporter.directNodeIdsByAlias,
|
|
@@ -186011,16 +186073,53 @@ var require_lib140 = __commonJS({
|
|
|
186011
186073
|
const { dependenciesGraph, dependenciesByProjectId, peerDependencyIssuesByProjects } = (0, resolvePeers_1.resolvePeers)({
|
|
186012
186074
|
dependenciesTree,
|
|
186013
186075
|
dedupePeerDependents: opts.dedupePeerDependents,
|
|
186076
|
+
dedupeInjectedDeps: opts.dedupeInjectedDeps,
|
|
186014
186077
|
lockfileDir: opts.lockfileDir,
|
|
186015
186078
|
projects: projectsToLink,
|
|
186016
186079
|
virtualStoreDir: opts.virtualStoreDir,
|
|
186017
|
-
resolvePeersFromWorkspaceRoot: Boolean(opts.resolvePeersFromWorkspaceRoot)
|
|
186080
|
+
resolvePeersFromWorkspaceRoot: Boolean(opts.resolvePeersFromWorkspaceRoot),
|
|
186081
|
+
resolvedImporters
|
|
186018
186082
|
});
|
|
186019
|
-
|
|
186020
|
-
|
|
186021
|
-
|
|
186022
|
-
|
|
186023
|
-
|
|
186083
|
+
const linkedDependenciesByProjectId = {};
|
|
186084
|
+
await Promise.all(projectsToResolve.map(async (project, index) => {
|
|
186085
|
+
const resolvedImporter = resolvedImporters[project.id];
|
|
186086
|
+
linkedDependenciesByProjectId[project.id] = resolvedImporter.linkedDependencies;
|
|
186087
|
+
let updatedManifest;
|
|
186088
|
+
let updatedOriginalManifest;
|
|
186089
|
+
if (project.updatePackageManifest) {
|
|
186090
|
+
[updatedManifest, updatedOriginalManifest] = await (0, updateProjectManifest_1.updateProjectManifest)(project, {
|
|
186091
|
+
directDependencies: resolvedImporter.directDependencies,
|
|
186092
|
+
preserveWorkspaceProtocol: opts.preserveWorkspaceProtocol,
|
|
186093
|
+
saveWorkspaceProtocol: opts.saveWorkspaceProtocol
|
|
186094
|
+
});
|
|
186095
|
+
} else {
|
|
186096
|
+
updatedManifest = project.manifest;
|
|
186097
|
+
updatedOriginalManifest = project.originalManifest;
|
|
186098
|
+
core_loggers_1.packageManifestLogger.debug({
|
|
186099
|
+
prefix: project.rootDir,
|
|
186100
|
+
updated: project.manifest
|
|
186101
|
+
});
|
|
186102
|
+
}
|
|
186103
|
+
if (updatedManifest != null) {
|
|
186104
|
+
if (opts.autoInstallPeers) {
|
|
186105
|
+
if (updatedManifest.peerDependencies) {
|
|
186106
|
+
const allDeps = (0, manifest_utils_1.getAllDependenciesFromManifest)(updatedManifest);
|
|
186107
|
+
for (const [peerName, peerRange] of Object.entries(updatedManifest.peerDependencies)) {
|
|
186108
|
+
if (allDeps[peerName])
|
|
186109
|
+
continue;
|
|
186110
|
+
updatedManifest.dependencies ??= {};
|
|
186111
|
+
updatedManifest.dependencies[peerName] = peerRange;
|
|
186112
|
+
}
|
|
186113
|
+
}
|
|
186114
|
+
}
|
|
186115
|
+
const projectSnapshot = opts.wantedLockfile.importers[project.id];
|
|
186116
|
+
opts.wantedLockfile.importers[project.id] = addDirectDependenciesToLockfile(updatedManifest, projectSnapshot, resolvedImporter.linkedDependencies, resolvedImporter.directDependencies, opts.registries, opts.excludeLinksFromLockfile);
|
|
186117
|
+
}
|
|
186118
|
+
importers[index].manifest = updatedOriginalManifest ?? project.originalManifest ?? project.manifest;
|
|
186119
|
+
for (const [alias, depPath] of Object.entries(dependenciesByProjectId[project.id])) {
|
|
186120
|
+
const projectSnapshot = opts.wantedLockfile.importers[project.id];
|
|
186121
|
+
if (project.manifest.dependenciesMeta != null) {
|
|
186122
|
+
projectSnapshot.dependenciesMeta = project.manifest.dependenciesMeta;
|
|
186024
186123
|
}
|
|
186025
186124
|
const depNode = dependenciesGraph[depPath];
|
|
186026
186125
|
const ref = (0, depPathToRef_1.depPathToRef)(depPath, {
|
|
@@ -186037,7 +186136,7 @@ var require_lib140 = __commonJS({
|
|
|
186037
186136
|
projectSnapshot.optionalDependencies[alias] = ref;
|
|
186038
186137
|
}
|
|
186039
186138
|
}
|
|
186040
|
-
}
|
|
186139
|
+
}));
|
|
186041
186140
|
if (opts.dedupeDirectDeps) {
|
|
186042
186141
|
const rootDeps = dependenciesByProjectId["."];
|
|
186043
186142
|
if (rootDeps) {
|
|
@@ -188190,7 +188289,7 @@ var require_extendInstallOptions = __commonJS({
|
|
|
188190
188289
|
storeDir: opts.storeDir,
|
|
188191
188290
|
strictPeerDependencies: true,
|
|
188192
188291
|
tag: "latest",
|
|
188193
|
-
unsafePerm: process.platform === "win32" || process.platform === "cygwin" || !process.setgid || process.getuid() !== 0,
|
|
188292
|
+
unsafePerm: process.platform === "win32" || process.platform === "cygwin" || !process.setgid || process.getuid?.() !== 0,
|
|
188194
188293
|
useLockfile: true,
|
|
188195
188294
|
saveLockfile: true,
|
|
188196
188295
|
useGitBranchLockfile: false,
|
|
@@ -189339,6 +189438,7 @@ Note that in CI environments, this setting is enabled by default.`
|
|
|
189339
189438
|
currentLockfile: ctx.currentLockfile,
|
|
189340
189439
|
defaultUpdateDepth: opts.depth,
|
|
189341
189440
|
dedupeDirectDeps: opts.dedupeDirectDeps,
|
|
189441
|
+
dedupeInjectedDeps: opts.dedupeInjectedDeps,
|
|
189342
189442
|
dedupePeerDependents: opts.dedupePeerDependents,
|
|
189343
189443
|
dryRun: opts.lockfileOnly,
|
|
189344
189444
|
engineStrict: opts.engineStrict,
|
|
@@ -209671,7 +209771,6 @@ var require_patchCommit = __commonJS({
|
|
|
209671
209771
|
const lockfileDir = opts.lockfileDir ?? opts.dir ?? process.cwd();
|
|
209672
209772
|
const patchesDirName = (0, normalize_path_1.default)(path_1.default.normalize(opts.patchesDir ?? "patches"));
|
|
209673
209773
|
const patchesDir = path_1.default.join(lockfileDir, patchesDirName);
|
|
209674
|
-
await fs_1.default.promises.mkdir(patchesDir, { recursive: true });
|
|
209675
209774
|
const patchedPkgManifest = await (0, read_package_json_1.readPackageJsonFromDir)(userDir);
|
|
209676
209775
|
const pkgNameAndVersion = `${patchedPkgManifest.name}@${patchedPkgManifest.version}`;
|
|
209677
209776
|
const gitTarballUrl = await getGitTarballUrlFromLockfile({
|
|
@@ -209689,6 +209788,7 @@ var require_patchCommit = __commonJS({
|
|
|
209689
209788
|
if (!patchContent.length) {
|
|
209690
209789
|
return `No changes were found to the following directory: ${userDir}`;
|
|
209691
209790
|
}
|
|
209791
|
+
await fs_1.default.promises.mkdir(patchesDir, { recursive: true });
|
|
209692
209792
|
const patchFileName = pkgNameAndVersion.replace("/", "__");
|
|
209693
209793
|
await fs_1.default.promises.writeFile(path_1.default.join(patchesDir, `${patchFileName}.patch`), patchContent, "utf8");
|
|
209694
209794
|
const { writeProjectManifest, manifest } = await (0, read_project_manifest_1.tryReadProjectManifest)(lockfileDir);
|
|
Binary file
|
package/dist/worker.js
CHANGED
|
@@ -12290,9 +12290,9 @@ var require_importIndexedDir = __commonJS({
|
|
|
12290
12290
|
}
|
|
12291
12291
|
});
|
|
12292
12292
|
|
|
12293
|
-
// ../node_modules/.pnpm/@reflink+reflink@0.1.
|
|
12293
|
+
// ../node_modules/.pnpm/@reflink+reflink@0.1.15/node_modules/@reflink/reflink/index.js
|
|
12294
12294
|
var require_reflink = __commonJS({
|
|
12295
|
-
"../node_modules/.pnpm/@reflink+reflink@0.1.
|
|
12295
|
+
"../node_modules/.pnpm/@reflink+reflink@0.1.15/node_modules/@reflink/reflink/index.js"(exports2, module2) {
|
|
12296
12296
|
var { existsSync, readFileSync } = require("fs");
|
|
12297
12297
|
var { join } = require("path");
|
|
12298
12298
|
var { platform, arch } = process;
|
|
@@ -12353,7 +12353,7 @@ var require_reflink = __commonJS({
|
|
|
12353
12353
|
if (localFileExisted) {
|
|
12354
12354
|
nativeBinding = require("./reflink.win32-x64-msvc.node");
|
|
12355
12355
|
} else {
|
|
12356
|
-
nativeBinding = require("
|
|
12356
|
+
nativeBinding = require("@reflink/reflink-win32-x64-msvc");
|
|
12357
12357
|
}
|
|
12358
12358
|
} catch (e) {
|
|
12359
12359
|
loadError = e;
|
|
@@ -12381,7 +12381,7 @@ var require_reflink = __commonJS({
|
|
|
12381
12381
|
if (localFileExisted) {
|
|
12382
12382
|
nativeBinding = require("./reflink.win32-arm64-msvc.node");
|
|
12383
12383
|
} else {
|
|
12384
|
-
nativeBinding = require("
|
|
12384
|
+
nativeBinding = require("@reflink/reflink-win32-arm64-msvc");
|
|
12385
12385
|
}
|
|
12386
12386
|
} catch (e) {
|
|
12387
12387
|
loadError = e;
|
|
@@ -12409,7 +12409,7 @@ var require_reflink = __commonJS({
|
|
|
12409
12409
|
if (localFileExisted) {
|
|
12410
12410
|
nativeBinding = require("./reflink.darwin-x64.node");
|
|
12411
12411
|
} else {
|
|
12412
|
-
nativeBinding = require("
|
|
12412
|
+
nativeBinding = require("@reflink/reflink-darwin-x64");
|
|
12413
12413
|
}
|
|
12414
12414
|
} catch (e) {
|
|
12415
12415
|
loadError = e;
|
|
@@ -12423,7 +12423,7 @@ var require_reflink = __commonJS({
|
|
|
12423
12423
|
if (localFileExisted) {
|
|
12424
12424
|
nativeBinding = require("./reflink.darwin-arm64.node");
|
|
12425
12425
|
} else {
|
|
12426
|
-
nativeBinding = require("./reflink.darwin-arm64-
|
|
12426
|
+
nativeBinding = require("./reflink.darwin-arm64-UVWNQWTH.node");
|
|
12427
12427
|
}
|
|
12428
12428
|
} catch (e) {
|
|
12429
12429
|
loadError = e;
|
|
@@ -12641,7 +12641,7 @@ var require_lib8 = __commonJS({
|
|
|
12641
12641
|
return void 0;
|
|
12642
12642
|
}
|
|
12643
12643
|
function createCloneFunction() {
|
|
12644
|
-
if (process.platform === "darwin") {
|
|
12644
|
+
if (process.platform === "darwin" || process.platform === "win32") {
|
|
12645
12645
|
const { reflinkFileSync } = require_reflink();
|
|
12646
12646
|
return (fr, to) => {
|
|
12647
12647
|
try {
|
package/package.json
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|