@pnpm/git-fetcher 1004.0.1 → 1005.0.1
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 +13 -7
- package/lib/index.js.map +1 -1
- package/package.json +9 -8
package/lib/index.js
CHANGED
|
@@ -11,17 +11,13 @@ const fs_packlist_1 = require("@pnpm/fs.packlist");
|
|
|
11
11
|
const logger_1 = require("@pnpm/logger");
|
|
12
12
|
const prepare_package_1 = require("@pnpm/prepare-package");
|
|
13
13
|
const worker_1 = require("@pnpm/worker");
|
|
14
|
+
const error_1 = require("@pnpm/error");
|
|
14
15
|
const rimraf_1 = __importDefault(require("@zkochan/rimraf"));
|
|
15
16
|
const execa_1 = __importDefault(require("execa"));
|
|
16
17
|
const url_1 = require("url");
|
|
17
18
|
function createGitFetcher(createOpts) {
|
|
18
19
|
const allowedHosts = new Set(createOpts?.gitShallowHosts ?? []);
|
|
19
20
|
const ignoreScripts = createOpts.ignoreScripts ?? false;
|
|
20
|
-
const preparePkg = prepare_package_1.preparePackage.bind(null, {
|
|
21
|
-
ignoreScripts: createOpts.ignoreScripts,
|
|
22
|
-
rawConfig: createOpts.rawConfig,
|
|
23
|
-
unsafePerm: createOpts.unsafePerm,
|
|
24
|
-
});
|
|
25
21
|
const gitFetcher = async (cafs, resolution, opts) => {
|
|
26
22
|
const tempLocation = await cafs.tempDir();
|
|
27
23
|
if (allowedHosts.size > 0 && shouldUseShallow(resolution.repo, allowedHosts)) {
|
|
@@ -33,9 +29,18 @@ function createGitFetcher(createOpts) {
|
|
|
33
29
|
await execGit(['clone', resolution.repo, tempLocation]);
|
|
34
30
|
}
|
|
35
31
|
await execGit(['checkout', resolution.commit], { cwd: tempLocation });
|
|
32
|
+
const receivedCommit = await execGit(['rev-parse', 'HEAD'], { cwd: tempLocation });
|
|
33
|
+
if (receivedCommit.trim() !== resolution.commit) {
|
|
34
|
+
throw new error_1.PnpmError('GIT_CHECKOUT_FAILED', `received commit ${receivedCommit.trim()} does not match expected value ${resolution.commit}`);
|
|
35
|
+
}
|
|
36
36
|
let pkgDir;
|
|
37
37
|
try {
|
|
38
|
-
const prepareResult = await
|
|
38
|
+
const prepareResult = await (0, prepare_package_1.preparePackage)({
|
|
39
|
+
allowBuild: opts.allowBuild,
|
|
40
|
+
ignoreScripts: createOpts.ignoreScripts,
|
|
41
|
+
rawConfig: createOpts.rawConfig,
|
|
42
|
+
unsafePerm: createOpts.unsafePerm,
|
|
43
|
+
}, tempLocation, resolution.path ?? '');
|
|
39
44
|
pkgDir = prepareResult.pkgDir;
|
|
40
45
|
if (ignoreScripts && prepareResult.shouldBeBuilt) {
|
|
41
46
|
(0, logger_1.globalWarn)(`The git-hosted package fetched from "${resolution.repo}" has to be built but the build scripts were ignored.`);
|
|
@@ -82,6 +87,7 @@ function prefixGitArgs() {
|
|
|
82
87
|
}
|
|
83
88
|
async function execGit(args, opts) {
|
|
84
89
|
const fullArgs = prefixGitArgs().concat(args || []);
|
|
85
|
-
await (0, execa_1.default)('git', fullArgs, opts);
|
|
90
|
+
const { stdout } = await (0, execa_1.default)('git', fullArgs, opts);
|
|
91
|
+
return stdout;
|
|
86
92
|
}
|
|
87
93
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;
|
|
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/git-fetcher",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1005.0.1",
|
|
4
4
|
"description": "A fetcher for git-hosted packages",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -28,21 +28,22 @@
|
|
|
28
28
|
"@pnpm/fs.packlist": "2.0.0",
|
|
29
29
|
"@zkochan/rimraf": "^3.0.2",
|
|
30
30
|
"execa": "npm:safe-execa@0.1.2",
|
|
31
|
-
"@pnpm/
|
|
32
|
-
"@pnpm/fetcher-base": "1001.0
|
|
31
|
+
"@pnpm/error": "1000.0.5",
|
|
32
|
+
"@pnpm/fetcher-base": "1001.1.0",
|
|
33
|
+
"@pnpm/prepare-package": "1001.0.0"
|
|
33
34
|
},
|
|
34
35
|
"peerDependencies": {
|
|
35
36
|
"@pnpm/logger": ">=1001.0.0 <1002.0.0",
|
|
36
|
-
"@pnpm/worker": "^1000.
|
|
37
|
+
"@pnpm/worker": "^1000.5.0"
|
|
37
38
|
},
|
|
38
39
|
"devDependencies": {
|
|
39
40
|
"@jest/globals": "29.7.0",
|
|
40
41
|
"tempy": "^1.0.1",
|
|
41
|
-
"@pnpm/create-cafs-store": "1000.0.
|
|
42
|
-
"@pnpm/git-fetcher": "1004.0.1",
|
|
42
|
+
"@pnpm/create-cafs-store": "1000.0.26",
|
|
43
43
|
"@pnpm/logger": "1001.0.1",
|
|
44
|
-
"@pnpm/
|
|
45
|
-
"@pnpm/store.cafs": "1000.0.
|
|
44
|
+
"@pnpm/git-fetcher": "1005.0.1",
|
|
45
|
+
"@pnpm/store.cafs": "1000.0.24",
|
|
46
|
+
"@pnpm/types": "1001.2.0"
|
|
46
47
|
},
|
|
47
48
|
"engines": {
|
|
48
49
|
"node": ">=18.12"
|