@pnpm/plugin-commands-rebuild 6.2.12 → 7.0.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/lib/implementation/extendRebuildOptions.d.ts +1 -2
- package/lib/implementation/extendRebuildOptions.js +6 -27
- package/lib/implementation/extendRebuildOptions.js.map +1 -1
- package/lib/implementation/index.d.ts +1 -0
- package/lib/implementation/index.js +20 -20
- package/lib/implementation/index.js.map +1 -1
- package/lib/rebuild.js +3 -2
- package/lib/rebuild.js.map +1 -1
- package/lib/recursive.d.ts +1 -1
- package/lib/recursive.js +7 -6
- package/lib/recursive.js.map +1 -1
- package/package.json +19 -19
|
@@ -36,5 +36,4 @@ export interface StrictRebuildOptions {
|
|
|
36
36
|
shamefullyHoist: boolean;
|
|
37
37
|
}
|
|
38
38
|
export declare type RebuildOptions = Partial<StrictRebuildOptions> & Pick<StrictRebuildOptions, 'storeDir' | 'storeController'>;
|
|
39
|
-
declare
|
|
40
|
-
export default _default;
|
|
39
|
+
export declare function extendRebuildOptions(opts: RebuildOptions): Promise<StrictRebuildOptions>;
|
|
@@ -1,33 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
28
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.extendRebuildOptions = void 0;
|
|
29
7
|
const path_1 = __importDefault(require("path"));
|
|
30
|
-
const normalize_registries_1 =
|
|
8
|
+
const normalize_registries_1 = require("@pnpm/normalize-registries");
|
|
31
9
|
const load_json_file_1 = __importDefault(require("load-json-file"));
|
|
32
10
|
const defaults = async (opts) => {
|
|
33
11
|
const packageManager = opts.packageManager ??
|
|
@@ -61,7 +39,7 @@ const defaults = async (opts) => {
|
|
|
61
39
|
userAgent: `${packageManager.name}/${packageManager.version} npm/? node/${process.version} ${process.platform} ${process.arch}`,
|
|
62
40
|
};
|
|
63
41
|
};
|
|
64
|
-
|
|
42
|
+
async function extendRebuildOptions(opts) {
|
|
65
43
|
if (opts) {
|
|
66
44
|
for (const key in opts) {
|
|
67
45
|
if (opts[key] === undefined) {
|
|
@@ -71,7 +49,8 @@ exports.default = async (opts) => {
|
|
|
71
49
|
}
|
|
72
50
|
const defaultOpts = await defaults(opts);
|
|
73
51
|
const extendedOpts = { ...defaultOpts, ...opts, storeDir: defaultOpts.storeDir };
|
|
74
|
-
extendedOpts.registries = (0, normalize_registries_1.
|
|
52
|
+
extendedOpts.registries = (0, normalize_registries_1.normalizeRegistries)(extendedOpts.registries);
|
|
75
53
|
return extendedOpts;
|
|
76
|
-
}
|
|
54
|
+
}
|
|
55
|
+
exports.extendRebuildOptions = extendRebuildOptions;
|
|
77
56
|
//# sourceMappingURL=extendRebuildOptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendRebuildOptions.js","sourceRoot":"","sources":["../../src/implementation/extendRebuildOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"extendRebuildOptions.js","sourceRoot":"","sources":["../../src/implementation/extendRebuildOptions.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,qEAAoF;AAGpF,oEAAyC;AAyCzC,MAAM,QAAQ,GAAG,KAAK,EAAE,IAAoB,EAAE,EAAE;IAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc;QACxC,MAAM,IAAA,wBAAY,EAAoC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAE,CAAA;IACpG,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACrC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,GAAG,CAAA;IAC3C,OAAO;QACL,gBAAgB,EAAE,CAAC;QACnB,WAAW,EAAE,IAAI;QACjB,GAAG;QACH,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,KAAK;QAC1B,WAAW;QACX,UAAU,EAAE,UAAU;QACtB,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,yCAAkB;QAC9B,sBAAsB,EAAE,KAAK;QAC7B,eAAe,EAAE,KAAK;QACtB,aAAa,EAAE,KAAK;QACpB,oBAAoB,EAAE,KAAK;QAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,UAAU,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;YACtC,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAC7B,CAAC,OAAO,CAAC,MAAM;YACf,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC;QACxB,WAAW,EAAE,IAAI;QACjB,SAAS,EAAE,GAAG,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,OAAO,eAAe,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;KACxG,CAAA;AAC3B,CAAC,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAoB;IAEpB,IAAI,IAAI,EAAE;QACR,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;gBAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;aACjB;SACF;KACF;IACD,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAA;IACxC,MAAM,YAAY,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAA;IAChF,YAAY,CAAC,UAAU,GAAG,IAAA,0CAAmB,EAAC,YAAY,CAAC,UAAU,CAAC,CAAA;IACtE,OAAO,YAAY,CAAA;AACrB,CAAC;AAdD,oDAcC"}
|
|
@@ -2,6 +2,7 @@ import { ProjectManifest } from '@pnpm/types';
|
|
|
2
2
|
import { RebuildOptions } from './extendRebuildOptions';
|
|
3
3
|
export { RebuildOptions };
|
|
4
4
|
export declare function rebuildSelectedPkgs(projects: Array<{
|
|
5
|
+
buildIndex: number;
|
|
5
6
|
manifest: ProjectManifest;
|
|
6
7
|
rootDir: string;
|
|
7
8
|
}>, pkgSpecs: string[], maybeOpts: RebuildOptions): Promise<void>;
|
|
@@ -30,12 +30,12 @@ exports.rebuildProjects = exports.rebuildSelectedPkgs = void 0;
|
|
|
30
30
|
const path_1 = __importDefault(require("path"));
|
|
31
31
|
const constants_1 = require("@pnpm/constants");
|
|
32
32
|
const core_loggers_1 = require("@pnpm/core-loggers");
|
|
33
|
-
const get_context_1 =
|
|
33
|
+
const get_context_1 = require("@pnpm/get-context");
|
|
34
34
|
const lifecycle_1 = require("@pnpm/lifecycle");
|
|
35
|
-
const link_bins_1 =
|
|
35
|
+
const link_bins_1 = require("@pnpm/link-bins");
|
|
36
36
|
const lockfile_utils_1 = require("@pnpm/lockfile-utils");
|
|
37
|
-
const lockfile_walker_1 =
|
|
38
|
-
const logger_1 =
|
|
37
|
+
const lockfile_walker_1 = require("@pnpm/lockfile-walker");
|
|
38
|
+
const logger_1 = require("@pnpm/logger");
|
|
39
39
|
const modules_yaml_1 = require("@pnpm/modules-yaml");
|
|
40
40
|
const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
41
41
|
const dp = __importStar(require("dependency-path"));
|
|
@@ -44,14 +44,14 @@ const graph_sequencer_1 = __importDefault(require("@pnpm/graph-sequencer"));
|
|
|
44
44
|
const npm_package_arg_1 = __importDefault(require("@pnpm/npm-package-arg"));
|
|
45
45
|
const p_limit_1 = __importDefault(require("p-limit"));
|
|
46
46
|
const semver_1 = __importDefault(require("semver"));
|
|
47
|
-
const extendRebuildOptions_1 =
|
|
47
|
+
const extendRebuildOptions_1 = require("./extendRebuildOptions");
|
|
48
48
|
function findPackages(packages, searched, opts) {
|
|
49
49
|
return Object.keys(packages)
|
|
50
50
|
.filter((relativeDepPath) => {
|
|
51
51
|
const pkgLockfile = packages[relativeDepPath];
|
|
52
52
|
const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(relativeDepPath, pkgLockfile);
|
|
53
53
|
if (!pkgInfo.name) {
|
|
54
|
-
logger_1.
|
|
54
|
+
logger_1.logger.warn({
|
|
55
55
|
message: `Skipping ${relativeDepPath} because cannot get the package name from ${constants_1.WANTED_LOCKFILE}.
|
|
56
56
|
Try to run run \`pnpm update --depth 100\` to create a new ${constants_1.WANTED_LOCKFILE} with all the necessary info.`,
|
|
57
57
|
prefix: opts.prefix,
|
|
@@ -76,8 +76,8 @@ async function rebuildSelectedPkgs(projects, pkgSpecs, maybeOpts) {
|
|
|
76
76
|
if ((reporter != null) && typeof reporter === 'function') {
|
|
77
77
|
logger_1.streamParser.on('data', reporter);
|
|
78
78
|
}
|
|
79
|
-
const opts = await (0, extendRebuildOptions_1.
|
|
80
|
-
const ctx = await (0, get_context_1.
|
|
79
|
+
const opts = await (0, extendRebuildOptions_1.extendRebuildOptions)(maybeOpts);
|
|
80
|
+
const ctx = await (0, get_context_1.getContext)({ ...opts, allProjects: projects });
|
|
81
81
|
if (!ctx.currentLockfile || (ctx.currentLockfile.packages == null))
|
|
82
82
|
return;
|
|
83
83
|
const packages = ctx.currentLockfile.packages;
|
|
@@ -112,8 +112,8 @@ async function rebuildProjects(projects, maybeOpts) {
|
|
|
112
112
|
if ((reporter != null) && typeof reporter === 'function') {
|
|
113
113
|
logger_1.streamParser.on('data', reporter);
|
|
114
114
|
}
|
|
115
|
-
const opts = await (0, extendRebuildOptions_1.
|
|
116
|
-
const ctx = await (0, get_context_1.
|
|
115
|
+
const opts = await (0, extendRebuildOptions_1.extendRebuildOptions)(maybeOpts);
|
|
116
|
+
const ctx = await (0, get_context_1.getContext)({ ...opts, allProjects: projects });
|
|
117
117
|
let idsToRebuild = [];
|
|
118
118
|
if (opts.pending) {
|
|
119
119
|
idsToRebuild = ctx.pendingBuilds;
|
|
@@ -137,13 +137,13 @@ async function rebuildProjects(projects, maybeOpts) {
|
|
|
137
137
|
storeController: store.ctrl,
|
|
138
138
|
unsafePerm: opts.unsafePerm || false,
|
|
139
139
|
};
|
|
140
|
-
await (0, lifecycle_1.runLifecycleHooksConcurrently)(['preinstall', 'install', 'postinstall', 'prepublish', 'prepare'], ctx.projects, opts.childConcurrency || 5, scriptsOpts);
|
|
141
|
-
for (const { id, manifest } of ctx.projects) {
|
|
140
|
+
await (0, lifecycle_1.runLifecycleHooksConcurrently)(['preinstall', 'install', 'postinstall', 'prepublish', 'prepare'], Object.values(ctx.projects), opts.childConcurrency || 5, scriptsOpts);
|
|
141
|
+
for (const { id, manifest } of Object.values(ctx.projects)) {
|
|
142
142
|
if (((manifest?.scripts) != null) && (!opts.pending || ctx.pendingBuilds.includes(id))) {
|
|
143
143
|
ctx.pendingBuilds.splice(ctx.pendingBuilds.indexOf(id), 1);
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
|
-
await (0, modules_yaml_1.
|
|
146
|
+
await (0, modules_yaml_1.writeModulesManifest)(ctx.rootModulesDir, {
|
|
147
147
|
prunedAt: new Date().toUTCString(),
|
|
148
148
|
...ctx.modulesFile,
|
|
149
149
|
hoistedDependencies: ctx.hoistedDependencies,
|
|
@@ -176,7 +176,7 @@ function getSubgraphToBuild(step, nodesToBuildAndTransitive, opts) {
|
|
|
176
176
|
for (const depPath of step.missing) {
|
|
177
177
|
// It might make sense to fail if the depPath is not in the skipped list from .modules.yaml
|
|
178
178
|
// However, the skipped list currently contains package IDs, not dep paths.
|
|
179
|
-
logger_1.
|
|
179
|
+
logger_1.logger.debug({ message: `No entry for "${depPath}" in ${constants_1.WANTED_LOCKFILE}` });
|
|
180
180
|
}
|
|
181
181
|
return currentShouldBeBuilt;
|
|
182
182
|
}
|
|
@@ -186,7 +186,7 @@ async function _rebuild(ctx, opts) {
|
|
|
186
186
|
const graph = new Map();
|
|
187
187
|
const pkgSnapshots = ctx.currentLockfile.packages ?? {};
|
|
188
188
|
const nodesToBuildAndTransitive = new Set();
|
|
189
|
-
getSubgraphToBuild((0, lockfile_walker_1.
|
|
189
|
+
getSubgraphToBuild((0, lockfile_walker_1.lockfileWalker)(ctx.currentLockfile, Object.values(ctx.projects).map(({ id }) => id), {
|
|
190
190
|
include: {
|
|
191
191
|
dependencies: opts.production,
|
|
192
192
|
devDependencies: opts.development,
|
|
@@ -205,7 +205,7 @@ async function _rebuild(ctx, opts) {
|
|
|
205
205
|
groups: [nodesToBuildAndTransitiveArray],
|
|
206
206
|
});
|
|
207
207
|
const chunks = graphSequencerResult.chunks;
|
|
208
|
-
const warn = (message) => logger_1.
|
|
208
|
+
const warn = (message) => logger_1.logger.info({ message, prefix: opts.dir });
|
|
209
209
|
const groups = chunks.map((chunk) => chunk.filter((depPath) => ctx.pkgsToRebuild.has(depPath)).map((depPath) => async () => {
|
|
210
210
|
const pkgSnapshot = pkgSnapshots[depPath];
|
|
211
211
|
const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
|
|
@@ -213,7 +213,7 @@ async function _rebuild(ctx, opts) {
|
|
|
213
213
|
try {
|
|
214
214
|
const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), 'node_modules');
|
|
215
215
|
const binPath = path_1.default.join(pkgRoot, 'node_modules', '.bin');
|
|
216
|
-
await (0, link_bins_1.
|
|
216
|
+
await (0, link_bins_1.linkBins)(modules, binPath, { extraNodePaths: ctx.extraNodePaths, warn });
|
|
217
217
|
await (0, lifecycle_1.runPostinstallHooks)({
|
|
218
218
|
depPath,
|
|
219
219
|
extraBinPaths: ctx.extraBinPaths,
|
|
@@ -256,12 +256,12 @@ async function _rebuild(ctx, opts) {
|
|
|
256
256
|
const pkgInfo = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
|
|
257
257
|
const modules = path_1.default.join(ctx.virtualStoreDir, dp.depPathToFilename(depPath), 'node_modules');
|
|
258
258
|
const binPath = path_1.default.join(modules, pkgInfo.name, 'node_modules', '.bin');
|
|
259
|
-
return (0, link_bins_1.
|
|
259
|
+
return (0, link_bins_1.linkBins)(modules, binPath, { warn });
|
|
260
260
|
})));
|
|
261
|
-
await Promise.all(ctx.projects.map(async ({ rootDir }) => limitLinking(async () => {
|
|
261
|
+
await Promise.all(Object.values(ctx.projects).map(async ({ rootDir }) => limitLinking(async () => {
|
|
262
262
|
const modules = path_1.default.join(rootDir, 'node_modules');
|
|
263
263
|
const binPath = path_1.default.join(modules, '.bin');
|
|
264
|
-
return (0, link_bins_1.
|
|
264
|
+
return (0, link_bins_1.linkBins)(modules, binPath, {
|
|
265
265
|
allowExoticManifests: true,
|
|
266
266
|
warn,
|
|
267
267
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/implementation/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AACvB,+CAGwB;AACxB,qDAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/implementation/index.ts"],"names":[],"mappings":"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"}
|
package/lib/rebuild.js
CHANGED
|
@@ -11,7 +11,7 @@ const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
|
11
11
|
const pick_1 = __importDefault(require("ramda/src/pick"));
|
|
12
12
|
const render_help_1 = __importDefault(require("render-help"));
|
|
13
13
|
const implementation_1 = require("./implementation");
|
|
14
|
-
const recursive_1 =
|
|
14
|
+
const recursive_1 = require("./recursive");
|
|
15
15
|
function rcOptionsTypes() {
|
|
16
16
|
return {
|
|
17
17
|
...(0, pick_1.default)([
|
|
@@ -68,7 +68,7 @@ For options that may be used with `-r`, see "pnpm help recursive"',
|
|
|
68
68
|
exports.help = help;
|
|
69
69
|
async function handler(opts, params) {
|
|
70
70
|
if (opts.recursive && (opts.allProjects != null) && (opts.selectedProjectsGraph != null) && opts.workspaceDir) {
|
|
71
|
-
await (0, recursive_1.
|
|
71
|
+
await (0, recursive_1.recursiveRebuild)(opts.allProjects, params, { ...opts, selectedProjectsGraph: opts.selectedProjectsGraph, workspaceDir: opts.workspaceDir });
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
74
|
const store = await (0, store_connection_manager_1.createOrConnectStoreController)(opts);
|
|
@@ -89,6 +89,7 @@ async function handler(opts, params) {
|
|
|
89
89
|
}
|
|
90
90
|
await (0, implementation_1.rebuildSelectedPkgs)([
|
|
91
91
|
{
|
|
92
|
+
buildIndex: 0,
|
|
92
93
|
manifest: await (0, cli_utils_1.readProjectManifestOnly)(rebuildOpts.dir, opts),
|
|
93
94
|
rootDir: rebuildOpts.dir,
|
|
94
95
|
},
|
package/lib/rebuild.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAkE;AAClE,2EAA4E;AAC5E,yCAAwD;AAExD,6EAGuC;AACvC,0DAAiC;AACjC,8DAAoC;AACpC,qDAGyB;AACzB,
|
|
1
|
+
{"version":3,"file":"rebuild.js","sourceRoot":"","sources":["../src/rebuild.ts"],"names":[],"mappings":"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"}
|
package/lib/recursive.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { Project } from '@pnpm/types';
|
|
|
4
4
|
declare type RecursiveRebuildOpts = CreateStoreControllerOptions & Pick<Config, 'hoistPattern' | 'hooks' | 'ignorePnpmfile' | 'ignoreScripts' | 'lockfileDir' | 'lockfileOnly' | 'rawLocalConfig' | 'registries' | 'sharedWorkspaceLockfile'> & {
|
|
5
5
|
pending?: boolean;
|
|
6
6
|
} & Partial<Pick<Config, 'bail' | 'sort' | 'workspaceConcurrency'>>;
|
|
7
|
-
export
|
|
7
|
+
export declare function recursiveRebuild(allProjects: Project[], params: string[], opts: RecursiveRebuildOpts & {
|
|
8
8
|
ignoredPackages?: Set<string>;
|
|
9
9
|
} & Required<Pick<Config, 'selectedProjectsGraph' | 'workspaceDir'>>): Promise<void>;
|
|
10
10
|
export {};
|
package/lib/recursive.js
CHANGED
|
@@ -3,18 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.recursiveRebuild = void 0;
|
|
6
7
|
const path_1 = __importDefault(require("path"));
|
|
7
8
|
const cli_utils_1 = require("@pnpm/cli-utils");
|
|
8
9
|
const find_workspace_packages_1 = require("@pnpm/find-workspace-packages");
|
|
9
|
-
const logger_1 =
|
|
10
|
-
const sort_packages_1 =
|
|
10
|
+
const logger_1 = require("@pnpm/logger");
|
|
11
|
+
const sort_packages_1 = require("@pnpm/sort-packages");
|
|
11
12
|
const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
12
13
|
const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
|
|
13
14
|
const mem_1 = __importDefault(require("mem"));
|
|
14
15
|
const p_limit_1 = __importDefault(require("p-limit"));
|
|
15
16
|
const read_ini_file_1 = __importDefault(require("read-ini-file"));
|
|
16
17
|
const implementation_1 = require("./implementation");
|
|
17
|
-
async function
|
|
18
|
+
async function recursiveRebuild(allProjects, params, opts) {
|
|
18
19
|
if (allProjects.length === 0) {
|
|
19
20
|
// It might make sense to throw an exception in this case
|
|
20
21
|
return;
|
|
@@ -29,7 +30,7 @@ async function recursive(allProjects, params, opts) {
|
|
|
29
30
|
}
|
|
30
31
|
const throwOnFail = cli_utils_1.throwOnCommandFail.bind(null, 'pnpm recursive rebuild');
|
|
31
32
|
const chunks = opts.sort !== false
|
|
32
|
-
? (0, sort_packages_1.
|
|
33
|
+
? (0, sort_packages_1.sortPackages)(opts.selectedProjectsGraph)
|
|
33
34
|
: [Object.keys(opts.selectedProjectsGraph).sort()];
|
|
34
35
|
const store = await (0, store_connection_manager_1.createOrConnectStoreController)(opts);
|
|
35
36
|
const workspacePackages = (0, find_workspace_packages_1.arrayOfWorkspacePackagesToMap)(allProjects);
|
|
@@ -101,7 +102,7 @@ async function recursive(allProjects, params, opts) {
|
|
|
101
102
|
result.passes++;
|
|
102
103
|
}
|
|
103
104
|
catch (err) { // eslint-disable-line
|
|
104
|
-
logger_1.
|
|
105
|
+
logger_1.logger.info(err);
|
|
105
106
|
if (!opts.bail) {
|
|
106
107
|
result.fails.push({
|
|
107
108
|
error: err,
|
|
@@ -117,7 +118,7 @@ async function recursive(allProjects, params, opts) {
|
|
|
117
118
|
}
|
|
118
119
|
throwOnFail(result);
|
|
119
120
|
}
|
|
120
|
-
exports.
|
|
121
|
+
exports.recursiveRebuild = recursiveRebuild;
|
|
121
122
|
async function readLocalConfig(prefix) {
|
|
122
123
|
try {
|
|
123
124
|
const ini = await (0, read_ini_file_1.default)(path_1.default.join(prefix, '.npmrc'));
|
package/lib/recursive.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recursive.js","sourceRoot":"","sources":["../src/recursive.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"recursive.js","sourceRoot":"","sources":["../src/recursive.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/plugin-commands-rebuild",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "7.0.0",
|
|
4
4
|
"description": "Commands for rebuilding dependencies",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
},
|
|
24
24
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/packages/plugin-commands-rebuild#readme",
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@pnpm/filter-workspace-packages": "
|
|
27
|
-
"@pnpm/plugin-commands-rebuild": "
|
|
28
|
-
"@pnpm/prepare": "0.0.
|
|
29
|
-
"@pnpm/registry-mock": "3.
|
|
30
|
-
"@pnpm/test-fixtures": "0.0.
|
|
26
|
+
"@pnpm/filter-workspace-packages": "6.0.0",
|
|
27
|
+
"@pnpm/plugin-commands-rebuild": "7.0.0",
|
|
28
|
+
"@pnpm/prepare": "0.0.55",
|
|
29
|
+
"@pnpm/registry-mock": "3.1.0",
|
|
30
|
+
"@pnpm/test-fixtures": "0.0.24",
|
|
31
31
|
"@types/ramda": "0.28.15",
|
|
32
32
|
"@types/semver": "7.3.12",
|
|
33
33
|
"@types/sinon": "^10.0.13",
|
|
@@ -37,23 +37,23 @@
|
|
|
37
37
|
"write-yaml-file": "^4.2.0"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@pnpm/cli-utils": "0.
|
|
40
|
+
"@pnpm/cli-utils": "1.0.0",
|
|
41
41
|
"@pnpm/common-cli-options-help": "0.9.0",
|
|
42
|
-
"@pnpm/config": "
|
|
42
|
+
"@pnpm/config": "16.0.0",
|
|
43
43
|
"@pnpm/constants": "6.1.0",
|
|
44
|
-
"@pnpm/core-loggers": "
|
|
45
|
-
"@pnpm/find-workspace-packages": "
|
|
46
|
-
"@pnpm/get-context": "
|
|
44
|
+
"@pnpm/core-loggers": "8.0.0",
|
|
45
|
+
"@pnpm/find-workspace-packages": "5.0.0",
|
|
46
|
+
"@pnpm/get-context": "8.0.0",
|
|
47
47
|
"@pnpm/graph-sequencer": "1.0.0",
|
|
48
|
-
"@pnpm/lifecycle": "
|
|
49
|
-
"@pnpm/link-bins": "
|
|
48
|
+
"@pnpm/lifecycle": "14.0.0",
|
|
49
|
+
"@pnpm/link-bins": "8.0.0",
|
|
50
50
|
"@pnpm/lockfile-utils": "4.2.6",
|
|
51
|
-
"@pnpm/lockfile-walker": "
|
|
52
|
-
"@pnpm/modules-yaml": "
|
|
53
|
-
"@pnpm/normalize-registries": "
|
|
51
|
+
"@pnpm/lockfile-walker": "6.0.0",
|
|
52
|
+
"@pnpm/modules-yaml": "11.0.0",
|
|
53
|
+
"@pnpm/normalize-registries": "4.0.0",
|
|
54
54
|
"@pnpm/npm-package-arg": "^1.0.0",
|
|
55
|
-
"@pnpm/sort-packages": "
|
|
56
|
-
"@pnpm/store-connection-manager": "
|
|
55
|
+
"@pnpm/sort-packages": "4.0.0",
|
|
56
|
+
"@pnpm/store-connection-manager": "5.0.0",
|
|
57
57
|
"@pnpm/store-controller-types": "14.1.3",
|
|
58
58
|
"@pnpm/types": "8.7.0",
|
|
59
59
|
"camelcase-keys": "^6.2.2",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"semver": "^7.3.8"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|
|
71
|
-
"@pnpm/logger": "^
|
|
71
|
+
"@pnpm/logger": "^5.0.0"
|
|
72
72
|
},
|
|
73
73
|
"funding": "https://opencollective.com/pnpm",
|
|
74
74
|
"exports": {
|