@nx/web 20.5.0 → 20.6.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "20.5.0",
+  "version": "20.6.0-beta.1",
   "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",
-    "@nx/js": "20.5.0"
+    "@nx/devkit": "20.6.0-beta.1",
+    "@nx/js": "20.6.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -150,12 +150,12 @@ async function setupBundler(tree, options) {
     }
 }
 async function addProject(tree, options) {
-    if (options.isUsingTsSolutionConfig) {
-        const packageJson = {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-        };
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
         if (options.projectName !== options.importPath) {
             packageJson.nx = { name: options.projectName };
         }
@@ -163,7 +163,6 @@ async function addProject(tree, options) {
             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, {
@@ -174,6 +173,9 @@ 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);
@@ -196,7 +198,7 @@ async function applicationGenerator(host, schema) {
 async function applicationGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
@@ -310,15 +312,15 @@ async function applicationGeneratorInternal(host, schema) {
     }
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
-        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: {
-                    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, {
@@ -330,6 +332,9 @@ 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,
@@ -365,15 +370,15 @@ async function applicationGeneratorInternal(host, schema) {
     }
     else if (options.e2eTestRunner === 'playwright') {
         const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
-        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: {
-                    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, {
@@ -385,6 +390,9 @@ 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,
@@ -494,6 +502,7 @@ async function normalizeOptions(host, options) {
         parsedTags,
         names: (0, devkit_1.names)(projectName),
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }
 exports.default = applicationGenerator;

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

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

package/src/generators/application/schema.json

@@ -104,6 +104,10 @@
       "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"],