@nx/workspace 16.8.0-beta.1 → 16.8.0-beta.3

package/generators.json

@@ -88,7 +88,7 @@
       "description": "Fixes projects configuration"
     },
     "npm-package": {
-      "factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
+      "factory": "./src/generators/npm-package/npm-package#npmPackageGeneratorInternal",
       "schema": "./src/generators/npm-package/schema.json",
       "description": "Create a minimal NPM package.",
       "x-type": "library"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "16.8.0-beta.1",
+  "version": "16.8.0-beta.3",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -33,39 +33,39 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/js": "16.8.0-beta.1",
-      "@nrwl/jest": "16.8.0-beta.1",
-      "@nrwl/linter": "16.8.0-beta.1",
-      "@nrwl/angular": "16.8.0-beta.1",
-      "@nrwl/cypress": "16.8.0-beta.1",
-      "@nrwl/detox": "16.8.0-beta.1",
-      "@nrwl/devkit": "16.8.0-beta.1",
-      "@nrwl/esbuild": "16.8.0-beta.1",
-      "@nrwl/eslint-plugin-nx": "16.8.0-beta.1",
-      "@nrwl/expo": "16.8.0-beta.1",
-      "@nrwl/express": "16.8.0-beta.1",
-      "@nrwl/nest": "16.8.0-beta.1",
-      "@nrwl/next": "16.8.0-beta.1",
-      "@nrwl/node": "16.8.0-beta.1",
+      "@nrwl/js": "16.8.0-beta.3",
+      "@nrwl/jest": "16.8.0-beta.3",
+      "@nrwl/linter": "16.8.0-beta.3",
+      "@nrwl/angular": "16.8.0-beta.3",
+      "@nrwl/cypress": "16.8.0-beta.3",
+      "@nrwl/detox": "16.8.0-beta.3",
+      "@nrwl/devkit": "16.8.0-beta.3",
+      "@nrwl/esbuild": "16.8.0-beta.3",
+      "@nrwl/eslint-plugin-nx": "16.8.0-beta.3",
+      "@nrwl/expo": "16.8.0-beta.3",
+      "@nrwl/express": "16.8.0-beta.3",
+      "@nrwl/nest": "16.8.0-beta.3",
+      "@nrwl/next": "16.8.0-beta.3",
+      "@nrwl/node": "16.8.0-beta.3",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "16.8.0-beta.1",
-      "@nrwl/react-native": "16.8.0-beta.1",
-      "@nrwl/react": "16.8.0-beta.1",
-      "@nrwl/rollup": "16.8.0-beta.1",
-      "@nrwl/storybook": "16.8.0-beta.1",
-      "@nrwl/tao": "16.8.0-beta.1",
-      "@nrwl/vite": "16.8.0-beta.1",
-      "@nrwl/web": "16.8.0-beta.1",
-      "@nrwl/webpack": "16.8.0-beta.1",
-      "nx": "16.8.0-beta.1"
+      "@nrwl/nx-plugin": "16.8.0-beta.3",
+      "@nrwl/react-native": "16.8.0-beta.3",
+      "@nrwl/react": "16.8.0-beta.3",
+      "@nrwl/rollup": "16.8.0-beta.3",
+      "@nrwl/storybook": "16.8.0-beta.3",
+      "@nrwl/tao": "16.8.0-beta.3",
+      "@nrwl/vite": "16.8.0-beta.3",
+      "@nrwl/web": "16.8.0-beta.3",
+      "@nrwl/webpack": "16.8.0-beta.3",
+      "nx": "16.8.0-beta.3"
     }
   },
   "dependencies": {
-    "@nrwl/workspace": "16.8.0-beta.1",
-    "@nx/devkit": "16.8.0-beta.1",
+    "@nrwl/workspace": "16.8.0-beta.3",
+    "@nx/devkit": "16.8.0-beta.3",
     "chalk": "^4.1.0",
     "ignore": "^5.0.4",
-    "nx": "16.8.0-beta.1",
+    "nx": "16.8.0-beta.3",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1"
@@ -74,5 +74,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
+  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
 }

package/src/generators/ci-workflow/ci-workflow.js

@@ -4,6 +4,7 @@ exports.ciWorkflowGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const default_base_1 = require("../../utilities/default-base");
+const path_1 = require("path");
 function ciWorkflowGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const ci = schema.ci;
@@ -16,7 +17,7 @@ function ciWorkflowGenerator(host, schema) {
         if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
             (0, devkit_1.writeJson)(host, 'nx.json', appendOriginPrefix(nxJson));
         }
-        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files', ci), '', options);
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files', ci), '', options);
         yield (0, devkit_1.formatFiles)(host);
     });
 }

package/src/generators/move/lib/move-project-files.js

@@ -21,6 +21,7 @@ function moveProjectFiles(tree, schema, project) {
         'tsconfig.spec.json',
         '.babelrc',
         '.eslintrc.json',
+        'eslint.config.js',
         /^jest\.config\.(app|lib)\.[jt]s$/,
         'vite.config.ts',
         /^webpack.*\.js$/,

package/src/generators/move/lib/{update-eslintrc-json.d.ts → update-eslint-config.d.ts}

@@ -5,4 +5,4 @@ import { NormalizedSchema } from '../schema';
  *
  * @param schema The options provided to the schematic
  */
-export declare function updateEslintrcJson(tree: Tree, schema: NormalizedSchema, project: ProjectConfiguration): void;
+export declare function updateEslintConfig(tree: Tree, schema: NormalizedSchema, project: ProjectConfiguration): void;

package/src/generators/move/lib/update-eslint-config.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateEslintConfig = void 0;
+const devkit_1 = require("@nx/devkit");
+/**
+ * Update the .eslintrc file of the project if it exists.
+ *
+ * @param schema The options provided to the schematic
+ */
+function updateEslintConfig(tree, schema, project) {
+    // if there is no suitable eslint config, we don't need to do anything
+    if (!tree.exists('.eslintrc.json') && !tree.exists('eslint.config.js')) {
+        return;
+    }
+    try {
+        const { updateRelativePathsInConfig,
+        // nx-ignore-next-line
+         } = require('@nx/linter/src/generators/utils/eslint-file');
+        updateRelativePathsInConfig(tree, project.root, schema.relativeToRootDestination);
+    }
+    catch (_a) {
+        devkit_1.output.warn({
+            title: `Could not update the eslint config file.`,
+            bodyLines: [
+                'The @nx/linter package could not be loaded. Please update the paths in eslint config manually.',
+            ],
+        });
+    }
+}
+exports.updateEslintConfig = updateEslintConfig;

package/src/generators/move/lib/update-project-root-files.js

@@ -40,7 +40,7 @@ function updateFilesForRootProjects(tree, schema, project) {
         if (!allowedExt.includes(ext)) {
             continue;
         }
-        if (file === '.eslintrc.json') {
+        if (file === '.eslintrc.json' || file === 'eslint.config.js') {
             continue;
         }
         const oldContent = tree.read((0, path_1.join)(schema.relativeToRootDestination, file), 'utf-8');
@@ -73,7 +73,7 @@ function updateFilesForNonRootProjects(tree, schema, project) {
         if (!allowedExt.includes(ext)) {
             continue;
         }
-        if (file === '.eslintrc.json') {
+        if (file === '.eslintrc.json' || file === 'eslint.config.js') {
             continue;
         }
         const oldContent = tree.read((0, path_1.join)(schema.relativeToRootDestination, file), 'utf-8');

package/src/generators/move/move.js

@@ -10,7 +10,7 @@ const normalize_schema_1 = require("./lib/normalize-schema");
 const update_build_targets_1 = require("./lib/update-build-targets");
 const update_cypress_config_1 = require("./lib/update-cypress-config");
 const update_default_project_1 = require("./lib/update-default-project");
-const update_eslintrc_json_1 = require("./lib/update-eslintrc-json");
+const update_eslint_config_1 = require("./lib/update-eslint-config");
 const update_implicit_dependencies_1 = require("./lib/update-implicit-dependencies");
 const update_imports_1 = require("./lib/update-imports");
 const update_jest_config_1 = require("./lib/update-jest-config");
@@ -39,7 +39,7 @@ function moveGenerator(tree, rawSchema) {
         (0, update_cypress_config_1.updateCypressConfig)(tree, schema, projectConfig);
         (0, update_jest_config_1.updateJestConfig)(tree, schema, projectConfig);
         (0, update_storybook_config_1.updateStorybookConfig)(tree, schema, projectConfig);
-        (0, update_eslintrc_json_1.updateEslintrcJson)(tree, schema, projectConfig);
+        (0, update_eslint_config_1.updateEslintConfig)(tree, schema, projectConfig);
         (0, update_readme_1.updateReadme)(tree, schema);
         (0, update_package_json_1.updatePackageJson)(tree, schema);
         (0, update_build_targets_1.updateBuildTargets)(tree, schema);

package/src/generators/npm-package/npm-package.d.ts

@@ -1,6 +1,10 @@
 import { Tree } from '@nx/devkit';
+import { type ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 export interface ProjectOptions {
     name: string;
+    directory?: string;
+    projectNameAndRootFormat?: ProjectNameAndRootFormat;
 }
 export declare function npmPackageGenerator(tree: Tree, options: ProjectOptions): Promise<void>;
+export declare function npmPackageGeneratorInternal(tree: Tree, _options: ProjectOptions): Promise<void>;
 export declare const npmPackageSchematic: (generatorOptions: ProjectOptions) => (tree: any, context: any) => Promise<any>;

package/src/generators/npm-package/npm-package.js

@@ -1,13 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.npmPackageSchematic = exports.npmPackageGenerator = void 0;
+exports.npmPackageSchematic = exports.npmPackageGeneratorInternal = exports.npmPackageGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const path_1 = require("path");
 const get_import_path_1 = require("../../utilities/get-import-path");
-function normalizeOptions(options) {
-    options.name = (0, devkit_1.names)(options.name).fileName;
-    return options;
+function normalizeOptions(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName, projectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+            name: options.name,
+            projectType: 'library',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/workspace:npm-package',
+        });
+        return Object.assign(Object.assign({}, options), { name: projectName, projectRoot });
+    });
 }
 function addFiles(projectRoot, tree, options) {
     const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
@@ -22,20 +31,24 @@ function addFiles(projectRoot, tree, options) {
 }
 function npmPackageGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        options = normalizeOptions(options);
-        const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
-        const projectRoot = (0, path_1.join)(libsDir, options.name);
+        return yield npmPackageGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
+    });
+}
+exports.npmPackageGenerator = npmPackageGenerator;
+function npmPackageGeneratorInternal(tree, _options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield normalizeOptions(tree, _options);
         (0, devkit_1.addProjectConfiguration)(tree, options.name, {
-            root: projectRoot,
+            root: options.projectRoot,
         });
-        const fileCount = tree.children(projectRoot).length;
-        const projectJsonExists = tree.exists((0, path_1.join)(projectRoot, 'project.json'));
+        const fileCount = tree.children(options.projectRoot).length;
+        const projectJsonExists = tree.exists((0, path_1.join)(options.projectRoot, 'project.json'));
         const isEmpty = fileCount === 0 || (fileCount === 1 && projectJsonExists);
         if (isEmpty) {
-            addFiles(projectRoot, tree, options);
+            addFiles(options.projectRoot, tree, options);
         }
         yield (0, devkit_1.formatFiles)(tree);
     });
 }
-exports.npmPackageGenerator = npmPackageGenerator;
+exports.npmPackageGeneratorInternal = npmPackageGeneratorInternal;
 exports.npmPackageSchematic = (0, devkit_1.convertNxGenerator)(npmPackageGenerator);

package/src/generators/npm-package/schema.json

@@ -14,7 +14,17 @@
         "index": 0
       },
       "x-prompt": "What name of your npm package?",
-      "pattern": "^[a-zA-Z].*$"
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
+    },
+    "directory": {
+      "type": "string",
+      "description": "A directory where the package is placed.",
+      "alias": "dir"
+    },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
     }
   },
   "required": ["name"]

package/src/generators/move/lib/update-eslintrc-json.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateEslintrcJson = void 0;
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-function offsetFilePath(project, pathToFile, offset) {
-    if (!pathToFile.startsWith('..')) {
-        // not a relative path
-        return pathToFile;
-    }
-    const pathFromRoot = (0, path_1.join)(project.root, pathToFile);
-    return (0, devkit_1.joinPathFragments)(offset, pathFromRoot);
-}
-/**
- * Update the .eslintrc file of the project if it exists.
- *
- * @param schema The options provided to the schematic
- */
-function updateEslintrcJson(tree, schema, project) {
-    const eslintRcPath = (0, path_1.join)(schema.relativeToRootDestination, '.eslintrc.json');
-    if (!tree.exists(eslintRcPath)) {
-        // no .eslintrc found. nothing to do
-        return;
-    }
-    const offset = (0, devkit_1.offsetFromRoot)(schema.relativeToRootDestination);
-    (0, devkit_1.updateJson)(tree, eslintRcPath, (eslintRcJson) => {
-        var _a;
-        if (typeof eslintRcJson.extends === 'string') {
-            eslintRcJson.extends = offsetFilePath(project, eslintRcJson.extends, offset);
-        }
-        else if (eslintRcJson.extends) {
-            eslintRcJson.extends = eslintRcJson.extends.map((extend) => offsetFilePath(project, extend, offset));
-        }
-        (_a = eslintRcJson.overrides) === null || _a === void 0 ? void 0 : _a.forEach((o) => {
-            var _a;
-            if ((_a = o.parserOptions) === null || _a === void 0 ? void 0 : _a.project) {
-                o.parserOptions.project = Array.isArray(o.parserOptions.project)
-                    ? o.parserOptions.project.map((p) => p.replace(project.root, schema.relativeToRootDestination))
-                    : o.parserOptions.project.replace(project.root, schema.relativeToRootDestination);
-            }
-        });
-        return eslintRcJson;
-    });
-}
-exports.updateEslintrcJson = updateEslintrcJson;