@pnpm/core 7.8.0 → 7.8.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.
Files changed (3) hide show
  1. package/lib/install/getPreferredVersions.js +6 -2
  2. package/lib/install/getPreferredVersions.js.map +1 -1
  3. package/package.json +24 -24
package/lib/install/getPreferredVersions.js CHANGED
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.getPreferredVersionsFromLockfileAndManifests = exports.getAllUniqueSpecs = void 0;
7
7
  const lockfile_utils_1 = require("@pnpm/lockfile-utils");
8
8
  const manifest_utils_1 = require("@pnpm/manifest-utils");
9
+ const resolver_base_1 = require("@pnpm/resolver-base");
9
10
  const version_selector_type_1 = __importDefault(require("version-selector-type"));
10
11
  function getAllUniqueSpecs(manifests) {
11
12
  const allSpecs = {};
@@ -35,7 +36,10 @@ function getPreferredVersionsFromLockfileAndManifests(snapshots, manifests) {
35
36
  if (!selector)
36
37
  continue;
37
38
  preferredVersions[name] = preferredVersions[name] ?? {};
38
- preferredVersions[name][spec] = selector.type;
39
+ preferredVersions[name][spec] = {
40
+ selectorType: selector.type,
41
+ weight: resolver_base_1.DIRECT_DEP_SELECTOR_WEIGHT,
42
+ };
39
43
  }
40
44
  }
41
45
  if (!snapshots)
@@ -50,7 +54,7 @@ function addPreferredVersionsFromLockfile(snapshots, preferredVersions) {
50
54
  if (!preferredVersions[name]) {
51
55
  preferredVersions[name] = { [version]: 'version' };
52
56
  }
53
- else {
57
+ else if (!preferredVersions[name][version]) {
54
58
  preferredVersions[name][version] = 'version';
55
59
  }
56
60
  }
package/lib/install/getPreferredVersions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getPreferredVersions.js","sourceRoot":"","sources":["../../src/install/getPreferredVersions.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA+E;AAC/E,yDAAqE;AAGrE,kFAA0D;AAE1D,SAAgB,iBAAiB,CAAE,SAA+B;IAChE,MAAM,QAAQ,GAA2B,EAAE,CAAA;IAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,KAAK,GAAG,IAAA,+CAA8B,EAAC,QAAQ,CAAC,CAAA;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAChD,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAQ;YAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3E,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACrB,SAAQ;aACT;YACD,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;SACtB;KACF;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAhBD,8CAgBC;AAED,SAAgB,4CAA4C,CAC1D,SAAuC,EACvC,SAAsD;IAEtD,MAAM,iBAAiB,GAAsB,EAAE,CAAA;IAC/C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,KAAK,GAAG,IAAA,+CAA8B,EAAC,QAAQ,CAAC,CAAA;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAChD,MAAM,QAAQ,GAAG,IAAA,+BAAsB,EAAC,IAAI,CAAC,CAAA;YAC7C,IAAI,CAAC,QAAQ;gBAAE,SAAQ;YACvB,iBAAiB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;YACvD,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAA;SAC9C;KACF;IACD,IAAI,CAAC,SAAS;QAAE,OAAO,iBAAiB,CAAA;IACxC,gCAAgC,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;IAC9D,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAjBD,oGAiBC;AAED,SAAS,gCAAgC,CAAE,SAA2B,EAAE,iBAAoC;IAC1G,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC3D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,uCAAsB,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACnE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAC5B,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAA;SACnD;aAAM;YACL,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;SAC7C;KACF;AACH,CAAC"}
1
+ {"version":3,"file":"getPreferredVersions.js","sourceRoot":"","sources":["../../src/install/getPreferredVersions.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA+E;AAC/E,yDAAqE;AACrE,uDAAmF;AAEnF,kFAA0D;AAE1D,SAAgB,iBAAiB,CAAE,SAA+B;IAChE,MAAM,QAAQ,GAA2B,EAAE,CAAA;IAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,KAAK,GAAG,IAAA,+CAA8B,EAAC,QAAQ,CAAC,CAAA;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAChD,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAQ;YAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3E,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACrB,SAAQ;aACT;YACD,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;SACtB;KACF;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAhBD,8CAgBC;AAED,SAAgB,4CAA4C,CAC1D,SAAuC,EACvC,SAAsD;IAEtD,MAAM,iBAAiB,GAAsB,EAAE,CAAA;IAC/C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,KAAK,GAAG,IAAA,+CAA8B,EAAC,QAAQ,CAAC,CAAA;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAChD,MAAM,QAAQ,GAAG,IAAA,+BAAsB,EAAC,IAAI,CAAC,CAAA;YAC7C,IAAI,CAAC,QAAQ;gBAAE,SAAQ;YACvB,iBAAiB,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;YACvD,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG;gBAC9B,YAAY,EAAE,QAAQ,CAAC,IAAI;gBAC3B,MAAM,EAAE,0CAA0B;aACnC,CAAA;SACF;KACF;IACD,IAAI,CAAC,SAAS;QAAE,OAAO,iBAAiB,CAAA;IACxC,gCAAgC,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;IAC9D,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AApBD,oGAoBC;AAED,SAAS,gCAAgC,CAAE,SAA2B,EAAE,iBAAoC;IAC1G,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC3D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,uCAAsB,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACnE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAC5B,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAA;SACnD;aAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE;YAC5C,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;SAC7C;KACF;AACH,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@pnpm/core",
3
3
  "description": "Fast, disk space efficient installation engine",
4
- "version": "7.8.0",
4
+ "version": "7.8.1",
5
5
  "bugs": {
6
6
  "url": "https://github.com/pnpm/pnpm/issues"
7
7
  },
@@ -30,30 +30,30 @@
30
30
  "run-groups": "^3.0.1",
31
31
  "semver": "^7.3.8",
32
32
  "version-selector-type": "^3.0.0",
33
- "@pnpm/build-modules": "10.1.5",
33
+ "@pnpm/build-modules": "10.1.6",
34
+ "@pnpm/calc-dep-state": "3.0.2",
35
+ "@pnpm/constants": "6.2.0",
34
36
  "@pnpm/core-loggers": "8.0.3",
35
37
  "@pnpm/crypto.base32-hash": "1.0.1",
36
38
  "@pnpm/dependency-path": "1.1.3",
37
39
  "@pnpm/error": "4.0.1",
38
- "@pnpm/filter-lockfile": "7.0.9",
40
+ "@pnpm/filter-lockfile": "7.0.10",
39
41
  "@pnpm/get-context": "8.2.2",
40
- "@pnpm/headless": "19.4.11",
41
- "@pnpm/hoist": "7.0.14",
42
+ "@pnpm/headless": "19.4.12",
43
+ "@pnpm/hoist": "7.0.15",
42
44
  "@pnpm/hooks.read-package-hook": "2.0.12",
43
- "@pnpm/lifecycle": "14.1.5",
45
+ "@pnpm/lifecycle": "14.1.6",
44
46
  "@pnpm/link-bins": "8.0.8",
45
47
  "@pnpm/lockfile-file": "7.0.4",
46
- "@pnpm/lockfile-to-pnp": "2.0.11",
47
- "@pnpm/lockfile-utils": "5.0.6",
48
+ "@pnpm/lockfile-to-pnp": "2.0.12",
49
+ "@pnpm/lockfile-utils": "5.0.7",
48
50
  "@pnpm/lockfile-walker": "6.0.8",
49
51
  "@pnpm/manifest-utils": "4.1.4",
50
52
  "@pnpm/matcher": "4.0.1",
51
- "@pnpm/modules-cleaner": "13.0.11",
52
- "@pnpm/calc-dep-state": "3.0.2",
53
- "@pnpm/constants": "6.2.0",
53
+ "@pnpm/modules-cleaner": "13.0.12",
54
54
  "@pnpm/modules-yaml": "11.1.0",
55
55
  "@pnpm/normalize-registries": "4.0.3",
56
- "@pnpm/package-requester": "20.1.5",
56
+ "@pnpm/package-requester": "20.1.6",
57
57
  "@pnpm/parse-wanted-dependency": "4.1.0",
58
58
  "@pnpm/pkg-manager.direct-dep-linker": "1.0.2",
59
59
  "@pnpm/prune-lockfile": "4.0.24",
@@ -61,15 +61,15 @@
61
61
  "@pnpm/read-package-json": "7.0.5",
62
62
  "@pnpm/read-project-manifest": "4.1.3",
63
63
  "@pnpm/remove-bins": "4.0.5",
64
- "@pnpm/resolve-dependencies": "29.3.0",
65
- "@pnpm/resolver-base": "9.1.5",
66
- "@pnpm/store-controller-types": "14.3.0",
64
+ "@pnpm/resolve-dependencies": "29.3.1",
65
+ "@pnpm/resolver-base": "9.2.0",
66
+ "@pnpm/store-controller-types": "14.3.1",
67
67
  "@pnpm/symlink-dependency": "6.0.3",
68
68
  "@pnpm/types": "8.10.0",
69
69
  "@pnpm/which-version-is-pinned": "4.0.0"
70
70
  },
71
71
  "devDependencies": {
72
- "@pnpm/registry-mock": "3.3.0",
72
+ "@pnpm/registry-mock": "3.4.0",
73
73
  "@types/fs-extra": "^9.0.13",
74
74
  "@types/is-windows": "^1.0.0",
75
75
  "@types/normalize-path": "^3.0.0",
@@ -90,16 +90,16 @@
90
90
  "symlink-dir": "^5.1.1",
91
91
  "write-json-file": "^4.3.0",
92
92
  "write-yaml-file": "^4.2.0",
93
- "@pnpm/assert-project": "2.3.19",
94
- "@pnpm/assert-store": "1.0.56",
95
- "@pnpm/cafs": "6.0.0",
96
- "@pnpm/client": "9.1.2",
97
- "@pnpm/core": "7.8.0",
93
+ "@pnpm/assert-project": "2.3.20",
94
+ "@pnpm/assert-store": "1.0.57",
95
+ "@pnpm/cafs": "6.0.1",
96
+ "@pnpm/client": "9.1.3",
97
+ "@pnpm/core": "7.8.1",
98
98
  "@pnpm/git-utils": "0.1.0",
99
- "@pnpm/package-store": "15.1.6",
100
- "@pnpm/prepare": "0.0.62",
99
+ "@pnpm/package-store": "15.1.7",
100
+ "@pnpm/prepare": "0.0.63",
101
101
  "@pnpm/store-path": "7.0.0",
102
- "@pnpm/test-fixtures": "0.0.31"
102
+ "@pnpm/test-fixtures": "0.0.32"
103
103
  },
104
104
  "directories": {
105
105
  "test": "test"