@nx/workspace 17.1.0-beta.0 → 17.1.0-beta.3

package/package.json

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

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

@@ -53,7 +53,7 @@ Just run `nx build demoapp` to build the application. The build artifacts will b
 Nx comes with local caching already built-in (check your `nx.json`). On CI you might want to go a step further.
 
 - [Set up remote caching](https://nx.dev/core-features/share-your-cache)
-- [Set up task distribution across multiple machines](https://nx.dev/core-features/distribute-task-execution)
+- [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)
 
 ## Connect with us!

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

@@ -65,6 +65,7 @@ function generatePreset(host, opts) {
             opts.e2eTestRunner !== undefined
                 ? `--e2eTestRunner=${opts.e2eTestRunner}`
                 : null,
+            opts.ssr ? `--ssr` : null,
         ].filter((e) => !!e);
     }
 }
@@ -106,6 +107,16 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
                     '@nx/vite': versions_1.nxVersion,
                 },
             };
+        case presets_1.Preset.Nuxt:
+        case presets_1.Preset.NuxtStandalone:
+            return {
+                dependencies: {},
+                dev: {
+                    '@nx/nuxt': versions_1.nxVersion,
+                    '@nx/cypress': e2eTestRunner === 'cypress' ? versions_1.nxVersion : undefined,
+                    '@nx/playwright': e2eTestRunner === 'playwright' ? versions_1.nxVersion : undefined,
+                },
+            };
         case presets_1.Preset.ReactMonorepo:
         case presets_1.Preset.ReactStandalone:
             return {

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

@@ -56,9 +56,6 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             lint: {
                 cache: true,
             },
-            test: {
-                cache: true,
-            },
             e2e: {
                 cache: true,
             },
@@ -82,6 +79,7 @@ function createFiles(tree, options) {
     const filesDirName = options.preset === presets_1.Preset.AngularStandalone ||
         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.TsStandalone
@@ -121,6 +119,7 @@ function addNpmScripts(tree, options) {
     if (options.preset === presets_1.Preset.AngularStandalone ||
         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) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {

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

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

package/src/generators/new/schema.json

@@ -72,6 +72,11 @@
       "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
     }
   },
   "additionalProperties": true

package/src/generators/preset/preset.js

@@ -30,6 +30,8 @@ async function createPreset(tree, options) {
             standalone: options.standaloneApi,
             routing: options.routing,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            bundler: options.bundler,
+            ssr: options.ssr,
         });
     }
     else if (options.preset === presets_1.Preset.AngularStandalone) {
@@ -44,6 +46,8 @@ async function createPreset(tree, options) {
             rootProject: true,
             standalone: options.standaloneApi,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            bundler: options.bundler,
+            ssr: options.ssr,
         });
     }
     else if (options.preset === presets_1.Preset.ReactMonorepo) {
@@ -100,6 +104,32 @@ async function createPreset(tree, options) {
             unitTestRunner: 'vitest',
         });
     }
+    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',
+        });
+    }
+    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',
+        });
+    }
     else if (options.preset === presets_1.Preset.NextJs) {
         const { applicationGenerator: nextApplicationGenerator } = require('@nx' +
             '/next');

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

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

package/src/generators/preset/schema.json

@@ -89,6 +89,11 @@
       "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
     }
   },
   "required": ["preset", "name"]

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

@@ -17,6 +17,8 @@ export declare enum Preset {
     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

@@ -22,6 +22,8 @@ var Preset;
     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/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.2.2";
+export declare const angularCliVersion = "~17.0.0-rc.4";

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.2.2';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~16.2.0';
+exports.angularCliVersion = '~17.0.0-rc.4';