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

package/migrations.json

@@ -34,6 +34,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "17.3.1": {
+      "version": "17.3.1-beta.0",
+      "packages": {
+        "axios": {
+          "version": "^1.6.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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

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

@@ -5,6 +5,6 @@ export interface NormalizedSchema extends Schema {
     parsedTags: string[];
 }
 export declare function addLintingToApplication(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<any>;
-export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<any>;
+export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;

package/src/generators/application/application.js

@@ -14,6 +14,7 @@ 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");
 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 getWebpackBuildConfig(project, options) {
     return {
         executor: `@nx/webpack:webpack`,
@@ -122,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,
     });
@@ -188,6 +189,7 @@ async function addLintingToApplication(tree, options) {
         skipFormat: true,
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
+        addPlugin: options.addPlugin,
     });
     return lintTask;
 }
@@ -261,6 +263,7 @@ function updateTsConfigOptions(tree, options) {
 }
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -270,8 +273,18 @@ 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);
-        return await applicationGenerator(tree, { ...options, skipFormat: true });
+        const nestTasks = await applicationGenerator(tree, {
+            ...options,
+            skipFormat: true,
+        });
+        return (0, devkit_1.runTasksInSerial)(...[
+            nestTasks,
+            () => {
+                (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+            },
+        ]);
     }
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
@@ -291,11 +304,14 @@ async function applicationGeneratorInternal(tree, schema) {
         const webpackInitTask = await webpackInitGenerator(tree, {
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
+            addPlugin: options.addPlugin,
         });
         tasks.push(webpackInitTask);
         if (!options.skipPackageJson) {
             const { ensureDependencies } = await Promise.resolve().then(() => require('@nx/webpack/src/utils/ensure-dependencies'));
-            tasks.push(ensureDependencies(tree, { uiFramework: 'react' }));
+            tasks.push(ensureDependencies(tree, {
+                uiFramework: options.isNest ? 'none' : 'react',
+            }));
         }
     }
     addAppFiles(tree, options);
@@ -353,6 +369,9 @@ async function applicationGeneratorInternal(tree, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
@@ -373,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/application/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "SchematicsNxNodeApp",
   "title": "Nx Application Options Schema",

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

@@ -8,8 +8,10 @@ const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-es
 const path = require("path");
 const versions_1 = require("../../utils/versions");
 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,
     });
@@ -19,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],
@@ -74,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)) {
@@ -87,6 +91,9 @@ async function e2eProjectGeneratorInternal(host, _options) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.e2eProjectName);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
@@ -102,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/e2e-project/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "SchematicsNxNodeE2eProject",
   "title": "Node E2E Project Generator",

package/src/generators/init/schema.json

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

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;
 }

package/src/generators/library/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxNodeLibrary",
   "title": "Create a Node Library for Nx",

package/src/generators/setup-docker/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "SchematicsNxSetupDocker",
   "title": "Nx Node Docker Options Schema",

package/src/utils/versions.d.ts

@@ -9,4 +9,4 @@ export declare const fastifyVersion = "~4.13.0";
 export declare const fastifyAutoloadVersion = "~5.7.1";
 export declare const fastifySensibleVersion = "~5.2.0";
 export declare const fastifyPluginVersion = "~4.5.0";
-export declare const axiosVersion = "^1.0.0";
+export declare const axiosVersion = "^1.6.0";

package/src/utils/versions.js

@@ -12,4 +12,4 @@ exports.fastifyVersion = '~4.13.0';
 exports.fastifyAutoloadVersion = '~5.7.1';
 exports.fastifySensibleVersion = '~5.2.0';
 exports.fastifyPluginVersion = '~4.5.0';
-exports.axiosVersion = '^1.0.0';
+exports.axiosVersion = '^1.6.0';