@pnpm/exec.build-commands 1001.0.6 → 1001.0.7
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/approveBuilds.js +6 -1
- package/lib/approveBuilds.js.map +1 -1
- package/lib/getAutomaticallyIgnoredBuilds.d.ts +7 -1
- package/lib/getAutomaticallyIgnoredBuilds.js +10 -5
- package/lib/getAutomaticallyIgnoredBuilds.js.map +1 -1
- package/lib/ignoredBuilds.js +5 -1
- package/lib/ignoredBuilds.js.map +1 -1
- package/package.json +9 -9
package/lib/approveBuilds.js
CHANGED
|
@@ -9,6 +9,7 @@ exports.cliOptionsTypes = cliOptionsTypes;
|
|
|
9
9
|
exports.rcOptionsTypes = rcOptionsTypes;
|
|
10
10
|
exports.handler = handler;
|
|
11
11
|
const logger_1 = require("@pnpm/logger");
|
|
12
|
+
const modules_yaml_1 = require("@pnpm/modules-yaml");
|
|
12
13
|
const read_project_manifest_1 = require("@pnpm/read-project-manifest");
|
|
13
14
|
const util_lex_comparator_1 = require("@pnpm/util.lex-comparator");
|
|
14
15
|
const render_help_1 = __importDefault(require("render-help"));
|
|
@@ -45,7 +46,7 @@ function rcOptionsTypes() {
|
|
|
45
46
|
return {};
|
|
46
47
|
}
|
|
47
48
|
async function handler(opts) {
|
|
48
|
-
const automaticallyIgnoredBuilds = await (0, getAutomaticallyIgnoredBuilds_1.getAutomaticallyIgnoredBuilds)(opts);
|
|
49
|
+
const { automaticallyIgnoredBuilds, modulesDir, modulesManifest, } = await (0, getAutomaticallyIgnoredBuilds_1.getAutomaticallyIgnoredBuilds)(opts);
|
|
49
50
|
if (!automaticallyIgnoredBuilds?.length) {
|
|
50
51
|
(0, logger_1.globalInfo)('There are no packages awaiting approval');
|
|
51
52
|
return;
|
|
@@ -147,6 +148,10 @@ Do you approve?`,
|
|
|
147
148
|
onlyBuiltDependencies: updatedOnlyBuiltDependencies,
|
|
148
149
|
}, buildPackages);
|
|
149
150
|
}
|
|
151
|
+
else if (modulesManifest) {
|
|
152
|
+
delete modulesManifest.ignoredBuilds;
|
|
153
|
+
await (0, modules_yaml_1.writeModulesManifest)(modulesDir, modulesManifest);
|
|
154
|
+
}
|
|
150
155
|
}
|
|
151
156
|
function sortUniqueStrings(array) {
|
|
152
157
|
return Array.from(new Set(array)).sort(util_lex_comparator_1.lexCompare);
|
package/lib/approveBuilds.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approveBuilds.js","sourceRoot":"","sources":["../src/approveBuilds.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"approveBuilds.js","sourceRoot":"","sources":["../src/approveBuilds.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,8 @@
|
|
|
1
|
+
import { type Modules } from '@pnpm/modules-yaml';
|
|
1
2
|
import { type IgnoredBuildsCommandOpts } from './ignoredBuilds';
|
|
2
|
-
export
|
|
3
|
+
export interface GetAutomaticallyIgnoredBuildsResult {
|
|
4
|
+
automaticallyIgnoredBuilds: string[] | null;
|
|
5
|
+
modulesDir: string;
|
|
6
|
+
modulesManifest: Modules | null;
|
|
7
|
+
}
|
|
8
|
+
export declare function getAutomaticallyIgnoredBuilds(opts: IgnoredBuildsCommandOpts): Promise<GetAutomaticallyIgnoredBuildsResult>;
|
|
@@ -7,10 +7,15 @@ exports.getAutomaticallyIgnoredBuilds = getAutomaticallyIgnoredBuilds;
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const modules_yaml_1 = require("@pnpm/modules-yaml");
|
|
9
9
|
async function getAutomaticallyIgnoredBuilds(opts) {
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
const modulesDir = getModulesDir(opts);
|
|
11
|
+
const modulesManifest = await (0, modules_yaml_1.readModulesManifest)(modulesDir);
|
|
12
|
+
return {
|
|
13
|
+
automaticallyIgnoredBuilds: modulesManifest && (modulesManifest.ignoredBuilds ?? []),
|
|
14
|
+
modulesDir,
|
|
15
|
+
modulesManifest,
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
function getModulesDir(opts) {
|
|
19
|
+
return opts.modulesDir ?? path_1.default.join(opts.lockfileDir ?? opts.dir, 'node_modules');
|
|
15
20
|
}
|
|
16
21
|
//# sourceMappingURL=getAutomaticallyIgnoredBuilds.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAutomaticallyIgnoredBuilds.js","sourceRoot":"","sources":["../src/getAutomaticallyIgnoredBuilds.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getAutomaticallyIgnoredBuilds.js","sourceRoot":"","sources":["../src/getAutomaticallyIgnoredBuilds.ts"],"names":[],"mappings":";;;;;AAUA,sEAQC;AAlBD,gDAAuB;AACvB,qDAAsE;AAS/D,KAAK,UAAU,6BAA6B,CAAE,IAA8B;IACjF,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;IACtC,MAAM,eAAe,GAAG,MAAM,IAAA,kCAAmB,EAAC,UAAU,CAAC,CAAA;IAC7D,OAAO;QACL,0BAA0B,EAAE,eAAe,IAAI,CAAC,eAAe,CAAC,aAAa,IAAI,EAAE,CAAC;QACpF,UAAU;QACV,eAAe;KAChB,CAAA;AACH,CAAC;AAED,SAAS,aAAa,CAAE,IAA8B;IACpD,OAAO,IAAI,CAAC,UAAU,IAAI,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;AACnF,CAAC"}
|
package/lib/ignoredBuilds.js
CHANGED
|
@@ -25,7 +25,11 @@ function rcOptionsTypes() {
|
|
|
25
25
|
}
|
|
26
26
|
async function handler(opts) {
|
|
27
27
|
const ignoredBuiltDependencies = opts.rootProjectManifest?.pnpm?.ignoredBuiltDependencies ?? [];
|
|
28
|
-
|
|
28
|
+
let { automaticallyIgnoredBuilds } = await (0, getAutomaticallyIgnoredBuilds_1.getAutomaticallyIgnoredBuilds)(opts);
|
|
29
|
+
if (automaticallyIgnoredBuilds) {
|
|
30
|
+
automaticallyIgnoredBuilds = automaticallyIgnoredBuilds
|
|
31
|
+
.filter((automaticallyIgnoredBuild) => !ignoredBuiltDependencies.includes(automaticallyIgnoredBuild));
|
|
32
|
+
}
|
|
29
33
|
let output = 'Automatically ignored builds during installation:\n';
|
|
30
34
|
if (automaticallyIgnoredBuilds == null) {
|
|
31
35
|
output += ' Cannot identify as no node_modules found';
|
package/lib/ignoredBuilds.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ignoredBuilds.js","sourceRoot":"","sources":["../src/ignoredBuilds.ts"],"names":[],"mappings":";;;;;;AAQA,oBAKC;AAED,0CAEC;AAED,wCAEC;AAED,
|
|
1
|
+
{"version":3,"file":"ignoredBuilds.js","sourceRoot":"","sources":["../src/ignoredBuilds.ts"],"names":[],"mappings":";;;;;;AAQA,oBAKC;AAED,0CAEC;AAED,wCAEC;AAED,0BAsBC;AA5CD,8DAAoC;AACpC,mFAA+E;AAIlE,QAAA,YAAY,GAAG,CAAC,gBAAgB,CAAC,CAAA;AAE9C,SAAgB,IAAI;IAClB,OAAO,IAAA,qBAAU,EAAC;QAChB,WAAW,EAAE,uDAAuD;QACpE,MAAM,EAAE,EAAE;KACX,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,eAAe;IAC7B,OAAO,EAAE,CAAA;AACX,CAAC;AAED,SAAgB,cAAc;IAC5B,OAAO,EAAE,CAAA;AACX,CAAC;AAEM,KAAK,UAAU,OAAO,CAAE,IAA8B;IAC3D,MAAM,wBAAwB,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,EAAE,wBAAwB,IAAI,EAAE,CAAA;IAC/F,IAAI,EAAE,0BAA0B,EAAE,GAAG,MAAM,IAAA,6DAA6B,EAAC,IAAI,CAAC,CAAA;IAC9E,IAAI,0BAA0B,EAAE,CAAC;QAC/B,0BAA0B,GAAG,0BAA0B;aACpD,MAAM,CAAC,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC,wBAAwB,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,CAAA;IACzG,CAAC;IACD,IAAI,MAAM,GAAG,qDAAqD,CAAA;IAClE,IAAI,0BAA0B,IAAI,IAAI,EAAE,CAAC;QACvC,MAAM,IAAI,4CAA4C,CAAA;IACxD,CAAC;SAAM,IAAI,0BAA0B,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,QAAQ,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC;;gGAEsC,CAAA;IAC9F,CAAC;IACD,MAAM,IAAI,IAAI,CAAA;IACd,IAAI,wBAAwB,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,IAAI,+EAA+E,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IACpI,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/exec.build-commands",
|
|
3
|
-
"version": "1001.0.
|
|
3
|
+
"version": "1001.0.7",
|
|
4
4
|
"description": "Commands for managing dependency builds",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -28,12 +28,12 @@
|
|
|
28
28
|
"chalk": "^4.1.2",
|
|
29
29
|
"enquirer": "^2.4.1",
|
|
30
30
|
"render-help": "^1.0.3",
|
|
31
|
-
"@pnpm/config": "1002.5.
|
|
32
|
-
"@pnpm/
|
|
31
|
+
"@pnpm/config": "1002.5.4",
|
|
32
|
+
"@pnpm/modules-yaml": "1000.2.0",
|
|
33
33
|
"@pnpm/prepare-temp-dir": "0.0.0",
|
|
34
|
-
"@pnpm/
|
|
35
|
-
"@pnpm/
|
|
36
|
-
"@pnpm/
|
|
34
|
+
"@pnpm/plugin-commands-rebuild": "1002.0.7",
|
|
35
|
+
"@pnpm/workspace.manifest-writer": "1000.0.2",
|
|
36
|
+
"@pnpm/read-project-manifest": "1000.0.7"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"@pnpm/logger": ">=5.1.0 <1001.0.0"
|
|
@@ -46,9 +46,9 @@
|
|
|
46
46
|
"read-yaml-file": "^2.1.0",
|
|
47
47
|
"write-pkg": "4.0.0",
|
|
48
48
|
"write-yaml-file": "^5.0.0",
|
|
49
|
-
"@pnpm/
|
|
50
|
-
"@pnpm/
|
|
51
|
-
"@pnpm/
|
|
49
|
+
"@pnpm/exec.build-commands": "1001.0.7",
|
|
50
|
+
"@pnpm/plugin-commands-installation": "1002.2.2",
|
|
51
|
+
"@pnpm/prepare": "0.0.114",
|
|
52
52
|
"@pnpm/types": "1000.2.1"
|
|
53
53
|
},
|
|
54
54
|
"engines": {
|