@pnpm/config 19.2.0 → 20.0.0

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.
@@ -11,7 +11,10 @@ function getOptionsFromRootManifest(manifestDir, manifest) {
11
11
  // We read Yarn's resolutions field for compatibility
12
12
  // but we really replace the version specs to any other version spec, not only to exact versions,
13
13
  // so we cannot call it resolutions
14
- const overrides = (0, map_1.default)(createVersionReferencesReplacer(manifest), manifest.pnpm?.overrides ?? manifest.resolutions ?? {});
14
+ const overrides = (0, map_1.default)(createVersionReferencesReplacer(manifest), {
15
+ ...manifest.resolutions,
16
+ ...manifest.pnpm?.overrides,
17
+ });
15
18
  const neverBuiltDependencies = manifest.pnpm?.neverBuiltDependencies;
16
19
  const onlyBuiltDependencies = manifest.pnpm?.onlyBuiltDependencies;
17
20
  const onlyBuiltDependenciesFile = manifest.pnpm?.onlyBuiltDependenciesFile;
@@ -19,7 +22,15 @@ function getOptionsFromRootManifest(manifestDir, manifest) {
19
22
  const peerDependencyRules = manifest.pnpm?.peerDependencyRules;
20
23
  const allowedDeprecatedVersions = manifest.pnpm?.allowedDeprecatedVersions;
21
24
  const allowNonAppliedPatches = manifest.pnpm?.allowNonAppliedPatches;
22
- const patchedDependencies = manifest.pnpm?.patchedDependencies;
25
+ let patchedDependencies = manifest.pnpm?.patchedDependencies;
26
+ if (patchedDependencies) {
27
+ patchedDependencies = { ...patchedDependencies };
28
+ for (const [dep, patchFile] of Object.entries(patchedDependencies)) {
29
+ if (path_1.default.isAbsolute(patchFile))
30
+ continue;
31
+ patchedDependencies[dep] = path_1.default.join(manifestDir, patchFile);
32
+ }
33
+ }
23
34
  const settings = {
24
35
  allowedDeprecatedVersions,
25
36
  allowNonAppliedPatches,
@@ -1 +1 @@
1
- {"version":3,"file":"getOptionsFromRootManifest.js","sourceRoot":"","sources":["../src/getOptionsFromRootManifest.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,uCAAuC;AAOvC,wDAAqC;AAcrC,SAAgB,0BAA0B,CAAE,WAAmB,EAAE,QAAyB;IACxF,qDAAqD;IACrD,iGAAiG;IACjG,mCAAmC;IACnC,MAAM,SAAS,GAAG,IAAA,aAAS,EACzB,+BAA+B,CAAC,QAAQ,CAAC,EACzC,QAAQ,CAAC,IAAI,EAAE,SAAS,IAAI,QAAQ,CAAC,WAAW,IAAI,EAAE,CACvD,CAAA;IACD,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;IACpE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAA;IAClE,MAAM,yBAAyB,GAAG,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAA;IAC1E,MAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAC1D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAC9D,MAAM,yBAAyB,GAAG,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAA;IAC1E,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;IACpE,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAC9D,MAAM,QAAQ,GAA4B;QACxC,yBAAyB;QACzB,sBAAsB;QACtB,SAAS;QACT,sBAAsB;QACtB,iBAAiB;QACjB,mBAAmB;QACnB,mBAAmB;KACpB,CAAA;IACD,IAAI,qBAAqB,EAAE;QACzB,QAAQ,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;KACvD;IACD,IAAI,yBAAyB,EAAE;QAC7B,QAAQ,CAAC,yBAAyB,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAA;KACvF;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAhCD,gEAgCC;AAED,SAAS,+BAA+B,CAAE,QAAyB;IACjE,MAAM,OAAO,GAAG;QACd,GAAG,QAAQ,CAAC,eAAe;QAC3B,GAAG,QAAQ,CAAC,YAAY;QACxB,GAAG,QAAQ,CAAC,oBAAoB;KACjC,CAAA;IACD,OAAO,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACrD,CAAC;AAED,SAAS,wBAAwB,CAAE,GAA2B,EAAE,IAAY;IAC1E,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IACnC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,CAAA;IACnC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAA;IAC3B,MAAM,IAAI,iBAAS,CACjB,iCAAiC,EACjC,0BAA0B,IAAI,iEAAiE,cAAc,IAAI,CAClH,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"getOptionsFromRootManifest.js","sourceRoot":"","sources":["../src/getOptionsFromRootManifest.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,uCAAuC;AAOvC,wDAAqC;AAcrC,SAAgB,0BAA0B,CAAE,WAAmB,EAAE,QAAyB;IACxF,qDAAqD;IACrD,iGAAiG;IACjG,mCAAmC;IACnC,MAAM,SAAS,GAAG,IAAA,aAAS,EACzB,+BAA+B,CAAC,QAAQ,CAAC,EACzC;QACE,GAAG,QAAQ,CAAC,WAAW;QACvB,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS;KAC5B,CACF,CAAA;IACD,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;IACpE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAA;IAClE,MAAM,yBAAyB,GAAG,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAA;IAC1E,MAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAC1D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAC9D,MAAM,yBAAyB,GAAG,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAA;IAC1E,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;IACpE,IAAI,mBAAmB,GAAG,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAC5D,IAAI,mBAAmB,EAAE;QACvB,mBAAmB,GAAG,EAAE,GAAG,mBAAmB,EAAE,CAAA;QAChD,KAAK,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;YAClE,IAAI,cAAI,CAAC,UAAU,CAAC,SAAS,CAAC;gBAAE,SAAQ;YACxC,mBAAmB,CAAC,GAAG,CAAC,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;SAC7D;KACF;IACD,MAAM,QAAQ,GAA4B;QACxC,yBAAyB;QACzB,sBAAsB;QACtB,SAAS;QACT,sBAAsB;QACtB,iBAAiB;QACjB,mBAAmB;QACnB,mBAAmB;KACpB,CAAA;IACD,IAAI,qBAAqB,EAAE;QACzB,QAAQ,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;KACvD;IACD,IAAI,yBAAyB,EAAE;QAC7B,QAAQ,CAAC,yBAAyB,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAA;KACvF;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AA1CD,gEA0CC;AAED,SAAS,+BAA+B,CAAE,QAAyB;IACjE,MAAM,OAAO,GAAG;QACd,GAAG,QAAQ,CAAC,eAAe;QAC3B,GAAG,QAAQ,CAAC,YAAY;QACxB,GAAG,QAAQ,CAAC,oBAAoB;KACjC,CAAA;IACD,OAAO,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACrD,CAAC;AAED,SAAS,wBAAwB,CAAE,GAA2B,EAAE,IAAY;IAC1E,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IACnC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,CAAA;IACnC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAA;IAC3B,MAAM,IAAI,iBAAS,CACjB,iCAAiC,EACjC,0BAA0B,IAAI,iEAAiE,cAAc,IAAI,CAClH,CAAA;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/config",
3
- "version": "19.2.0",
3
+ "version": "20.0.0",
4
4
  "description": "Gets configuration options for pnpm",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -37,23 +37,23 @@
37
37
  "ramda": "npm:@pnpm/ramda@0.28.1",
38
38
  "read-ini-file": "4.0.0",
39
39
  "realpath-missing": "^1.1.0",
40
- "which": "^3.0.1",
40
+ "which": "^4.0.0",
41
+ "@pnpm/constants": "7.1.1",
41
42
  "@pnpm/error": "5.0.2",
43
+ "@pnpm/git-utils": "1.0.0",
42
44
  "@pnpm/matcher": "5.0.0",
43
45
  "@pnpm/pnpmfile": "5.0.14",
44
- "@pnpm/git-utils": "1.0.0",
45
- "@pnpm/types": "9.3.0",
46
46
  "@pnpm/read-project-manifest": "5.0.7",
47
- "@pnpm/constants": "7.1.1"
47
+ "@pnpm/types": "9.3.0"
48
48
  },
49
49
  "devDependencies": {
50
50
  "@types/is-windows": "^1.0.0",
51
51
  "@types/ramda": "0.28.20",
52
52
  "@types/which": "^2.0.2",
53
53
  "symlink-dir": "^5.2.0",
54
- "@pnpm/config": "19.2.0",
55
- "@pnpm/test-fixtures": "0.1.11",
56
- "@pnpm/prepare": "0.0.81"
54
+ "@pnpm/config": "20.0.0",
55
+ "@pnpm/prepare": "0.0.82",
56
+ "@pnpm/test-fixtures": "0.1.12"
57
57
  },
58
58
  "funding": "https://opencollective.com/pnpm",
59
59
  "exports": {