@nx/workspace 18.1.0-beta.2 → 18.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.0-beta.4",
   "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": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "18.1.0-beta.2",
+    "@nx/devkit": "18.1.0-beta.4",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "18.1.0-beta.2",
-    "@nrwl/workspace": "18.1.0-beta.2"
+    "nx": "18.1.0-beta.4",
+    "@nrwl/workspace": "18.1.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

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

@@ -46,16 +46,15 @@ function normalizeOptions(options, tree) {
     };
 }
 function defaultBranchNeedsOriginPrefix(nxJson) {
-    return !nxJson.affected?.defaultBase?.startsWith('origin/');
+    const base = nxJson.defaultBase ?? nxJson.affected?.defaultBase;
+    return !base?.startsWith('origin/');
 }
 function appendOriginPrefix(nxJson) {
-    return {
-        ...nxJson,
-        affected: {
-            ...(nxJson.affected ?? {}),
-            defaultBase: nxJson.affected?.defaultBase
-                ? `origin/${nxJson.affected.defaultBase}`
-                : 'origin/main',
-        },
-    };
+    if (nxJson?.affected?.defaultBase) {
+        nxJson.affected.defaultBase = `origin/${nxJson.affected.defaultBase}`;
+    }
+    if (nxJson.defaultBase || !nxJson.affected) {
+        nxJson.defaultBase = `origin/${nxJson.defaultBase ?? (0, default_base_1.deduceDefaultBase)()}`;
+    }
+    return nxJson;
 }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfig = void 0;
 const path = require("path");
+const jest_config_1 = require("../../utils/jest-config");
 /**
  * Updates the project name and coverage folder in the jest.config.js if it exists
  *
@@ -34,13 +35,14 @@ function updateJestConfig(tree, schema, project) {
         tree.write(jestConfigPath, newContent);
     }
     // update root jest.config.ts
-    const rootJestConfigPath = '/jest.config.ts';
-    if (!tree.exists(rootJestConfigPath)) {
+    const rootJestConfigPath = (0, jest_config_1.findRootJestConfig)(tree);
+    if (!rootJestConfigPath || !tree.exists(rootJestConfigPath)) {
         return;
     }
     const findProject = `'<rootDir>/${project.root}'`;
     const oldRootJestConfigContent = tree.read(rootJestConfigPath, 'utf-8');
-    const usingJestProjects = oldRootJestConfigContent.includes('getJestProjects()');
+    const usingJestProjects = oldRootJestConfigContent.includes('getJestProjects()') ||
+        oldRootJestConfigContent.includes('getJestProjectsAsync()');
     const newRootJestConfigContent = oldRootJestConfigContent.replace(findProject, usingJestProjects ? `` : `'<rootDir>/${schema.relativeToRootDestination}'`);
     tree.write(rootJestConfigPath, newRootJestConfigContent);
 }

package/src/generators/new/files-readme/README.md.template

@@ -2,52 +2,71 @@
 
 <a alt="Nx logo" href="https://nx.dev" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="45"></a>
 
-✨ **This workspace has been generated by [Nx, Smart Monorepos · Fast CI.](https://nx.dev)** ✨<% if (!!appName) { %>
+✨ **This workspace has been generated by [Nx, Smart Monorepos · Fast CI.](https://nx.dev)** ✨
 
-<% if (includeServe) { %>
-## Start the app
+## Integrate with editors
 
-To start the development server run `nx serve <%= appName %>`. Open your browser and navigate to http://localhost:4200/. Happy coding!<% } %>
-<% } %>
+Enhance your Nx experience by installing [Nx Console](https://nx.dev/nx-console) for your favorite editor. Nx Console
+provides an interactive UI to view your projects, run tasks, generate code, and more! Available for VSCode, IntelliJ and
+comes with a LSP for Vim users.
+<% if (!!appName) {
+    if (isJsStandalone) { %>
+## Build the library
+
+Run `npx nx build` to build the library. The build artifacts are stored in the output directory (i.e. `dist/`), ready to be published.
+<% } else { %>
+## Start the application
+
+Run `npx nx <%= serveCommand %> <%= appName %>` to start the development server. Happy coding!
+
+## Build for production
 
-## Generate code
+Run `npx nx build <%= appName %>` to build the application. The build artifacts are stored in the output directory (e.g. `dist/` or `build/`), ready to be deployed.
+<% } } else { %>
+## Nx plugins and code generators
 
-If you happen to use Nx plugins, you can leverage code generators that might come with it.
+Add Nx plugins to leverage their code generators and automated, inferred tasks.
 
-Run `nx list` to get a list of available plugins and whether they have generators. Then run `nx list <plugin-name>` to see what generators are available.
+```
+# Add plugin
+npx nx add @nx/react
+
+# Use code generator
+npx nx generate @nx/react:app demo
 
-Learn more about [Nx generators on the docs](https://nx.dev/features/generate-code).
+# Run development server
+npx nx serve demo
+
+# View project details
+npx nx show project demo --web
+```
 
+Run `npx nx list` to get a list of available plugins and whether they have generators. Then run `npx nx list <plugin-name>` to see what generators are available.
+
+Learn more about [code generators](https://nx.dev/features/generate-code) and [inferred tasks](https://nx.dev/concepts/inferred-tasks) in the docs.
+<% } %>
 ## Running tasks
 
 To execute tasks with Nx use the following syntax:
 
 ```
-nx <target> <project> <...options>
+npx nx <target> <project> <...options>
 ```
 
 You can also run multiple targets:
 
 ```
-nx run-many -t <target1> <target2>
+npx nx run-many -t <target1> <target2>
 ```
 
 ..or add `-p` to filter specific projects
 
 ```
-nx run-many -t <target1> <target2> -p <proj1> <proj2>
+npx nx run-many -t <target1> <target2> -p <proj1> <proj2>
 ```
 
 Targets can be defined in the `package.json` or `projects.json`. Learn more [in the docs](https://nx.dev/features/run-tasks).
 
-## Want better Editor Integration?
-
-Have a look at the [Nx Console extensions](https://nx.dev/nx-console). It provides autocomplete support, a UI for exploring and running tasks & generators, and more! Available for VSCode, IntelliJ and comes with a LSP for Vim users.
-
-## Ready to deploy?
-
-Just run `nx build demoapp` to build the application. The build artifacts will be stored in the `dist/` directory, ready to be deployed.
-
 ## Set up CI!
 
 Nx comes with local caching already built-in (check your `nx.json`). On CI you might want to go a step further.
@@ -56,8 +75,9 @@ Nx comes with local caching already built-in (check your `nx.json`). On CI you m
 - [Set up task distribution across multiple machines](https://nx.dev/nx-cloud/features/distribute-task-execution)
 - [Learn more how to setup CI](https://nx.dev/recipes/ci)
 
-## Explore the Project Graph
-Run `nx graph` to show the graph of the workspace.
+## Explore the project graph
+
+Run `npx nx graph` to show the graph of the workspace.
 It will show tasks that you can run with Nx.
 
 - [Learn more about Exploring the Project Graph](https://nx.dev/core-features/explore-graph)

package/src/generators/new/generate-preset.js

@@ -67,6 +67,7 @@ function generatePreset(host, opts) {
                 ? `--e2eTestRunner=${opts.e2eTestRunner}`
                 : null,
             opts.ssr ? `--ssr` : null,
+            opts.prefix !== undefined ? `--prefix=${opts.prefix}` : null,
         ].filter((e) => !!e);
     }
 }

package/src/generators/new/generate-workspace-files.js

@@ -45,9 +45,7 @@ function setPresetProperty(tree, options) {
 function createNxJson(tree, { directory, defaultBase, preset }) {
     const nxJson = {
         $schema: './node_modules/nx/schemas/nx-schema.json',
-        affected: {
-            defaultBase,
-        },
+        defaultBase,
         targetDefaults: process.env.NX_ADD_PLUGINS === 'false'
             ? {
                 build: {
@@ -61,7 +59,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             : undefined,
     };
     if (defaultBase === 'main') {
-        delete nxJson.affected;
+        delete nxJson.defaultBase;
     }
     if (preset !== presets_1.Preset.NPM) {
         nxJson.namedInputs = {
@@ -71,6 +69,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
         };
         if (process.env.NX_ADD_PLUGINS === 'false') {
             nxJson.targetDefaults.build.inputs = ['production', '^production'];
+            nxJson.useInferencePlugins = false;
         }
     }
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(directory, 'nx.json'), nxJson);
@@ -103,8 +102,11 @@ function createReadme(tree, { name, appName, directory, preset }) {
     const formattedNames = (0, devkit_1.names)(name);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
         formattedNames,
-        includeServe: preset !== presets_1.Preset.TsStandalone,
+        isJsStandalone: preset === presets_1.Preset.TsStandalone,
         appName,
+        serveCommand: preset === presets_1.Preset.NextJs || preset === presets_1.Preset.NextJsStandalone
+            ? 'dev'
+            : 'serve',
         name,
     });
 }
@@ -121,8 +123,7 @@ function addNpmScripts(tree, options) {
         options.preset === presets_1.Preset.ReactStandalone ||
         options.preset === presets_1.Preset.VueStandalone ||
         options.preset === presets_1.Preset.NuxtStandalone ||
-        options.preset === presets_1.Preset.NodeStandalone ||
-        options.preset === presets_1.Preset.NextJsStandalone) {
+        options.preset === presets_1.Preset.NodeStandalone) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {
                 start: 'nx serve',
@@ -132,6 +133,17 @@ function addNpmScripts(tree, options) {
             return json;
         });
     }
+    if (options.preset === presets_1.Preset.NextJsStandalone) {
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
+            Object.assign(json.scripts, {
+                dev: 'nx dev',
+                build: 'nx build',
+                start: 'nx start',
+                test: 'nx test',
+            });
+            return json;
+        });
+    }
     if (options.preset === presets_1.Preset.TsStandalone) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {

package/src/generators/new/new.d.ts

@@ -20,6 +20,7 @@ interface Schema {
     packageManager?: PackageManager;
     e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';
     ssr?: boolean;
+    prefix?: string;
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;

package/src/generators/new/schema.json

@@ -82,6 +82,10 @@
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",
       "type": "boolean",
       "default": false
+    },
+    "prefix": {
+      "description": "The prefix to use for Angular component and directive selectors.",
+      "type": "string"
     }
   },
   "additionalProperties": true

package/src/generators/preset/preset.js

@@ -16,7 +16,12 @@ async function presetGenerator(tree, options) {
 exports.presetGenerator = presetGenerator;
 exports.default = presetGenerator;
 async function createPreset(tree, options) {
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false';
+    console.log('Crate preset');
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    console.log('Add plugin', addPlugin);
+    console.log(options.preset, presets_1.Preset.ReactNative);
     if (options.preset === presets_1.Preset.Apps) {
         return;
     }
@@ -33,6 +38,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            prefix: options.prefix,
         });
     }
     else if (options.preset === presets_1.Preset.AngularStandalone) {
@@ -49,6 +55,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            prefix: options.prefix,
         });
     }
     else if (options.preset === presets_1.Preset.ReactMonorepo) {
@@ -206,8 +213,11 @@ async function createPreset(tree, options) {
         });
     }
     else if (options.preset === presets_1.Preset.ReactNative) {
+        console.log('Before require');
         const { reactNativeApplicationGenerator } = require('@nx' +
             '/react-native');
+        console.log('Hello', reactNativeApplicationGenerator);
+        console.log('Active require');
         return reactNativeApplicationGenerator(tree, {
             name: options.name,
             directory: (0, path_1.join)('apps', options.name),

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

@@ -18,4 +18,5 @@ export interface Schema {
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';
   js?: boolean;
   ssr?: boolean;
+  prefix?: string;
 }

package/src/generators/preset/schema.json

@@ -99,6 +99,10 @@
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",
       "type": "boolean",
       "default": false
+    },
+    "prefix": {
+      "description": "The prefix to use for Angular component and directive selectors.",
+      "type": "string"
     }
   },
   "required": ["preset", "name"]

package/src/generators/remove/lib/update-jest-config.js

@@ -5,9 +5,16 @@ const devkit_1 = require("@nx/devkit");
 const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nodes");
 const path_1 = require("path");
 const typescript_1 = require("../../../utilities/typescript");
+const jest_config_1 = require("../../utils/jest-config");
 let tsModule;
 function isUsingUtilityFunction(host) {
-    return host.read('jest.config.ts').toString().includes('getJestProjects()');
+    const rootConfigPath = (0, jest_config_1.findRootJestConfig)(host);
+    if (!rootConfigPath) {
+        return false;
+    }
+    const rootConfig = host.read(rootConfigPath, 'utf-8');
+    return (rootConfig.includes('getJestProjects()') ||
+        rootConfig.includes('getJestProjectsAsync()'));
 }
 /**
  * in a standalone project, the root jest.config.ts is a project config instead
@@ -15,7 +22,11 @@ function isUsingUtilityFunction(host) {
  * in that case we do not need to edit it to remove it
  **/
 function isMonorepoConfig(tree) {
-    return tree.read('jest.config.ts', 'utf-8').includes('projects:');
+    const rootConfigPath = (0, jest_config_1.findRootJestConfig)(tree);
+    if (!rootConfigPath) {
+        return false;
+    }
+    return tree.read(rootConfigPath, 'utf-8').includes('projects:');
 }
 /**
  * Updates the root jest config projects array and removes the project.
@@ -26,14 +37,15 @@ function updateJestConfig(tree, schema, projectConfig) {
     }
     const { createSourceFile, ScriptTarget, isPropertyAssignment, isArrayLiteralExpression, isStringLiteral, } = tsModule;
     const projectToRemove = schema.projectName;
-    if (!tree.exists('jest.config.ts') ||
+    const rootConfigPath = (0, jest_config_1.findRootJestConfig)(tree);
+    if (!tree.exists(rootConfigPath) ||
         !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
         isUsingUtilityFunction(tree) ||
         !isMonorepoConfig(tree)) {
         return;
     }
-    const contents = tree.read('jest.config.ts', 'utf-8');
-    const sourceFile = createSourceFile('jest.config.ts', contents, ScriptTarget.Latest);
+    const contents = tree.read(rootConfigPath, 'utf-8');
+    const sourceFile = createSourceFile(rootConfigPath, contents, ScriptTarget.Latest);
     const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
     const projectsAssignment = sourceNodes.find((node) => isPropertyAssignment(node) &&
         node.name.getText(sourceFile) === 'projects' &&
@@ -52,7 +64,7 @@ function updateJestConfig(tree, schema, projectConfig) {
     const start = previousProject
         ? previousProject.getEnd()
         : project.getStart(sourceFile);
-    tree.write('jest.config.ts', (0, devkit_1.applyChangesToString)(contents, [
+    tree.write(rootConfigPath, (0, devkit_1.applyChangesToString)(contents, [
         {
             type: devkit_1.ChangeType.Delete,
             start,

package/src/generators/utils/jest-config.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nx/devkit';
+export declare function findRootJestConfig(tree: Tree): string | null;

package/src/generators/utils/jest-config.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findRootJestConfig = void 0;
+function findRootJestConfig(tree) {
+    if (tree.exists('jest.config.js')) {
+        return 'jest.config.js';
+    }
+    if (tree.exists('jest.config.ts')) {
+        return 'jest.config.ts';
+    }
+    return null;
+}
+exports.findRootJestConfig = findRootJestConfig;