@nx/node 17.2.0-beta.1 → 17.2.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "17.2.0-beta.1",
+  "version": "17.2.0-beta.10",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -31,11 +31,11 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.2.0-beta.1",
-    "@nx/jest": "17.2.0-beta.1",
-    "@nx/js": "17.2.0-beta.1",
-    "@nx/eslint": "17.2.0-beta.1",
-    "@nrwl/node": "17.2.0-beta.1"
+    "@nx/devkit": "17.2.0-beta.10",
+    "@nx/jest": "17.2.0-beta.10",
+    "@nx/js": "17.2.0-beta.10",
+    "@nx/eslint": "17.2.0-beta.10",
+    "@nrwl/node": "17.2.0-beta.10"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -7,12 +7,12 @@ const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
 const versions_1 = require("@nx/js/src/utils/versions");
 const eslint_1 = require("@nx/eslint");
-const lint_project_1 = require("@nx/eslint/src/generators/lint-project/lint-project");
 const path_1 = require("path");
 const versions_2 = require("../../utils/versions");
 const e2e_project_1 = require("../e2e-project/e2e-project");
 const init_1 = require("../init/init");
 const setup_docker_1 = require("../setup-docker/setup-docker");
+const has_webpack_plugin_1 = require("../../utils/has-webpack-plugin");
 function getWebpackBuildConfig(project, options) {
     return {
         executor: `@nx/webpack:webpack`,
@@ -25,7 +25,6 @@ function getWebpackBuildConfig(project, options) {
             main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'main' + (options.js ? '.js' : '.ts')),
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
-            isolatedConfig: true,
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
         },
         configurations: {
@@ -95,14 +94,19 @@ function addProject(tree, options) {
         targets: {},
         tags: options.parsedTags,
     };
-    project.targets.build =
-        options.bundler === 'esbuild'
-            ? getEsBuildConfig(project, options)
-            : getWebpackBuildConfig(project, options);
+    if (options.bundler === 'esbuild') {
+        project.targets.build = getEsBuildConfig(project, options);
+    }
+    else if (options.bundler === 'webpack') {
+        if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) {
+            project.targets.build = getWebpackBuildConfig(project, options);
+        }
+    }
     project.targets.serve = getServeConfig(options);
     (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
 }
 function addAppFiles(tree, options) {
+    const sourceRoot = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src');
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/common'), options.appProjectRoot, {
         ...options,
         tmpl: '',
@@ -110,6 +114,14 @@ function addAppFiles(tree, options) {
         root: options.appProjectRoot,
         offset: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
+        webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
+            ? {
+                outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot),
+                main: './src/main' + (options.js ? '.js' : '.ts'),
+                tsConfig: './tsconfig.app.json',
+                assets: ['./assets'],
+            }
+            : null,
     });
     if (options.bundler !== 'webpack') {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'));
@@ -169,9 +181,6 @@ async function addLintingToApplication(tree, options) {
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
         ],
-        eslintFilePatterns: [
-            (0, lint_project_1.mapLintPattern)(options.appProjectRoot, options.js ? 'js' : 'ts', options.rootProject),
-        ],
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,
         setParserOptionsProject: options.setParserOptionsProject,
@@ -266,6 +275,14 @@ async function applicationGeneratorInternal(tree, schema) {
     tasks.push(initTask);
     const installTask = addProjectDependencies(tree, options);
     tasks.push(installTask);
+    if (options.bundler === 'webpack') {
+        const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.nxVersion);
+        const webpackInitTask = await webpackInitGenerator(tree, {
+            uiFramework: 'react',
+            skipFormat: true,
+        });
+        tasks.push(webpackInitTask);
+    }
     addAppFiles(tree, options);
     addProject(tree, options);
     updateTsConfigOptions(tree, options);

package/src/generators/application/files/common/webpack.config.js__tmpl__

@@ -1,8 +1,35 @@
+<% if (webpackPluginOptions) { %>
+const { NxWebpackPlugin } = require('@nx/webpack');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '<%= offset %><%= webpackPluginOptions.outputPath %>'),
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      target: 'node',
+      compiler: 'tsc',
+      main: '<%= webpackPluginOptions.main %>',
+      tsConfig: '<%= webpackPluginOptions.tsConfig %>',
+      assets: <%- JSON.stringify(webpackPluginOptions.assets) %>,
+      optimization: false,
+      outputHashing: 'none',
+    })
+  ],
+};
+<% } else { %>
 const { composePlugins, withNx} = require('@nx/webpack');
 
 // Nx plugins for webpack.
-module.exports = composePlugins(withNx(), (config) => {
-  // Update the webpack config as needed here.
-  // e.g. `config.plugins.push(new MyPlugin())`
-  return config;
-});
+module.exports = composePlugins(
+  withNx({
+    target: 'node',
+  }),
+  (config) => {
+    // Update the webpack config as needed here.
+    // e.g. `config.plugins.push(new MyPlugin())`
+    return config;
+  }
+);
+<% } %>

package/src/generators/e2e-project/e2e-project.js

@@ -71,7 +71,6 @@ async function e2eProjectGeneratorInternal(host, _options) {
             tsConfigPaths: [
                 (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'tsconfig.json'),
             ],
-            eslintFilePatterns: [`${options.e2eProjectRoot}/**/*.{js,ts}`],
             setParserOptionsProject: false,
             skipPackageJson: false,
             rootProject: options.rootProject,

package/src/utils/has-webpack-plugin.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function hasWebpackPlugin(tree: Tree): boolean;

package/src/utils/has-webpack-plugin.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasWebpackPlugin = void 0;
+const devkit_1 = require("@nx/devkit");
+function hasWebpackPlugin(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    return !!nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/webpack/plugin'
+        : p.plugin === '@nx/webpack/plugin');
+}
+exports.hasWebpackPlugin = hasWebpackPlugin;