@nx/web 20.5.0-beta.1 → 20.5.0-beta.3

package/package.json

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

package/src/generators/application/application.js

@@ -29,19 +29,22 @@ function createApplicationFiles(tree, options) {
         });
     }
     else {
+        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: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+            offsetFromRoot: rootOffset,
             rootTsConfigPath,
             webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
                 ? {
                     compiler: options.compiler,
                     target: 'web',
-                    outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot != '.'
-                        ? options.appProjectRoot
-                        : options.projectName),
+                    outputPath: options.isUsingTsSolutionConfig
+                        ? 'dist'
+                        : (0, devkit_1.joinPathFragments)(rootOffset, 'dist', options.appProjectRoot !== '.'
+                            ? options.appProjectRoot
+                            : options.projectName),
                     tsConfig: './tsconfig.app.json',
                     main: './src/main.ts',
                     assets: ['./src/favicon.ico', './src/assets'],
@@ -100,7 +103,7 @@ async function setupBundler(tree, options) {
             addPlugin: options.addPlugin,
         });
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-        if (project.targets.build) {
+        if (project.targets?.build) {
             const prodConfig = project.targets.build.configurations.production;
             const buildOptions = project.targets.build.options;
             buildOptions.assets = assets;
@@ -212,6 +215,21 @@ async function applicationGeneratorInternal(host, schema) {
         await setupBundler(host, options);
     }
     createApplicationFiles(host, options);
+    if (options.linter === 'eslint') {
+        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_2.nxVersion);
+        const lintTask = await lintProjectGenerator(host, {
+            linter: options.linter,
+            project: options.projectName,
+            tsConfigPaths: [
+                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+            ],
+            unitTestRunner: options.unitTestRunner,
+            skipFormat: true,
+            setParserOptionsProject: options.setParserOptionsProject,
+            addPlugin: options.addPlugin,
+        });
+        tasks.push(lintTask);
+    }
     if (options.bundler === 'vite') {
         const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
         // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
@@ -259,21 +277,6 @@ async function applicationGeneratorInternal(host, schema) {
         options.inSourceTests) {
         host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/app/app.element.spec.ts`));
     }
-    if (options.linter === 'eslint') {
-        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_2.nxVersion);
-        const lintTask = await lintProjectGenerator(host, {
-            linter: options.linter,
-            project: options.projectName,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-            setParserOptionsProject: options.setParserOptionsProject,
-            addPlugin: options.addPlugin,
-        });
-        tasks.push(lintTask);
-    }
     const nxJson = (0, devkit_1.readNxJson)(host);
     let hasPlugin;
     let buildPlugin;

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

@@ -4,7 +4,7 @@ const { join } = require('path');
 
 module.exports = {
   output: {
-    path: join(__dirname, '<%= offsetFromRoot %><%= webpackPluginOptions.outputPath %>'),
+    path: join(__dirname, '<%= webpackPluginOptions.outputPath %>'),
   },
   devServer: {
     port: 4200