@nx/web 20.0.0-beta.4 → 20.0.0-beta.6

package/migrations.json

@@ -1,18 +1,5 @@
 {
-  "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/web with @nx/web",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-0-0-update-executors": {
-      "cli": "nx",
-      "version": "16.0.0-beta.4",
-      "description": "Replace @nrwl/web executors with @nx/webpack and @nx/rollup",
-      "implementation": "./src/migrations/update-16-0-0-update-executors/update-16-0-0-update-executors"
-    }
-  },
+  "generators": {},
   "packageJsonUpdates": {
     "17.3.0": {
       "version": "17.3.0-beta.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "20.0.0-beta.4",
+  "version": "20.0.0-beta.6",
   "private": false,
   "description": "The Nx Plugin for Web Components contains generators for managing Web Component applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Playwright, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -35,9 +35,8 @@
     "http-server": "^14.1.0",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.0.0-beta.4",
-    "@nx/js": "20.0.0-beta.4",
-    "@nrwl/web": "20.0.0-beta.4"
+    "@nx/devkit": "20.0.0-beta.6",
+    "@nx/js": "20.0.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -15,6 +15,7 @@ const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaul
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const static_serve_configuration_1 = require("../static-serve/static-serve-configuration");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function createApplicationFiles(tree, options) {
     if (options.bundler === 'vite') {
         (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/app-vite'), options.appProjectRoot, {
@@ -160,6 +161,7 @@ async function applicationGenerator(host, schema) {
     });
 }
 async function applicationGeneratorInternal(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'web', 'application');
     const options = await normalizeOptions(host, schema);
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
@@ -210,6 +212,7 @@ async function applicationGeneratorInternal(host, schema) {
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             addPlugin: options.addPlugin,
+            compiler: options.compiler,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -389,13 +392,12 @@ async function applicationGeneratorInternal(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -1,15 +1,13 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   prefix?: string;
   style?: string;
   bundler?: 'webpack' | 'none' | 'vite';
   compiler?: 'babel' | 'swc';
   skipFormat?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   inSourceTests?: boolean;

package/src/generators/application/schema.json

@@ -6,24 +6,20 @@
   "description": "Create a web application using `swc` or `babel` as compiler.",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z][^:]*$"
-    },
-    "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "style": {
       "description": "The file extension to be used for style files.",
@@ -77,7 +73,8 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
+      "enum": ["vitest", "jest", "none"],
+      "default": "vitest",
       "description": "Test runner to use for unit tests. Default value is 'jest' when using 'webpack' or 'none' as the bundler and 'vitest' when using 'vite' as the bundler"
     },
     "inSourceTests": {
@@ -113,6 +110,6 @@
       "x-deprecated": "Nx only supports standaloneConfig"
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

package/src/generators/init/init.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webInitGenerator = webInitGenerator;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(tree, schema) {
     const tasks = [];
@@ -10,6 +11,7 @@ function updateDependencies(tree, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function webInitGenerator(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'web', 'init');
     let installTask = () => { };
     if (!schema.skipPackageJson) {
         installTask = updateDependencies(tree, schema);

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/web', '@nx/web');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-0-0-update-executors/update-16-0-0-update-executors.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(host: Tree): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/migrations/update-16-0-0-update-executors/update-16-0-0-update-executors.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-async function update(host) {
-    const projects = (0, devkit_1.getProjects)(host);
-    const deps = {};
-    for (const [name, config] of projects.entries()) {
-        let updated = false;
-        // webpack
-        if (config?.targets?.build?.executor === '@nrwl/web:webpack') {
-            config.targets.build.executor = '@nx/webpack:webpack';
-            deps['@nx/webpack'] = versions_1.nxVersion;
-            updated = true;
-        }
-        if (config?.targets?.serve?.executor === '@nrwl/web:dev-server') {
-            config.targets.serve.executor = '@nx/webpack:dev-server';
-            deps['@nx/webpack'] = versions_1.nxVersion;
-            updated = true;
-        }
-        // rollup
-        if (config?.targets?.build?.executor === '@nrwl/web:rollup') {
-            config.targets.build.executor = '@nx/rollup:rollup';
-            deps['@nx/rollup'] = versions_1.nxVersion;
-            updated = true;
-        }
-        if (updated) {
-            (0, devkit_1.updateProjectConfiguration)(host, name, config);
-        }
-    }
-    await (0, devkit_1.formatFiles)(host);
-    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, deps);
-}