@nx/web 23.0.0-beta.12 → 23.0.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.14",
   "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": {
@@ -36,20 +36,20 @@
     "http-server": "^14.1.0",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12"
+    "@nx/devkit": "23.0.0-beta.14",
+    "@nx/js": "23.0.0-beta.14"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12",
-    "@nx/vitest": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.14",
+    "@nx/vitest": "23.0.0-beta.14"
   },
   "peerDependencies": {
-    "@nx/cypress": "23.0.0-beta.12",
-    "@nx/eslint": "23.0.0-beta.12",
-    "@nx/jest": "23.0.0-beta.12",
-    "@nx/playwright": "23.0.0-beta.12",
-    "@nx/vite": "23.0.0-beta.12",
-    "@nx/webpack": "23.0.0-beta.12"
+    "@nx/cypress": "23.0.0-beta.14",
+    "@nx/eslint": "23.0.0-beta.14",
+    "@nx/jest": "23.0.0-beta.14",
+    "@nx/playwright": "23.0.0-beta.14",
+    "@nx/vite": "23.0.0-beta.14",
+    "@nx/webpack": "23.0.0-beta.14"
   },
   "peerDependenciesMeta": {
     "@nx/cypress": {

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

@@ -12,7 +12,7 @@ const path_1 = require("path");
 const package_json_1 = require("nx/src/utils/package-json");
 const client_1 = require("nx/src/daemon/client/client");
 const utils_1 = require("nx/src/tasks-runner/utils");
-const strip_glob_to_base_dir_1 = require("@nx/js/src/utils/strip-glob-to-base-dir");
+const internal_2 = require("@nx/js/internal");
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 // platform specific command name
 const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
@@ -86,7 +86,7 @@ function getBuildTargetOutputPath(options, context) {
                     projectName: project.data.name,
                     projectRoot: project.data.root,
                 });
-                outputPath = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputPath);
+                outputPath = (0, internal_2.stripGlobToBaseDir)(outputPath);
             }
         }
     }
@@ -102,7 +102,7 @@ function createFileWatcher(project, changeHandler) {
     return client_1.daemonClient.registerFileWatcher({
         watchProjects: project ? [project] : 'all',
         includeGlobalWorkspaceFiles: true,
-        includeDependentProjects: true,
+        includeDependencies: true,
     }, async (error, val) => {
         if (error === 'reconnecting') {
             // Silent - daemon restarts automatically on lockfile changes

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

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/web/src/generators/application/application.ts"],"names":[],"mappings":"AAOA,OAAO,EAML,iBAAiB,EASjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwPlC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAKpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqW5E;AA0DD,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/web/src/generators/application/application.ts"],"names":[],"mappings":"AAOA,OAAO,EAML,iBAAiB,EASjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAoBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAkPlC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAKpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqW5E;AA0DD,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -6,14 +6,12 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const versions_1 = require("@nx/js/src/utils/versions");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
-const versions_2 = require("../../utils/versions");
+const versions_1 = 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 static_serve_configuration_1 = tslib_1.__importDefault(require("../static-serve/static-serve-configuration"));
-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') {
@@ -85,7 +83,7 @@ async function setupBundler(tree, options) {
         (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/assets'),
     ];
     if (options.bundler === 'webpack') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
         await configurationGenerator(tree, {
             target: 'web',
             project: options.projectName,
@@ -196,7 +194,7 @@ async function applicationGenerator(host, 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);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
@@ -216,7 +214,7 @@ async function applicationGeneratorInternal(host, schema) {
     }
     createApplicationFiles(host, options);
     if (options.linter === 'eslint') {
-        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_2.nxVersion);
+        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
         const lintTask = await lintProjectGenerator(host, {
             linter: options.linter,
             project: options.projectName,
@@ -236,7 +234,7 @@ async function applicationGeneratorInternal(host, schema) {
         }
     }
     if (options.bundler === 'vite') {
-        const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
+        const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
         // See: https://vite.dev/guide/env-and-mode.html
         if (host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'))) {
@@ -261,8 +259,8 @@ async function applicationGeneratorInternal(host, schema) {
         }, false);
     }
     if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
-        const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
-        (0, devkit_1.ensurePackage)('@nx/vitest', versions_2.nxVersion);
+        const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
         const { configurationGenerator } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nx/vitest/generators')));
         const vitestTask = await configurationGenerator(host, {
             uiFramework: 'none',
@@ -310,15 +308,15 @@ async function applicationGeneratorInternal(host, schema) {
         e2eDevServerTarget: `${options.projectName}:serve`,
     };
     if (options.bundler === 'webpack') {
-        const { getWebpackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.nxVersion);
+        const { getWebpackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
         e2eWebServerInfo = await getWebpackE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `webpack.config.js`), options.addPlugin, 4200);
     }
     else if (options.bundler === 'vite') {
-        const { getViteE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
+        const { getViteE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         e2eWebServerInfo = await getViteE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.ts`), options.addPlugin, 4200);
     }
     if (options.e2eTestRunner === 'cypress') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         const packageJson = {
             name: options.e2eProjectName,
             version: '0.0.1',
@@ -359,7 +357,7 @@ async function applicationGeneratorInternal(host, schema) {
         tasks.push(cypressTask);
     }
     else if (options.e2eTestRunner === 'playwright') {
-        const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
+        const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
         const packageJson = {
             name: options.e2eProjectName,
             version: '0.0.1',
@@ -398,7 +396,7 @@ async function applicationGeneratorInternal(host, schema) {
         tasks.push(playwrightTask);
     }
     if (options.unitTestRunner === 'jest') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_2.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
         const jestTask = await configurationGenerator(host, {
             project: options.projectName,
             skipSerializers: true,
@@ -418,7 +416,7 @@ async function applicationGeneratorInternal(host, schema) {
                 target: 'es2016',
             },
         });
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@swc/core': versions_1.swcCoreVersion, 'swc-loader': versions_2.swcLoaderVersion });
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@swc/core': internal_2.swcCoreVersion, 'swc-loader': versions_1.swcLoaderVersion });
         tasks.push(installTask);
     }
     else {
@@ -427,8 +425,8 @@ async function applicationGeneratorInternal(host, schema) {
         });
     }
     setDefaults(host, options);
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, { '@types/node': versions_2.typesNodeVersion }));
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_1.tsLibVersion }, { '@types/node': versions_1.typesNodeVersion }));
+    (0, internal_2.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
@@ -453,11 +451,11 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.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);
+    const npmScope = (0, internal_2.getNpmScope)(host);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];