nx 16.5.2 → 16.5.4

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -22,27 +22,19 @@ function retrieveWorkspaceFiles(workspaceRoot, nxJson) {
         perf_hooks_1.performance.mark('native-file-deps:end');
         perf_hooks_1.performance.measure('native-file-deps', 'native-file-deps:start', 'native-file-deps:end');
         perf_hooks_1.performance.mark('get-workspace-files:start');
-        let workspaceFiles;
-        try {
-            workspaceFiles = getWorkspaceFilesNative(workspaceRoot, globs);
-        }
-        catch (e) {
-            // If the error is a parse error from Rust, then use the JS readJsonFile function to write a pretty error message
-            if (e.code === "ParseError" /* WorkspaceErrors.ParseError */) {
-                (0, fileutils_1.readJsonFile)((0, path_1.join)(workspaceRoot, e.message));
-                // readJsonFile should always fail, but if it doesn't, then throw the original error
-                throw e;
-            }
-            else {
-                throw e;
-            }
-        }
+        const { projectConfigurations, projectFileMap, globalFiles } = getWorkspaceFilesNative(workspaceRoot, globs, (configs) => {
+            const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs);
+            return projectConfigurations.projects;
+        });
         perf_hooks_1.performance.mark('get-workspace-files:end');
         perf_hooks_1.performance.measure('get-workspace-files', 'get-workspace-files:start', 'get-workspace-files:end');
         return {
-            allWorkspaceFiles: buildAllWorkspaceFiles(workspaceFiles.projectFileMap, workspaceFiles.globalFiles),
-            projectFileMap: workspaceFiles.projectFileMap,
-            projectConfigurations: createProjectConfigurations(workspaceRoot, nxJson, workspaceFiles.configFiles),
+            allWorkspaceFiles: buildAllWorkspaceFiles(projectFileMap, globalFiles),
+            projectFileMap,
+            projectConfigurations: {
+                version: 2,
+                projects: projectConfigurations,
+            },
         };
     });
 }
@@ -55,10 +47,12 @@ exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
  */
 function retrieveProjectConfigurations(workspaceRoot, nxJson) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { getConfigFiles } = require('../../native');
+        const { getProjectConfigurations } = require('../../native');
         const globs = yield configurationGlobs(workspaceRoot, nxJson);
-        const configPaths = getConfigFiles(workspaceRoot, globs);
-        return createProjectConfigurations(workspaceRoot, nxJson, configPaths);
+        return getProjectConfigurations(workspaceRoot, globs, (configs) => {
+            const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs);
+            return projectConfigurations.projects;
+        });
     });
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
@@ -74,14 +68,17 @@ function createProjectConfigurations(workspaceRoot, nxJson, configFiles) {
     perf_hooks_1.performance.mark('build-project-configs:start');
     let projectConfigurations = mergeTargetDefaultsIntoProjectDescriptions((0, workspaces_1.buildProjectsConfigurationsFromProjectPaths)(nxJson, configFiles, (path) => (0, fileutils_1.readJsonFile)((0, path_1.join)(workspaceRoot, path))), nxJson);
     if ((0, angular_json_1.shouldMergeAngularProjects)(workspaceRoot, false)) {
-        projectConfigurations.projects = (0, angular_json_1.mergeAngularJsonAndProjects)(projectConfigurations.projects, workspaceRoot);
+        projectConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectConfigurations, workspaceRoot);
     }
     perf_hooks_1.performance.mark('build-project-configs:end');
     perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
-    return projectConfigurations;
+    return {
+        version: 2,
+        projects: projectConfigurations,
+    };
 }
-function mergeTargetDefaultsIntoProjectDescriptions(config, nxJson) {
-    for (const proj of Object.values(config.projects)) {
+function mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
+    for (const proj of Object.values(projects)) {
         if (proj.targets) {
             for (const targetName of Object.keys(proj.targets)) {
                 const projectTargetDefinition = proj.targets[targetName];
@@ -92,7 +89,7 @@ function mergeTargetDefaultsIntoProjectDescriptions(config, nxJson) {
             }
         }
     }
-    return config;
+    return projects;
 }
 function configurationGlobs(workspaceRoot, nxJson) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/src/tasks-runner/utils.js

@@ -132,7 +132,7 @@ function getOutputsForTargetAndConfiguration(task, node) {
                 options,
             });
         })
-            .filter((output) => !!output && !output.match(/{.*}/));
+            .filter((output) => !!output && !output.match(/{(projectRoot|workspaceRoot|(options.*))}/));
     }
     // Keep backwards compatibility in case `outputs` doesn't exist
     if (options.outputPath) {

package/src/utils/ab-testing.js

@@ -52,7 +52,7 @@ function recordStat(opts) {
             if (process.env.NX_VERBOSE_LOGGING === 'true') {
                 console.log(`Record stat. Major: ${major}`);
             }
-            if (major < 10 || major > 15)
+            if (major < 10 || major > 16)
                 return; // test version, skip it
             const axios = require('axios');
             yield ((_a = axios['default']) !== null && _a !== void 0 ? _a : axios)

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

@@ -34,7 +34,7 @@ export declare function getPackageManagerCommand(packageManager?: PackageManager
  * By default, the package manager is derived based on the lock file,
  * but it can also be passed in explicitly.
  */
-export declare function getPackageManagerVersion(packageManager?: PackageManager): string;
+export declare function getPackageManagerVersion(packageManager?: PackageManager, cwd?: string): 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.

package/src/utils/package-manager.js

@@ -44,7 +44,7 @@ exports.detectPackageManager = detectPackageManager;
 function getPackageManagerCommand(packageManager = detectPackageManager(), root = workspace_root_1.workspaceRoot) {
     const commands = {
         yarn: () => {
-            const yarnVersion = getPackageManagerVersion('yarn');
+            const yarnVersion = getPackageManagerVersion('yarn', root);
             const useBerry = (0, semver_1.gte)(yarnVersion, '2.0.0');
             return {
                 preInstall: useBerry
@@ -63,7 +63,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
             };
         },
         pnpm: () => {
-            const pnpmVersion = getPackageManagerVersion('pnpm');
+            const pnpmVersion = getPackageManagerVersion('pnpm', root);
             const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
             const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
             const isPnpmWorkspace = (0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'));
@@ -105,8 +105,11 @@ exports.getPackageManagerCommand = getPackageManagerCommand;
  * By default, the package manager is derived based on the lock file,
  * but it can also be passed in explicitly.
  */
-function getPackageManagerVersion(packageManager = detectPackageManager()) {
-    return (0, child_process_1.execSync)(`${packageManager} --version`).toString('utf-8').trim();
+function getPackageManagerVersion(packageManager = detectPackageManager(), cwd = process.cwd()) {
+    return (0, child_process_1.execSync)(`${packageManager} --version`, {
+        cwd,
+        encoding: 'utf-8',
+    }).trim();
 }
 exports.getPackageManagerVersion = getPackageManagerVersion;
 /**

package/src/utils/testing/temp-fs.js

@@ -10,7 +10,7 @@ const fs_1 = require("fs");
 class TempFs {
     constructor(dirname, overrideWorkspaceRoot = true) {
         this.dirname = dirname;
-        this.tempDir = (0, fs_extra_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), this.dirname));
+        this.tempDir = (0, fs_extra_1.realpathSync)((0, fs_extra_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), this.dirname)));
         if (overrideWorkspaceRoot) {
             process.env.NX_WORKSPACE_ROOT_PATH = this.tempDir;
         }
@@ -33,7 +33,11 @@ class TempFs {
         });
     }
     createFileSync(filePath, content) {
-        (0, fs_extra_1.outputFileSync)((0, path_2.joinPathFragments)(this.tempDir, filePath), content);
+        let dir = (0, path_2.joinPathFragments)(this.tempDir, (0, path_1.dirname)(filePath));
+        if (!(0, fs_1.existsSync)(dir)) {
+            (0, fs_extra_1.mkdirpSync)(dir);
+        }
+        (0, fs_1.writeFileSync)((0, path_2.joinPathFragments)(this.tempDir, filePath), content);
     }
     readFile(filePath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {