@nx/web 17.0.3 → 17.0.5

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 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

@@ -1,4 +1,9 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
 
 <div style="text-align: center;">
 
@@ -15,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart, Fast and Extensible Build System
+# Nx: Smart Monorepos · Fast CI
 
-Nx is a next generation build system with first class monorepo support and powerful integrations.
+Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
 
 This package is a [Web plugin for Nx](https://nx.dev/packages/web).
 
@@ -59,5 +64,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 

package/migrations.json

@@ -37,5 +37,15 @@
       "implementation": "./src/migrations/update-16-0-0-update-executors/update-16-0-0-update-executors"
     }
   },
-  "packageJsonUpdates": {}
+  "packageJsonUpdates": {
+    "17.3.0": {
+      "version": "17.3.0-beta.3",
+      "packages": {
+        "@types/node": {
+          "version": "18.16.9",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "17.0.3",
+  "version": "17.0.5",
   "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, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -34,9 +34,9 @@
     "detect-port": "^1.5.1",
     "http-server": "^14.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.3",
-    "@nx/js": "17.0.3",
-    "@nrwl/web": "17.0.3"
+    "@nx/devkit": "17.0.5",
+    "@nx/js": "17.0.5",
+    "@nrwl/web": "17.0.5"
   },
   "publishConfig": {
     "access": "public"

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

@@ -9,6 +9,7 @@ const path_1 = require("path");
 const package_json_1 = require("nx/src/utils/package-json");
 const detectPort = require("detect-port");
 const client_1 = require("nx/src/daemon/client/client");
+const utils_1 = require("nx/src/tasks-runner/utils");
 // platform specific command name
 const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 function getHttpServerArgs(options) {
@@ -44,8 +45,15 @@ function getHttpServerArgs(options) {
     }
     return args;
 }
-function getBuildTargetCommand(options) {
-    const cmd = ['nx', 'run', options.buildTarget];
+function getBuildTargetCommand(options, context) {
+    const target = (0, devkit_1.parseTargetString)(options.buildTarget, context);
+    const cmd = ['nx', 'run'];
+    if (target.configuration) {
+        cmd.push(`${target.project}:${target.target}:${target.configuration}`);
+    }
+    else {
+        cmd.push(`${target.project}:${target.target}`);
+    }
     if (options.parallel) {
         cmd.push(`--parallel`);
     }
@@ -58,16 +66,27 @@ function getBuildTargetOutputPath(options, context) {
     if (options.staticFilePath) {
         return options.staticFilePath;
     }
-    let buildOptions;
+    let outputPath;
     try {
         const target = (0, devkit_1.parseTargetString)(options.buildTarget, context);
-        buildOptions = (0, devkit_1.readTargetOptions)(target, context);
+        const buildOptions = (0, devkit_1.readTargetOptions)(target, context);
+        if (buildOptions?.outputPath) {
+            outputPath = buildOptions.outputPath;
+        }
+        else {
+            const project = context.projectGraph.nodes[context.projectName];
+            const buildTarget = project.data.targets[target.target];
+            outputPath = buildTarget.outputs?.[0];
+            if (outputPath)
+                outputPath = (0, utils_1.interpolate)(outputPath, {
+                    projectName: project.data.name,
+                    projectRoot: project.data.root,
+                });
+        }
     }
     catch (e) {
         throw new Error(`Invalid buildTarget: ${options.buildTarget}`);
     }
-    // TODO: vsavkin we should also check outputs
-    const outputPath = buildOptions.outputPath;
     if (!outputPath) {
         throw new Error(`Unable to get the outputPath from buildTarget ${options.buildTarget}. Make sure ${options.buildTarget} has an outputPath property or manually provide an staticFilePath property`);
     }
@@ -78,50 +97,69 @@ function createFileWatcher(project, changeHandler) {
         watchProjects: project ? [project] : 'all',
         includeGlobalWorkspaceFiles: true,
         includeDependentProjects: true,
-    }, async (error, { changedFiles }) => {
+    }, async (error, val) => {
         if (error === 'closed') {
             throw new Error('Watch error: Daemon closed the connection');
         }
         else if (error) {
             throw new Error(`Watch error: ${error?.message ?? 'Unknown'}`);
         }
-        else if (changedFiles.length > 0) {
+        else if (val?.changedFiles.length > 0) {
             changeHandler();
         }
     });
 }
 async function* fileServerExecutor(options, context) {
+    if (!options.buildTarget && !options.staticFilePath) {
+        throw new Error("You must set either 'buildTarget' or 'staticFilePath'.");
+    }
+    if (options.watch && !options.buildTarget) {
+        throw new Error("Watch error: You can only specify 'watch' when 'buildTarget' is set.");
+    }
     let running = false;
-    const run = () => {
-        if (!running) {
-            running = true;
-            try {
-                const args = getBuildTargetCommand(options);
-                (0, child_process_1.execFileSync)(pmCmd, args, {
-                    stdio: [0, 1, 2],
-                });
-            }
-            catch {
-                throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
-            }
-            finally {
-                running = false;
+    let disposeWatch;
+    if (options.buildTarget) {
+        const run = () => {
+            if (!running) {
+                running = true;
+                /**
+                 * Expose a variable to the build target to know if it's being run by the serve-static executor
+                 * This is useful because a config might need to change if it's being run by serve-static without the user's input
+                 * or if being ran by another executor (eg. E2E tests)
+                 * */
+                process.env.NX_SERVE_STATIC_BUILD_RUNNING = 'true';
+                try {
+                    const args = getBuildTargetCommand(options, context);
+                    (0, child_process_1.execFileSync)(pmCmd, args, {
+                        stdio: [0, 1, 2],
+                    });
+                }
+                catch {
+                    throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
+                }
+                finally {
+                    process.env.NX_SERVE_STATIC_BUILD_RUNNING = undefined;
+                    running = false;
+                }
             }
+        };
+        if (options.watch) {
+            const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+            disposeWatch = await createFileWatcher(context.projectName, run);
         }
-    };
-    let disposeWatch;
-    if (options.watch) {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        disposeWatch = await createFileWatcher(context.projectName, run);
+        // perform initial run
+        run();
     }
-    // perform initial run
-    run();
+    const port = await detectPort(options.port || 8080);
     const outputPath = getBuildTargetOutputPath(options, context);
     if (options.spa) {
         const src = (0, path_1.join)(outputPath, 'index.html');
         const dst = (0, path_1.join)(outputPath, '404.html');
         // See: https://github.com/http-party/http-server#magic-files
         (0, fs_1.copyFileSync)(src, dst);
+        // We also need to ensure the proxyUrl is set, otherwise the browser will continue to throw a 404 error
+        // This can cause unexpected behaviors and failures especially in automated test suites
+        options.proxyUrl ??= `http${options.ssl ? 's' : ''}://localhost:${port}?`;
     }
     const args = getHttpServerArgs(options);
     const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server', module.paths);
@@ -129,7 +167,6 @@ async function* fileServerExecutor(options, context) {
     const pathToHttpServer = (0, path_1.resolve)(pathToHttpServerPkgJson.replace('package.json', ''), pathToHttpServerBin);
     // detect port as close to when used to prevent port being used by another process
     // when running in  parallel
-    const port = await detectPort(options.port || 8080);
     args.push(`-p=${port}`);
     const serve = (0, child_process_1.fork)(pathToHttpServer, [outputPath, ...args], {
         stdio: 'pipe',

package/src/executors/file-server/schema.d.ts

@@ -1,11 +1,11 @@
 export interface Schema {
-  host: string;
-  port: number;
-  ssl: boolean;
+  host?: string;
+  port?: number;
+  ssl?: boolean;
   sslKey?: string;
   sslCert?: string;
   proxyUrl?: string;
-  buildTarget: string;
+  buildTarget?: string;
   parallel: boolean;
   maxParallel?: number;
   withDeps: boolean;

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

@@ -44,7 +44,7 @@
     },
     "proxyUrl": {
       "type": "string",
-      "description": "URL to proxy unhandled requests to."
+      "description": "URL to proxy unhandled requests to. _Note: If the 'spa' flag is set to true, manually setting this value will override the catch-all redirect functionality from http-server which may lead to unexpected behavior._"
     },
     "proxyOptions": {
       "type": "object",
@@ -94,6 +94,5 @@
       "default": -1
     }
   },
-  "additionalProperties": false,
-  "required": ["buildTarget"]
+  "additionalProperties": false
 }

package/src/generators/application/application.js

@@ -9,16 +9,45 @@ const path_1 = require("path");
 const versions_2 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
+const has_webpack_plugin_1 = require("../../utils/has-webpack-plugin");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 function createApplicationFiles(tree, options) {
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, options.bundler === 'vite' ? './files/app-vite' : './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),
-    });
-    if (options.unitTestRunner === 'none') {
-        tree.delete((0, path_1.join)(options.appProjectRoot, './src/app/app.element.spec.ts'));
+    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),
+        });
+    }
+    else {
+        (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),
+            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),
+                    tsConfig: './tsconfig.app.json',
+                    main: './src/main.ts',
+                    assets: ['./src/favicon.ico', './src/assets'],
+                    index: './src/index.html',
+                    baseHref: '/',
+                    styles: [`./src/styles.${options.style}`],
+                }
+                : null,
+        });
+        if (options.unitTestRunner === 'none') {
+            tree.delete((0, path_1.join)(options.appProjectRoot, './src/app/app.element.spec.ts'));
+        }
     }
 }
 async function setupBundler(tree, options) {
@@ -31,6 +60,7 @@ async function setupBundler(tree, options) {
     if (options.bundler === 'webpack') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.nxVersion);
         await configurationGenerator(tree, {
+            target: 'web',
             project: options.projectName,
             main,
             tsConfig,
@@ -38,38 +68,42 @@ async function setupBundler(tree, options) {
             devServer: true,
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-        const prodConfig = project.targets.build.configurations.production;
-        const buildOptions = project.targets.build.options;
-        buildOptions.assets = assets;
-        buildOptions.index = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/index.html');
-        buildOptions.baseHref = '/';
-        buildOptions.styles = [
-            (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
-        ];
-        // We can delete that, because this projest is an application
-        // and applications have a .babelrc file in their root dir.
-        // So Nx will find it and use it
-        delete buildOptions.babelUpwardRootMode;
-        buildOptions.scripts = [];
-        prodConfig.fileReplacements = [
-            {
-                replace: (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/environments/environment.ts`),
-                with: (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/environments/environment.prod.ts`),
-            },
-        ];
-        prodConfig.optimization = true;
-        prodConfig.outputHashing = 'all';
-        prodConfig.sourceMap = false;
-        prodConfig.namedChunks = false;
-        prodConfig.extractLicenses = true;
-        prodConfig.vendorChunk = false;
-        (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
+        if (project.targets.build) {
+            const prodConfig = project.targets.build.configurations.production;
+            const buildOptions = project.targets.build.options;
+            buildOptions.assets = assets;
+            buildOptions.index = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/index.html');
+            buildOptions.baseHref = '/';
+            buildOptions.styles = [
+                (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
+            ];
+            // We can delete that, because this projest is an application
+            // and applications have a .babelrc file in their root dir.
+            // So Nx will find it and use it
+            delete buildOptions.babelUpwardRootMode;
+            buildOptions.scripts = [];
+            prodConfig.fileReplacements = [
+                {
+                    replace: (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/environments/environment.ts`),
+                    with: (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/environments/environment.prod.ts`),
+                },
+            ];
+            prodConfig.optimization = true;
+            prodConfig.outputHashing = 'all';
+            prodConfig.sourceMap = false;
+            prodConfig.namedChunks = false;
+            prodConfig.extractLicenses = true;
+            prodConfig.vendorChunk = false;
+            (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
+        }
+        // TODO(jack): Flush this out... no bundler should be possible for web but the experience isn't holistic due to missing features (e.g. writing index.html).
     }
     else if (options.bundler === 'none') {
-        // TODO(jack): Flush this out... no bundler should be possible for web but the experience isn't holistic due to missing features (e.g. writing index.html).
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+        (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, `@nx/js:${options.compiler}`);
         project.targets.build = {
             executor: `@nx/js:${options.compiler}`,
             outputs: ['{options.outputPath}'],
@@ -77,7 +111,6 @@ async function setupBundler(tree, options) {
                 main,
                 outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot),
                 tsConfig,
-                assets,
             },
         };
         (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
@@ -95,9 +128,6 @@ async function addProject(tree, options) {
         tags: options.parsedTags,
         targets,
     }, options.standaloneConfig);
-    if (options.bundler !== 'vite') {
-        await setupBundler(tree, options);
-    }
 }
 function setDefaults(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -113,6 +143,7 @@ function setDefaults(tree, options) {
 }
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -121,13 +152,21 @@ exports.applicationGenerator = applicationGenerator;
 async function applicationGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
     const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        js: false,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const webTask = await (0, init_1.webInitGenerator)(host, {
         ...options,
         skipFormat: true,
     });
     tasks.push(webTask);
-    createApplicationFiles(host, options);
     await addProject(host, options);
+    if (options.bundler !== 'vite') {
+        await setupBundler(host, options);
+    }
+    createApplicationFiles(host, options);
     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.
@@ -142,6 +181,7 @@ async function applicationGeneratorInternal(host, schema) {
             includeVitest: options.unitTestRunner === 'vitest',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -156,9 +196,10 @@ async function applicationGeneratorInternal(host, schema) {
         const vitestTask = await vitestGenerator(host, {
             uiFramework: 'none',
             project: options.projectName,
-            coverageProvider: 'c8',
+            coverageProvider: 'v8',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -181,9 +222,9 @@ async function applicationGeneratorInternal(host, schema) {
                 (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             ],
             unitTestRunner: options.unitTestRunner,
-            eslintFilePatterns: [`${options.appProjectRoot}/**/*.ts`],
             skipFormat: true,
             setParserOptionsProject: options.setParserOptionsProject,
+            addPlugin: options.addPlugin,
         });
         tasks.push(lintTask);
     }
@@ -200,7 +241,8 @@ async function applicationGeneratorInternal(host, schema) {
         const cypressTask = await configurationGenerator(host, {
             ...options,
             project: options.e2eProjectName,
-            devServerTarget: `${options.projectName}:serve`,
+            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
+            baseUrl: options.e2eWebServerAddress,
             directory: 'src',
             skipFormat: true,
         });
@@ -223,8 +265,9 @@ async function applicationGeneratorInternal(host, schema) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
-            webServerAddress: 'http://localhost:4200',
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
+            webServerAddress: options.e2eWebServerAddress,
+            addPlugin: options.addPlugin,
         });
         tasks.push(playwrightTask);
     }
@@ -236,6 +279,7 @@ async function applicationGeneratorInternal(host, schema) {
             setupFile: 'web-components',
             compiler: options.compiler,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(jestTask);
     }
@@ -257,9 +301,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) {
         await (0, devkit_1.formatFiles)(host);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
@@ -272,8 +320,39 @@ async function normalizeOptions(host, options) {
         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;
+    let e2eWebServerTarget = 'serve';
+    if (options.addPlugin) {
+        if (nxJson.plugins) {
+            for (const plugin of nxJson.plugins) {
+                if (options.bundler === 'vite' &&
+                    typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/vite/plugin' &&
+                    plugin.options.serveTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .serveTargetName;
+                }
+                else if (options.bundler === 'webpack' &&
+                    typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/webpack/plugin' &&
+                    plugin.options.serveTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .serveTargetName;
+                }
+            }
+        }
+    }
+    let e2ePort = 4200;
+    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
+        nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
+        e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options?.port;
+    }
     const e2eProjectName = `${appProjectName}-e2e`;
     const e2eProjectRoot = `${appProjectRoot}-e2e`;
+    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
@@ -295,6 +374,9 @@ async function normalizeOptions(host, options) {
         appProjectRoot,
         e2eProjectRoot,
         e2eProjectName,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2ePort,
         parsedTags,
     };
 }

package/src/generators/application/files/app-vite/src/app/app.element.__style__

@@ -278,7 +278,15 @@
       #nx-console svg {
         color: rgba(0, 122, 204, 1);
       }
-
+      #nx-console-jetbrains {
+      margin-top: 2rem;
+      }
+      #nx-console-jetbrains:hover {
+        background-color: rgba(255, 49, 140, 1);
+      }
+      #nx-console-jetbrains svg {
+        color: rgba(255, 49, 140, 1);
+      }
       #nx-repo:hover {
         background-color: rgba(24, 23, 23, 1);
       }

package/src/generators/application/files/app-vite/src/app/app.element.ts__tmpl__

@@ -234,10 +234,44 @@ export class AppElement extends HTMLElement {
                 />
               </svg>
               <span>
-                Install Nx Console
-                <span>Plugin for VSCode</span>
+                Install Nx Console for VSCode
+                <span>The official VSCode extension for Nx.</span>
               </span>
             </a>
+            <a
+                id="nx-console-jetbrains"
+                class="button-pill rounded shadow"
+                href="https://plugins.jetbrains.com/plugin/21060-nx-console"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <svg
+                  height="48"
+                  width="48"
+                  viewBox="20 20 60 60"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path d="m22.5 22.5h60v60h-60z" />
+                  <g fill="#fff">
+                    <path d="m29.03 71.25h22.5v3.75h-22.5z" />
+                    <path d="m28.09 38 1.67-1.58a1.88 1.88 0 0 0 1.47.87c.64 0 1.06-.44 1.06-1.31v-5.98h2.58v6a3.48 3.48 0 0 1 -.87 2.6 3.56 3.56 0 0 1 -2.57.95 3.84 3.84 0 0 1 -3.34-1.55z" />
+                    <path d="m36 30h7.53v2.19h-5v1.44h4.49v2h-4.42v1.49h5v2.21h-7.6z" />
+                    <path d="m47.23 32.29h-2.8v-2.29h8.21v2.27h-2.81v7.1h-2.6z" />
+                    <path d="m29.13 43.08h4.42a3.53 3.53 0 0 1 2.55.83 2.09 2.09 0 0 1 .6 1.53 2.16 2.16 0 0 1 -1.44 2.09 2.27 2.27 0 0 1 1.86 2.29c0 1.61-1.31 2.59-3.55 2.59h-4.44zm5 2.89c0-.52-.42-.8-1.18-.8h-1.29v1.64h1.24c.79 0 1.25-.26 1.25-.81zm-.9 2.66h-1.57v1.73h1.62c.8 0 1.24-.31 1.24-.86 0-.5-.4-.87-1.27-.87z" />
+                    <path d="m38 43.08h4.1a4.19 4.19 0 0 1 3 1 2.93 2.93 0 0 1 .9 2.19 3 3 0 0 1 -1.93 2.89l2.24 3.27h-3l-1.88-2.84h-.87v2.84h-2.56zm4 4.5c.87 0 1.39-.43 1.39-1.11 0-.75-.54-1.12-1.4-1.12h-1.44v2.26z" />
+                    <path d="m49.59 43h2.5l4 9.44h-2.79l-.67-1.69h-3.63l-.67 1.69h-2.71zm2.27 5.73-1-2.65-1.06 2.65z" />
+                    <path d="m56.46 43.05h2.6v9.37h-2.6z" />
+                    <path d="m60.06 43.05h2.42l3.37 5v-5h2.57v9.37h-2.26l-3.53-5.14v5.14h-2.57z" />
+                    <path d="m68.86 51 1.45-1.73a4.84 4.84 0 0 0 3 1.13c.71 0 1.08-.24 1.08-.65 0-.4-.31-.6-1.59-.91-2-.46-3.53-1-3.53-2.93 0-1.74 1.37-3 3.62-3a5.89 5.89 0 0 1 3.86 1.25l-1.26 1.84a4.63 4.63 0 0 0 -2.62-.92c-.63 0-.94.25-.94.6 0 .42.32.61 1.63.91 2.14.46 3.44 1.16 3.44 2.91 0 1.91-1.51 3-3.79 3a6.58 6.58 0 0 1 -4.35-1.5z" />
+                  </g>
+                </svg>
+                <span>
+                  Install Nx Console for JetBrains
+                  <span>
+                    Available for WebStorm, Intellij IDEA Ultimate and more!
+                  </span>
+                </span>
+              </a>
             <div id="nx-cloud" class="rounded shadow">
               <div>
                 <svg id="nx-cloud-logo" role="img" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" fill="transparent" viewBox="0 0 24 24">
@@ -245,7 +279,7 @@ export class AppElement extends HTMLElement {
                   <path stroke-width="2" d="M23 6v14.1667C23 21.7307 21.7307 23 20.1667 23H6c0-3.128 2.53867-5.6667 5.6667-5.6667 3.128 0 5.6666-2.5386 5.6666-5.6666C17.3333 8.53867 19.872 6 23 6Z" />
                 </svg>
                 <h2>
-                  NxCloud
+                  Nx Cloud
                   <span>
                     Enable faster CI & better DX
                   </span>
@@ -255,7 +289,7 @@ export class AppElement extends HTMLElement {
                 You can activate distributed tasks executions and caching by
                 running:
               </p>
-              <pre>nx connect-to-nx-cloud</pre>
+              <pre>nx connect</pre>
               <a href="https://nx.app/?utm_source=nx-project" target="_blank" rel="noreferrer"> What is Nx Cloud? </a>
             </div>
             <a id="nx-repo" class="button-pill rounded shadow" href="https://github.com/nrwl/nx?utm_source=nx-project" target="_blank" rel="noreferrer">
@@ -302,7 +336,7 @@ export class AppElement extends HTMLElement {
 nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nx/angular:component button --project ui</pre>
+nx g @nx/angular:component ui/src/lib/button</pre>
           </details>
           <details>
             <summary>

package/src/generators/application/files/app-webpack/src/app/app.element.__style__

@@ -278,7 +278,15 @@
       #nx-console svg {
         color: rgba(0, 122, 204, 1);
       }
-
+      #nx-console-jetbrains {
+      margin-top: 2rem;
+      }
+      #nx-console-jetbrains:hover {
+        background-color: rgba(255, 49, 140, 1);
+      }
+      #nx-console-jetbrains svg {
+        color: rgba(255, 49, 140, 1);
+      }
       #nx-repo:hover {
         background-color: rgba(24, 23, 23, 1);
       }

package/src/generators/application/files/app-webpack/src/app/app.element.ts__tmpl__

@@ -234,10 +234,44 @@ export class AppElement extends HTMLElement {
                 />
               </svg>
               <span>
-                Install Nx Console
-                <span>Plugin for VSCode</span>
+                Install Nx Console for VSCode
+                <span>The official VSCode extension for Nx.</span>
               </span>
             </a>
+            <a
+                id="nx-console-jetbrains"
+                class="button-pill rounded shadow"
+                href="https://plugins.jetbrains.com/plugin/21060-nx-console"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <svg
+                  height="48"
+                  width="48"
+                  viewBox="20 20 60 60"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path d="m22.5 22.5h60v60h-60z" />
+                  <g fill="#fff">
+                    <path d="m29.03 71.25h22.5v3.75h-22.5z" />
+                    <path d="m28.09 38 1.67-1.58a1.88 1.88 0 0 0 1.47.87c.64 0 1.06-.44 1.06-1.31v-5.98h2.58v6a3.48 3.48 0 0 1 -.87 2.6 3.56 3.56 0 0 1 -2.57.95 3.84 3.84 0 0 1 -3.34-1.55z" />
+                    <path d="m36 30h7.53v2.19h-5v1.44h4.49v2h-4.42v1.49h5v2.21h-7.6z" />
+                    <path d="m47.23 32.29h-2.8v-2.29h8.21v2.27h-2.81v7.1h-2.6z" />
+                    <path d="m29.13 43.08h4.42a3.53 3.53 0 0 1 2.55.83 2.09 2.09 0 0 1 .6 1.53 2.16 2.16 0 0 1 -1.44 2.09 2.27 2.27 0 0 1 1.86 2.29c0 1.61-1.31 2.59-3.55 2.59h-4.44zm5 2.89c0-.52-.42-.8-1.18-.8h-1.29v1.64h1.24c.79 0 1.25-.26 1.25-.81zm-.9 2.66h-1.57v1.73h1.62c.8 0 1.24-.31 1.24-.86 0-.5-.4-.87-1.27-.87z" />
+                    <path d="m38 43.08h4.1a4.19 4.19 0 0 1 3 1 2.93 2.93 0 0 1 .9 2.19 3 3 0 0 1 -1.93 2.89l2.24 3.27h-3l-1.88-2.84h-.87v2.84h-2.56zm4 4.5c.87 0 1.39-.43 1.39-1.11 0-.75-.54-1.12-1.4-1.12h-1.44v2.26z" />
+                    <path d="m49.59 43h2.5l4 9.44h-2.79l-.67-1.69h-3.63l-.67 1.69h-2.71zm2.27 5.73-1-2.65-1.06 2.65z" />
+                    <path d="m56.46 43.05h2.6v9.37h-2.6z" />
+                    <path d="m60.06 43.05h2.42l3.37 5v-5h2.57v9.37h-2.26l-3.53-5.14v5.14h-2.57z" />
+                    <path d="m68.86 51 1.45-1.73a4.84 4.84 0 0 0 3 1.13c.71 0 1.08-.24 1.08-.65 0-.4-.31-.6-1.59-.91-2-.46-3.53-1-3.53-2.93 0-1.74 1.37-3 3.62-3a5.89 5.89 0 0 1 3.86 1.25l-1.26 1.84a4.63 4.63 0 0 0 -2.62-.92c-.63 0-.94.25-.94.6 0 .42.32.61 1.63.91 2.14.46 3.44 1.16 3.44 2.91 0 1.91-1.51 3-3.79 3a6.58 6.58 0 0 1 -4.35-1.5z" />
+                  </g>
+                </svg>
+                <span>
+                  Install Nx Console for JetBrains
+                  <span>
+                    Available for WebStorm, Intellij IDEA Ultimate and more!
+                  </span>
+                </span>
+              </a>
             <div id="nx-cloud" class="rounded shadow">
               <div>
                 <svg id="nx-cloud-logo" role="img" xmlns="http://www.w3.org/2000/svg" stroke="currentColor" fill="transparent" viewBox="0 0 24 24">
@@ -245,7 +279,7 @@ export class AppElement extends HTMLElement {
                   <path stroke-width="2" d="M23 6v14.1667C23 21.7307 21.7307 23 20.1667 23H6c0-3.128 2.53867-5.6667 5.6667-5.6667 3.128 0 5.6666-2.5386 5.6666-5.6666C17.3333 8.53867 19.872 6 23 6Z" />
                 </svg>
                 <h2>
-                  NxCloud
+                  Nx Cloud
                   <span>
                     Enable faster CI & better DX
                   </span>
@@ -255,7 +289,7 @@ export class AppElement extends HTMLElement {
                 You can activate distributed tasks executions and caching by
                 running:
               </p>
-              <pre>nx connect-to-nx-cloud</pre>
+              <pre>nx connect</pre>
               <a href="https://nx.app/?utm_source=nx-project" target="_blank" rel="noreferrer"> What is Nx Cloud? </a>
             </div>
             <a id="nx-repo" class="button-pill rounded shadow" href="https://github.com/nrwl/nx?utm_source=nx-project" target="_blank" rel="noreferrer">
@@ -302,7 +336,7 @@ export class AppElement extends HTMLElement {
 nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nx/angular:component button --project ui</pre>
+nx g @nx/angular:component ui/src/lib/button</pre>
           </details>
           <details>
             <summary>

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

@@ -1,8 +1,39 @@
+<% if (webpackPluginOptions) { %>
+const { NxWebpackPlugin } = require('@nx/webpack');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '<%= offsetFromRoot %><%= webpackPluginOptions.outputPath %>'),
+  },
+  devServer: {
+    port: 4200
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: '<%= webpackPluginOptions.tsConfig %>',
+      compiler: '<%= webpackPluginOptions.compiler %>',
+      main: '<%= webpackPluginOptions.main %>',
+      index: '<%= webpackPluginOptions.index %>',
+      baseHref: '<%= webpackPluginOptions.baseHref %>',
+      assets: <%- JSON.stringify(webpackPluginOptions.assets) %>,
+      styles: <%- JSON.stringify(webpackPluginOptions.styles) %>,
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    })
+  ],
+};
+<% } else { %>
 const { composePlugins, withNx, withWeb } = require('@nx/webpack');
 
 // Nx plugins for webpack.
-module.exports = composePlugins(withNx(), withWeb(), (config) => {
-  // Update the webpack config as needed here.
-  // e.g. `config.plugins.push(new MyPlugin())`
-  return config;
-});
+module.exports = composePlugins(
+  withNx(),
+  withWeb(),
+  (config) => {
+    // Update the webpack config as needed here.
+    // e.g. `config.plugins.push(new MyPlugin())`
+    return config;
+  }
+);
+<% } %>

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

@@ -17,4 +17,5 @@ export interface Schema {
   linter?: Linter;
   standaloneConfig?: boolean;
   setParserOptionsProject?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/application/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxWebApp",
   "title": "Create a Web Application for Nx",
@@ -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     ]"
           }
         ]
       }

package/src/generators/init/init.js

@@ -2,55 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(tree, schema) {
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/web'], []);
-    const devDependencies = {
-        '@nx/web': versions_1.nxVersion,
-        '@types/node': versions_1.typesNodeVersion,
-    };
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        tslib: versions_1.tsLibVersion,
-    }, devDependencies);
+    const tasks = [];
+    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/web'], []));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion }, undefined, schema.keepExistingVersions));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function webInitGenerator(tree, schema) {
-    const tasks = [];
-    const jsInitTask = await (0, js_1.initGenerator)(tree, {
-        js: false,
-        skipFormat: true,
-    });
-    tasks.push(jsInitTask);
-    if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-        const { jestInitGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-        const jestTask = await jestInitGenerator(tree, {
-            skipPackageJson: schema.skipPackageJson,
-        });
-        tasks.push(jestTask);
-    }
-    if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
-        const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-        const cypressTask = await cypressInitGenerator(tree, {
-            skipPackageJson: schema.skipPackageJson,
-        });
-        tasks.push(cypressTask);
-    }
-    else if (schema.e2eTestRunner === 'playwright') {
-        const { initGenerator: playwrightInitGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-        const playwrightConfigTask = await playwrightInitGenerator(tree, {
-            skipFormat: true,
-            skipPackageJson: schema.skipPackageJson,
-        });
-        tasks.push(playwrightConfigTask);
-    }
+    let installTask = () => { };
     if (!schema.skipPackageJson) {
-        const installTask = updateDependencies(tree, schema);
-        tasks.push(installTask);
+        installTask = updateDependencies(tree, schema);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installTask;
 }
 exports.webInitGenerator = webInitGenerator;
 exports.default = webInitGenerator;

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

@@ -1,7 +1,5 @@
 export interface Schema {
-  bundler?: 'webpack' | 'none' | 'vite';
-  unitTestRunner?: 'jest' | 'vitest' | 'none';
-  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
   skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,30 +1,11 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWebInit",
   "cli": "nx",
   "title": "Init Web Plugin",
   "description": "Init Web Plugin.",
   "type": "object",
   "properties": {
-    "bundler": {
-      "type": "string",
-      "description": "The bundler to use.",
-      "enum": ["webpack", "none", "vite"],
-      "default": "webpack"
-    },
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
-    "e2eTestRunner": {
-      "description": "Adds the specified e2e test runner",
-      "type": "string",
-      "enum": ["cypress", "playwright", "none"],
-      "x-prompt": "Which E2E test runner would you like to use?",
-      "default": "cypress"
-    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",
@@ -35,6 +16,12 @@
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "required": []

package/src/generators/static-serve/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWebStaticServe",
   "cli": "nx",
   "title": "Static Serve Configuration",
@@ -18,6 +18,11 @@
       "type": "string",
       "description": "Name of the serve target to add. Defaults to 'serve-static'.",
       "default": "serve-static"
+    },
+    "spa": {
+      "type": "boolean",
+      "description": "Whether to set the 'spa' flag on the generated target.",
+      "default": true
     }
   },
   "required": ["buildTarget"]

package/src/generators/static-serve/static-serve-configuration.d.ts

@@ -1,8 +1,9 @@
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 interface WebStaticServeSchema {
     buildTarget: string;
     outputPath?: string;
     targetName?: string;
+    spa?: boolean;
 }
-export declare function webStaticServeGenerator(tree: Tree, options: WebStaticServeSchema): void;
+export declare function webStaticServeGenerator(tree: Tree, options: WebStaticServeSchema): Promise<void>;
 export default webStaticServeGenerator;

package/src/generators/static-serve/static-serve-configuration.js

@@ -2,17 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webStaticServeGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-function webStaticServeGenerator(tree, options) {
-    const opts = normalizeOptions(tree, options);
+async function webStaticServeGenerator(tree, options) {
+    const opts = await normalizeOptions(tree, options);
     addStaticConfig(tree, opts);
 }
 exports.webStaticServeGenerator = webStaticServeGenerator;
-function normalizeOptions(tree, options) {
-    const target = (0, devkit_1.parseTargetString)(options.buildTarget);
+async function normalizeOptions(tree, options) {
+    let projectGraph;
+    try {
+        projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    }
+    catch (e) {
+        projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    }
+    const target = (0, devkit_1.parseTargetString)(options.buildTarget, projectGraph);
     const opts = {
         ...options,
         targetName: options.targetName || 'serve-static',
         projectName: target.project,
+        spa: options.spa ?? true,
     };
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, target.project);
     const buildTargetConfig = projectConfig?.targets?.[target.target];
@@ -27,7 +35,7 @@ Optionally, you can provide a different name with the --target-name option other
     }
     // NOTE: @nx/web:file-server only looks for the outputPath option
     if (!buildTargetConfig.options?.outputPath && !opts.outputPath) {
-        // attempt to find the suiteable path from the outputs
+        // attempt to find the suitable path from the outputs
         let maybeOutputValue;
         for (const o of buildTargetConfig?.outputs || []) {
             const isInterpolatedOutput = o.trim().startsWith('{options.');
@@ -65,6 +73,7 @@ function addStaticConfig(tree, opts) {
         options: {
             buildTarget: opts.buildTarget,
             staticFilePath: opts.outputPath,
+            spa: opts.spa,
         },
     };
     projectConfig.targets[opts.targetName] = staticServeOptions;

package/src/migrations/update-15-9-1/add-dropped-dependencies.js

@@ -13,7 +13,7 @@ async function addDroppedDependencies(tree) {
     for (const [_, projectConfiguration] of projects) {
         for (const [_, targetConfiguration] of Object.entries(projectConfiguration.targets ?? {})) {
             for (const droppedDependency of droppedDependencies) {
-                if (targetConfiguration.executor?.startsWith(droppedDependency + ':')) {
+                if (targetConfiguration?.['executor']?.startsWith(droppedDependency + ':')) {
                     devDependencies[droppedDependency] = devkit_1.NX_VERSION;
                 }
             }
@@ -22,7 +22,7 @@ async function addDroppedDependencies(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     for (const [_, targetConfiguration] of Object.entries(nxJson?.targetDefaults ?? {})) {
         for (const droppedDependency of droppedDependencies) {
-            if (targetConfiguration.executor?.startsWith(droppedDependency + ':')) {
+            if (targetConfiguration?.['executor']?.startsWith(droppedDependency + ':')) {
                 devDependencies[droppedDependency] = devkit_1.NX_VERSION;
             }
         }

package/src/utils/has-webpack-plugin.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function hasWebpackPlugin(tree: Tree): boolean;

package/src/utils/has-webpack-plugin.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasWebpackPlugin = void 0;
+const devkit_1 = require("@nx/devkit");
+function hasWebpackPlugin(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    return !!nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/webpack/plugin'
+        : p.plugin === '@nx/webpack/plugin');
+}
+exports.hasWebpackPlugin = hasWebpackPlugin;

package/src/utils/versions.d.ts

@@ -1,4 +1,4 @@
 export declare const nxVersion: any;
 export declare const swcLoaderVersion = "0.1.15";
-export declare const typesNodeVersion = "18.7.1";
+export declare const typesNodeVersion = "18.16.9";
 export declare const tsLibVersion = "^2.3.0";

package/src/utils/versions.js

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsLibVersion = exports.typesNodeVersion = exports.swcLoaderVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.swcLoaderVersion = '0.1.15';
-exports.typesNodeVersion = '18.7.1';
+exports.typesNodeVersion = '18.16.9';
 exports.tsLibVersion = '^2.3.0';

package/src/utils/wait-for-port-open.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForPortOpen = void 0;
+const devkit_1 = require("@nx/devkit");
 const net = require("net");
 function waitForPortOpen(port, options = {}) {
-    const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET'];
+    const host = options.host ?? '127.0.0.1';
+    const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET', 'ETIMEDOUT'];
     return new Promise((resolve, reject) => {
         const checkPort = (retries = options.retries ?? 120) => {
             const client = new net.Socket();
@@ -20,6 +22,9 @@ function waitForPortOpen(port, options = {}) {
             });
             client.once('error', (err) => {
                 if (retries === 0 || !allowedErrorCodes.includes(err['code'])) {
+                    if (process.env['NX_VERBOSE_LOGGING'] === 'true') {
+                        devkit_1.logger.info(`Error connecting on ${host}:${port}: ${err['code'] || err}`);
+                    }
                     cleanupClient();
                     reject(err);
                 }
@@ -29,7 +34,10 @@ function waitForPortOpen(port, options = {}) {
             });
             // Node will use IPv6 if it is available, but this can cause issues if the server is only listening on IPv4.
             // Hard-coding to look on 127.0.0.1 to avoid using the IPv6 loopback address "::1".
-            client.connect({ port, host: options.host ?? '127.0.0.1' });
+            if (process.env['NX_VERBOSE_LOGGING'] === 'true') {
+                devkit_1.logger.info(`Connecting on ${host}:${port}`);
+            }
+            client.connect({ port, host });
         };
         checkPort();
     });

package/src/generators/application/files/app-webpack/src/environments/environment.prod.ts__tmpl__

@@ -1,3 +0,0 @@
-export const environment = {
-  production: true
-};

package/src/generators/application/files/app-webpack/src/environments/environment.ts__tmpl__

@@ -1,6 +0,0 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// When building for production, this file is replaced with `environment.prod.ts`.
-
-export const environment = {
-  production: false
-};