npm - nx - Versions diffs - 13.10.0-beta.7 → 13.10.0-beta.8 - Mend

nx 13.10.0-beta.7 → 13.10.0-beta.8

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 (14) hide show

package/package.json +4 -3
package/src/command-line/migrate.js +141 -54
package/src/command-line/migrate.js.map +1 -1
package/src/core/hasher/file-hasher-base.js +4 -4
package/src/core/hasher/file-hasher-base.js.map +1 -1
package/src/core/hasher/node-based-file-hasher.js +7 -6
package/src/core/hasher/node-based-file-hasher.js.map +1 -1
package/src/utils/fileutils.d.ts +8 -0
package/src/utils/fileutils.js +41 -1
package/src/utils/fileutils.js.map +1 -1
package/src/utils/package-manager.d.ts +16 -0
package/src/utils/package-manager.js +75 -1
package/src/utils/package-manager.js.map +1 -1
package/src/utils/versions.js +1 -1

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "13.10.0-beta.7",
+  "version": "13.10.0-beta.8",
   "description": "Smart, Fast and Extensible Build System",
   "repository": {
     "type": "git",
@@ -51,6 +51,7 @@
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "semver": "7.3.4",
+    "tar-stream": "~2.2.0",
     "tmp": "~0.2.1",
     "yargs": "^17.4.0",
     "yargs-parser": "21.0.1",
@@ -59,8 +60,8 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "@nrwl/cli": "13.10.0-beta.7",
-    "@nrwl/tao": "13.10.0-beta.7"
+    "@nrwl/cli": "13.10.0-beta.8",
+    "@nrwl/tao": "13.10.0-beta.8"
   },
   "main": "./bin/nx.js",
   "typings": "./bin/nx.d.ts"

package/src/command-line/migrate.js CHANGED Viewed

@@ -7,11 +7,11 @@ const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const tmp_1 = require("tmp");
-const logger_1 = require("../utils/logger");
-const params_1 = require("../utils/params");
-const package_manager_1 = require("../utils/package-manager");
 const tree_1 = require("../shared/tree");
 const fileutils_1 = require("../utils/fileutils");
+const logger_1 = require("../utils/logger");
+const package_manager_1 = require("../utils/package-manager");
+const params_1 = require("../utils/params");
 function normalizeVersion(version) {
     const [v, t] = version.split('-');
     const [major, minor, patch] = v.split('.');
@@ -312,54 +312,153 @@ function versions(root, from) {
 function createFetcher() {
     const cache = {};
     return function f(packageName, packageVersion) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!cache[`${packageName}-${packageVersion}`]) {
-                const dir = (0, tmp_1.dirSync)().name;
-                const npmrc = checkForNPMRC();
-                if (npmrc) {
-                    // Creating a package.json is needed for .npmrc to resolve
-                    (0, fileutils_1.writeJsonFile)(`${dir}/package.json`, {});
-                    // Copy npmrc if it exists, so that npm still follows it.
-                    (0, fs_extra_1.copyFileSync)(npmrc, `${dir}/.npmrc`);
+            if (cache[`${packageName}-${packageVersion}`]) {
+                return cache[`${packageName}-${packageVersion}`];
+            }
+            let resolvedVersion;
+            let migrations;
+            try {
+                resolvedVersion = (0, package_manager_1.resolvePackageVersionUsingRegistry)(packageName, packageVersion);
+                if (cache[`${packageName}-${resolvedVersion}`]) {
+                    return cache[`${packageName}-${resolvedVersion}`];
                 }
                 logger_1.logger.info(`Fetching ${packageName}@${packageVersion}`);
-                const pmc = (0, package_manager_1.getPackageManagerCommand)();
-                (0, child_process_1.execSync)(`${pmc.add} ${packageName}@${packageVersion}`, {
-                    stdio: [],
-                    cwd: dir,
-                });
-                const migrationsFilePath = packageToMigrationsFilePath(packageName, dir);
-                const packageJsonPath = require.resolve(`${packageName}/package.json`, {
-                    paths: [dir],
-                });
-                const json = (0, fileutils_1.readJsonFile)(packageJsonPath);
-                // packageVersion can be a tag, resolvedVersion works with semver
-                const resolvedVersion = json.version;
-                if (migrationsFilePath) {
-                    const json = (0, fileutils_1.readJsonFile)(migrationsFilePath);
-                    cache[`${packageName}-${packageVersion}`] = {
-                        version: resolvedVersion,
-                        generators: json.generators || json.schematics,
-                        packageJsonUpdates: json.packageJsonUpdates,
-                    };
-                }
-                else {
-                    cache[`${packageName}-${packageVersion}`] = {
-                        version: resolvedVersion,
-                    };
-                }
-                try {
-                    (0, fs_extra_1.removeSync)(dir);
-                }
-                catch (_a) {
-                    // It's okay if this fails, the OS will clean it up eventually
-                }
+                migrations = yield getPackageMigrations(packageName, resolvedVersion);
+            }
+            catch (_b) {
+                logger_1.logger.info(`Fetching ${packageName}@${packageVersion}`);
+                const result = yield installPackageAndGetVersionAngMigrations(packageName, packageVersion);
+                resolvedVersion = result.resolvedVersion;
+                migrations = result.migrations;
+            }
+            if (migrations) {
+                cache[`${packageName}-${packageVersion}`] = cache[`${packageName}-${resolvedVersion}`] = {
+                    version: resolvedVersion,
+                    generators: (_a = migrations.generators) !== null && _a !== void 0 ? _a : migrations.schematics,
+                    packageJsonUpdates: migrations.packageJsonUpdates,
+                };
+            }
+            else {
+                cache[`${packageName}-${packageVersion}`] = cache[`${packageName}-${resolvedVersion}`] = {
+                    version: resolvedVersion,
+                };
             }
             return cache[`${packageName}-${packageVersion}`];
         });
     };
 }
 // testing-fetch-end
+function getPackageMigrations(packageName, packageVersion) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            // check if there are migrations in the packages by looking at the
+            // registry directly
+            const migrationsPath = getPackageMigrationsPathFromRegistry(packageName, packageVersion);
+            if (!migrationsPath) {
+                return null;
+            }
+            // try to obtain the migrations from the registry directly
+            return yield getPackageMigrationsUsingRegistry(packageName, packageVersion, migrationsPath);
+        }
+        catch (_a) {
+            // fall back to installing the package
+            const { migrations } = yield installPackageAndGetVersionAngMigrations(packageName, packageVersion);
+            return migrations;
+        }
+    });
+}
+function getPackageMigrationsPathFromRegistry(packageName, packageVersion) {
+    var _a, _b;
+    let pm = (0, package_manager_1.detectPackageManager)();
+    if (pm === 'yarn') {
+        pm = 'npm';
+    }
+    const result = (0, child_process_1.execSync)(`${pm} view ${packageName}@${packageVersion} nx-migrations ng-update --json`, {
+        stdio: [],
+    })
+        .toString()
+        .trim();
+    if (!result) {
+        return null;
+    }
+    const json = JSON.parse(result);
+    let migrationsFilePath = (_b = (_a = json['nx-migrations']) !== null && _a !== void 0 ? _a : json['ng-update']) !== null && _b !== void 0 ? _b : json;
+    if (typeof json === 'object') {
+        migrationsFilePath = migrationsFilePath.migrations;
+    }
+    return migrationsFilePath;
+}
+function getPackageMigrationsUsingRegistry(packageName, packageVersion, migrationsFilePath) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const dir = (0, tmp_1.dirSync)().name;
+        createNPMRC(dir);
+        let pm = (0, package_manager_1.detectPackageManager)();
+        if (pm === 'yarn') {
+            pm = 'npm';
+        }
+        const tarballPath = (0, child_process_1.execSync)(`${pm} pack ${packageName}@${packageVersion}`, {
+            cwd: dir,
+            stdio: [],
+        })
+            .toString()
+            .trim();
+        let migrations = null;
+        migrationsFilePath = (0, path_1.join)('package', migrationsFilePath);
+        const migrationDestinationPath = (0, path_1.join)(dir, migrationsFilePath);
+        try {
+            yield (0, fileutils_1.extractFileFromTarball)((0, path_1.join)(dir, tarballPath), migrationsFilePath, migrationDestinationPath);
+            migrations = (0, fileutils_1.readJsonFile)(migrationDestinationPath);
+        }
+        catch (_a) {
+            throw new Error(`Failed to find migrations file "${migrationsFilePath}" in package "${packageName}@${packageVersion}".`);
+        }
+        try {
+            (0, fs_extra_1.removeSync)(dir);
+        }
+        catch (_b) {
+            // It's okay if this fails, the OS will clean it up eventually
+        }
+        return migrations;
+    });
+}
+function installPackageAndGetVersionAngMigrations(packageName, packageVersion) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const dir = (0, tmp_1.dirSync)().name;
+        createNPMRC(dir);
+        const pmc = (0, package_manager_1.getPackageManagerCommand)();
+        (0, child_process_1.execSync)(`${pmc.add} ${packageName}@${packageVersion}`, {
+            stdio: [],
+            cwd: dir,
+        });
+        const packageJsonPath = require.resolve(`${packageName}/package.json`, {
+            paths: [dir],
+        });
+        const { version: resolvedVersion } = (0, fileutils_1.readJsonFile)(packageJsonPath);
+        const migrationsFilePath = packageToMigrationsFilePath(packageName, dir);
+        let migrations = null;
+        if (migrationsFilePath) {
+            migrations = (0, fileutils_1.readJsonFile)(migrationsFilePath);
+        }
+        try {
+            (0, fs_extra_1.removeSync)(dir);
+        }
+        catch (_a) {
+            // It's okay if this fails, the OS will clean it up eventually
+        }
+        return { migrations, resolvedVersion };
+    });
+}
+function createNPMRC(dir) {
+    // A package.json is needed for pnpm pack and for .npmrc to resolve
+    (0, fileutils_1.writeJsonFile)(`${dir}/package.json`, {});
+    const npmrc = (0, package_manager_1.checkForNPMRC)();
+    if (npmrc) {
+        // Copy npmrc if it exists, so that npm still follows it.
+        (0, fs_extra_1.copyFileSync)(npmrc, `${dir}/.npmrc`);
+    }
+}
 function packageToMigrationsFilePath(packageName, dir) {
     const packageJsonPath = require.resolve(`${packageName}/package.json`, {
         paths: [dir],
@@ -532,16 +631,4 @@ function migrate(root, args) {
     });
 }
 exports.migrate = migrate;
-/**
- * Checks for a project level npmrc file by crawling up the file tree until
- * hitting a package.json file, as this is how npm finds them as well.
- */
-function checkForNPMRC() {
-    let directory = process.cwd();
-    while (!(0, fs_extra_1.existsSync)((0, path_1.join)(directory, 'package.json'))) {
-        directory = (0, path_1.dirname)(directory);
-    }
-    const path = (0, path_1.join)(directory, '.npmrc');
-    return (0, fs_extra_1.existsSync)(path) ? path : null;
-}
 //# sourceMappingURL=migrate.js.map

package/src/command-line/migrate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}

package/src/core/hasher/file-hasher-base.js CHANGED Viewed

@@ -47,16 +47,16 @@ class FileHasherBase {
         if (!this.fileHashes) {
             throw new Error('FileHasher is invoked before being initialized');
         }
-        const relativePath = path.startsWith(app_root_1.appRootPath)
-            ? path.substr(app_root_1.appRootPath.length + 1)
-            : path;
+        const relativePath = (0, path_1.normalizePath)(path.startsWith(app_root_1.workspaceRoot)
+            ? path.substring(app_root_1.workspaceRoot.length + 1)
+            : path);
         if (this.fileHashes.has(relativePath)) {
             return this.fileHashes.get(relativePath);
         }
         else {
             try {
                 // this has to be absolute to avoid issues with cwd
-                return hashing_impl_1.defaultHashing.hashFile((0, path_1.joinPathFragments)(app_root_1.appRootPath, relativePath));
+                return hashing_impl_1.defaultHashing.hashFile((0, path_1.joinPathFragments)(app_root_1.workspaceRoot, relativePath));
             }
             catch (_a) {
                 return '';

package/src/core/hasher/file-hasher-base.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file-hasher-base.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/core/hasher/file-hasher-base.ts"],"names":[],"mappings":";;;;AAAA,~~oDAAoD~~;~~AACpD~~,2CAAyC;AACzC,iDAAgD;AAEhD,~~4CAAsD~~;~~AAEtD~~,MAAsB,cAAc;IAApC;QAEY,kBAAa,GAAG,KAAK,CAAC;~~IAuElC~~,CAAC;~~IArEC~~,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAMK,iBAAiB;;YACrB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;aACnB;QACH,CAAC;KAAA;IAED,WAAW;QACT,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrC,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACjD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,iBAAiB,CACf,YAAiC,EACjC,eAAyB,EAAE;QAE3B,wBAAW,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAE9C,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;YACtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SACrC;QAED,wBAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC5C,wBAAW,CAAC,OAAO,CACjB,qBAAqB,EACrB,2BAA2B,EAC3B,yBAAyB,CAC1B,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,~~sBAAW~~,CAAC;~~YAC/C~~,CAAC,CAAC,IAAI,CAAC,~~MAAM~~,CAAC,~~sBAAW~~,CAAC,MAAM,GAAG,CAAC,CAAC;~~YACrC~~,CAAC,CAAC,IAAI,CAAC;~~QACT~~,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC1C;aAAM;YACL,IAAI;gBACF,mDAAmD;gBACnD,OAAO,6BAAc,CAAC,QAAQ,CAC5B,IAAA,wBAAiB,EAAC,~~sBAAW~~,EAAE,YAAY,CAAC,~~CAC7C~~,CAAC;aACH;YAAC,WAAM;gBACN,OAAO,EAAE,CAAC;aACX;SACF;IACH,CAAC;CACF;~~AAzED~~,~~wCAyEC~~"}
1	+ {"version":3,"file":"file-hasher-base.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/core/hasher/file-hasher-base.ts"],"names":[],"mappings":";;;;AAAA,oDAAsD;AACtD,2CAAyC;AACzC,iDAAgD;AAEhD,4CAAqE;AAErE,MAAsB,cAAc;IAApC;QAEY,kBAAa,GAAG,KAAK,CAAC;IAyElC,CAAC;IAvEC,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAMK,iBAAiB;;YACrB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;aACnB;QACH,CAAC;KAAA;IAED,WAAW;QACT,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrC,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACjD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,iBAAiB,CACf,YAAiC,EACjC,eAAyB,EAAE;QAE3B,wBAAW,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAE9C,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;YACtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SACrC;QAED,wBAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC5C,wBAAW,CAAC,OAAO,CACjB,qBAAqB,EACrB,2BAA2B,EAC3B,yBAAyB,CAC1B,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QACD,MAAM,YAAY,GAAG,IAAA,oBAAa,EAChC,IAAI,CAAC,UAAU,CAAC,wBAAa,CAAC;YAC5B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,wBAAa,CAAC,MAAM,GAAG,CAAC,CAAC;YAC1C,CAAC,CAAC,IAAI,CACT,CAAC;QACF,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC1C;aAAM;YACL,IAAI;gBACF,mDAAmD;gBACnD,OAAO,6BAAc,CAAC,QAAQ,CAC5B,IAAA,wBAAiB,EAAC,wBAAa,EAAE,YAAY,CAAC,CAC/C,CAAC;aACH;YAAC,WAAM;gBACN,OAAO,EAAE,CAAC;aACX;SACF;IACH,CAAC;CACF;AA3ED,wCA2EC"}

package/src/core/hasher/node-based-file-hasher.js CHANGED Viewed

@@ -9,6 +9,7 @@ const fs_1 = require("fs");
 const file_hasher_base_1 = require("./file-hasher-base");
 const strip_indents_1 = require("../../utils/strip-indents");
 const ignore_1 = require("ignore");
+const path_2 = require("nx/src/utils/path");
 class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
     constructor() {
         super(...arguments);
@@ -18,7 +19,7 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             perf_hooks_1.performance.mark('init hashing:start');
             this.clear();
-            this.allFilesInDir(app_root_1.appRootPath, true);
+            this.allFilesInDir(app_root_1.workspaceRoot, true);
             perf_hooks_1.performance.mark('init hashing:end');
             perf_hooks_1.performance.measure('init hashing', 'init hashing:start', 'init hashing:end');
         });
@@ -33,21 +34,21 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
         });
     }
     allFilesInDir(absoluteDirName, recurse = true) {
-        const relDirName = (0, path_1.relative)(app_root_1.appRootPath, absoluteDirName);
+        const relDirName = (0, path_1.relative)(app_root_1.workspaceRoot, absoluteDirName);
         if (relDirName && this.ignoredGlobs.ignores(relDirName)) {
             return;
         }
         try {
             (0, fs_1.readdirSync)(absoluteDirName).forEach((c) => {
                 const absoluteChild = (0, path_1.join)(absoluteDirName, c);
-                const relChild = (0, path_1.relative)(app_root_1.appRootPath, absoluteChild);
+                const relChild = (0, path_1.relative)(app_root_1.workspaceRoot, absoluteChild);
                 if (this.ignoredGlobs.ignores(relChild)) {
                     return;
                 }
                 try {
                     const s = (0, fs_1.statSync)(absoluteChild);
                     if (!s.isDirectory()) {
-                        this.fileHashes.set(relChild, this.hashFile(relChild));
+                        this.fileHashes.set((0, path_2.normalizePath)(relChild), this.hashFile(relChild));
                     }
                     else if (s.isDirectory() && recurse) {
                         this.allFilesInDir(absoluteChild, true);
@@ -62,8 +63,8 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
 exports.NodeBasedFileHasher = NodeBasedFileHasher;
 function getIgnoredGlobs() {
     const ig = (0, ignore_1.default)();
-    ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.gitignore`));
-    ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.nxignore`));
+    ig.add(readFileIfExisting(`${app_root_1.workspaceRoot}/.gitignore`));
+    ig.add(readFileIfExisting(`${app_root_1.workspaceRoot}/.nxignore`));
     ig.add((0, strip_indents_1.stripIndents) `
       node_modules
       tmp

package/src/core/hasher/node-based-file-hasher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/core/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,~~oDAAoD~~;~~AACpD~~,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,6DAAyD;AACzD,mCAA4B;~~AAE5B~~,MAAa,mBAAoB,SAAQ,iCAAc;IAAvD;;QACE,iBAAY,GAAG,eAAe,EAAE,CAAC;~~IAkDnC~~,CAAC;~~IAhDO~~,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,IAAI,CAAC,aAAa,CAAC,~~sBAAW~~,EAAE,IAAI,CAAC,CAAC;~~YAEtC~~,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpC,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,OAAO,CAAC,CAAC;QACX,CAAC;KAAA;IAEO,aAAa,CACnB,eAAuB,EACvB,UAAmB,IAAI;QAEvB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,~~sBAAW~~,EAAE,eAAe,CAAC,CAAC;~~QAC1D~~,IAAI,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;SACR;QACD,IAAI;YACF,IAAA,gBAAW,EAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,~~sBAAW~~,EAAE,aAAa,CAAC,CAAC;~~gBACtD~~,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,OAAO;iBACR;gBACD,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,~~CAAC~~,QAAQ,~~EAAE~~,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,~~CAAC~~,CAAC;~~qBACxD~~;yBAAM,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;qBACzC;iBACF;gBAAC,WAAM,GAAE;YACZ,CAAC,CAAC,CAAC;SACJ;QAAC,WAAM,GAAE;IACZ,CAAC;CACF;~~AAnDD~~,~~kDAmDC~~;AAED,SAAS,eAAe;IACtB,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,~~sBAAW~~,aAAa,CAAC,CAAC,CAAC;~~IACxD~~,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,~~sBAAW~~,YAAY,CAAC,CAAC,CAAC;~~IACvD~~,EAAE,CAAC,GAAG,CAAC,IAAA,4BAAY,EAAA;;;;;KAKhB,CAAC,CAAC;IACL,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}
1	+ {"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/core/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,oDAAsD;AACtD,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,6DAAyD;AACzD,mCAA4B;AAC5B,4CAAkD;AAElD,MAAa,mBAAoB,SAAQ,iCAAc;IAAvD;;QACE,iBAAY,GAAG,eAAe,EAAE,CAAC;IAqDnC,CAAC;IAnDO,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,IAAI,CAAC,aAAa,CAAC,wBAAa,EAAE,IAAI,CAAC,CAAC;YAExC,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpC,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,OAAO,CAAC,CAAC;QACX,CAAC;KAAA;IAEO,aAAa,CACnB,eAAuB,EACvB,UAAmB,IAAI;QAEvB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,wBAAa,EAAE,eAAe,CAAC,CAAC;QAC5D,IAAI,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;SACR;QACD,IAAI;YACF,IAAA,gBAAW,EAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,wBAAa,EAAE,aAAa,CAAC,CAAC;gBACxD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,OAAO;iBACR;gBACD,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,IAAA,oBAAa,EAAC,QAAQ,CAAC,EACvB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,CAAC;qBACH;yBAAM,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;qBACzC;iBACF;gBAAC,WAAM,GAAE;YACZ,CAAC,CAAC,CAAC;SACJ;QAAC,WAAM,GAAE;IACZ,CAAC;CACF;AAtDD,kDAsDC;AAED,SAAS,eAAe;IACtB,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,wBAAa,aAAa,CAAC,CAAC,CAAC;IAC1D,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,wBAAa,YAAY,CAAC,CAAC,CAAC;IACzD,EAAE,CAAC,GAAG,CAAC,IAAA,4BAAY,EAAA;;;;;KAKhB,CAAC,CAAC;IACL,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}

package/src/utils/fileutils.d.ts CHANGED Viewed

@@ -33,3 +33,11 @@ export declare function directoryExists(name: any): boolean;
 export declare function fileExists(filePath: string): boolean;
 export declare function createDirectory(directoryPath: string): void;
 export declare function isRelativePath(path: string): boolean;
+/**
+ * Extracts a file from a given tarball to the specified destination.
+ * @param tarballPath The path to the tarball from where the file should be extracted.
+ * @param file The path to the file inside the tarball.
+ * @param destinationFilePath The destination file path.
+ * @returns True if the file was extracted successfully, false otherwise.
+ */
+export declare function extractFileFromTarball(tarballPath: string, file: string, destinationFilePath: string): Promise<void>;

package/src/utils/fileutils.js CHANGED Viewed

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRelativePath = exports.createDirectory = exports.fileExists = exports.directoryExists = exports.writeJsonFile = exports.readJsonFile = void 0;
+exports.extractFileFromTarball = exports.isRelativePath = exports.createDirectory = exports.fileExists = exports.directoryExists = exports.writeJsonFile = exports.readJsonFile = void 0;
+const tslib_1 = require("tslib");
 const json_1 = require("./json");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const fs_2 = require("fs");
 const path_2 = require("path");
+const tar = require("tar-stream");
+const zlib_1 = require("zlib");
 /**
  * Reads a JSON file and returns the object the JSON content represents.
  *
@@ -79,4 +82,41 @@ function isRelativePath(path) {
         path.startsWith('../'));
 }
 exports.isRelativePath = isRelativePath;
+/**
+ * Extracts a file from a given tarball to the specified destination.
+ * @param tarballPath The path to the tarball from where the file should be extracted.
+ * @param file The path to the file inside the tarball.
+ * @param destinationFilePath The destination file path.
+ * @returns True if the file was extracted successfully, false otherwise.
+ */
+function extractFileFromTarball(tarballPath, file, destinationFilePath) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(destinationFilePath));
+            var tarExtractStream = tar.extract();
+            const destinationFileStream = (0, fs_1.createWriteStream)(destinationFilePath);
+            let isFileExtracted = false;
+            tarExtractStream.on('entry', function (header, stream, next) {
+                if (header.name === file) {
+                    stream.pipe(destinationFileStream);
+                    stream.on('end', () => {
+                        isFileExtracted = true;
+                        resolve();
+                    });
+                }
+                stream.on('end', function () {
+                    next();
+                });
+                stream.resume();
+            });
+            tarExtractStream.on('finish', function () {
+                if (!isFileExtracted) {
+                    reject();
+                }
+            });
+            (0, fs_1.createReadStream)(tarballPath).pipe((0, zlib_1.createGunzip)()).pipe(tarExtractStream);
+        });
+    });
+}
+exports.extractFileFromTarball = extractFileFromTarball;
 //# sourceMappingURL=fileutils.js.map

package/src/utils/fileutils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fileutils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/fileutils.ts"],"names":[],"mappings":"~~;;;~~AAAA,iCAAkD;AAElD,~~2BAAiD~~;~~AACjD~~,+BAA+B;AAC/B,uCAAyC;AACzC,2BAAyC;AACzC,+BAA8C;~~AAkB9C~~;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,IAAY,EACZ,OAAyB;IAEzB,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;KACzE;IACD,IAAI;QACF,OAAO,IAAA,gBAAS,EAAI,OAAO,EAAE,OAAO,CAAC,CAAC;KACvC;IAAC,OAAO,CAAC,EAAE;QACV,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC5C,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAdD,oCAcC;AAED;;;;;;GAMG;AACH,SAAgB,aAAa,CAC3B,IAAY,EACZ,IAAO,EACP,OAA0B;IAE1B,IAAA,wBAAa,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,CAAC;IAC7B,MAAM,cAAc,GAAG,IAAA,oBAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa;QACpC,CAAC,CAAC,GAAG,cAAc,IAAI;QACvB,CAAC,CAAC,cAAc,CAAC;IACnB,IAAA,kBAAa,EAAC,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;AACtD,CAAC;AAXD,sCAWC;AAED,SAAgB,eAAe,CAAC,IAAI;IAClC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;KACrC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,0CAMC;AAED,SAAgB,UAAU,CAAC,QAAgB;IACzC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,gCAMC;AAED,SAAgB,eAAe,CAAC,aAAqB;IACnD,MAAM,UAAU,GAAG,IAAA,cAAW,EAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACpD,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;QAChC,eAAe,CAAC,UAAU,CAAC,CAAC;KAC7B;IACD,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE;QACnC,IAAA,cAAS,EAAC,aAAa,CAAC,CAAC;KAC1B;AACH,CAAC;AARD,0CAQC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,CACL,IAAI,KAAK,GAAG;QACZ,IAAI,KAAK,IAAI;QACb,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CACvB,CAAC;AACJ,CAAC;AAPD,wCAOC"}
1	+ {"version":3,"file":"fileutils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/fileutils.ts"],"names":[],"mappings":"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"}

package/src/utils/package-manager.d.ts CHANGED Viewed

@@ -31,3 +31,19 @@ export declare function getPackageManagerCommand(packageManager?: PackageManager
  * but it can also be passed in explicitly.
  */
 export declare function getPackageManagerVersion(packageManager?: PackageManager): string;
+/**
+ * Checks for a project level npmrc file by crawling up the file tree until
+ * hitting a package.json file, as this is how npm finds them as well.
+ */
+export declare function checkForNPMRC(directory?: string): string | null;
+/**
+ * Returns the resolved version for a given package and version tag using the
+ * NPM registry (when using Yarn it will fall back to NPM to fetch the info).
+ */
+export declare function resolvePackageVersionUsingRegistry(packageName: string, version: string): string;
+/**
+ * Return the resolved version for a given package and version tag using by
+ * installing it in a temporary directory and fetching the version from the
+ * package.json.
+ */
+export declare function resolvePackageVersionUsingInstallation(packageName: string, version: string): string;

package/src/utils/package-manager.js CHANGED Viewed

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageManagerVersion = exports.getPackageManagerCommand = exports.detectPackageManager = void 0;
+exports.resolvePackageVersionUsingInstallation = exports.resolvePackageVersionUsingRegistry = exports.checkForNPMRC = exports.getPackageManagerVersion = exports.getPackageManagerCommand = exports.detectPackageManager = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const tmp_1 = require("tmp");
+const fileutils_1 = require("./fileutils");
 /**
  * Detects which package manager is used in the workspace based on the lock file.
  */
@@ -83,4 +85,76 @@ function getPackageManagerVersion(packageManager = detectPackageManager()) {
     return (0, child_process_1.execSync)(`${packageManager} --version`).toString('utf-8').trim();
 }
 exports.getPackageManagerVersion = getPackageManagerVersion;
+/**
+ * Checks for a project level npmrc file by crawling up the file tree until
+ * hitting a package.json file, as this is how npm finds them as well.
+ */
+function checkForNPMRC(directory = process.cwd()) {
+    while (!(0, fs_1.existsSync)((0, path_1.join)(directory, 'package.json'))) {
+        directory = (0, path_1.dirname)(directory);
+    }
+    const path = (0, path_1.join)(directory, '.npmrc');
+    return (0, fs_1.existsSync)(path) ? path : null;
+}
+exports.checkForNPMRC = checkForNPMRC;
+/**
+ * Returns the resolved version for a given package and version tag using the
+ * NPM registry (when using Yarn it will fall back to NPM to fetch the info).
+ */
+function resolvePackageVersionUsingRegistry(packageName, version) {
+    let pm = detectPackageManager();
+    if (pm === 'yarn') {
+        pm = 'npm';
+    }
+    try {
+        const result = (0, child_process_1.execSync)(`${pm} view ${packageName}@${version} version`, {
+            stdio: [],
+        })
+            .toString()
+            .trim();
+        if (!result) {
+            throw new Error(`Unable to resolve version ${packageName}@${version}.`);
+        }
+        // get the last line of the output, strip the package version and quotes
+        const resolvedVersion = result
+            .split('\n')
+            .pop()
+            .split(' ')
+            .pop()
+            .replace(/'/g, '');
+        return resolvedVersion;
+    }
+    catch (_a) {
+        throw new Error(`Unable to resolve version ${packageName}@${version}.`);
+    }
+}
+exports.resolvePackageVersionUsingRegistry = resolvePackageVersionUsingRegistry;
+/**
+ * Return the resolved version for a given package and version tag using by
+ * installing it in a temporary directory and fetching the version from the
+ * package.json.
+ */
+function resolvePackageVersionUsingInstallation(packageName, version) {
+    const dir = (0, tmp_1.dirSync)().name;
+    const npmrc = checkForNPMRC();
+    (0, fileutils_1.writeJsonFile)(`${dir}/package.json`, {});
+    if (npmrc) {
+        // Copy npmrc if it exists, so that npm still follows it.
+        (0, fs_1.copyFileSync)(npmrc, `${dir}/.npmrc`);
+    }
+    const pmc = getPackageManagerCommand();
+    (0, child_process_1.execSync)(`${pmc.add} ${packageName}@${version}`, { stdio: [], cwd: dir });
+    const packageJsonPath = require.resolve(`${packageName}/package.json`, {
+        paths: [dir],
+    });
+    const { version: resolvedVersion } = (0, fileutils_1.readJsonFile)(packageJsonPath);
+    try {
+        (0, fs_1.unlinkSync)(dir);
+    }
+    catch (_a) {
+        // It's okay if this fails, the OS will clean it up eventually
+    }
+    return resolvedVersion;
+}
+exports.resolvePackageVersionUsingInstallation = resolvePackageVersionUsingInstallation;
 //# sourceMappingURL=package-manager.js.map

package/src/utils/package-manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,~~2BAAgC~~;~~AAChC~~,+~~BAA4B~~;~~AAe5B~~;;GAEG;AACH,SAAgB,oBAAoB,CAAC,MAAc,EAAE;IACnD,OAAO,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACvC,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;YACzC,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAND,oDAMC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,wBAAwB,CACtC,iBAAiC,oBAAoB,EAAE;IAEvD,MAAM,QAAQ,GAA6D;QACzE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YACX,OAAO,EAAE,MAAM;YACf,GAAG,EAAE,aAAa;YAClB,MAAM,EAAE,gBAAgB;YACxB,SAAS,EAAE,iBAAiB;YAC5B,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE,CAAC,QAAQ,MAAM,IAAI,IAAI,EAAE;YAC/D,IAAI,EAAE,WAAW;SAClB,CAAC;QACF,IAAI,EAAE,GAAG,EAAE;YACT,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnE,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE;gBAC/B,OAAO,GAAG,IAAI,CAAC;aAChB;YACD,OAAO;gBACL,OAAO,EAAE,mCAAmC;gBAC5C,GAAG,EAAE,UAAU;gBACf,MAAM,EAAE,aAAa;gBACrB,SAAS,EAAE,aAAa;gBACxB,EAAE,EAAE,SAAS;gBACb,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM;gBACpC,GAAG,EAAE,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE,CAAC,YAAY,MAAM,OAAO,IAAI,EAAE;gBACtE,IAAI,EAAE,qBAAqB;aAC5B,CAAC;QACJ,CAAC;QACD,GAAG,EAAE,GAAG,EAAE;;;YACR,YAAA,OAAO,CAAC,GAAG,EAAC,2BAA2B,uCAA3B,2BAA2B,GAAK,MAAM,EAAC;YAEnD,OAAO;gBACL,OAAO,EAAE,aAAa;gBACtB,GAAG,EAAE,aAAa;gBAClB,MAAM,EAAE,gBAAgB;gBACxB,SAAS,EAAE,gBAAgB;gBAC3B,EAAE,EAAE,QAAQ;gBACZ,IAAI,EAAE,KAAK;gBACX,GAAG,EAAE,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE,CAAC,WAAW,MAAM,OAAO,IAAI,EAAE;gBACrE,IAAI,EAAE,QAAQ;aACf,CAAC;QACJ,CAAC;KACF,CAAC;IAEF,OAAO,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;AACpC,CAAC;AAhDD,4DAgDC;AAED;;;;GAIG;AACH,SAAgB,wBAAwB,CACtC,iBAAiC,oBAAoB,EAAE;IAEvD,OAAO,IAAA,wBAAQ,EAAC,GAAG,cAAc,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1E,CAAC;AAJD,4DAIC"}
1	+ {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}

package/src/utils/versions.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.10.0-beta.7';
+exports.nxVersion = '13.10.0-beta.8';
 exports.angularCliVersion = '~13.2.0';
 exports.typescriptVersion = '~4.5.2';
 exports.prettierVersion = '^2.5.1';