@nx/web 20.5.0-rc.3 → 20.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "20.5.0-rc.3",
+  "version": "20.5.0",
   "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,8 +35,8 @@
     "http-server": "^14.1.0",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.5.0-rc.3",
-    "@nx/js": "20.5.0-rc.3"
+    "@nx/devkit": "20.5.0",
+    "@nx/js": "20.5.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -16,13 +16,11 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 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");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 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,
@@ -32,7 +30,6 @@ function createApplicationFiles(tree, options) {
         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: rootOffset,
             rootTsConfigPath,
@@ -154,16 +151,19 @@ async function setupBundler(tree, options) {
 }
 async function addProject(tree, options) {
     if (options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: (0, get_import_path_1.getImportPath)(tree, options.name),
+        const packageJson = {
+            name: options.importPath,
             version: '0.0.1',
             private: true,
-            nx: options.parsedTags?.length
-                ? {
-                    tags: options.parsedTags,
-                }
-                : undefined,
-        });
+        };
+        if (options.projectName !== options.importPath) {
+            packageJson.nx = { name: options.projectName };
+        }
+        if (options.parsedTags?.length) {
+            packageJson.nx ??= {};
+            packageJson.nx.tags = options.parsedTags;
+        }
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -316,8 +316,6 @@ async function applicationGeneratorInternal(host, schema) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });
@@ -373,8 +371,6 @@ async function applicationGeneratorInternal(host, schema) {
                 version: '0.0.1',
                 private: true,
                 nx: {
-                    projectType: 'application',
-                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     implicitDependencies: [options.projectName],
                 },
             });
@@ -462,8 +458,8 @@ async function applicationGeneratorInternal(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
-    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    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,
@@ -472,9 +468,10 @@ 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 appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = `${appProjectName}-e2e`;
     const e2eProjectRoot = `${appProjectRoot}-e2e`;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
@@ -486,17 +483,16 @@ 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: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
-            : appProjectName,
+        projectName: appProjectName,
+        importPath,
         strict: options.strict ?? true,
         appProjectRoot,
         e2eProjectRoot,
         e2eProjectName,
         parsedTags,
+        names: (0, devkit_1.names)(projectName),
         isUsingTsSolutionConfig,
     };
 }

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" />