@pnpm/build-modules 10.1.1 → 10.1.3
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/index.js +5 -18
- package/lib/index.js.map +1 -1
- package/package.json +5 -6
package/lib/index.js
CHANGED
|
@@ -7,19 +7,20 @@ exports.linkBinsOfDependencies = exports.buildModules = void 0;
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const calc_dep_state_1 = require("@pnpm/calc-dep-state");
|
|
9
9
|
const core_loggers_1 = require("@pnpm/core-loggers");
|
|
10
|
-
const error_1 = require("@pnpm/error");
|
|
11
10
|
const lifecycle_1 = require("@pnpm/lifecycle");
|
|
12
11
|
const link_bins_1 = require("@pnpm/link-bins");
|
|
13
12
|
const logger_1 = require("@pnpm/logger");
|
|
14
13
|
const fs_hard_link_dir_1 = require("@pnpm/fs.hard-link-dir");
|
|
15
14
|
const read_package_json_1 = require("@pnpm/read-package-json");
|
|
15
|
+
const patching_apply_patch_1 = require("@pnpm/patching.apply-patch");
|
|
16
16
|
const p_defer_1 = __importDefault(require("p-defer"));
|
|
17
|
-
const applyPatches_1 = require("patch-package/dist/applyPatches");
|
|
18
17
|
const pickBy_1 = __importDefault(require("ramda/src/pickBy"));
|
|
19
18
|
const run_groups_1 = __importDefault(require("run-groups"));
|
|
20
19
|
const buildSequence_1 = require("./buildSequence");
|
|
21
20
|
async function buildModules(depGraph, rootDepPaths, opts) {
|
|
22
|
-
const warn = (message) =>
|
|
21
|
+
const warn = (message) => {
|
|
22
|
+
logger_1.logger.warn({ message, prefix: opts.lockfileDir });
|
|
23
|
+
};
|
|
23
24
|
// postinstall hooks
|
|
24
25
|
const buildDepOpts = { ...opts, warn };
|
|
25
26
|
if (opts.hoistedLocations) {
|
|
@@ -52,7 +53,7 @@ async function buildDependency(depPath, depGraph, opts) {
|
|
|
52
53
|
await linkBinsOfDependencies(depNode, depGraph, opts);
|
|
53
54
|
const isPatched = depNode.patchFile?.path != null;
|
|
54
55
|
if (isPatched) {
|
|
55
|
-
|
|
56
|
+
(0, patching_apply_patch_1.applyPatchToDir)({ patchedDir: depNode.dir, patchFilePath: depNode.patchFile.path });
|
|
56
57
|
}
|
|
57
58
|
const hasSideEffects = !opts.ignoreScripts && await (0, lifecycle_1.runPostinstallHooks)({
|
|
58
59
|
depPath,
|
|
@@ -128,20 +129,6 @@ async function buildDependency(depPath, depGraph, opts) {
|
|
|
128
129
|
}
|
|
129
130
|
}
|
|
130
131
|
}
|
|
131
|
-
function applyPatchToDep(patchDir, patchFilePath) {
|
|
132
|
-
// Ideally, we would just run "patch" or "git apply".
|
|
133
|
-
// However, "patch" is not available on Windows and "git apply" is hard to execute on a subdirectory of an existing repository
|
|
134
|
-
const cwd = process.cwd();
|
|
135
|
-
process.chdir(patchDir);
|
|
136
|
-
const success = (0, applyPatches_1.applyPatch)({
|
|
137
|
-
patchFilePath,
|
|
138
|
-
patchDir,
|
|
139
|
-
});
|
|
140
|
-
process.chdir(cwd);
|
|
141
|
-
if (!success) {
|
|
142
|
-
throw new error_1.PnpmError('PATCH_FAILED', `Could not apply patch ${patchFilePath} to ${patchDir}`);
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
132
|
async function linkBinsOfDependencies(depNode, depGraph, opts) {
|
|
146
133
|
const childrenToLink = opts.optional
|
|
147
134
|
? depNode.children
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,yDAAmE;AACnE,qDAAoE;AACpE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/build-modules",
|
|
3
|
-
"version": "10.1.
|
|
3
|
+
"version": "10.1.3",
|
|
4
4
|
"description": "Build packages in node_modules",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -29,22 +29,21 @@
|
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@pnpm/graph-sequencer": "1.0.0",
|
|
31
31
|
"p-defer": "^3.0.0",
|
|
32
|
-
"patch-package": "^6.5.0",
|
|
33
32
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
34
33
|
"run-groups": "^3.0.1",
|
|
35
34
|
"@pnpm/calc-dep-state": "3.0.2",
|
|
36
35
|
"@pnpm/core-loggers": "8.0.3",
|
|
37
|
-
"@pnpm/
|
|
38
|
-
"@pnpm/fs.hard-link-dir": "1.0.0",
|
|
36
|
+
"@pnpm/fs.hard-link-dir": "1.0.1",
|
|
39
37
|
"@pnpm/lifecycle": "14.1.5",
|
|
40
|
-
"@pnpm/link-bins": "8.0.
|
|
38
|
+
"@pnpm/link-bins": "8.0.8",
|
|
39
|
+
"@pnpm/patching.apply-patch": "1.0.0",
|
|
41
40
|
"@pnpm/read-package-json": "7.0.5",
|
|
42
41
|
"@pnpm/store-controller-types": "14.3.0",
|
|
43
42
|
"@pnpm/types": "8.10.0"
|
|
44
43
|
},
|
|
45
44
|
"devDependencies": {
|
|
46
45
|
"@types/ramda": "0.28.20",
|
|
47
|
-
"@pnpm/build-modules": "10.1.
|
|
46
|
+
"@pnpm/build-modules": "10.1.3"
|
|
48
47
|
},
|
|
49
48
|
"funding": "https://opencollective.com/pnpm",
|
|
50
49
|
"exports": {
|