nx 16.5.0 → 16.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.5.0",
+  "version": "16.6.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.5.0",
+    "@nrwl/tao": "16.6.0-beta.0",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.5.0",
-    "@nx/nx-darwin-x64": "16.5.0",
-    "@nx/nx-freebsd-x64": "16.5.0",
-    "@nx/nx-linux-arm-gnueabihf": "16.5.0",
-    "@nx/nx-linux-arm64-gnu": "16.5.0",
-    "@nx/nx-linux-arm64-musl": "16.5.0",
-    "@nx/nx-linux-x64-gnu": "16.5.0",
-    "@nx/nx-linux-x64-musl": "16.5.0",
-    "@nx/nx-win32-arm64-msvc": "16.5.0",
-    "@nx/nx-win32-x64-msvc": "16.5.0"
+    "@nx/nx-darwin-arm64": "16.6.0-beta.0",
+    "@nx/nx-darwin-x64": "16.6.0-beta.0",
+    "@nx/nx-freebsd-x64": "16.6.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "16.6.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "16.6.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "16.6.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "16.6.0-beta.0",
+    "@nx/nx-linux-x64-musl": "16.6.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "16.6.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "16.6.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -175,5 +175,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "eaebcc34f92db2200dab0bde2e2e1dde107a47bf"
+  "gitHead": "5a7ffb93c9e84bffbf52f6ae9c6c1e3b8edb9d35"
 }

package/src/config/workspaces.d.ts

@@ -73,7 +73,7 @@ export declare function inferProjectFromNonStandardFile(file: string): ProjectCo
     name: string;
 };
 export declare function buildProjectsConfigurationsFromProjectPaths(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
-readJson?: <T extends Object>(string: any) => T): ProjectsConfigurations;
+readJson?: <T extends Object>(string: any) => T): Record<string, ProjectConfiguration>;
 export declare function mergeTargetConfigurations(projectConfiguration: ProjectConfiguration, target: string, targetDefaults: TargetDefaults[string]): TargetConfiguration;
 export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];
 export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;

package/src/config/workspaces.js

@@ -58,13 +58,16 @@ class Workspaces {
             return this.cachedProjectsConfig;
         }
         const nxJson = this.readNxJson();
-        const projectsConfigurations = buildProjectsConfigurationsFromProjectPaths(nxJson, globForProjectFiles(this.root, (opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference)
+        let projectsConfigurations = buildProjectsConfigurationsFromProjectPaths(nxJson, globForProjectFiles(this.root, (opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference)
             ? []
             : getGlobPatternsFromPlugins(nxJson, (0, installation_directory_1.getNxRequirePaths)(this.root), this.root), nxJson), (path) => (0, fileutils_1.readJsonFile)((0, path_1.join)(this.root, path)));
         if ((0, angular_json_1.shouldMergeAngularProjects)(this.root, opts === null || opts === void 0 ? void 0 : opts._includeProjectsFromAngularJson)) {
-            projectsConfigurations.projects = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations.projects, this.root);
+            projectsConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations, this.root);
         }
-        this.cachedProjectsConfig = this.mergeTargetDefaultsIntoProjectDescriptions(projectsConfigurations, nxJson);
+        this.cachedProjectsConfig = {
+            version: 2,
+            projects: this.mergeTargetDefaultsIntoProjectDescriptions(projectsConfigurations, nxJson),
+        };
         return this.cachedProjectsConfig;
     }
     /**
@@ -74,8 +77,8 @@ class Workspaces {
         const nxJson = this.readNxJson();
         return Object.assign(Object.assign({}, this.readProjectsConfigurations(opts)), nxJson);
     }
-    mergeTargetDefaultsIntoProjectDescriptions(config, nxJson) {
-        for (const proj of Object.values(config.projects)) {
+    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];
@@ -86,7 +89,7 @@ class Workspaces {
                 }
             }
         }
-        return config;
+        return projects;
     }
     isNxExecutor(nodeModule, executor) {
         return !this.readExecutor(nodeModule, executor).isNgCompat;
@@ -565,10 +568,7 @@ readJson = (string) => (0, fileutils_1.readJsonFile)(string) // making this an a
             }
         }
     }
-    return {
-        version: 2,
-        projects: projects,
-    };
+    return projects;
 }
 exports.buildProjectsConfigurationsFromProjectPaths = buildProjectsConfigurationsFromProjectPaths;
 function mergeTargetConfigurations(projectConfiguration, target, targetDefaults) {

package/src/generators/utils/project-configuration.js

@@ -119,7 +119,7 @@ function readAndCombineAllProjectConfigurations(tree) {
     const createdFiles = findCreatedProjectFiles(tree);
     const deletedFiles = findDeletedProjectFiles(tree);
     const projectFiles = [...globbedFiles, ...createdFiles].filter((r) => deletedFiles.indexOf(r) === -1);
-    return (0, workspaces_1.buildProjectsConfigurationsFromProjectPaths)(nxJson, projectFiles, (file) => (0, json_1.readJson)(tree, file)).projects;
+    return (0, workspaces_1.buildProjectsConfigurationsFromProjectPaths)(nxJson, projectFiles, (file) => (0, json_1.readJson)(tree, file));
 }
 /**
  * Used to ensure that projects created during

package/src/hasher/task-hasher.js

@@ -188,7 +188,7 @@ class TaskHasherImpl {
                             return yield this.hashNamedInputForDependencies(d.target, task, input.input || 'default', visited);
                         }
                         else {
-                            const hash = this.hashExternalDependency(d.target);
+                            const hash = this.hashExternalDependency(d.source, d.target);
                             return {
                                 value: hash,
                                 details: {
@@ -239,13 +239,16 @@ class TaskHasherImpl {
         }
         return partialHashes;
     }
-    hashExternalDependency(projectName, visited = new Set()) {
+    computeExternalDependencyIdentifier(sourceProjectName, targetProjectName) {
+        return `${sourceProjectName}->${targetProjectName}`;
+    }
+    hashExternalDependency(sourceProjectName, targetProjectName, visited = new Set()) {
         // try to retrieve the hash from cache
-        if (this.externalDepsHashCache[projectName]) {
-            return this.externalDepsHashCache[projectName];
+        if (this.externalDepsHashCache[targetProjectName]) {
+            return this.externalDepsHashCache[targetProjectName];
         }
-        visited.add(projectName);
-        const node = this.projectGraph.externalNodes[projectName];
+        visited.add(this.computeExternalDependencyIdentifier(sourceProjectName, targetProjectName));
+        const node = this.projectGraph.externalNodes[targetProjectName];
         let partialHash;
         if (node) {
             const partialHashes = [];
@@ -258,10 +261,10 @@ class TaskHasherImpl {
                 partialHashes.push(node.data.version);
             }
             // we want to calculate the hash of the entire dependency tree
-            if (this.projectGraph.dependencies[projectName]) {
-                this.projectGraph.dependencies[projectName].forEach((d) => {
-                    if (!visited.has(d.target)) {
-                        partialHashes.push(this.hashExternalDependency(d.target, visited));
+            if (this.projectGraph.dependencies[targetProjectName]) {
+                this.projectGraph.dependencies[targetProjectName].forEach((d) => {
+                    if (!visited.has(this.computeExternalDependencyIdentifier(targetProjectName, d.target))) {
+                        partialHashes.push(this.hashExternalDependency(targetProjectName, d.target, visited));
                     }
                 });
             }
@@ -272,9 +275,9 @@ class TaskHasherImpl {
             // this may occur if dependency is not an npm package
             // but rather symlinked in node_modules or it's pointing to a remote git repo
             // in this case we have no information about the versioning of the given package
-            partialHash = `__${projectName}__`;
+            partialHash = `__${targetProjectName}__`;
         }
-        this.externalDepsHashCache[projectName] = partialHash;
+        this.externalDepsHashCache[targetProjectName] = partialHash;
         return partialHash;
     }
     hashTarget(projectName, targetName, selfInputs) {
@@ -290,7 +293,7 @@ class TaskHasherImpl {
             target.executor.startsWith(`@nx/`)) {
             const executorPackage = target.executor.split(':')[0];
             const executorNodeName = this.findExternalDependencyNodeName(executorPackage);
-            hash = this.hashExternalDependency(executorNodeName);
+            hash = this.hashExternalDependency(projectName, executorNodeName);
         }
         else {
             // use command external dependencies if available to construct the hash
@@ -303,7 +306,7 @@ class TaskHasherImpl {
                     const externalDependencies = input['externalDependencies'];
                     for (let dep of externalDependencies) {
                         dep = this.findExternalDependencyNodeName(dep);
-                        partialHashes.push(this.hashExternalDependency(dep));
+                        partialHashes.push(this.hashExternalDependency(projectName, dep));
                     }
                 }
             }

package/src/native/index.d.ts

@@ -37,14 +37,13 @@ export const enum WorkspaceErrors {
   Generic = 'Generic'
 }
 /** Get workspace config files based on provided globs */
-export function getConfigFiles(workspaceRoot: string, globs: Array<string>): Array<string>
+export function getProjectConfigurations(workspaceRoot: string, globs: Array<string>, parseConfigurations: (arg0: Array<string>) => Record<string, object>): Record<string, object>
 export interface NxWorkspaceFiles {
   projectFileMap: Record<string, Array<FileData>>
   globalFiles: Array<FileData>
-  configFiles: Array<string>
+  projectConfigurations: Record<string, object>
 }
-/** Throws exceptions */
-export function getWorkspaceFilesNative(workspaceRoot: string, globs: Array<string>): NxWorkspaceFiles
+export function getWorkspaceFilesNative(workspaceRoot: string, globs: Array<string>, parseConfigurations: (arg0: Array<string>) => Record<string, object>): NxWorkspaceFiles
 export class Watcher {
   origin: string
   /**

package/src/native/index.js

@@ -246,7 +246,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { expandOutputs, remove, copy, hashArray, hashFile, hashFiles, hashFilesMatchingGlobs, EventType, Watcher, WorkspaceErrors, getConfigFiles, getWorkspaceFilesNative } = nativeBinding
+const { expandOutputs, remove, copy, hashArray, hashFile, hashFiles, hashFilesMatchingGlobs, EventType, Watcher, WorkspaceErrors, getProjectConfigurations, getWorkspaceFilesNative } = nativeBinding
 
 module.exports.expandOutputs = expandOutputs
 module.exports.remove = remove
@@ -258,5 +258,5 @@ module.exports.hashFilesMatchingGlobs = hashFilesMatchingGlobs
 module.exports.EventType = EventType
 module.exports.Watcher = Watcher
 module.exports.WorkspaceErrors = WorkspaceErrors
-module.exports.getConfigFiles = getConfigFiles
+module.exports.getProjectConfigurations = getProjectConfigurations
 module.exports.getWorkspaceFilesNative = getWorkspaceFilesNative

package/src/plugins/js/package-json/create-package-json.d.ts

@@ -19,8 +19,9 @@ export declare function createPackageJson(projectName: string, graph: ProjectGra
     isProduction?: boolean;
     helperDependencies?: string[];
 }, fileMap?: ProjectFileMap): PackageJson;
-export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, options: {
+export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, rootPackageJson: PackageJson, options: {
     helperDependencies?: string[];
     ignoredDependencies?: string[];
+    isProduction?: boolean;
 }, fileMap?: ProjectFileMap): NpmDeps;
 export {};

package/src/plugins/js/package-json/create-package-json.js

@@ -19,7 +19,11 @@ const path_1 = require("path");
 function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     const projectNode = graph.nodes[projectName];
     const isLibrary = projectNode.type === 'lib';
-    const npmDeps = findProjectsNpmDependencies(projectNode, graph, options.target, { helperDependencies: options.helperDependencies }, fileMap);
+    const rootPackageJson = (0, fileutils_1.readJsonFile)(`${options.root || workspace_root_1.workspaceRoot}/package.json`);
+    const npmDeps = findProjectsNpmDependencies(projectNode, graph, options.target, rootPackageJson, {
+        helperDependencies: options.helperDependencies,
+        isProduction: options.isProduction,
+    }, fileMap);
     // default package.json if one does not exist
     let packageJson = {
         name: projectName,
@@ -51,7 +55,6 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
             (isLibrary && ((_a = rootPackageJson[section]) === null || _a === void 0 ? void 0 : _a[packageName])) ||
             version);
     };
-    const rootPackageJson = (0, fileutils_1.readJsonFile)(`${options.root || workspace_root_1.workspaceRoot}/package.json`);
     Object.entries(npmDeps.dependencies).forEach(([packageName, version]) => {
         var _a, _b, _c, _d, _e, _f;
         if (((_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName]) &&
@@ -106,7 +109,7 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     return packageJson;
 }
 exports.createPackageJson = createPackageJson;
-function findProjectsNpmDependencies(projectNode, graph, target, options, fileMap) {
+function findProjectsNpmDependencies(projectNode, graph, target, rootPackageJson, options, fileMap) {
     var _a, _b;
     if (fileMap == null) {
         fileMap = ((_a = (0, nx_deps_cache_1.readProjectFileMapCache)()) === null || _a === void 0 ? void 0 : _a.projectFileMap) || {};
@@ -126,7 +129,14 @@ function findProjectsNpmDependencies(projectNode, graph, target, options, fileMa
             graph.externalNodes[dep].data.version;
         recursivelyCollectPeerDependencies(dep, graph, npmDeps, seen);
     });
-    findAllNpmDeps(fileMap, projectNode, graph, npmDeps, seen, options.ignoredDependencies || [], dependencyInputs, selfInputs);
+    // if it's production, we want to ignore all found devDependencies
+    const ignoredDependencies = options.isProduction && rootPackageJson.devDependencies
+        ? [
+            ...(options.ignoredDependencies || []),
+            ...Object.keys(rootPackageJson.devDependencies),
+        ]
+        : options.ignoredDependencies || [];
+    findAllNpmDeps(fileMap, projectNode, graph, npmDeps, seen, ignoredDependencies, dependencyInputs, selfInputs);
     return npmDeps;
 }
 exports.findProjectsNpmDependencies = findProjectsNpmDependencies;

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -18,4 +18,4 @@ export declare function retrieveWorkspaceFiles(workspaceRoot: string, nxJson: Nx
  * @param workspaceRoot
  * @param nxJson
  */
-export declare function retrieveProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<ProjectsConfigurations>;
+export declare function retrieveProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<any>;

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/utils/package-manager.d.ts

@@ -1,5 +1,6 @@
 export type PackageManager = 'yarn' | 'pnpm' | 'npm';
 export interface PackageManagerCommands {
+    preInstall?: string;
     install: string;
     ciInstall: string;
     add: string;

package/src/utils/package-manager.js

@@ -47,6 +47,9 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
             const yarnVersion = getPackageManagerVersion('yarn');
             const useBerry = (0, semver_1.gte)(yarnVersion, '2.0.0');
             return {
+                preInstall: useBerry
+                    ? 'yarn set version stable'
+                    : 'yarn set version classic',
                 install: 'yarn',
                 ciInstall: useBerry
                     ? 'yarn install --immutable'