@nx/web 18.0.0-beta.0 → 18.0.0-beta.2

package/package.json

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

package/src/generators/application/application.js

@@ -11,6 +11,7 @@ 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 add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 function createApplicationFiles(tree, options) {
     if (options.bundler === 'vite') {
         (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/app-vite'), options.appProjectRoot, {
@@ -30,6 +31,7 @@ function createApplicationFiles(tree, options) {
             rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
             webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
                 ? {
+                    compiler: options.compiler,
                     target: 'web',
                     outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot != '.'
                         ? options.appProjectRoot
@@ -66,6 +68,7 @@ async function setupBundler(tree, options) {
             devServer: true,
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
         if (project.targets.build) {
@@ -140,6 +143,7 @@ function setDefaults(tree, options) {
 }
 async function applicationGenerator(host, schema) {
     return await applicationGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -177,6 +181,7 @@ async function applicationGeneratorInternal(host, schema) {
             includeVitest: options.unitTestRunner === 'vitest',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -194,6 +199,7 @@ async function applicationGeneratorInternal(host, schema) {
             coverageProvider: 'v8',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -218,6 +224,7 @@ async function applicationGeneratorInternal(host, schema) {
             unitTestRunner: options.unitTestRunner,
             skipFormat: true,
             setParserOptionsProject: options.setParserOptionsProject,
+            addPlugin: options.addPlugin,
         });
         tasks.push(lintTask);
     }
@@ -260,6 +267,7 @@ async function applicationGeneratorInternal(host, schema) {
             setParserOptionsProject: options.setParserOptionsProject,
             webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
             webServerAddress: 'http://localhost:4200',
+            addPlugin: options.addPlugin,
         });
         tasks.push(playwrightTask);
     }
@@ -271,6 +279,7 @@ async function applicationGeneratorInternal(host, schema) {
             setupFile: 'web-components',
             compiler: options.compiler,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(jestTask);
     }
@@ -296,6 +305,9 @@ async function applicationGeneratorInternal(host, schema) {
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
@@ -308,6 +320,7 @@ async function normalizeOptions(host, options) {
         callingGenerator: '@nx/web:application',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const e2eProjectName = `${appProjectName}-e2e`;
     const e2eProjectRoot = `${appProjectRoot}-e2e`;
     const npmScope = (0, get_npm_scope_1.getNpmScope)(host);

package/src/generators/application/files/app-webpack/webpack.config.js__tmpl__

@@ -12,6 +12,7 @@ module.exports = {
   plugins: [
     new NxWebpackPlugin({
       tsConfig: '<%= webpackPluginOptions.tsConfig %>',
+      compiler: '<%= webpackPluginOptions.compiler %>',
       main: '<%= webpackPluginOptions.main %>',
       index: '<%= webpackPluginOptions.index %>',
       baseHref: '<%= webpackPluginOptions.baseHref %>',

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

@@ -17,4 +17,5 @@ export interface Schema {
   linter?: Linter;
   standaloneConfig?: boolean;
   setParserOptionsProject?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/application/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxWebApp",
   "title": "Create a Web Application for Nx",
@@ -39,11 +39,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }

package/src/generators/init/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWebInit",
   "cli": "nx",
   "title": "Init Web Plugin",

package/src/generators/static-serve/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWebStaticServe",
   "cli": "nx",
   "title": "Static Serve Configuration",