@nx/web 17.3.0-beta.3 → 17.3.0-beta.5

package/package.json

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

package/src/generators/application/application.js

@@ -146,6 +146,11 @@ 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,
@@ -285,6 +290,7 @@ 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);
     }

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);
+function updateDependencies(tree) {
+    const tasks = [];
+    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/web'], []));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion }));
+    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);
     }
     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,4 @@
 export interface Schema {
-  bundler?: 'webpack' | 'none' | 'vite';
-  unitTestRunner?: 'jest' | 'vitest' | 'none';
-  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
   skipPackageJson?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,25 +6,6 @@
   "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",