@pnpm/core 1.3.1 → 2.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pnpm/core",
   "description": "Fast, disk space efficient installation engine",
-  "version": "1.3.1",
+  "version": "2.1.0",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -15,42 +15,43 @@
     "@pnpm/logger": "^4.0.0"
   },
   "dependencies": {
-    "@pnpm/build-modules": "7.2.0",
+    "@pnpm/build-modules": "7.2.1",
     "@pnpm/constants": "5.0.0",
-    "@pnpm/core-loggers": "6.0.6",
+    "@pnpm/core-loggers": "6.1.0",
     "@pnpm/error": "2.0.0",
-    "@pnpm/filter-lockfile": "5.0.11",
-    "@pnpm/get-context": "5.2.0",
-    "@pnpm/headless": "16.3.1",
-    "@pnpm/hoist": "5.2.6",
-    "@pnpm/lifecycle": "12.1.0",
-    "@pnpm/link-bins": "6.2.5",
-    "@pnpm/lockfile-file": "4.2.1",
-    "@pnpm/lockfile-to-pnp": "0.4.31",
-    "@pnpm/lockfile-utils": "3.1.1",
-    "@pnpm/lockfile-walker": "4.0.10",
-    "@pnpm/manifest-utils": "2.1.2",
-    "@pnpm/modules-cleaner": "11.0.15",
-    "@pnpm/modules-yaml": "9.0.6",
-    "@pnpm/normalize-registries": "2.0.6",
-    "@pnpm/package-requester": "15.2.2",
+    "@pnpm/filter-lockfile": "5.0.13",
+    "@pnpm/get-context": "5.3.0",
+    "@pnpm/headless": "16.3.5",
+    "@pnpm/hoist": "5.2.8",
+    "@pnpm/lifecycle": "12.1.1",
+    "@pnpm/link-bins": "6.2.6",
+    "@pnpm/lockfile-file": "4.2.2",
+    "@pnpm/lockfile-to-pnp": "0.4.35",
+    "@pnpm/lockfile-utils": "3.1.3",
+    "@pnpm/lockfile-walker": "4.0.11",
+    "@pnpm/manifest-utils": "2.1.3",
+    "@pnpm/modules-cleaner": "11.0.17",
+    "@pnpm/modules-yaml": "9.0.7",
+    "@pnpm/normalize-registries": "2.0.9",
+    "@pnpm/package-requester": "15.2.4",
+    "@pnpm/parse-overrides": "1.0.0",
     "@pnpm/parse-wanted-dependency": "2.0.0",
-    "@pnpm/prune-lockfile": "3.0.10",
+    "@pnpm/prune-lockfile": "3.0.11",
     "@pnpm/read-modules-dir": "3.0.1",
-    "@pnpm/read-package-json": "5.0.6",
-    "@pnpm/read-project-manifest": "2.0.7",
-    "@pnpm/remove-bins": "2.0.8",
-    "@pnpm/resolve-dependencies": "21.2.2",
-    "@pnpm/resolver-base": "8.1.1",
-    "@pnpm/store-controller-types": "11.0.7",
-    "@pnpm/symlink-dependency": "4.0.8",
-    "@pnpm/types": "7.6.0",
+    "@pnpm/read-package-json": "5.0.7",
+    "@pnpm/read-project-manifest": "2.0.8",
+    "@pnpm/remove-bins": "2.0.9",
+    "@pnpm/resolve-dependencies": "22.0.0",
+    "@pnpm/resolver-base": "8.1.2",
+    "@pnpm/store-controller-types": "11.0.8",
+    "@pnpm/symlink-dependency": "4.0.9",
+    "@pnpm/types": "7.7.0",
+    "@pnpm/which-version-is-pinned": "1.0.0",
     "@zkochan/npm-package-arg": "^2.0.1",
     "@zkochan/rimraf": "^2.1.1",
-    "dependency-path": "8.0.6",
+    "dependency-path": "8.0.7",
     "graph-sequencer": "2.0.0",
     "is-inner-link": "^4.0.0",
-    "is-subdir": "^1.1.1",
     "load-json-file": "^6.2.0",
     "normalize-path": "^3.0.0",
     "p-every": "^2.0.0",
@@ -61,17 +62,16 @@
     "ramda": "^0.27.1",
     "run-groups": "^3.0.1",
     "semver": "^7.3.4",
-    "semver-utils": "^1.1.4",
     "version-selector-type": "^3.0.0"
   },
   "devDependencies": {
-    "@pnpm/assert-project": "2.2.9",
-    "@pnpm/assert-store": "1.0.26",
-    "@pnpm/cafs": "3.0.9",
-    "@pnpm/client": "6.0.5",
+    "@pnpm/assert-project": "2.2.10",
+    "@pnpm/assert-store": "1.0.27",
+    "@pnpm/cafs": "3.0.10",
+    "@pnpm/client": "6.0.9",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/package-store": "12.1.2",
-    "@pnpm/prepare": "0.0.28",
+    "@pnpm/package-store": "12.1.4",
+    "@pnpm/prepare": "0.0.29",
     "@pnpm/store-path": "^5.0.0",
     "@pnpm/test-fixtures": "0.0.0",
     "@types/fs-extra": "^9.0.5",
@@ -132,7 +132,7 @@
   "repository": "https://github.com/pnpm/pnpm/blob/master/packages/core",
   "funding": "https://opencollective.com/pnpm",
   "scripts": {
-    "start": "pnpm run tsc -- --watch",
+    "start": "pnpm tsc --watch",
     "?commit": "echo 'Run Git commit wizard'",
     "commit": "commit",
     "commitmsg": "commitlint -e",

package/lib/guessPinnedVersionFromExistingSpec.d.ts

@@ -1 +0,0 @@
-export default function guessPinnedVersionFromExistingSpec(spec: string): "major" | "minor" | "patch" | "none" | undefined;

package/lib/guessPinnedVersionFromExistingSpec.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const semver_utils_1 = require("semver-utils");
-function guessPinnedVersionFromExistingSpec(spec) {
-    if (spec.startsWith('workspace:'))
-        spec = spec.substr('workspace:'.length);
-    if (spec === '*')
-        return 'none';
-    const parsedRange = (0, semver_utils_1.parseRange)(spec);
-    if (parsedRange.length !== 1)
-        return undefined;
-    const versionObject = parsedRange[0];
-    switch (versionObject.operator) {
-        case '~': return 'minor';
-        case '^': return 'major';
-        case undefined:
-            if (versionObject.patch)
-                return 'patch';
-            if (versionObject.minor)
-                return 'minor';
-    }
-    return undefined;
-}
-exports.default = guessPinnedVersionFromExistingSpec;
-//# sourceMappingURL=guessPinnedVersionFromExistingSpec.js.map

package/lib/guessPinnedVersionFromExistingSpec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"guessPinnedVersionFromExistingSpec.js","sourceRoot":"","sources":["../src/guessPinnedVersionFromExistingSpec.ts"],"names":[],"mappings":";;AAAA,+CAAyC;AAEzC,SAAwB,kCAAkC,CAAE,IAAY;IACtE,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IAC1E,IAAI,IAAI,KAAK,GAAG;QAAE,OAAO,MAAM,CAAA;IAC/B,MAAM,WAAW,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAA;IACpC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAA;IAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;IACpC,QAAQ,aAAa,CAAC,QAAQ,EAAE;QAChC,KAAK,GAAG,CAAC,CAAC,OAAO,OAAO,CAAA;QACxB,KAAK,GAAG,CAAC,CAAC,OAAO,OAAO,CAAA;QACxB,KAAK,SAAS;YACZ,IAAI,aAAa,CAAC,KAAK;gBAAE,OAAO,OAAO,CAAA;YACvC,IAAI,aAAa,CAAC,KAAK;gBAAE,OAAO,OAAO,CAAA;KACxC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAdD,qDAcC"}

package/lib/install/getWantedDependencies.d.ts

@@ -1,15 +0,0 @@
-import { IncludedDependencies, ProjectManifest } from '@pnpm/types';
-export declare type PinnedVersion = 'major' | 'minor' | 'patch' | 'none';
-export interface WantedDependency {
-    alias: string;
-    pref: string;
-    dev: boolean;
-    optional: boolean;
-    raw: string;
-    pinnedVersion?: PinnedVersion;
-}
-export default function getWantedDependencies(pkg: Pick<ProjectManifest, 'devDependencies' | 'dependencies' | 'optionalDependencies' | 'dependenciesMeta'>, opts?: {
-    includeDirect?: IncludedDependencies;
-    nodeExecPath?: string;
-    updateWorkspaceDependencies?: boolean;
-}): WantedDependency[];

package/lib/install/getWantedDependencies.js

@@ -1,54 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const manifest_utils_1 = require("@pnpm/manifest-utils");
-const guessPinnedVersionFromExistingSpec_1 = __importDefault(require("../guessPinnedVersionFromExistingSpec"));
-function getWantedDependencies(pkg, opts) {
-    var _a, _b, _c, _d, _e;
-    const depsToInstall = (0, manifest_utils_1.filterDependenciesByType)(pkg, (_a = opts === null || opts === void 0 ? void 0 : opts.includeDirect) !== null && _a !== void 0 ? _a : {
-        dependencies: true,
-        devDependencies: true,
-        optionalDependencies: true,
-    });
-    return getWantedDependenciesFromGivenSet(depsToInstall, {
-        dependencies: (_b = pkg.dependencies) !== null && _b !== void 0 ? _b : {},
-        devDependencies: (_c = pkg.devDependencies) !== null && _c !== void 0 ? _c : {},
-        optionalDependencies: (_d = pkg.optionalDependencies) !== null && _d !== void 0 ? _d : {},
-        dependenciesMeta: (_e = pkg.dependenciesMeta) !== null && _e !== void 0 ? _e : {},
-        updatePref: (opts === null || opts === void 0 ? void 0 : opts.updateWorkspaceDependencies) === true
-            ? updateWorkspacePref
-            : (pref) => pref,
-    });
-}
-exports.default = getWantedDependencies;
-function updateWorkspacePref(pref) {
-    return pref.startsWith('workspace:') ? 'workspace:*' : pref;
-}
-function getWantedDependenciesFromGivenSet(deps, opts) {
-    if (!deps)
-        return [];
-    return Object.keys(deps).map((alias) => {
-        var _a, _b, _c;
-        const pref = opts.updatePref(deps[alias]);
-        let depType;
-        if (opts.optionalDependencies[alias] != null)
-            depType = 'optional';
-        else if (opts.dependencies[alias] != null)
-            depType = 'prod';
-        else if (opts.devDependencies[alias] != null)
-            depType = 'dev';
-        return {
-            alias,
-            dev: depType === 'dev',
-            injected: (_a = opts.dependenciesMeta[alias]) === null || _a === void 0 ? void 0 : _a.injected,
-            optional: depType === 'optional',
-            nodeExecPath: (_b = opts.nodeExecPath) !== null && _b !== void 0 ? _b : (_c = opts.dependenciesMeta[alias]) === null || _c === void 0 ? void 0 : _c.node,
-            pinnedVersion: (0, guessPinnedVersionFromExistingSpec_1.default)(deps[alias]),
-            pref,
-            raw: `${alias}@${pref}`,
-        };
-    });
-}
-//# sourceMappingURL=getWantedDependencies.js.map

package/lib/install/getWantedDependencies.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getWantedDependencies.js","sourceRoot":"","sources":["../../src/install/getWantedDependencies.ts"],"names":[],"mappings":";;;;;AAAA,yDAA+D;AAO/D,+GAAsF;AAatF,SAAwB,qBAAqB,CAC3C,GAA4G,EAC5G,IAIC;;IAED,MAAM,aAAa,GAAG,IAAA,yCAAwB,EAAC,GAAG,EAChD,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa,mCAAI;QACrB,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,IAAI;KAC3B,CAAC,CAAA;IACJ,OAAO,iCAAiC,CAAC,aAAa,EAAE;QACtD,YAAY,EAAE,MAAA,GAAG,CAAC,YAAY,mCAAI,EAAE;QACpC,eAAe,EAAE,MAAA,GAAG,CAAC,eAAe,mCAAI,EAAE;QAC1C,oBAAoB,EAAE,MAAA,GAAG,CAAC,oBAAoB,mCAAI,EAAE;QACpD,gBAAgB,EAAE,MAAA,GAAG,CAAC,gBAAgB,mCAAI,EAAE;QAC5C,UAAU,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,2BAA2B,MAAK,IAAI;YACpD,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;KACnB,CAAC,CAAA;AACJ,CAAC;AAvBD,wCAuBC;AAED,SAAS,mBAAmB,CAAE,IAAY;IACxC,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAA;AAC7D,CAAC;AAED,SAAS,iCAAiC,CACxC,IAAkB,EAClB,IAOC;IAED,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAA;IACpB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACzC,IAAI,OAAO,CAAA;QACX,IAAI,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,IAAI;YAAE,OAAO,GAAG,UAAU,CAAA;aAC7D,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,IAAI;YAAE,OAAO,GAAG,MAAM,CAAA;aACtD,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,IAAI;YAAE,OAAO,GAAG,KAAK,CAAA;QAC7D,OAAO;YACL,KAAK;YACL,GAAG,EAAE,OAAO,KAAK,KAAK;YACtB,QAAQ,EAAE,MAAA,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,0CAAE,QAAQ;YAChD,QAAQ,EAAE,OAAO,KAAK,UAAU;YAChC,YAAY,EAAE,MAAA,IAAI,CAAC,YAAY,mCAAI,MAAA,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,0CAAE,IAAI;YACrE,aAAa,EAAE,IAAA,4CAAkC,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAI;YACJ,GAAG,EAAE,GAAG,KAAK,IAAI,IAAI,EAAE;SACxB,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/lib/safeIsInnerLink.d.ts

@@ -1,6 +0,0 @@
-export default function safeIsInnerLink(projectModulesDir: string, depName: string, opts: {
-    hideAlienModules: boolean;
-    projectDir: string;
-    storeDir: string;
-    virtualStoreDir: string;
-}): Promise<true | string>;

package/lib/safeIsInnerLink.js

@@ -1,36 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-const logger_1 = __importDefault(require("@pnpm/logger"));
-const is_inner_link_1 = __importDefault(require("is-inner-link"));
-const is_subdir_1 = __importDefault(require("is-subdir"));
-async function safeIsInnerLink(projectModulesDir, depName, opts) {
-    try {
-        const link = await (0, is_inner_link_1.default)(projectModulesDir, depName);
-        if (link.isInner)
-            return true;
-        if ((0, is_subdir_1.default)(opts.virtualStoreDir, link.target) || (0, is_subdir_1.default)(opts.storeDir, link.target))
-            return true;
-        return link.target;
-    }
-    catch (err) { // eslint-disable-line
-        if (err.code === 'ENOENT')
-            return true;
-        if (opts.hideAlienModules) {
-            logger_1.default.warn({
-                message: `Moving ${depName} that was installed by a different package manager to "node_modules/.ignored`,
-                prefix: opts.projectDir,
-            });
-            const ignoredDir = path_1.default.join(projectModulesDir, '.ignored', depName);
-            await fs_1.promises.mkdir(path_1.default.dirname(ignoredDir), { recursive: true });
-            await fs_1.promises.rename(path_1.default.join(projectModulesDir, depName), ignoredDir);
-        }
-        return true;
-    }
-}
-exports.default = safeIsInnerLink;
-//# sourceMappingURL=safeIsInnerLink.js.map

package/lib/safeIsInnerLink.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"safeIsInnerLink.js","sourceRoot":"","sources":["../src/safeIsInnerLink.ts"],"names":[],"mappings":";;;;;AAAA,2BAAmC;AACnC,gDAAuB;AACvB,0DAAiC;AACjC,kEAAuC;AACvC,0DAAgC;AAEjB,KAAK,UAAU,eAAe,CAC3C,iBAAyB,EACzB,OAAe,EACf,IAKC;IAED,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,IAAA,uBAAW,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;QAE1D,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAA;QAE7B,IAAI,IAAA,mBAAQ,EAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAA,mBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAA;QAEpG,OAAO,IAAI,CAAC,MAAgB,CAAA;KAC7B;IAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;QACzC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QAEtC,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,gBAAM,CAAC,IAAI,CAAC;gBACV,OAAO,EAAE,UAAU,OAAO,8EAA8E;gBACxG,MAAM,EAAE,IAAI,CAAC,UAAU;aACxB,CAAC,CAAA;YACF,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;YACpE,MAAM,aAAE,CAAC,KAAK,CAAC,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC7D,MAAM,aAAE,CAAC,MAAM,CACb,cAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,EACrC,UAAU,CACX,CAAA;SACF;QACD,OAAO,IAAI,CAAA;KACZ;AACH,CAAC;AAnCD,kCAmCC"}