@pnpm/plugin-commands-installation 11.0.11 → 11.1.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.
Files changed (3) hide show
  1. package/lib/getOptionsFromRootManifest.js +23 -1
  2. package/lib/getOptionsFromRootManifest.js.map +1 -1
  3. package/package.json +23 -23
package/lib/getOptionsFromRootManifest.js CHANGED
@@ -1,11 +1,16 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.getOptionsFromRootManifest = void 0;
7
+ const error_1 = require("@pnpm/error");
8
+ const map_1 = __importDefault(require("ramda/src/map"));
4
9
  function getOptionsFromRootManifest(manifest) {
5
10
  // We read Yarn's resolutions field for compatibility
6
11
  // but we really replace the version specs to any other version spec, not only to exact versions,
7
12
  // so we cannot call it resolutions
8
- const overrides = manifest.pnpm?.overrides ?? manifest.resolutions;
13
+ const overrides = (0, map_1.default)(createVersionReferencesReplacer(manifest), manifest.pnpm?.overrides ?? manifest.resolutions ?? {});
9
14
  const neverBuiltDependencies = manifest.pnpm?.neverBuiltDependencies;
10
15
  const onlyBuiltDependencies = manifest.pnpm?.onlyBuiltDependencies;
11
16
  const packageExtensions = manifest.pnpm?.packageExtensions;
@@ -28,4 +33,21 @@ function getOptionsFromRootManifest(manifest) {
28
33
  return settings;
29
34
  }
30
35
  exports.getOptionsFromRootManifest = getOptionsFromRootManifest;
36
+ function createVersionReferencesReplacer(manifest) {
37
+ const allDeps = {
38
+ ...manifest.devDependencies,
39
+ ...manifest.dependencies,
40
+ ...manifest.optionalDependencies,
41
+ };
42
+ return replaceVersionReferences.bind(null, allDeps);
43
+ }
44
+ function replaceVersionReferences(dep, spec) {
45
+ if (!spec.startsWith('$'))
46
+ return spec;
47
+ const dependencyName = spec.slice(1);
48
+ const newSpec = dep[dependencyName];
49
+ if (newSpec)
50
+ return newSpec;
51
+ throw new error_1.PnpmError('CANNOT_RESOLVE_OVERRIDE_VERSION', `Cannot resolve version ${spec} in overrides. The direct dependencies don't have dependency "${dependencyName}".`);
52
+ }
31
53
  //# sourceMappingURL=getOptionsFromRootManifest.js.map
package/lib/getOptionsFromRootManifest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getOptionsFromRootManifest.js","sourceRoot":"","sources":["../src/getOptionsFromRootManifest.ts"],"names":[],"mappings":";;;AAOA,SAAgB,0BAA0B,CAAE,QAAyB;IAUnE,qDAAqD;IACrD,iGAAiG;IACjG,mCAAmC;IACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS,IAAI,QAAQ,CAAC,WAAW,CAAA;IAClE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;IACpE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAA;IAClE,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,GAAG;QACf,yBAAyB;QACzB,sBAAsB;QACtB,SAAS;QACT,sBAAsB;QACtB,iBAAiB;QACjB,mBAAmB;QACnB,mBAAmB;KACpB,CAAA;IACD,IAAI,qBAAqB,EAAE;QACzB,QAAQ,CAAC,uBAAuB,CAAC,GAAG,qBAAqB,CAAA;KAC1D;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAlCD,gEAkCC"}
1
+ {"version":3,"file":"getOptionsFromRootManifest.js","sourceRoot":"","sources":["../src/getOptionsFromRootManifest.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAuC;AAOvC,wDAAqC;AAErC,SAAgB,0BAA0B,CAAE,QAAyB;IAUnE,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,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,GAAG;QACf,yBAAyB;QACzB,sBAAsB;QACtB,SAAS;QACT,sBAAsB;QACtB,iBAAiB;QACjB,mBAAmB;QACnB,mBAAmB;KACpB,CAAA;IACD,IAAI,qBAAqB,EAAE;QACzB,QAAQ,CAAC,uBAAuB,CAAC,GAAG,qBAAqB,CAAA;KAC1D;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AArCD,gEAqCC;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,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IACtC,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/plugin-commands-installation",
3
- "version": "11.0.11",
3
+ "version": "11.1.0",
4
4
  "description": "Commands for installation",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
25
25
  "@pnpm/registry-mock": "3.1.0",
26
26
  "@types/is-ci": "^3.0.0",
27
27
  "@types/proxyquire": "^1.3.28",
28
- "@types/ramda": "0.28.15",
28
+ "@types/ramda": "0.28.20",
29
29
  "@types/sinon": "^10.0.13",
30
30
  "@types/yarnpkg__lockfile": "^1.1.5",
31
31
  "@types/zkochan__table": "npm:@types/table@6.0.0",
@@ -33,18 +33,18 @@
33
33
  "path-name": "^1.0.0",
34
34
  "proxyquire": "^2.1.3",
35
35
  "read-yaml-file": "^2.1.0",
36
- "sinon": "^14.0.2",
36
+ "sinon": "^15.0.0",
37
37
  "symlink-dir": "^5.1.0",
38
38
  "tempy": "^1.0.1",
39
39
  "write-json-file": "^4.3.0",
40
40
  "write-pkg": "4.0.0",
41
41
  "write-yaml-file": "^4.2.0",
42
- "@pnpm/assert-project": "2.3.14",
43
- "@pnpm/modules-yaml": "11.0.2",
42
+ "@pnpm/assert-project": "2.3.15",
44
43
  "@pnpm/lockfile-types": "4.3.5",
45
- "@pnpm/prepare": "0.0.57",
46
- "@pnpm/test-fixtures": "0.0.26",
47
- "@pnpm/plugin-commands-installation": "11.0.11"
44
+ "@pnpm/modules-yaml": "11.0.2",
45
+ "@pnpm/plugin-commands-installation": "11.1.0",
46
+ "@pnpm/prepare": "0.0.58",
47
+ "@pnpm/test-fixtures": "0.0.27"
48
48
  },
49
49
  "dependencies": {
50
50
  "@pnpm/colorize-semver-diff": "^1.0.1",
@@ -68,28 +68,28 @@
68
68
  "ramda": "npm:@pnpm/ramda@0.28.1",
69
69
  "render-help": "^1.0.2",
70
70
  "version-selector-type": "^3.0.0",
71
+ "@pnpm/cli-utils": "1.0.13",
71
72
  "@pnpm/command": "3.0.0",
72
- "@pnpm/config": "16.1.5",
73
- "@pnpm/cli-utils": "1.0.11",
74
- "@pnpm/error": "4.0.0",
75
- "@pnpm/constants": "6.1.0",
76
- "@pnpm/filter-workspace-packages": "6.0.11",
77
73
  "@pnpm/common-cli-options-help": "0.9.0",
74
+ "@pnpm/config": "16.1.7",
75
+ "@pnpm/constants": "6.1.0",
76
+ "@pnpm/core": "7.2.3",
77
+ "@pnpm/error": "4.0.0",
78
+ "@pnpm/filter-workspace-packages": "6.0.13",
78
79
  "@pnpm/find-workspace-dir": "5.0.0",
79
- "@pnpm/core": "7.2.1",
80
+ "@pnpm/find-workspace-packages": "5.0.13",
80
81
  "@pnpm/graceful-fs": "2.0.0",
81
- "@pnpm/find-workspace-packages": "5.0.11",
82
+ "@pnpm/manifest-utils": "4.1.2",
82
83
  "@pnpm/matcher": "4.0.1",
83
- "@pnpm/manifest-utils": "4.1.1",
84
- "@pnpm/package-store": "15.0.2",
85
- "@pnpm/parse-wanted-dependency": "4.0.0",
86
- "@pnpm/outdated": "11.0.6",
87
- "@pnpm/plugin-commands-rebuild": "7.0.11",
88
- "@pnpm/read-project-manifest": "4.1.0",
89
- "@pnpm/pnpmfile": "4.0.11",
84
+ "@pnpm/outdated": "11.0.7",
85
+ "@pnpm/package-store": "15.0.3",
86
+ "@pnpm/parse-wanted-dependency": "4.0.1",
87
+ "@pnpm/plugin-commands-rebuild": "7.0.13",
88
+ "@pnpm/pnpmfile": "4.0.13",
89
+ "@pnpm/read-project-manifest": "4.1.1",
90
90
  "@pnpm/resolver-base": "9.1.4",
91
91
  "@pnpm/sort-packages": "4.0.2",
92
- "@pnpm/store-connection-manager": "5.1.4",
92
+ "@pnpm/store-connection-manager": "5.1.6",
93
93
  "@pnpm/types": "8.9.0"
94
94
  },
95
95
  "peerDependencies": {