nx 16.7.0 → 16.7.2

package/src/utils/assert-workspace-validity.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertWorkspaceValidity = void 0;
 const find_matching_projects_1 = require("./find-matching-projects");
 const output_1 = require("./output");
-function assertWorkspaceValidity(projectsConfigurations, nxJson) {
-    const projectNames = Object.keys(projectsConfigurations.projects);
+function assertWorkspaceValidity(projects, nxJson) {
+    const projectNames = Object.keys(projects);
     const projectGraphNodes = projectNames.reduce((graph, project) => {
-        const projectConfiguration = projectsConfigurations.projects[project];
+        const projectConfiguration = projects[project];
         graph[project] = {
             name: project,
             type: projectConfiguration.projectType === 'library' ? 'lib' : 'app',
@@ -14,7 +14,6 @@ function assertWorkspaceValidity(projectsConfigurations, nxJson) {
         };
         return graph;
     }, {});
-    const projects = Object.assign({}, projectsConfigurations.projects);
     const invalidImplicitDependencies = new Map();
     if (nxJson.implicitDependencies) {
         output_1.output.warn({

package/src/utils/nx-plugin.d.ts

@@ -8,7 +8,6 @@ import { ProjectGraphDependencyWithFile } from '../project-graph/project-graph-b
  * Context for {@link CreateNodesFunction}
  */
 export interface CreateNodesContext {
-    readonly projectsConfigurations: Record<string, ProjectConfiguration>;
     readonly nxJsonConfiguration: NxJsonConfiguration;
     readonly workspaceRoot: string;
 }

package/src/utils/nx-plugin.js

@@ -17,6 +17,7 @@ const installation_directory_1 = require("./installation-directory");
 const typescript_1 = require("../plugins/js/utils/typescript");
 const retrieve_workspace_files_1 = require("../project-graph/utils/retrieve-workspace-files");
 const globs_1 = require("./globs");
+const angular_json_1 = require("../adapter/angular-json");
 tslib_1.__exportStar(require("./nx-plugin.deprecated"), exports);
 // Short lived cache (cleared between cmd runs)
 // holding resolved nx plugin objects.
@@ -113,6 +114,9 @@ function loadNxPlugins(plugins, paths = (0, installation_directory_1.getNxRequir
         const jsPlugin = yield Promise.resolve().then(() => require('../plugins/js'));
         jsPlugin.name = 'nx-js-graph-plugin';
         result.push(jsPlugin);
+        if ((0, angular_json_1.shouldMergeAngularProjects)(root, false)) {
+            result.push(angular_json_1.NxAngularJsonPlugin);
+        }
         plugins !== null && plugins !== void 0 ? plugins : (plugins = []);
         for (const plugin of plugins) {
             result.push(yield loadNxPluginAsync(plugin, paths, root));
@@ -122,6 +126,9 @@ function loadNxPlugins(plugins, paths = (0, installation_directory_1.getNxRequir
 }
 exports.loadNxPlugins = loadNxPlugins;
 function ensurePluginIsV2(plugin) {
+    if (isNxPluginV2(plugin)) {
+        return plugin;
+    }
     if (isNxPluginV1(plugin) && plugin.projectFilePatterns) {
         return Object.assign(Object.assign({}, plugin), { createNodes: [
                 `*/**/${(0, globs_1.combineGlobPatterns)(plugin.projectFilePatterns)}`,

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

@@ -66,6 +66,7 @@ export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigra
     packageGroup?: ArrayPackageGroup;
 };
 export declare function buildTargetFromScript(script: string, nx: NxProjectPackageJsonConfiguration): TargetConfiguration;
+export declare function readTargetsFromPackageJson({ scripts, nx }: PackageJson): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.
  *

package/src/utils/package-json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.buildTargetFromScript = exports.readNxMigrateConfig = exports.normalizePackageGroup = void 0;
+exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.readTargetsFromPackageJson = exports.buildTargetFromScript = exports.readNxMigrateConfig = exports.normalizePackageGroup = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fileutils_1 = require("./fileutils");
@@ -35,6 +35,16 @@ function buildTargetFromScript(script, nx) {
     return Object.assign(Object.assign({}, nxTargetConfiguration), { executor: 'nx:run-script', options: Object.assign(Object.assign({}, (nxTargetConfiguration.options || {})), { script }) });
 }
 exports.buildTargetFromScript = buildTargetFromScript;
+function readTargetsFromPackageJson({ scripts, nx }) {
+    const res = {};
+    Object.keys(scripts || {}).forEach((script) => {
+        if (!(nx === null || nx === void 0 ? void 0 : nx.includedScripts) || (nx === null || nx === void 0 ? void 0 : nx.includedScripts.includes(script))) {
+            res[script] = buildTargetFromScript(script, nx);
+        }
+    });
+    return res;
+}
+exports.readTargetsFromPackageJson = readTargetsFromPackageJson;
 /**
  * Uses `require.resolve` to read the package.json for a module.
  *

package/src/utils/package-manager.js

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

package/src/utils/project-graph-utils.d.ts

@@ -1,8 +1,6 @@
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
-import { TargetConfiguration } from '../config/workspace-json-project-json';
 export declare function projectHasTarget(project: ProjectGraphProjectNode, target: string): boolean;
 export declare function projectHasTargetAndConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string): any;
-export declare function mergeNpmScriptsWithTargets(projectRoot: string, targets: any): Record<string, TargetConfiguration>;
 export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph): [projectDirs: string[], warnings: string[]];
 /**
  * Find all internal project dependencies.

package/src/utils/project-graph-utils.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllProjectNodeDependencies = exports.getSourceDirOfDependentProjects = exports.mergeNpmScriptsWithTargets = exports.projectHasTargetAndConfiguration = exports.projectHasTarget = void 0;
-const package_json_1 = require("./package-json");
-const path_1 = require("path");
-const fileutils_1 = require("./fileutils");
+exports.findAllProjectNodeDependencies = exports.getSourceDirOfDependentProjects = exports.projectHasTargetAndConfiguration = exports.projectHasTarget = void 0;
 const project_graph_1 = require("../project-graph/project-graph");
 function projectHasTarget(project, target) {
     return !!(project.data &&
@@ -17,23 +14,6 @@ function projectHasTargetAndConfiguration(project, target, configuration) {
         project.data.targets[target].configurations[configuration]);
 }
 exports.projectHasTargetAndConfiguration = projectHasTargetAndConfiguration;
-function mergeNpmScriptsWithTargets(projectRoot, targets) {
-    try {
-        const { scripts, nx } = (0, fileutils_1.readJsonFile)((0, path_1.join)(projectRoot, 'package.json'));
-        const res = {};
-        // handle no scripts
-        Object.keys(scripts || {}).forEach((script) => {
-            if (!(nx === null || nx === void 0 ? void 0 : nx.includedScripts) || (nx === null || nx === void 0 ? void 0 : nx.includedScripts.includes(script))) {
-                res[script] = (0, package_json_1.buildTargetFromScript)(script, nx);
-            }
-        });
-        return Object.assign(Object.assign({}, res), (targets || {}));
-    }
-    catch (e) {
-        return targets;
-    }
-}
-exports.mergeNpmScriptsWithTargets = mergeNpmScriptsWithTargets;
 function getSourceDirOfDependentProjects(projectName, projectGraph = (0, project_graph_1.readCachedProjectGraph)()) {
     if (!projectGraph.nodes[projectName]) {
         throw new Error(`Couldn't find project "${projectName}" in this Nx workspace`);

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

@@ -10,3 +10,15 @@ jest.mock('fs', () => {
             }
         } });
 });
+// @ts-ignore
+jest.mock('node:fs', () => {
+    const mockFs = require('memfs').fs;
+    return Object.assign(Object.assign({}, mockFs), { existsSync(path) {
+            if (path.endsWith('.node')) {
+                return true;
+            }
+            else {
+                return mockFs.existsSync(path);
+            }
+        } });
+});