@nx/web 0.0.0-pr-30418-4e2b721 → 0.0.0-pr-3-ec41644

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "0.0.0-pr-30418-4e2b721",
+  "version": "0.0.0-pr-3-ec41644",
   "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": "0.0.0-pr-30418-4e2b721",
-    "@nx/js": "0.0.0-pr-30418-4e2b721"
+    "@nx/devkit": "0.0.0-pr-3-ec41644",
+    "@nx/js": "0.0.0-pr-3-ec41644"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -16,11 +16,13 @@ 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,
@@ -30,6 +32,7 @@ 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,
@@ -150,19 +153,17 @@ async function setupBundler(tree, options) {
     }
 }
 async function addProject(tree, options) {
-    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;
-        }
+    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),
+            version: '0.0.1',
+            private: true,
+            nx: options.parsedTags?.length
+                ? {
+                    tags: options.parsedTags,
+                }
+                : undefined,
+        });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(tree, options.projectName, {
@@ -173,9 +174,6 @@ async function addProject(tree, options) {
             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);
@@ -198,7 +196,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);
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
@@ -312,15 +310,17 @@ async function applicationGeneratorInternal(host, schema) {
     }
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
-        const packageJson = {
-            name: options.e2eProjectName,
-            version: '0.0.1',
-            private: true,
-        };
-        if (!options.useProjectJson) {
-            packageJson.nx = {
-                implicitDependencies: [options.projectName],
-            };
+        if (options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -332,9 +332,6 @@ async function applicationGeneratorInternal(host, schema) {
                 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,
@@ -370,15 +367,17 @@ async function applicationGeneratorInternal(host, schema) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
-        const packageJson = {
-            name: options.e2eProjectName,
-            version: '0.0.1',
-            private: true,
-        };
-        if (!options.useProjectJson) {
-            packageJson.nx = {
-                implicitDependencies: [options.projectName],
-            };
+        if (options.isUsingTsSolutionConfig) {
+            (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                name: options.e2eProjectName,
+                version: '0.0.1',
+                private: true,
+                nx: {
+                    projectType: 'application',
+                    sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                    implicitDependencies: [options.projectName],
+                },
+            });
         }
         else {
             (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -390,9 +389,6 @@ async function applicationGeneratorInternal(host, schema) {
                 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,
@@ -466,8 +462,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.ensureRootProjectName)(options, 'application');
-    const { projectName, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -476,10 +472,9 @@ 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())
@@ -491,18 +486,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,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
+            : appProjectName,
         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><%= names.className %></title>
+    <title><%= 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><%= names.className %></title>
+    <title><%= className %></title>
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />

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

@@ -16,5 +16,4 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   strict?: boolean;
   addPlugin?: boolean;
-  useProjectJson?: boolean;
 }

package/src/generators/application/schema.json

@@ -104,10 +104,6 @@
       "type": "boolean",
       "description": "Creates an application with strict mode and strict type checking.",
       "default": true
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],