@nx/workspace 16.6.0 → 16.7.0-beta.1

package/generators.json

@@ -14,6 +14,11 @@
       "aliases": ["rm"],
       "description": "Remove an application or library."
     },
+    "convert-to-monorepo": {
+      "factory": "./src/generators/convert-to-monorepo/convert-to-monorepo#monorepoSchematic",
+      "schema": "./src/generators/convert-to-monorepo/schema.json",
+      "description": "Convert a Nx project to a monorepo."
+    },
     "workspace-generator": {
       "factory": "./src/generators/workspace-generator/workspace-generator",
       "schema": "./src/generators/workspace-generator/schema.json",
@@ -53,6 +58,11 @@
       "aliases": ["rm"],
       "description": "Remove an application or library."
     },
+    "convert-to-monorepo": {
+      "factory": "./src/generators/convert-to-monorepo/convert-to-monorepo",
+      "schema": "./src/generators/convert-to-monorepo/schema.json",
+      "description": "Convert a Nx project to a monorepo."
+    },
     "new": {
       "factory": "./src/generators/new/new#newGenerator",
       "schema": "./src/generators/new/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "16.6.0",
+  "version": "16.7.0-beta.1",
   "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.6.0",
-      "@nrwl/jest": "16.6.0",
-      "@nrwl/linter": "16.6.0",
-      "@nrwl/angular": "16.6.0",
-      "@nrwl/cypress": "16.6.0",
-      "@nrwl/detox": "16.6.0",
-      "@nrwl/devkit": "16.6.0",
-      "@nrwl/esbuild": "16.6.0",
-      "@nrwl/eslint-plugin-nx": "16.6.0",
-      "@nrwl/expo": "16.6.0",
-      "@nrwl/express": "16.6.0",
-      "@nrwl/nest": "16.6.0",
-      "@nrwl/next": "16.6.0",
-      "@nrwl/node": "16.6.0",
+      "@nrwl/js": "16.7.0-beta.1",
+      "@nrwl/jest": "16.7.0-beta.1",
+      "@nrwl/linter": "16.7.0-beta.1",
+      "@nrwl/angular": "16.7.0-beta.1",
+      "@nrwl/cypress": "16.7.0-beta.1",
+      "@nrwl/detox": "16.7.0-beta.1",
+      "@nrwl/devkit": "16.7.0-beta.1",
+      "@nrwl/esbuild": "16.7.0-beta.1",
+      "@nrwl/eslint-plugin-nx": "16.7.0-beta.1",
+      "@nrwl/expo": "16.7.0-beta.1",
+      "@nrwl/express": "16.7.0-beta.1",
+      "@nrwl/nest": "16.7.0-beta.1",
+      "@nrwl/next": "16.7.0-beta.1",
+      "@nrwl/node": "16.7.0-beta.1",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "16.6.0",
-      "@nrwl/react-native": "16.6.0",
-      "@nrwl/react": "16.6.0",
-      "@nrwl/rollup": "16.6.0",
-      "@nrwl/storybook": "16.6.0",
-      "@nrwl/tao": "16.6.0",
-      "@nrwl/vite": "16.6.0",
-      "@nrwl/web": "16.6.0",
-      "@nrwl/webpack": "16.6.0",
-      "nx": "16.6.0"
+      "@nrwl/nx-plugin": "16.7.0-beta.1",
+      "@nrwl/react-native": "16.7.0-beta.1",
+      "@nrwl/react": "16.7.0-beta.1",
+      "@nrwl/rollup": "16.7.0-beta.1",
+      "@nrwl/storybook": "16.7.0-beta.1",
+      "@nrwl/tao": "16.7.0-beta.1",
+      "@nrwl/vite": "16.7.0-beta.1",
+      "@nrwl/web": "16.7.0-beta.1",
+      "@nrwl/webpack": "16.7.0-beta.1",
+      "nx": "16.7.0-beta.1"
     }
   },
   "dependencies": {
-    "@nrwl/workspace": "16.6.0",
-    "@nx/devkit": "16.6.0",
+    "@nrwl/workspace": "16.7.0-beta.1",
+    "@nx/devkit": "16.7.0-beta.1",
     "chalk": "^4.1.0",
     "ignore": "^5.0.4",
-    "nx": "16.6.0",
+    "nx": "16.7.0-beta.1",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1"
@@ -74,5 +74,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "d02a8dbf06c85de78c0c76f64a17f10ae8085739"
+  "gitHead": "50a145bb64edcf76985184a9a83d1449dcd4f3d9"
 }

package/src/generators/convert-to-monorepo/convert-to-monorepo.d.ts

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+export declare function monorepoGenerator(tree: Tree, options: {}): Promise<void>;
+export default monorepoGenerator;
+export declare const monorepoSchematic: (generatorOptions: {}) => (tree: any, context: any) => Promise<any>;

package/src/generators/convert-to-monorepo/convert-to-monorepo.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.monorepoSchematic = exports.monorepoGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const move_1 = require("../move/move");
+function monorepoGenerator(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = (0, devkit_1.getProjects)(tree);
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+        let rootProject;
+        const projectsToMove = [];
+        // Need to determine libs vs packages directory base on the type of root project.
+        for (const [, project] of projects) {
+            if (project.root === '.')
+                rootProject = project;
+            projectsToMove.push(project);
+        }
+        // Currently, Nx only handles apps+libs or packages. You cannot mix and match them.
+        // If the standalone project is an app (React, Angular, etc), then use apps+libs.
+        // Otherwise, for TS standalone (lib), use packages.
+        const isRootProjectApp = rootProject.projectType === 'application';
+        const appsDir = isRootProjectApp ? 'apps' : 'packages';
+        const libsDir = isRootProjectApp ? 'libs' : 'packages';
+        for (const project of projectsToMove) {
+            yield (0, move_1.moveGenerator)(tree, {
+                projectName: project.name,
+                newProjectName: project.name,
+                destination: project.projectType === 'application'
+                    ? (0, devkit_1.joinPathFragments)(appsDir, project.name)
+                    : (0, devkit_1.joinPathFragments)(libsDir, project.name),
+                destinationRelativeToRoot: true,
+                updateImportPath: project.projectType === 'library',
+            });
+        }
+    });
+}
+exports.monorepoGenerator = monorepoGenerator;
+exports.default = monorepoGenerator;
+exports.monorepoSchematic = (0, devkit_1.convertNxGenerator)(monorepoGenerator);

package/src/generators/convert-to-monorepo/schema.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxWorkspaceConvertToMonorepo",
+  "cli": "nx",
+  "title": "Nx Convert to Monorepo",
+  "description": "Convert an Nx project to a monorepo.",
+  "type": "object",
+  "examples": [
+    {
+      "command": "nx g @nx/workspace:monorepo",
+      "description": "Convert an Nx standalone project to a monorepo."
+    }
+  ],
+  "properties": {},
+  "required": []
+}

package/src/generators/move/lib/create-project-configuration-in-new-destination.js

@@ -4,13 +4,44 @@ exports.createProjectConfigurationInNewDestination = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
+    var _a;
     projectConfig.name = schema.newProjectName;
+    const isRootProject = projectConfig.root === '.';
     // Subtle bug if project name === path, where the updated name was being overrideen.
     const { name } = projectConfig, rest = tslib_1.__rest(projectConfig, ["name"]);
     // replace old root path with new one
-    const projectString = JSON.stringify(rest);
-    const newProjectString = projectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
+    let newProjectString = JSON.stringify(rest);
+    if (isRootProject) {
+        // Don't replace . with new root since it'll match all characters.
+        // Only look for "./" and replace with new root.
+        newProjectString = newProjectString.replace(/\.\//g, schema.relativeToRootDestination + '/');
+        newProjectString = newProjectString.replace(/"((tsconfig|jest|webpack|vite)\..*?\.(ts|js|json))"/g, `"${schema.relativeToRootDestination}/$1"`);
+        newProjectString = newProjectString.replace(/"(\.\/)?src\/(.*?)"/g, `"${schema.relativeToRootDestination}/src/$2"`);
+    }
+    else {
+        newProjectString = newProjectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
+    }
     const newProject = Object.assign({ name }, JSON.parse(newProjectString));
+    newProject.root = schema.relativeToRootDestination;
+    // Correct "e2e" target and config since part of the rename will be wrong unless we make the project name "e2e" more unique.
+    // e.g. my-app-e2e is safer to search and replace than "e2e".
+    if (projectConfig.name === 'e2e') {
+        for (const [targetName, targetConfig] of Object.entries(newProject.targets)) {
+            const wrongName = schema.relativeToRootDestination;
+            if (targetName !== wrongName)
+                continue;
+            if (((_a = targetConfig.options) === null || _a === void 0 ? void 0 : _a.testingType) === wrongName) {
+                targetConfig.options.testingType = 'e2e';
+            }
+            newProject.targets['e2e'] = targetConfig;
+            delete newProject.targets[targetName];
+        }
+    }
+    // Original sourceRoot is typically 'src' or 'app', but it could be any folder.
+    // Make sure it is updated to be under the new destination.
+    if (isRootProject && projectConfig.sourceRoot) {
+        newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, projectConfig.sourceRoot);
+    }
     // Create a new project with the root replaced
     (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
 }

package/src/generators/move/lib/extract-base-configs.d.ts

@@ -0,0 +1,4 @@
+import { ProjectConfiguration, Tree } from '@nx/devkit';
+export declare function maybeExtractTsConfigBase(tree: Tree): void;
+export declare function maybeExtractJestConfigBase(tree: Tree): Promise<void>;
+export declare function maybeExtractEslintConfigIfRootProject(tree: Tree, rootProject: ProjectConfiguration): void;

package/src/generators/move/lib/extract-base-configs.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.maybeExtractEslintConfigIfRootProject = exports.maybeExtractJestConfigBase = exports.maybeExtractTsConfigBase = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+function maybeExtractTsConfigBase(tree) {
+    let extractTsConfigBase;
+    try {
+        extractTsConfigBase = require('@nx/' + 'js').extractTsConfigBase;
+    }
+    catch (_a) {
+        // Not installed, skip
+        return;
+    }
+    extractTsConfigBase(tree);
+}
+exports.maybeExtractTsConfigBase = maybeExtractTsConfigBase;
+function maybeExtractJestConfigBase(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let jestInitGenerator;
+        try {
+            jestInitGenerator = require('@nx/' + 'jest').jestInitGenerator;
+        }
+        catch (_a) {
+            // Not installed, skip
+            return;
+        }
+        yield jestInitGenerator(tree, {});
+    });
+}
+exports.maybeExtractJestConfigBase = maybeExtractJestConfigBase;
+function maybeExtractEslintConfigIfRootProject(tree, rootProject) {
+    if (rootProject.root !== '.')
+        return;
+    if (tree.exists('.eslintrc.base.json'))
+        return;
+    let migrateConfigToMonorepoStyle;
+    try {
+        migrateConfigToMonorepoStyle = require('@nx/' +
+            'linter/src/generators/init/init-migration').migrateConfigToMonorepoStyle;
+    }
+    catch (_a) {
+        // linter not install
+    }
+    // Only need to handle migrating the root rootProject.
+    // If other libs/apps exist, then this migration is already done by `@nx/linter:lint-rootProject` generator.
+    migrateConfigToMonorepoStyle === null || migrateConfigToMonorepoStyle === void 0 ? void 0 : migrateConfigToMonorepoStyle([rootProject.name], tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
+        tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.js'))
+        ? 'jest'
+        : 'none');
+}
+exports.maybeExtractEslintConfigIfRootProject = maybeExtractEslintConfigIfRootProject;

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

@@ -9,11 +9,49 @@ const path_1 = require("path");
  * @param schema The options provided to the schematic
  */
 function moveProjectFiles(tree, schema, project) {
+    // We don't want to move configuration files and other folders that we don't know about.
+    // Moving the wrong files is worse than not moving them, because there might be
+    // a lot of work to undo it.
+    const knownRootProjectFiles = [
+        // Config files
+        'project.json',
+        'tsconfig.json',
+        'tsconfig.app.json',
+        'tsconfig.lib.json',
+        'tsconfig.spec.json',
+        '.babelrc',
+        '.eslintrc.json',
+        /^jest\.config\.(app|lib)\.[jt]s$/,
+        'vite.config.ts',
+        /^webpack.*\.js$/,
+        'index.html', // Vite
+    ];
+    const knownRootProjectFolders = [
+        'src',
+        'app',
+        'pages',
+        'public', // Vite, Remix, Next.js
+    ];
+    const isKnownRootProjectFile = (file) => {
+        const baseDir = (0, path_1.dirname)(file).split(path_1.sep)[0];
+        if (baseDir === '.') {
+            // Not nested, check file matches
+            return knownRootProjectFiles.some((stringOrRegex) => typeof stringOrRegex === 'string'
+                ? file === stringOrRegex
+                : stringOrRegex.test(file));
+        }
+        else {
+            // Nested, check base dir matches
+            return knownRootProjectFolders.includes(baseDir);
+        }
+    };
     (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (file) => {
+        if (project.root === '.' && !isKnownRootProjectFile(file))
+            return;
         // This is a rename but Angular Devkit isn't capable of writing to a file after it's renamed so this is a workaround
-        const content = tree.read(file);
         const relativeFromOriginalSource = (0, path_1.relative)(project.root, file);
         const newFilePath = (0, path_1.join)(schema.relativeToRootDestination, relativeFromOriginalSource);
+        const content = tree.read(file);
         tree.write(newFilePath, content);
         tree.delete(file);
     });

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

@@ -25,7 +25,9 @@ function updateCypressConfig(tree, schema, project) {
         return tree;
     }
     const cypressConfigPath = path.join(schema.relativeToRootDestination, 'cypress.config.ts');
-    if (tree.exists(cypressConfigPath)) {
+    // Search and replace for "e2e" directory is not safe, and will result in an invalid config file.
+    // Leave it and let users fix the config if needed.
+    if (project.root !== 'e2e' && tree.exists(cypressConfigPath)) {
         const oldContent = tree.read(cypressConfigPath, 'utf-8');
         const findName = new RegExp(`'${schema.projectName}'`, 'g');
         const findDir = new RegExp(project.root, 'g');

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

@@ -28,7 +28,7 @@ function updateEslintrcJson(tree, schema, project) {
         if (typeof eslintRcJson.extends === 'string') {
             eslintRcJson.extends = offsetFilePath(project, eslintRcJson.extends, offset);
         }
-        else {
+        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) => {

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

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

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateProjectRootFiles = void 0;
+exports.updateFilesForNonRootProjects = exports.updateFilesForRootProjects = exports.updateProjectRootFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const path_1 = require("path");
@@ -13,6 +13,47 @@ const allowedExt = ['.ts', '.js', '.json'];
  * @param schema The options provided to the schematic
  */
 function updateProjectRootFiles(tree, schema, project) {
+    if (project.root === '.') {
+        // Need to handle root project differently since replacing '.' with 'dir',
+        // for example, // will change '../../' to 'dirdir/dirdir/'.
+        updateFilesForRootProjects(tree, schema, project);
+    }
+    else {
+        updateFilesForNonRootProjects(tree, schema, project);
+    }
+}
+exports.updateProjectRootFiles = updateProjectRootFiles;
+function updateFilesForRootProjects(tree, schema, project) {
+    // Skip updating "path" and "extends" for tsconfig files since they are mostly
+    // relative to the project root. The only exception is tsconfig.json that
+    // should extend from ../../tsconfig.base.json. We'll handle this separately.
+    const regex = /(?<!"path".+)(?<!"extends".+)(?<=['"])\.\/(?=[a-zA-Z0-9])/g;
+    const newRelativeRoot = 
+    // Normalize separators
+    path
+        .relative(path.join(devkit_1.workspaceRoot, schema.relativeToRootDestination), devkit_1.workspaceRoot)
+        .split(path.sep)
+        // Include trailing slash because the regex matches the trailing slash in "./"
+        .join('/') + '/';
+    for (const file of tree.children(schema.relativeToRootDestination)) {
+        const ext = (0, path_1.extname)(file);
+        if (!allowedExt.includes(ext)) {
+            continue;
+        }
+        if (file === '.eslintrc.json') {
+            continue;
+        }
+        const oldContent = tree.read((0, path_1.join)(schema.relativeToRootDestination, file), 'utf-8');
+        let newContent = oldContent.replace(regex, newRelativeRoot);
+        if (file === 'tsconfig.json') {
+            // Since we skipped updating "extends" earlier, need to point to the base config.
+            newContent = newContent.replace(`./tsconfig.base.json`, newRelativeRoot + `tsconfig.base.json`);
+        }
+        tree.write((0, path_1.join)(schema.relativeToRootDestination, file), newContent);
+    }
+}
+exports.updateFilesForRootProjects = updateFilesForRootProjects;
+function updateFilesForNonRootProjects(tree, schema, project) {
     const newRelativeRoot = path
         .relative(path.join(devkit_1.workspaceRoot, schema.relativeToRootDestination), devkit_1.workspaceRoot)
         .split(path.sep)
@@ -36,8 +77,11 @@ function updateProjectRootFiles(tree, schema, project) {
             continue;
         }
         const oldContent = tree.read((0, path_1.join)(schema.relativeToRootDestination, file), 'utf-8');
-        const newContent = oldContent.replace(regex, newRelativeRoot);
+        let newContent = oldContent.replace(regex, newRelativeRoot);
+        if (file == 'tsconfig.json') {
+            newContent = newContent.replace('tsconfig.json', 'tsconfig.base.json');
+        }
         tree.write((0, path_1.join)(schema.relativeToRootDestination, file), newContent);
     }
 }
-exports.updateProjectRootFiles = updateProjectRootFiles;
+exports.updateFilesForNonRootProjects = updateFilesForNonRootProjects;

package/src/generators/move/move.js

@@ -18,11 +18,19 @@ const update_package_json_1 = require("./lib/update-package-json");
 const update_project_root_files_1 = require("./lib/update-project-root-files");
 const update_readme_1 = require("./lib/update-readme");
 const update_storybook_config_1 = require("./lib/update-storybook-config");
+const extract_base_configs_1 = require("./lib/extract-base-configs");
 function moveGenerator(tree, rawSchema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
+        let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
         (0, check_destination_1.checkDestination)(tree, rawSchema, projectConfig);
         const schema = (0, normalize_schema_1.normalizeSchema)(tree, rawSchema, projectConfig);
+        if (projectConfig.root === '.') {
+            (0, extract_base_configs_1.maybeExtractTsConfigBase)(tree);
+            yield (0, extract_base_configs_1.maybeExtractJestConfigBase)(tree);
+            (0, extract_base_configs_1.maybeExtractEslintConfigIfRootProject)(tree, projectConfig);
+            // Reload config since it has been updated after extracting base configs
+            projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
+        }
         (0, devkit_1.removeProjectConfiguration)(tree, schema.projectName);
         (0, move_project_files_1.moveProjectFiles)(tree, schema, projectConfig);
         (0, create_project_configuration_in_new_destination_1.createProjectConfigurationInNewDestination)(tree, schema, projectConfig);