@nx/workspace 20.5.0-rc.0 → 20.5.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.5.0-rc.0",
+  "version": "20.5.0-rc.2",
   "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": {
@@ -38,12 +38,12 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.5.0-rc.0",
+    "@nx/devkit": "20.5.0-rc.2",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.5.0-rc.0"
+    "nx": "20.5.0-rc.2"
   },
   "publishConfig": {
     "access": "public"

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

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const default_base_1 = require("../../utilities/default-base");
 const path_1 = require("path");
 const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
+const ts_solution_setup_1 = require("../../utilities/typescript/ts-solution-setup");
 async function ciWorkflowGenerator(tree, schema) {
     const ci = schema.ci;
     const options = normalizeOptions(schema, tree);
@@ -35,6 +36,7 @@ function normalizeOptions(options, tree) {
     const hasCypress = allDependencies['@nx/cypress'];
     const hasPlaywright = allDependencies['@nx/playwright'];
     const hasE2E = hasCypress || hasPlaywright;
+    const hasTypecheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)((0, devkit_1.readJson)(tree, 'nx.json'));
     return {
         workflowName,
@@ -47,6 +49,7 @@ function normalizeOptions(options, tree) {
         hasCypress,
         hasE2E,
         hasPlaywright,
+        hasTypecheck,
         nxCloudHost,
         tmpl: '',
         connectedToCloud,

package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__

@@ -68,4 +68,4 @@ jobs:
       # - script: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
       # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
       # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) lint test build<% if(hasE2E){ %> e2e<% } %>
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__

@@ -33,7 +33,7 @@ pipelines:
             # <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
             # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
             # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> -t lint test build<% if(hasE2E){ %> e2e<% } %>
+            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>
 
   branches:
     main:
@@ -59,4 +59,4 @@ pipelines:
             # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
             # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
             # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
-            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1
+            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__

@@ -37,7 +37,7 @@ jobs:
       # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
       # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
       # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e<% } %>
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>
 
 workflows:
   version: 2

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__

@@ -50,4 +50,4 @@ jobs:
       # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
       # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
       # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e<% } %>
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__

@@ -31,4 +31,4 @@ variables:
     # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
     # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
     # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
-    - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e<% } %>
+    - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

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

@@ -48,6 +48,12 @@ function createProjectConfigurationInNewDestination(tree, schema, projectConfig)
     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);
+    if (schema.isNxConfiguredInPackageJson) {
+        // Update the existing project configuration in the package.json
+        (0, devkit_1.updateProjectConfiguration)(tree, schema.newProjectName, newProject);
+    }
+    else {
+        // Create a new project with the root replaced
+        (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
+    }
 }

package/src/generators/move/lib/normalize-schema.js

@@ -1,23 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
+const devkit_1 = require("@nx/devkit");
 const get_import_path_1 = require("../../../utilities/get-import-path");
 const utils_1 = require("./utils");
 const ts_solution_setup_1 = require("../../../utils/ts-solution-setup");
 async function normalizeSchema(tree, schema, projectConfiguration) {
     const { destination, newProjectName, importPath } = await determineProjectNameAndRootOptions(tree, schema, projectConfiguration);
+    const isNxConfiguredInPackageJson = !tree.exists((0, devkit_1.joinPathFragments)(projectConfiguration.root, 'project.json'));
     return {
         ...schema,
         destination: (0, utils_1.normalizePathSlashes)(schema.destination),
         importPath,
         newProjectName,
         relativeToRootDestination: destination,
+        isNxConfiguredInPackageJson,
     };
 }
 async function determineProjectNameAndRootOptions(tree, options, projectConfiguration) {
     validateName(tree, options.newProjectName, projectConfiguration);
-    const projectNameAndRootOptions = getProjectNameAndRootOptions(tree, options, projectConfiguration);
-    return projectNameAndRootOptions;
+    let destination = (0, utils_1.normalizePathSlashes)(options.destination);
+    if (options.newProjectName &&
+        options.newProjectName.includes('/') &&
+        !options.newProjectName.startsWith('@')) {
+        throw new Error(`You can't specify a new project name with a directory path (${options.newProjectName}). ` +
+            `Please provide a valid name without path segments and the full destination with the "--destination" option.`);
+    }
+    const newProjectName = options.newProjectName ?? options.projectName;
+    if (projectConfiguration.projectType !== 'library') {
+        return { destination, newProjectName };
+    }
+    let importPath = options.importPath;
+    if (importPath) {
+        return { destination, newProjectName, importPath };
+    }
+    if (options.newProjectName?.startsWith('@')) {
+        // keep the existing import path if the name didn't change
+        importPath =
+            options.newProjectName && options.projectName !== options.newProjectName
+                ? newProjectName
+                : undefined;
+    }
+    else if (options.newProjectName) {
+        const npmScope = (0, get_import_path_1.getNpmScope)(tree);
+        importPath = npmScope
+            ? `${npmScope === '@' ? '' : '@'}${npmScope}/${newProjectName}`
+            : newProjectName;
+    }
+    return { destination, newProjectName, importPath };
 }
 function validateName(tree, name, projectConfiguration) {
     if (!name) {
@@ -49,39 +79,3 @@ function validateName(tree, name, projectConfiguration) {
         }
     }
 }
-function getProjectNameAndRootOptions(tree, options, projectConfiguration) {
-    let destination = (0, utils_1.normalizePathSlashes)(options.destination);
-    if (options.newProjectName &&
-        options.newProjectName.includes('/') &&
-        !options.newProjectName.startsWith('@')) {
-        throw new Error(`You can't specify a new project name with a directory path (${options.newProjectName}). ` +
-            `Please provide a valid name without path segments and the full destination with the "--destination" option.`);
-    }
-    const asProvidedOptions = getAsProvidedOptions(tree, { ...options, destination }, projectConfiguration);
-    return asProvidedOptions;
-}
-function getAsProvidedOptions(tree, options, projectConfiguration) {
-    const newProjectName = options.newProjectName ?? options.projectName;
-    const destination = options.destination;
-    if (projectConfiguration.projectType !== 'library') {
-        return { destination, newProjectName };
-    }
-    let importPath = options.importPath;
-    if (importPath) {
-        return { destination, newProjectName, importPath };
-    }
-    if (options.newProjectName?.startsWith('@')) {
-        // keep the existing import path if the name didn't change
-        importPath =
-            options.newProjectName && options.projectName !== options.newProjectName
-                ? newProjectName
-                : undefined;
-    }
-    else if (options.newProjectName) {
-        const npmScope = (0, get_import_path_1.getNpmScope)(tree);
-        importPath = npmScope
-            ? `${npmScope === '@' ? '' : '@'}${npmScope}/${newProjectName}`
-            : newProjectName;
-    }
-    return { destination, newProjectName, importPath };
-}

package/src/generators/move/schema.d.ts

@@ -9,4 +9,5 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   relativeToRootDestination: string;
+  isNxConfiguredInPackageJson?: boolean;
 }