@nx/workspace 17.0.3 → 17.0.4

package/src/generators/new/new.js

@@ -13,14 +13,16 @@ async function newGenerator(tree, opts) {
     await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, { ...options, nxCloud: undefined });
     (0, generate_preset_1.addPresetDependencies)(tree, options);
     return async () => {
-        const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);
-        if (pmc.preInstall) {
-            (0, child_process_1.execSync)(pmc.preInstall, {
-                cwd: (0, devkit_1.joinPathFragments)(tree.root, options.directory),
-                stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
-            });
+        if (!options.skipInstall) {
+            const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);
+            if (pmc.preInstall) {
+                (0, child_process_1.execSync)(pmc.preInstall, {
+                    cwd: (0, devkit_1.joinPathFragments)(tree.root, options.directory),
+                    stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
+                });
+            }
+            (0, devkit_1.installPackagesTask)(tree, false, options.directory, options.packageManager);
         }
-        (0, devkit_1.installPackagesTask)(tree, false, options.directory, options.packageManager);
         // TODO: move all of these into create-nx-workspace
         if (options.preset !== presets_1.Preset.NPM && !options.isCustomPreset) {
             await (0, generate_preset_1.generatePreset)(tree, options);

package/src/generators/new/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceNew",
   "title": "Create an empty workspace",
   "description": "Create an empty workspace.",
@@ -68,10 +68,24 @@
       "type": "boolean",
       "default": true
     },
+    "nextSrcDir": {
+      "description": "Generate a `src` directory for this project.",
+      "type": "boolean",
+      "default": true
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",
       "enum": ["cypress", "playwright", "jest", "detox", "none"]
+    },
+    "ssr": {
+      "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/npm-package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceNpmPackage",
   "title": "Add a minimal npm package",
   "description": "Add a minimal npm package.",

package/src/generators/preset/preset.js

@@ -16,6 +16,10 @@ async function presetGenerator(tree, options) {
 exports.presetGenerator = presetGenerator;
 exports.default = presetGenerator;
 async function createPreset(tree, options) {
+    console.log('Crate preset');
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
     if (options.preset === presets_1.Preset.Apps) {
         return;
     }
@@ -30,6 +34,9 @@ async function createPreset(tree, options) {
             standalone: options.standaloneApi,
             routing: options.routing,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            bundler: options.bundler,
+            ssr: options.ssr,
+            prefix: options.prefix,
         });
     }
     else if (options.preset === presets_1.Preset.AngularStandalone) {
@@ -44,6 +51,9 @@ async function createPreset(tree, options) {
             rootProject: true,
             standalone: options.standaloneApi,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            bundler: options.bundler,
+            ssr: options.ssr,
+            prefix: options.prefix,
         });
     }
     else if (options.preset === presets_1.Preset.ReactMonorepo) {
@@ -57,6 +67,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: options.bundler ?? 'webpack',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.ReactStandalone) {
@@ -72,6 +83,34 @@ async function createPreset(tree, options) {
             bundler: options.bundler ?? 'vite',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
+            addPlugin,
+        });
+    }
+    else if (options.preset === presets_1.Preset.RemixMonorepo) {
+        const { applicationGenerator: remixApplicationGenerator } = require('@nx' +
+            '/remix/generators');
+        return remixApplicationGenerator(tree, {
+            name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
+            linter: options.linter,
+            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            unitTestRunner: 'vitest',
+            addPlugin,
+        });
+    }
+    else if (options.preset === presets_1.Preset.RemixStandalone) {
+        const { applicationGenerator: remixApplicationGenerator } = require('@nx' +
+            '/remix/generators');
+        return remixApplicationGenerator(tree, {
+            name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
+            linter: options.linter,
+            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            rootProject: true,
+            unitTestRunner: 'vitest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.VueMonorepo) {
@@ -84,6 +123,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.VueStandalone) {
@@ -98,6 +138,35 @@ async function createPreset(tree, options) {
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: 'vitest',
+            addPlugin,
+        });
+    }
+    else if (options.preset === presets_1.Preset.Nuxt) {
+        const { applicationGenerator: nuxtApplicationGenerator } = require('@nx' +
+            '/nuxt');
+        return nuxtApplicationGenerator(tree, {
+            name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
+            style: options.style,
+            linter: options.linter,
+            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
+        });
+    }
+    else if (options.preset === presets_1.Preset.NuxtStandalone) {
+        const { applicationGenerator: nuxtApplicationGenerator } = require('@nx' +
+            '/nuxt');
+        return nuxtApplicationGenerator(tree, {
+            name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
+            style: options.style,
+            linter: options.linter,
+            rootProject: true,
+            e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            unitTestRunner: 'vitest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NextJs) {
@@ -110,7 +179,9 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
+            src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NextJsStandalone) {
@@ -123,8 +194,10 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
+            src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             rootProject: true,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.WebComponents) {
@@ -138,6 +211,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: 'vite',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Nest) {
@@ -149,6 +223,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Express) {
@@ -159,17 +234,22 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     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),
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Expo) {
@@ -180,6 +260,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.TS) {
@@ -197,6 +278,7 @@ async function createPreset(tree, options) {
             testEnvironment: 'node',
             js: options.js,
             rootProject: true,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NodeStandalone) {
@@ -214,6 +296,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NodeMonorepo) {
@@ -230,6 +313,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: false,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else {

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

@@ -12,8 +12,11 @@ export interface Schema {
   bundler?: 'vite' | 'webpack' | 'rspack' | 'esbuild';
   docker?: boolean;
   nextAppDir?: boolean;
+  nextSrcDir?: boolean;
   routing?: boolean;
   standaloneApi?: boolean;
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';
   js?: boolean;
+  ssr?: boolean;
+  prefix?: string;
 }

package/src/generators/preset/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspacePreset",
   "cli": "nx",
   "title": "Creates applications in a new workspace",
@@ -39,11 +39,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }
@@ -85,10 +85,24 @@
       "type": "boolean",
       "default": true
     },
+    "nextSrcDir": {
+      "description": "Generate a `src` directory for this project.",
+      "type": "boolean",
+      "default": true
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",
       "enum": ["cypress", "playwright", "jest", "detox", "none"]
+    },
+    "ssr": {
+      "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/remove/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceRemove",
   "cli": "nx",
   "title": "Nx Remove",

package/src/generators/run-commands/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SchematicsRunCommands",
   "title": "Create a custom target to run any command",
   "description": "Create a custom target to run any command.",

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;

package/src/generators/utils/presets.d.ts

@@ -14,9 +14,13 @@ export declare enum Preset {
     ReactMonorepo = "react-monorepo",
     ReactStandalone = "react-standalone",
     NextJsStandalone = "nextjs-standalone",
+    RemixMonorepo = "remix-monorepo",
+    RemixStandalone = "remix-standalone",
     ReactNative = "react-native",
     VueMonorepo = "vue-monorepo",
     VueStandalone = "vue-standalone",
+    Nuxt = "nuxt",
+    NuxtStandalone = "nuxt-standalone",
     Expo = "expo",
     NextJs = "next",
     Nest = "nest",

package/src/generators/utils/presets.js

@@ -4,7 +4,7 @@ exports.Preset = void 0;
 var Preset;
 (function (Preset) {
     Preset["Apps"] = "apps";
-    // TODO(v18): Remove Empty and Core presets
+    // TODO(v19): Remove Empty and Core presets
     /** @deprecated Use Apps instead
      */
     Preset["Empty"] = "empty";
@@ -19,9 +19,13 @@ var Preset;
     Preset["ReactMonorepo"] = "react-monorepo";
     Preset["ReactStandalone"] = "react-standalone";
     Preset["NextJsStandalone"] = "nextjs-standalone";
+    Preset["RemixMonorepo"] = "remix-monorepo";
+    Preset["RemixStandalone"] = "remix-standalone";
     Preset["ReactNative"] = "react-native";
     Preset["VueMonorepo"] = "vue-monorepo";
     Preset["VueStandalone"] = "vue-standalone";
+    Preset["Nuxt"] = "nuxt";
+    Preset["NuxtStandalone"] = "nuxt-standalone";
     Preset["Expo"] = "expo";
     Preset["NextJs"] = "next";
     Preset["Nest"] = "nest";

package/src/utils/output.js

@@ -10,7 +10,7 @@ if (process.env.CI === 'true') {
 }
 class CLIOutput {
     constructor() {
-        this.NX_PREFIX = `${chalk.cyan('>')} ${chalk.reset.inverse.bold.cyan(' NX ')}`;
+        this.NX_PREFIX = chalk.reset.inverse.bold.cyan(' NX ');
         /**
          * Longer dash character which forms more of a continuous line when place side to side
          * with itself, unlike the standard dash character

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
-export declare const typescriptVersion = "~5.1.3";
-export declare const angularCliVersion = "~16.2.0";
+export declare const typescriptVersion = "~5.4.2";
+export declare const angularCliVersion = "~17.3.0";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = exports.typescriptVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.typescriptVersion = '~5.1.3';
+exports.typescriptVersion = '~5.4.2';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~16.2.0';
+exports.angularCliVersion = '~17.3.0';