@nx/node 18.0.0-canary.20240202-ea5befb → 18.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "18.0.0-canary.20240202-ea5befb",
+  "version": "18.0.0",
   "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": "18.0.0-canary.20240202-ea5befb",
-    "@nx/jest": "18.0.0-canary.20240202-ea5befb",
-    "@nx/js": "18.0.0-canary.20240202-ea5befb",
-    "@nx/eslint": "18.0.0-canary.20240202-ea5befb",
-    "@nrwl/node": "18.0.0-canary.20240202-ea5befb"
+    "@nx/devkit": "18.0.0",
+    "@nx/jest": "18.0.0",
+    "@nx/js": "18.0.0",
+    "@nx/eslint": "18.0.0",
+    "@nrwl/node": "18.0.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -123,7 +123,7 @@ function addAppFiles(tree, options) {
                 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'],
+                assets: ['./src/assets'],
             }
             : null,
     });
@@ -189,6 +189,7 @@ async function addLintingToApplication(tree, options) {
         skipFormat: true,
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
+        addPlugin: options.addPlugin,
     });
     return lintTask;
 }
@@ -262,6 +263,7 @@ function updateTsConfigOptions(tree, options) {
 }
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -271,6 +273,7 @@ async function applicationGeneratorInternal(tree, schema) {
     const options = await normalizeOptions(tree, schema);
     const tasks = [];
     if (options.framework === 'nest') {
+        // nx-ignore-next-line
         const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_2.nxVersion);
         const nestTasks = await applicationGenerator(tree, {
             ...options,
@@ -301,6 +304,7 @@ async function applicationGeneratorInternal(tree, schema) {
         const webpackInitTask = await webpackInitGenerator(tree, {
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(webpackInitTask);
         if (!options.skipPackageJson) {
@@ -388,6 +392,7 @@ async function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     return {
+        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
         ...options,
         name: appProjectName,
         frontendProject: options.frontendProject

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

@@ -25,6 +25,7 @@ export interface Schema {
   rootProject?: boolean;
   docker?: boolean;
   isNest?: boolean;
+  addPlugin?: boolean;
 }
 
 export type NodeJsFrameWorks = 'express' | 'koa' | 'fastify' | 'nest' | 'none';

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

@@ -11,6 +11,7 @@ const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function e2eProjectGenerator(host, options) {
     return await e2eProjectGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...options,
     });
@@ -20,6 +21,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
     const tasks = [];
     const options = await normalizeOptions(host, _options);
     const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
+    // TODO(@ndcunningham): This is broken.. the outputs are wrong.. and this isn't using the jest generator
     (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
         root: options.e2eProjectRoot,
         implicitDependencies: [options.project],
@@ -75,6 +77,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
             setParserOptionsProject: false,
             skipPackageJson: false,
             rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
         });
         tasks.push(linterTask);
         if (options.rootProject && (0, eslint_file_1.isEslintConfigSupported)(host)) {
@@ -106,6 +109,7 @@ async function normalizeOptions(tree, options) {
         callingGenerator: null,
     });
     return {
+        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
         ...options,
         e2eProjectRoot,
         e2eProjectName,

package/src/generators/e2e-project/schema.d.ts

@@ -11,4 +11,5 @@ export interface Schema {
   rootProject?: boolean;
   isNest?: boolean;
   skipFormat?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/library/library.js

@@ -12,6 +12,7 @@ const init_1 = require("../init/init");
 const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -29,7 +30,7 @@ async function libraryGeneratorInternal(tree, schema) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
     const libraryInstall = await (0, js_1.libraryGenerator)(tree, {
-        ...schema,
+        ...options,
         bundler: schema.buildable ? 'tsc' : 'none',
         includeBabelRc: schema.babelJest,
         importPath: options.importPath,
@@ -61,6 +62,7 @@ async function normalizeOptions(tree, options) {
         callingGenerator: '@nx/node:library',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const fileName = getCaseAwareFileName({
         fileName: options.simpleModuleName
             ? projectNames.projectSimpleName

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

@@ -23,4 +23,5 @@ export interface Schema {
   standaloneConfig?: boolean;
   setParserOptionsProject?: boolean;
   compiler: 'tsc' | 'swc';
+  addPlugin?: boolean;
 }