@nx/devkit 16.7.1 → 16.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.7.1",
+  "version": "16.8.0-beta.0",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more.",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/devkit": "16.7.1",
+    "@nrwl/devkit": "16.8.0-beta.0",
     "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
@@ -46,5 +46,5 @@
     "migrations": "./migrations.json"
   },
   "type": "commonjs",
-  "gitHead": "8b38708d6c18496711695499d07c95f3ecc31cc9"
+  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
 }

package/src/executors/parse-target-string.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.targetToTargetString = exports.parseTargetString = void 0;
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const split_target_1 = require("nx/src/utils/split-target");
 const nx_1 = require("../../nx");
-const { readCachedProjectGraph } = (0, nx_1.requireNx)();
+let { readCachedProjectGraph, splitTarget } = (0, nx_1.requireNx)();
+// TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
+splitTarget = splitTarget !== null && splitTarget !== void 0 ? splitTarget : require('nx/src/utils/split-target').splitTarget;
 function parseTargetString(targetString, projectGraph) {
     if (!projectGraph) {
         try {
@@ -14,7 +14,7 @@ function parseTargetString(targetString, projectGraph) {
             projectGraph = { nodes: {} };
         }
     }
-    const [project, target, configuration] = (0, split_target_1.splitTarget)(targetString, projectGraph);
+    const [project, target, configuration] = splitTarget(targetString, projectGraph);
     if (!project || !target) {
         throw new Error(`Invalid Target String: ${targetString}`);
     }

package/src/executors/read-target-options.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readTargetOptions = void 0;
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const params_1 = require("nx/src/utils/params");
 const nx_1 = require("../../nx");
 const path_1 = require("path");
-const { Workspaces, getExecutorInformation, calculateDefaultProjectName } = (0, nx_1.requireNx)();
+let { Workspaces, getExecutorInformation, calculateDefaultProjectName, combineOptionsForExecutor, } = (0, nx_1.requireNx)();
+// TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
+combineOptionsForExecutor =
+    combineOptionsForExecutor !== null && combineOptionsForExecutor !== void 0 ? combineOptionsForExecutor : require('nx/src/utils/params').combineOptionsForExecutor;
 /**
  * Reads and combines options for a given target.
  *
@@ -26,6 +27,6 @@ function readTargetOptions({ project, target, configuration }, context) {
         ? calculateDefaultProjectName(context.cwd, context.root, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration)
         : // TODO(v18): remove calculateDefaultProjectName. This is to be backwards compatible with Nx 16.5 and below.
             ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
-    return (0, params_1.combineOptionsForExecutor)({}, (_a = configuration !== null && configuration !== void 0 ? configuration : targetConfiguration.defaultConfiguration) !== null && _a !== void 0 ? _a : '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.cwd, context.root));
+    return combineOptionsForExecutor({}, (_a = configuration !== null && configuration !== void 0 ? configuration : targetConfiguration.defaultConfiguration) !== null && _a !== void 0 ? _a : '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.cwd, context.root));
 }
 exports.readTargetOptions = readTargetOptions;

package/src/generators/format-files.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFiles = void 0;
 const tslib_1 = require("tslib");
 const path = require("path");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const object_sort_1 = require("nx/src/utils/object-sort");
 const nx_1 = require("../../nx");
-const { updateJson, readJson } = (0, nx_1.requireNx)();
+let { updateJson, readJson, sortObjectByKeys } = (0, nx_1.requireNx)();
+// TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
+sortObjectByKeys =
+    sortObjectByKeys !== null && sortObjectByKeys !== void 0 ? sortObjectByKeys : require('nx/src/utils/object-sort').sortObjectByKeys;
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
@@ -52,7 +53,7 @@ function sortTsConfig(tree) {
         if (!tsConfigPath) {
             return;
         }
-        updateJson(tree, tsConfigPath, (tsconfig) => (Object.assign(Object.assign({}, tsconfig), { compilerOptions: Object.assign(Object.assign({}, tsconfig.compilerOptions), { paths: (0, object_sort_1.sortObjectByKeys)(tsconfig.compilerOptions.paths) }) })));
+        updateJson(tree, tsConfigPath, (tsconfig) => (Object.assign(Object.assign({}, tsconfig), { compilerOptions: Object.assign(Object.assign({}, tsconfig.compilerOptions), { paths: sortObjectByKeys(tsconfig.compilerOptions.paths) }) })));
     }
     catch (e) {
         // catch noop

package/src/generators/project-name-and-root-utils.d.ts

@@ -4,6 +4,7 @@ export type ProjectNameAndRootFormat = 'as-provided' | 'derived';
 export type ProjectGenerationOptions = {
     name: string;
     projectType: ProjectType;
+    callingGenerator: string;
     directory?: string;
     importPath?: string;
     projectNameAndRootFormat?: ProjectNameAndRootFormat;
@@ -37,4 +38,6 @@ export type ProjectNameAndRootOptions = {
      */
     importPath?: string;
 };
-export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions>;
+export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions & {
+    projectNameAndRootFormat: ProjectNameAndRootFormat;
+}>;

package/src/generators/project-name-and-root-utils.js

@@ -6,14 +6,14 @@ const enquirer_1 = require("enquirer");
 const nx_1 = require("../../nx");
 const get_workspace_layout_1 = require("../utils/get-workspace-layout");
 const names_1 = require("../utils/names");
-const { joinPathFragments, readJson, readNxJson } = (0, nx_1.requireNx)();
+const { joinPathFragments, normalizePath, readJson, readNxJson, updateNxJson } = (0, nx_1.requireNx)();
 function determineProjectNameAndRootOptions(tree, options) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         validateName(options.name, options.projectNameAndRootFormat);
         const formats = getProjectNameAndRootFormats(tree, options);
-        const format = (_a = options.projectNameAndRootFormat) !== null && _a !== void 0 ? _a : (yield determineFormat(formats));
-        return formats[format];
+        const format = (_a = options.projectNameAndRootFormat) !== null && _a !== void 0 ? _a : (yield determineFormat(tree, formats, options.callingGenerator));
+        return Object.assign(Object.assign({}, formats[format]), { projectNameAndRootFormat: format });
     });
 }
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
@@ -37,7 +37,9 @@ function validateName(name, projectNameAndRootFormat) {
         throw new Error(`The project name should match the pattern "${pattern}". The provided value "${name}" does not match.`);
     }
 }
-function determineFormat(formats) {
+function determineFormat(tree, formats, callingGenerator) {
+    var _a, _b;
+    var _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (!formats.derived) {
             return 'as-provided';
@@ -53,7 +55,7 @@ function determineFormat(formats) {
     Name: ${formats['derived'].projectName}
     Root: ${formats['derived'].projectRoot}`;
         const derivedSelectedValue = `${formats['derived'].projectName} @ ${formats['derived'].projectRoot} (This was derived from the folder structure. Please provide the exact name and directory in the future)`;
-        return yield (0, enquirer_1.prompt)({
+        const result = yield (0, enquirer_1.prompt)({
             type: 'select',
             name: 'format',
             message: 'What should be the project name and where should it be generated?',
@@ -69,12 +71,29 @@ function determineFormat(formats) {
             ],
             initial: 'as-provided',
         }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
+        if (result === 'as-provided' && callingGenerator) {
+            const { saveDefault } = yield (0, enquirer_1.prompt)({
+                type: 'confirm',
+                message: 'Would you like to save this layout as a default?',
+                name: 'saveDefault',
+            });
+            if (saveDefault) {
+                const nxJson = readNxJson(tree);
+                (_a = nxJson.generators) !== null && _a !== void 0 ? _a : (nxJson.generators = {});
+                (_b = (_c = nxJson.generators)[callingGenerator]) !== null && _b !== void 0 ? _b : (_c[callingGenerator] = {});
+                nxJson.generators[callingGenerator].projectNameAndRootFormat = result;
+                updateNxJson(tree, nxJson);
+            }
+        }
+        return result;
     });
 }
 function getProjectNameAndRootFormats(tree, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const name = (0, names_1.names)(options.name).fileName;
-    const directory = (_a = options.directory) === null || _a === void 0 ? void 0 : _a.replace(/^\.?\//, '');
+    const directory = options.directory
+        ? normalizePath(options.directory.replace(/^\.?\//, ''))
+        : undefined;
     const asProvidedProjectName = name;
     const asProvidedProjectDirectory = directory
         ? (0, names_1.names)(directory).fileName
@@ -90,7 +109,7 @@ function getProjectNameAndRootFormats(tree, options) {
                     projectSimpleName: nameWithoutScope,
                     projectFileName: nameWithoutScope,
                 },
-                importPath: (_b = options.importPath) !== null && _b !== void 0 ? _b : asProvidedProjectName,
+                importPath: (_a = options.importPath) !== null && _a !== void 0 ? _a : asProvidedProjectName,
                 projectRoot: asProvidedProjectDirectory,
             },
         };
@@ -103,7 +122,7 @@ function getProjectNameAndRootFormats(tree, options) {
             npmScope = getNpmScope(tree);
             asProvidedImportPath =
                 asProvidedProjectDirectory === '.'
-                    ? (_c = readJson(tree, 'package.json').name) !== null && _c !== void 0 ? _c : getImportPath(npmScope, asProvidedProjectName)
+                    ? (_b = readJson(tree, 'package.json').name) !== null && _b !== void 0 ? _b : getImportPath(npmScope, asProvidedProjectName)
                     : getImportPath(npmScope, asProvidedProjectName);
         }
     }
@@ -129,7 +148,7 @@ function getProjectNameAndRootFormats(tree, options) {
         if (!derivedImportPath) {
             derivedImportPath =
                 derivedProjectDirectory === '.'
-                    ? (_d = readJson(tree, 'package.json').name) !== null && _d !== void 0 ? _d : getImportPath(npmScope, derivedProjectName)
+                    ? (_c = readJson(tree, 'package.json').name) !== null && _c !== void 0 ? _c : getImportPath(npmScope, derivedProjectName)
                     : getImportPath(npmScope, derivedProjectDirectoryWithoutLayout);
         }
     }

package/src/utils/convert-nx-executor.js

@@ -21,7 +21,7 @@ function convertNxExecutor(executor) {
             const projectsConfigurations = retrieveProjectConfigurationsWithAngularProjects
                 ? {
                     version: 2,
-                    projects: yield retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration),
+                    projects: yield retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration).then((p) => p.projectNodes),
                 }
                 : // TODO(v18): remove retrieveProjectConfigurations. This is to be backwards compatible with Nx 16.5 and below.
                     workspaces.readProjectsConfigurations({

package/src/utils/invoke-nx-generator.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxGenerator = void 0;
 const tslib_1 = require("tslib");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const logger_1 = require("nx/src/utils/logger");
 const path_1 = require("path");
 const nx_1 = require("../../nx");
-const { logger } = (0, nx_1.requireNx)();
+let { logger, stripIndent } = (0, nx_1.requireNx)();
+// TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
+stripIndent = stripIndent !== null && stripIndent !== void 0 ? stripIndent : require('nx/src/utils/logger').stripIndent;
 class RunCallbackTask {
     constructor(callback) {
         this.callback = callback;
@@ -167,7 +167,7 @@ class DevkitTreeFromAngularDevkitTree {
         this.warnUnsupportedFilePermissionsChange(filePath, mode);
     }
     warnUnsupportedFilePermissionsChange(filePath, mode) {
-        logger.warn((0, logger_1.stripIndent)(`The Angular DevKit tree does not support changing a file permissions.
+        logger.warn(stripIndent(`The Angular DevKit tree does not support changing a file permissions.
                   Ignoring changing ${filePath} permissions to ${mode}.`));
     }
 }

package/src/utils/module-federation/secondary-entry-points.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectPackageSecondaryEntryPoints = exports.recursivelyCollectSecondaryEntryPointsFromDirectory = exports.getNonNodeModulesSubDirs = exports.collectWorkspaceLibrarySecondaryEntryPoints = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const package_json_1 = require("nx/src/utils/package-json");
 const nx_1 = require("../../../nx");
-const { readJsonFile, joinPathFragments, workspaceRoot } = (0, nx_1.requireNx)();
+let { readJsonFile, joinPathFragments, workspaceRoot, readModulePackageJson } = (0, nx_1.requireNx)();
+// TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
+readModulePackageJson =
+    readModulePackageJson !== null && readModulePackageJson !== void 0 ? readModulePackageJson : require('nx/src/utils/package-json').readModulePackageJson;
 function collectWorkspaceLibrarySecondaryEntryPoints(library, tsconfigPathAliases) {
     const libraryRoot = (0, path_1.join)(workspaceRoot, library.root);
     const needsSecondaryEntryPointsCollected = (0, fs_1.existsSync)((0, path_1.join)(libraryRoot, 'ng-package.json'));
@@ -83,7 +84,7 @@ function collectPackageSecondaryEntryPoints(pkgName, pkgVersion, collectedPackag
     let packageJsonPath;
     let packageJson;
     try {
-        ({ path: packageJsonPath, packageJson } = (0, package_json_1.readModulePackageJson)(pkgName));
+        ({ path: packageJsonPath, packageJson } = readModulePackageJson(pkgName));
         pathToPackage = (0, path_1.dirname)(packageJsonPath);
     }
     catch (_a) {