@nx/devkit 17.0.0-beta.8 → 17.0.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "17.0.0-beta.8",
+  "version": "17.0.0-rc.1",
   "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": {
@@ -34,7 +34,7 @@
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "semver": "7.5.3",
-    "@nrwl/devkit": "17.0.0-beta.8"
+    "@nrwl/devkit": "17.0.0-rc.1"
   },
   "peerDependencies": {
     "nx": ">= 16 <= 18"

package/src/generators/artifact-name-and-directory-utils.d.ts

@@ -6,7 +6,7 @@ export type ArtifactGenerationOptions = {
     name: string;
     directory?: string;
     disallowPathInNameForDerived?: boolean;
-    fileExtension?: 'js' | 'jsx' | 'ts' | 'tsx';
+    fileExtension?: 'js' | 'jsx' | 'ts' | 'tsx' | 'vue';
     fileName?: string;
     flat?: boolean;
     nameAndDirectoryFormat?: NameAndDirectoryFormat;

package/src/generators/artifact-name-and-directory-utils.js

@@ -7,9 +7,16 @@ const nx_1 = require("../../nx");
 const names_1 = require("../utils/names");
 const { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, getProjects, joinPathFragments, logger, normalizePath, output, workspaceRoot, } = (0, nx_1.requireNx)();
 async function determineArtifactNameAndDirectoryOptions(tree, options) {
+    if (!options.nameAndDirectoryFormat &&
+        (process.env.NX_INTERACTIVE !== 'true' || !isTTY())) {
+        options.nameAndDirectoryFormat = 'derived';
+    }
     const formats = getNameAndDirectoryOptionFormats(tree, options);
     const format = options.nameAndDirectoryFormat ?? (await determineFormat(formats, options));
     validateResolvedProject(tree, formats[format]?.project, options, formats[format]?.directory);
+    if (format === 'derived' && options.callingGenerator) {
+        logDeprecationMessage(options, formats);
+    }
     return {
         ...formats[format],
         nameAndDirectoryFormat: format,
@@ -20,10 +27,6 @@ async function determineFormat(formats, options) {
     if (!formats.derived) {
         return 'as-provided';
     }
-    if (process.env.NX_INTERACTIVE !== 'true' || !isTTY()) {
-        logDeprecationMessage(options, formats);
-        return 'derived';
-    }
     const asProvidedDescription = `As provided: ${formats['as-provided'].filePath}`;
     const asProvidedSelectedValue = formats['as-provided'].filePath;
     const derivedDescription = `Derived:     ${formats['derived'].filePath}`;
@@ -47,9 +50,6 @@ async function determineFormat(formats, options) {
         ],
         initial: 'as-provided',
     }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-    if (result === 'derived' && options.callingGenerator) {
-        logDeprecationMessage(options, formats);
-    }
     return result;
 }
 function logDeprecationMessage(options, formats) {

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

@@ -41,3 +41,7 @@ export type ProjectNameAndRootOptions = {
 export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions & {
     projectNameAndRootFormat: ProjectNameAndRootFormat;
 }>;
+/**
+ * Function for setting cwd during testing
+ */
+export declare function setCwd(path: string): void;

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.determineProjectNameAndRootOptions = void 0;
+exports.setCwd = exports.determineProjectNameAndRootOptions = void 0;
 const enquirer_1 = require("enquirer");
 const path_1 = require("path");
 const nx_1 = require("../../nx");
 const get_workspace_layout_1 = require("../utils/get-workspace-layout");
 const names_1 = require("../utils/names");
-const { joinPathFragments, normalizePath, logger, readJson, readNxJson, updateNxJson, stripIndents, workspaceRoot, } = (0, nx_1.requireNx)();
+const { joinPathFragments, normalizePath, logger, readJson, stripIndents, workspaceRoot, } = (0, nx_1.requireNx)();
 const deprecationWarning = stripIndents `
     In Nx 18, generating projects will no longer derive the name and root.
     Please provide the exact project name and root in the future.`;
@@ -85,20 +85,19 @@ async function determineFormat(tree, formats, callingGenerator) {
     return result;
 }
 function getProjectNameAndRootFormats(tree, options) {
-    const name = (0, names_1.names)(options.name).fileName;
     const directory = options.directory
         ? normalizePath(options.directory.replace(/^\.?\//, ''))
         : undefined;
-    const asProvidedProjectName = name;
+    const asProvidedProjectName = options.name;
     let asProvidedProjectDirectory;
     const relativeCwd = normalizePath((0, path_1.relative)(workspaceRoot, getCwd())).replace(/\/$/, '');
     if (directory) {
         // append the directory to the current working directory if it doesn't start with it
         if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
-            asProvidedProjectDirectory = (0, names_1.names)(directory).fileName;
+            asProvidedProjectDirectory = directory;
         }
         else {
-            asProvidedProjectDirectory = joinPathFragments(relativeCwd, (0, names_1.names)(directory).fileName);
+            asProvidedProjectDirectory = joinPathFragments(relativeCwd, directory);
         }
     }
     else if (options.rootProject) {
@@ -112,7 +111,7 @@ function getProjectNameAndRootFormats(tree, options) {
             asProvidedProjectDirectory = joinPathFragments(relativeCwd, asProvidedProjectName);
         }
     }
-    if (name.startsWith('@')) {
+    if (asProvidedProjectName.startsWith('@')) {
         const nameWithoutScope = asProvidedProjectName.split('/')[1];
         return {
             'as-provided': {
@@ -139,6 +138,7 @@ function getProjectNameAndRootFormats(tree, options) {
                     : getImportPath(npmScope, asProvidedProjectName);
         }
     }
+    const name = (0, names_1.names)(options.name).fileName;
     let { projectDirectory, layoutDirectory } = getDirectories(tree, directory, options.projectType);
     const derivedProjectDirectoryWithoutLayout = projectDirectory
         ? `${(0, names_1.names)(projectDirectory).fileName}/${name}`
@@ -199,11 +199,6 @@ function getImportPath(npmScope, name) {
     return npmScope ? `${npmScope === '@' ? '' : '@'}${npmScope}/${name}` : name;
 }
 function getNpmScope(tree) {
-    const nxJson = readNxJson(tree);
-    // TODO(v17): Remove reading this from nx.json
-    if (nxJson?.npmScope) {
-        return nxJson.npmScope;
-    }
     const { name } = tree.exists('package.json')
         ? readJson(tree, 'package.json')
         : { name: null };
@@ -223,3 +218,10 @@ function getCwd() {
         ? process.env.INIT_CWD
         : process.cwd();
 }
+/**
+ * Function for setting cwd during testing
+ */
+function setCwd(path) {
+    process.env.INIT_CWD = (0, path_1.join)(workspaceRoot, path);
+}
+exports.setCwd = setCwd;

package/src/tasks/install-packages-task.js

@@ -29,6 +29,12 @@ function installPackagesTask(tree, alwaysRun = false, cwd = '', packageManager =
             cwd: (0, path_1.join)(tree.root, cwd),
             stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
         };
+        // ensure local registry from process is not interfering with the install
+        // when we start the process from temp folder the local registry would override the custom registry
+        if (process.env.npm_config_registry &&
+            process.env.npm_config_registry.match(/^https:\/\/registry\.(npmjs\.org|yarnpkg\.com)/)) {
+            delete process.env.npm_config_registry;
+        }
         (0, child_process_1.execSync)(pmc.install, execSyncOptions);
     }
 }

package/src/utils/get-workspace-layout.d.ts

@@ -6,7 +6,7 @@ import type { Tree } from 'nx/src/generators/tree';
  * Example:
  *
  * ```typescript
- * { appsDir: 'apps', libsDir: 'libs', npmScope: 'myorg' }
+ * { appsDir: 'apps', libsDir: 'libs' }
  * ```
  * @param tree - file system tree
  */
@@ -14,10 +14,6 @@ export declare function getWorkspaceLayout(tree: Tree): {
     appsDir: string;
     libsDir: string;
     standaloneAsDefault: boolean;
-    /**
-     * @deprecated This will be removed in Nx 17. Use {@link getNpmScope} instead.
-     */
-    npmScope: string;
 };
 /**
  * Experimental

package/src/utils/get-workspace-layout.js

@@ -10,7 +10,7 @@ const { readNxJson } = (0, nx_1.requireNx)();
  * Example:
  *
  * ```typescript
- * { appsDir: 'apps', libsDir: 'libs', npmScope: 'myorg' }
+ * { appsDir: 'apps', libsDir: 'libs' }
  * ```
  * @param tree - file system tree
  */
@@ -21,7 +21,6 @@ function getWorkspaceLayout(tree) {
             inOrderOfPreference(tree, ['apps', 'packages'], '.'),
         libsDir: nxJson?.workspaceLayout?.libsDir ??
             inOrderOfPreference(tree, ['libs', 'packages'], '.'),
-        npmScope: nxJson?.npmScope,
         standaloneAsDefault: true,
     };
 }