@nx/web 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -9,7 +9,7 @@
 
 [![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
+[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

package/migrations.json

@@ -1,27 +1,4 @@
 {
-  "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"
-    }
-  },
-  "packageJsonUpdates": {
-    "17.3.0": {
-      "version": "17.3.0-beta.3",
-      "packages": {
-        "@types/node": {
-          "version": "18.16.9",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    }
-  }
+  "generators": {},
+  "packageJsonUpdates": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "0.0.0-pr-31222-862e973",
+  "version": "0.0.0-pr-31313-387cdca",
   "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,13 +35,12 @@
     "http-server": "^14.1.0",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-31222-862e973",
-    "@nx/js": "0.0.0-pr-31222-862e973",
-    "@nrwl/web": "0.0.0-pr-31222-862e973"
+    "@nx/devkit": "0.0.0-pr-31313-387cdca",
+    "@nx/js": "0.0.0-pr-31313-387cdca"
   },
   "publishConfig": {
     "access": "public"
   },
-  "type": "commonjs",
-  "types": "./index.d.ts"
+  "types": "./index.d.ts",
+  "type": "commonjs"
 }

package/src/executors/file-server/file-server.impl.js

@@ -134,7 +134,7 @@ async function* fileServerExecutor(options, context) {
                     (0, child_process_1.execFileSync)(pmCmd, args, {
                         stdio: [0, 1, 2],
                         shell: true,
-                        windowsHide: true,
+                        windowsHide: false,
                     });
                 }
                 catch {

package/src/executors/file-server/schema.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
+  "continuous": true,
   "outputCapture": "direct-nodejs",
   "title": "File Server",
   "description": "Serve a web application from a folder. This executor is a wrapper around the [http-server](https://www.npmjs.com/package/http-server) package.",
@@ -74,7 +75,14 @@
       "description": "Path where the build artifacts are located. If not provided then it will be infered from the buildTarget executor options as outputPath"
     },
     "cors": {
-      "type": "boolean",
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "string"
+        }
+      ],
       "description": "Enable CORS",
       "default": true
     },

package/src/generators/application/application.js

@@ -14,31 +14,33 @@ const has_webpack_plugin_1 = require("../../utils/has-webpack-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 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) {
+    const rootTsConfigPath = (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot);
     if (options.bundler === 'vite') {
         (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/app-vite'), options.appProjectRoot, {
             ...options,
-            ...(0, devkit_1.names)(options.name),
             tmpl: '',
             offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
-            rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
+            rootTsConfigPath,
         });
     }
     else {
+        const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
         (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/app-webpack'), options.appProjectRoot, {
             ...options,
-            ...(0, devkit_1.names)(options.name),
             tmpl: '',
-            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
-            rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
+            offsetFromRoot: rootOffset,
+            rootTsConfigPath,
             webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
                 ? {
                     compiler: options.compiler,
                     target: 'web',
-                    outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot != '.'
-                        ? options.appProjectRoot
-                        : options.projectName),
+                    outputPath: options.isUsingTsSolutionConfig
+                        ? 'dist'
+                        : (0, devkit_1.joinPathFragments)(rootOffset, 'dist', options.appProjectRoot !== '.'
+                            ? options.appProjectRoot
+                            : options.projectName),
                     tsConfig: './tsconfig.app.json',
                     main: './src/main.ts',
                     assets: ['./src/favicon.ico', './src/assets'],
@@ -52,15 +54,29 @@ function createApplicationFiles(tree, options) {
             tree.delete((0, path_1.join)(options.appProjectRoot, './src/app/app.element.spec.ts'));
         }
     }
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
-        return {
-            ...json,
-            compilerOptions: {
-                ...(json.compilerOptions || {}),
-                strict: options.strict,
-            },
-        };
-    });
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), () => ({
+            extends: rootTsConfigPath,
+            files: [],
+            include: [],
+            references: [
+                {
+                    path: './tsconfig.app.json',
+                },
+            ],
+        }));
+    }
+    else {
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
+            return {
+                ...json,
+                compilerOptions: {
+                    ...(json.compilerOptions || {}),
+                    strict: options.strict,
+                },
+            };
+        });
+    }
 }
 async function setupBundler(tree, options) {
     const main = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/main.ts');
@@ -83,7 +99,7 @@ async function setupBundler(tree, options) {
             addPlugin: options.addPlugin,
         });
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-        if (project.targets.build) {
+        if (project.targets?.build) {
             const prodConfig = project.targets.build.configurations.production;
             const buildOptions = project.targets.build.options;
             buildOptions.assets = assets;
@@ -116,6 +132,7 @@ async function setupBundler(tree, options) {
     else if (options.bundler === 'none') {
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
         (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/js:${options.compiler}`);
+        project.targets ??= {};
         project.targets.build = {
             executor: `@nx/js:${options.compiler}`,
             outputs: ['{options.outputPath}'],
@@ -132,14 +149,32 @@ async function setupBundler(tree, options) {
     }
 }
 async function addProject(tree, options) {
-    const targets = {};
-    (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
-        projectType: 'application',
-        root: options.appProjectRoot,
-        sourceRoot: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src'),
-        tags: options.parsedTags,
-        targets,
-    }, options.standaloneConfig);
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
+        if (options.projectName !== options.importPath) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
+            projectType: 'application',
+            root: options.appProjectRoot,
+            sourceRoot: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src'),
+            tags: options.parsedTags,
+            targets: {},
+        });
+    }
+    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    }
 }
 function setDefaults(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -156,16 +191,19 @@ function setDefaults(tree, options) {
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
 async function applicationGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
+    if (options.isUsingTsSolutionConfig) {
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+    }
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         js: false,
         skipFormat: true,
+        platform: 'web',
     });
     tasks.push(jsInitTask);
     const webTask = await (0, init_1.webInitGenerator)(host, {
@@ -178,6 +216,21 @@ async function applicationGeneratorInternal(host, schema) {
         await setupBundler(host, options);
     }
     createApplicationFiles(host, options);
+    if (options.linter === 'eslint') {
+        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_2.nxVersion);
+        const lintTask = await lintProjectGenerator(host, {
+            linter: options.linter,
+            project: options.projectName,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+            ],
+            unitTestRunner: options.unitTestRunner,
+            skipFormat: true,
+            setParserOptionsProject: options.setParserOptionsProject,
+            addPlugin: options.addPlugin,
+        });
+        tasks.push(lintTask);
+    }
     if (options.bundler === 'vite') {
         const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
         // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
@@ -211,6 +264,7 @@ async function applicationGeneratorInternal(host, schema) {
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             addPlugin: options.addPlugin,
+            compiler: options.compiler,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -224,21 +278,6 @@ async function applicationGeneratorInternal(host, schema) {
         options.inSourceTests) {
         host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/app/app.element.spec.ts`));
     }
-    if (options.linter === 'eslint') {
-        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_2.nxVersion);
-        const lintTask = await lintProjectGenerator(host, {
-            linter: options.linter,
-            project: options.projectName,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-            setParserOptionsProject: options.setParserOptionsProject,
-            addPlugin: options.addPlugin,
-        });
-        tasks.push(lintTask);
-    }
     const nxJson = (0, devkit_1.readNxJson)(host);
     let hasPlugin;
     let buildPlugin;
@@ -272,14 +311,29 @@ async function applicationGeneratorInternal(host, schema) {
     }
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            projectType: 'application',
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                projectType: 'application',
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const cypressTask = await configurationGenerator(host, {
             ...options,
             project: options.e2eProjectName,
@@ -287,42 +341,40 @@ async function applicationGeneratorInternal(host, schema) {
             baseUrl: e2eWebServerInfo.e2eWebServerAddress,
             directory: 'src',
             skipFormat: true,
-            webServerCommands: hasPlugin
-                ? {
-                    default: e2eWebServerInfo.e2eWebServerCommand,
-                    production: e2eWebServerInfo.e2eCiWebServerCommand,
-                }
-                : undefined,
-            ciWebServerCommand: hasPlugin
-                ? e2eWebServerInfo.e2eCiWebServerCommand
-                : undefined,
+            webServerCommands: {
+                default: e2eWebServerInfo.e2eWebServerCommand,
+                production: e2eWebServerInfo.e2eCiWebServerCommand,
+            },
+            ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
         });
-        if (options.addPlugin ||
-            (0, devkit_1.readNxJson)(host).plugins?.find((p) => typeof p === 'string'
-                ? p === '@nx/cypress/plugin'
-                : p.plugin === '@nx/cypress/plugin')) {
-            let buildTarget = '^build';
-            if (hasPlugin) {
-                const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(host, buildPlugin, (0, devkit_1.joinPathFragments)(options.appProjectRoot, buildConfigFile));
-                if (matchingPlugin && typeof matchingPlugin !== 'string') {
-                    buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
-                }
-            }
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(host, '@nx/cypress/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `cypress.config.ts`));
-        }
         tasks.push(cypressTask);
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
-        (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
-            root: options.e2eProjectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
-            projectType: 'application',
-            targets: {},
-            tags: [],
-            implicitDependencies: [options.projectName],
-        });
+        const packageJson = {
+            name: options.e2eProjectName,
+            version: '0.0.1',
+            private: true,
+        };
+        if (!options.useProjectJson) {
+            packageJson.nx = {
+                implicitDependencies: [options.projectName],
+            };
+        }
+        else {
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                projectType: 'application',
+                targets: {},
+                tags: [],
+                implicitDependencies: [options.projectName],
+            });
+        }
+        if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+        }
         const playwrightTask = await playwrightConfigGenerator(host, {
             project: options.e2eProjectName,
             skipFormat: true,
@@ -335,19 +387,6 @@ async function applicationGeneratorInternal(host, schema) {
             webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
             addPlugin: options.addPlugin,
         });
-        if (options.addPlugin ||
-            (0, devkit_1.readNxJson)(host).plugins?.find((p) => typeof p === 'string'
-                ? p === '@nx/playwright/plugin'
-                : p.plugin === '@nx/playwright/plugin')) {
-            let buildTarget = '^build';
-            if (hasPlugin) {
-                const matchingPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(host, buildPlugin, (0, devkit_1.joinPathFragments)(options.appProjectRoot, buildConfigFile));
-                if (matchingPlugin && typeof matchingPlugin !== 'string') {
-                    buildTarget = `^${matchingPlugin.options?.buildTargetName ?? 'build'}`;
-                }
-            }
-            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(host, '@nx/playwright/plugin', buildTarget, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, `playwright.config.ts`));
-        }
         tasks.push(playwrightTask);
     }
     if (options.unitTestRunner === 'jest') {
@@ -381,7 +420,13 @@ async function applicationGeneratorInternal(host, schema) {
     }
     setDefaults(host, options);
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, { '@types/node': versions_2.typesNodeVersion }));
-    if (!schema.skipFormat) {
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+        module: 'esnext',
+        moduleResolution: 'bundler',
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
+    if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
     tasks.push(() => {
@@ -390,18 +435,18 @@ 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.ensureRootProjectName)(options, 'application');
+    const { projectName, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/web:application',
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = `${appProjectName}-e2e`;
     const e2eProjectRoot = `${appProjectRoot}-e2e`;
     const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
@@ -415,15 +460,18 @@ async function normalizeOptions(host, options) {
     return {
         ...options,
         prefix: options.prefix ?? npmScope ?? 'app',
-        name: (0, devkit_1.names)(options.name).fileName,
         compiler: options.compiler ?? 'babel',
         bundler: options.bundler ?? 'webpack',
         projectName: appProjectName,
+        importPath,
         strict: options.strict ?? true,
         appProjectRoot,
         e2eProjectRoot,
         e2eProjectName,
         parsedTags,
+        names: (0, devkit_1.names)(projectName),
+        isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }
 exports.default = applicationGenerator;

package/src/generators/application/files/app-vite/index.html__tmpl__

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title><%= className %></title>
+    <title><%= names.className %></title>
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />

package/src/generators/application/files/app-webpack/src/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title><%= className %></title>
+    <title><%= names.className %></title>
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />

package/src/generators/application/files/app-webpack/webpack.config.js__tmpl__

@@ -4,7 +4,7 @@ const { join } = require('path');
 
 module.exports = {
   output: {
-    path: join(__dirname, '<%= offsetFromRoot %><%= webpackPluginOptions.outputPath %>'),
+    path: join(__dirname, '<%= webpackPluginOptions.outputPath %>'),
   },
   devServer: {
     port: 4200

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

@@ -1,22 +1,20 @@
-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;
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   linter?: Linter | LinterType;
-  standaloneConfig?: boolean;
   setParserOptionsProject?: boolean;
   strict?: boolean;
   addPlugin?: boolean;
+  useProjectJson?: 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.",
@@ -58,8 +54,8 @@
     "bundler": {
       "type": "string",
       "description": "The bundler to use.",
-      "enum": ["webpack", "none", "vite"],
-      "default": "webpack",
+      "enum": ["vite", "webpack", "none"],
+      "default": "vite",
       "x-prompt": "Which bundler do you want to use?",
       "x-priority": "important"
     },
@@ -67,7 +63,8 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?"
     },
     "skipFormat": {
       "description": "Skip formatting files",
@@ -77,8 +74,10 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
-      "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"
+      "enum": ["vitest", "jest", "none"],
+      "default": "none",
+      "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",
+      "x-prompt": "What unit test runner should be used?"
     },
     "inSourceTests": {
       "type": "boolean",
@@ -106,13 +105,11 @@
       "description": "Creates an application with strict mode and strict type checking.",
       "default": true
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside workspace.json",
+    "useProjectJson": {
       "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/application-examples.md"
 }

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);
-}