@pnpm/config 1004.6.2 → 1004.7.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/auth.js +3 -0
- package/lib/auth.js.map +1 -1
- package/lib/getNetworkConfigs.js +22 -16
- package/lib/getNetworkConfigs.js.map +1 -1
- package/package.json +10 -10
package/lib/auth.js
CHANGED
package/lib/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;AA2EA,8CAEC;AA5ED,qEAAsF;AAGtF,MAAM,iBAAiB,GAAG;IACxB,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,KAAK;IACL,eAAe;IACf,mBAAmB;IACnB,aAAa;IACb,OAAO;IACP,UAAU;IACV,UAAU;IACV,YAAY;CACuB,CAAA;AAErC,MAAM,yBAAyB,GAAG;IAChC,KAAK;IACL,SAAS;IACT,OAAO;IACP,WAAW;IACX,MAAM;IACN,UAAU;IACV,WAAW;IACX,cAAc;IACd,QAAQ;IACR,aAAa;CACd,CAAA;AAED,MAAM,aAAa,GAAG;IACpB,IAAI;IACJ,MAAM;IACN,KAAK;IACL,cAAc;IACd,iBAAiB;IACjB,YAAY;IACZ,WAAW;IACX,SAAS;IACT,UAAU;IACV,YAAY;IACZ,WAAW;CACkB,CAAA;AAE/B,SAAS,eAAe,CAAE,SAAiB;IACzC,IAAK,iBAA8B,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAA;IACpE,IAAI,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IACrF,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,YAAY,CAAE,MAAoB;IACzC,OAAQ,aAAqC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAChE,CAAC;AAED,SAAS,iBAAiB,CAA+C,WAAwB;IAC/F,MAAM,MAAM,GAAyB,EAAE,CAAA;IACvC,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;QAChC,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,cAAc,CAAE,QAAyB;IAChD,MAAM,MAAM,GAA4B,EAAE,CAAA;IAC1C,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,YAAY,CAAC,GAAmB,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAmB,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IACD,OAAO,MAAyB,CAAA;AAClC,CAAC;AAED,SAAgB,iBAAiB,CAAE,SAA4B,EAAE,UAA6B;IAC5F,IAAA,4CAAmB,EAAC,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAA;AAC/E,CAAC"}
|
package/lib/getNetworkConfigs.js
CHANGED
|
@@ -7,33 +7,39 @@ exports.getNetworkConfigs = getNetworkConfigs;
|
|
|
7
7
|
const normalize_registry_url_1 = __importDefault(require("normalize-registry-url"));
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
function getNetworkConfigs(rawConfig) {
|
|
10
|
-
// Get all the auth options that have
|
|
10
|
+
// Get all the auth options that have SSL certificate data or file references
|
|
11
11
|
const sslConfigs = {};
|
|
12
12
|
const registries = {};
|
|
13
13
|
for (const [configKey, value] of Object.entries(rawConfig)) {
|
|
14
14
|
if (configKey[0] === '@' && configKey.endsWith(':registry')) {
|
|
15
15
|
registries[configKey.slice(0, configKey.indexOf(':'))] = (0, normalize_registry_url_1.default)(value);
|
|
16
|
+
continue;
|
|
16
17
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
if (configKey.includes(':certfile')) {
|
|
24
|
-
sslConfigs[registry].cert = fs_1.default.readFileSync(value, 'utf8');
|
|
25
|
-
}
|
|
26
|
-
else if (configKey.includes(':keyfile')) {
|
|
27
|
-
sslConfigs[registry].key = fs_1.default.readFileSync(value, 'utf8');
|
|
28
|
-
}
|
|
29
|
-
else if (configKey.includes(':cafile')) {
|
|
30
|
-
sslConfigs[registry].ca = fs_1.default.readFileSync(value, 'utf8');
|
|
31
|
-
}
|
|
18
|
+
const parsed = tryParseSslSetting(configKey);
|
|
19
|
+
if (!parsed)
|
|
20
|
+
continue;
|
|
21
|
+
const { registry, sslConfigKey, isFile } = parsed;
|
|
22
|
+
if (!sslConfigs[registry]) {
|
|
23
|
+
sslConfigs[registry] = { cert: '', key: '' };
|
|
32
24
|
}
|
|
25
|
+
sslConfigs[registry][sslConfigKey] = isFile
|
|
26
|
+
? fs_1.default.readFileSync(value, 'utf8')
|
|
27
|
+
: value.replace(/\\n/g, '\n');
|
|
33
28
|
}
|
|
34
29
|
return {
|
|
35
30
|
registries,
|
|
36
31
|
sslConfigs,
|
|
37
32
|
};
|
|
38
33
|
}
|
|
34
|
+
const SSL_SUFFIX_RE = /:(?<id>cert|key|ca)(?<kind>file)?$/;
|
|
35
|
+
function tryParseSslSetting(key) {
|
|
36
|
+
const match = key.match(SSL_SUFFIX_RE);
|
|
37
|
+
if (!match?.groups) {
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
const registry = key.slice(0, match.index); // already includes the trailing slash
|
|
41
|
+
const sslConfigKey = match.groups.id;
|
|
42
|
+
const isFile = Boolean(match.groups.kind);
|
|
43
|
+
return { registry, sslConfigKey, isFile };
|
|
44
|
+
}
|
|
39
45
|
//# sourceMappingURL=getNetworkConfigs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNetworkConfigs.js","sourceRoot":"","sources":["../src/getNetworkConfigs.ts"],"names":[],"mappings":";;;;;AASA,
|
|
1
|
+
{"version":3,"file":"getNetworkConfigs.js","sourceRoot":"","sources":["../src/getNetworkConfigs.ts"],"names":[],"mappings":";;;;;AASA,8CAyBC;AAjCD,oFAAyD;AACzD,4CAAmB;AAOnB,SAAgB,iBAAiB,CAAE,SAAiC;IAClE,6EAA6E;IAC7E,MAAM,UAAU,GAA8B,EAAE,CAAA;IAChD,MAAM,UAAU,GAA2B,EAAE,CAAA;IAC7C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3D,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC5D,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAA,gCAAoB,EAAC,KAA0B,CAAC,CAAA;YACzG,SAAQ;QACV,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAA;QAC5C,IAAI,CAAC,MAAM;YAAE,SAAQ;QAErB,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;QACjD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAA;QAC9C,CAAC;QACD,UAAU,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,GAAG,MAAM;YACzC,CAAC,CAAC,YAAE,CAAC,YAAY,CAAC,KAA0B,EAAE,MAAM,CAAC;YACrD,CAAC,CAAE,KAA2B,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxD,CAAC;IACD,OAAO;QACL,UAAU;QACV,UAAU;KACX,CAAA;AACH,CAAC;AAED,MAAM,aAAa,GAAG,oCAAoC,CAAA;AAQ1D,SAAS,kBAAkB,CAAE,GAAW;IACtC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;IACtC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAM,CAAC,CAAA,CAAC,sCAAsC;IAClF,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,EAAqB,CAAA;IACvD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACzC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,CAAA;AAC3C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/config",
|
|
3
|
-
"version": "1004.
|
|
3
|
+
"version": "1004.7.1",
|
|
4
4
|
"description": "Gets configuration options for pnpm",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -42,16 +42,16 @@
|
|
|
42
42
|
"read-ini-file": "4.0.0",
|
|
43
43
|
"realpath-missing": "^1.1.0",
|
|
44
44
|
"which": "npm:@pnpm/which@^3.0.1",
|
|
45
|
+
"@pnpm/catalogs.types": "1000.0.0",
|
|
45
46
|
"@pnpm/catalogs.config": "1000.0.5",
|
|
47
|
+
"@pnpm/error": "1000.0.5",
|
|
46
48
|
"@pnpm/constants": "1001.3.1",
|
|
47
49
|
"@pnpm/git-utils": "1000.0.0",
|
|
48
|
-
"@pnpm/pnpmfile": "1002.1.6",
|
|
49
50
|
"@pnpm/matcher": "1000.1.0",
|
|
50
|
-
"@pnpm/read-project-manifest": "1001.2.
|
|
51
|
-
"@pnpm/
|
|
52
|
-
"@pnpm/
|
|
53
|
-
"@pnpm/
|
|
54
|
-
"@pnpm/error": "1000.0.5"
|
|
51
|
+
"@pnpm/read-project-manifest": "1001.2.2",
|
|
52
|
+
"@pnpm/pnpmfile": "1002.1.7",
|
|
53
|
+
"@pnpm/types": "1001.1.0",
|
|
54
|
+
"@pnpm/workspace.read-manifest": "1000.2.8"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
57
|
"@pnpm/logger": ">=1001.0.0 <1002.0.0"
|
|
@@ -63,9 +63,9 @@
|
|
|
63
63
|
"@types/ramda": "0.29.12",
|
|
64
64
|
"@types/which": "^2.0.2",
|
|
65
65
|
"symlink-dir": "^6.0.5",
|
|
66
|
-
"@pnpm/config": "1004.
|
|
67
|
-
"@pnpm/
|
|
68
|
-
"@pnpm/
|
|
66
|
+
"@pnpm/config": "1004.7.1",
|
|
67
|
+
"@pnpm/prepare": "1000.0.8",
|
|
68
|
+
"@pnpm/test-fixtures": "1000.0.0"
|
|
69
69
|
},
|
|
70
70
|
"engines": {
|
|
71
71
|
"node": ">=18.12"
|