@pnpm/plugin-commands-patching 3.1.4 → 3.1.5
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/patchCommit.js +34 -1
- package/lib/patchCommit.js.map +1 -1
- package/package.json +19 -16
package/lib/patchCommit.js
CHANGED
|
@@ -11,14 +11,17 @@ const config_1 = require("@pnpm/config");
|
|
|
11
11
|
const plugin_commands_installation_1 = require("@pnpm/plugin-commands-installation");
|
|
12
12
|
const read_package_json_1 = require("@pnpm/read-package-json");
|
|
13
13
|
const read_project_manifest_1 = require("@pnpm/read-project-manifest");
|
|
14
|
+
const fast_glob_1 = __importDefault(require("fast-glob"));
|
|
14
15
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
15
16
|
const pick_1 = __importDefault(require("ramda/src/pick"));
|
|
17
|
+
const equals_1 = __importDefault(require("ramda/src/equals"));
|
|
16
18
|
const safe_execa_1 = __importDefault(require("safe-execa"));
|
|
17
19
|
const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
|
|
18
20
|
const render_help_1 = __importDefault(require("render-help"));
|
|
19
21
|
const tempy_1 = __importDefault(require("tempy"));
|
|
20
22
|
const writePackage_1 = require("./writePackage");
|
|
21
23
|
const parse_wanted_dependency_1 = require("@pnpm/parse-wanted-dependency");
|
|
24
|
+
const npm_packlist_1 = __importDefault(require("npm-packlist"));
|
|
22
25
|
exports.rcOptionsTypes = cliOptionsTypes;
|
|
23
26
|
function cliOptionsTypes() {
|
|
24
27
|
return (0, pick_1.default)(['patches-dir'], config_1.types);
|
|
@@ -52,7 +55,8 @@ async function handler(opts, params) {
|
|
|
52
55
|
const pkgNameAndVersion = `${patchedPkgManifest.name}@${patchedPkgManifest.version}`;
|
|
53
56
|
const srcDir = tempy_1.default.directory();
|
|
54
57
|
await (0, writePackage_1.writePackage)((0, parse_wanted_dependency_1.parseWantedDependency)(pkgNameAndVersion), srcDir, opts);
|
|
55
|
-
const
|
|
58
|
+
const patchedPkgDir = await preparePkgFilesForDiff(userDir);
|
|
59
|
+
const patchContent = await diffFolders(srcDir, patchedPkgDir);
|
|
56
60
|
const patchFileName = pkgNameAndVersion.replace('/', '__');
|
|
57
61
|
await fs_1.default.promises.writeFile(path_1.default.join(patchesDir, `${patchFileName}.patch`), patchContent, 'utf8');
|
|
58
62
|
const { writeProjectManifest, manifest } = await (0, read_project_manifest_1.tryReadProjectManifest)(lockfileDir);
|
|
@@ -126,4 +130,33 @@ function removeTrailingAndLeadingSlash(p) {
|
|
|
126
130
|
}
|
|
127
131
|
return p;
|
|
128
132
|
}
|
|
133
|
+
/**
|
|
134
|
+
* Link files from the source directory to a new temporary directory,
|
|
135
|
+
* but only if not all files in the source directory should be included in the package.
|
|
136
|
+
* If all files should be included, return the original source directory without creating any links.
|
|
137
|
+
* This is required in order for the diff to not include files that are not part of the package.
|
|
138
|
+
*/
|
|
139
|
+
async function preparePkgFilesForDiff(src) {
|
|
140
|
+
const files = Array.from(new Set((await (0, npm_packlist_1.default)({ path: src })).map((f) => path_1.default.join(f))));
|
|
141
|
+
// If there are no extra files in the source directories, then there is no reason
|
|
142
|
+
// to copy.
|
|
143
|
+
if (await areAllFilesInPkg(files, src)) {
|
|
144
|
+
return src;
|
|
145
|
+
}
|
|
146
|
+
const dest = tempy_1.default.directory();
|
|
147
|
+
await Promise.all(files.map(async (file) => {
|
|
148
|
+
const srcFile = path_1.default.join(src, file);
|
|
149
|
+
const destFile = path_1.default.join(dest, file);
|
|
150
|
+
const destDir = path_1.default.dirname(destFile);
|
|
151
|
+
await fs_1.default.promises.mkdir(destDir, { recursive: true });
|
|
152
|
+
await fs_1.default.promises.link(srcFile, destFile);
|
|
153
|
+
}));
|
|
154
|
+
return dest;
|
|
155
|
+
}
|
|
156
|
+
async function areAllFilesInPkg(files, basePath) {
|
|
157
|
+
const allFiles = await (0, fast_glob_1.default)('**', {
|
|
158
|
+
cwd: basePath,
|
|
159
|
+
});
|
|
160
|
+
return (0, equals_1.default)(allFiles.sort(), files.sort());
|
|
161
|
+
}
|
|
129
162
|
//# sourceMappingURL=patchCommit.js.map
|
package/lib/patchCommit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchCommit.js","sourceRoot":"","sources":["../src/patchCommit.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,+CAAyC;AACzC,yCAA6D;AAC7D,qFAA4D;AAC5D,+DAAgE;AAChE,uEAAoE;AACpE,oEAA0C;AAC1C,0DAAiC;AACjC,4DAA8B;AAC9B,gFAAqD;AACrD,8DAAoC;AACpC,kDAAyB;AACzB,iDAA6C;AAC7C,2EAAqE;
|
|
1
|
+
{"version":3,"file":"patchCommit.js","sourceRoot":"","sources":["../src/patchCommit.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/plugin-commands-patching",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.5",
|
|
4
4
|
"description": "Commands for creating patches",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -25,38 +25,41 @@
|
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@pnpm/registry-mock": "3.8.0",
|
|
27
27
|
"@types/normalize-path": "^3.0.0",
|
|
28
|
+
"@types/npm-packlist": "^3.0.0",
|
|
28
29
|
"@types/ramda": "0.28.20",
|
|
29
30
|
"@types/semver": "7.3.13",
|
|
30
31
|
"write-yaml-file": "^5.0.0",
|
|
31
|
-
"@pnpm/filter-workspace-packages": "7.0.
|
|
32
|
-
"@pnpm/plugin-commands-patching": "3.1.
|
|
33
|
-
"@pnpm/prepare": "0.0.
|
|
34
|
-
"@pnpm/test-fixtures": "0.0.
|
|
32
|
+
"@pnpm/filter-workspace-packages": "7.0.10",
|
|
33
|
+
"@pnpm/plugin-commands-patching": "3.1.5",
|
|
34
|
+
"@pnpm/prepare": "0.0.69",
|
|
35
|
+
"@pnpm/test-fixtures": "0.0.38"
|
|
35
36
|
},
|
|
36
37
|
"dependencies": {
|
|
37
38
|
"enquirer": "^2.3.6",
|
|
38
39
|
"escape-string-regexp": "^4.0.0",
|
|
40
|
+
"fast-glob": "^3.2.12",
|
|
39
41
|
"normalize-path": "^3.0.0",
|
|
42
|
+
"npm-packlist": "^5.1.3",
|
|
40
43
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
41
44
|
"realpath-missing": "^1.1.0",
|
|
42
45
|
"render-help": "^1.0.3",
|
|
43
46
|
"safe-execa": "^0.1.3",
|
|
44
47
|
"semver": "^7.5.1",
|
|
45
48
|
"tempy": "^1.0.1",
|
|
46
|
-
"@pnpm/cli-utils": "2.0.
|
|
47
|
-
"@pnpm/config": "18.4.
|
|
48
|
-
"@pnpm/constants": "7.1.
|
|
49
|
-
"@pnpm/error": "5.0.
|
|
50
|
-
"@pnpm/lockfile-file": "8.1.
|
|
51
|
-
"@pnpm/lockfile-utils": "8.0.
|
|
49
|
+
"@pnpm/cli-utils": "2.0.10",
|
|
50
|
+
"@pnpm/config": "18.4.1",
|
|
51
|
+
"@pnpm/constants": "7.1.1",
|
|
52
|
+
"@pnpm/error": "5.0.2",
|
|
53
|
+
"@pnpm/lockfile-file": "8.1.1",
|
|
54
|
+
"@pnpm/lockfile-utils": "8.0.2",
|
|
52
55
|
"@pnpm/modules-yaml": "12.1.1",
|
|
53
56
|
"@pnpm/parse-wanted-dependency": "5.0.0",
|
|
54
|
-
"@pnpm/patching.apply-patch": "2.0.
|
|
57
|
+
"@pnpm/patching.apply-patch": "2.0.3",
|
|
55
58
|
"@pnpm/pick-registry-for-package": "5.0.1",
|
|
56
|
-
"@pnpm/plugin-commands-installation": "13.0.
|
|
57
|
-
"@pnpm/read-package-json": "8.0.
|
|
58
|
-
"@pnpm/read-project-manifest": "5.0.
|
|
59
|
-
"@pnpm/store-connection-manager": "6.0.
|
|
59
|
+
"@pnpm/plugin-commands-installation": "13.0.10",
|
|
60
|
+
"@pnpm/read-package-json": "8.0.2",
|
|
61
|
+
"@pnpm/read-project-manifest": "5.0.2",
|
|
62
|
+
"@pnpm/store-connection-manager": "6.0.12"
|
|
60
63
|
},
|
|
61
64
|
"peerDependencies": {
|
|
62
65
|
"@pnpm/logger": "^5.0.0"
|