@nx/node 21.4.0-beta.4 → 21.4.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "21.4.0-beta.4",
+  "version": "21.4.0-beta.6",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -32,16 +32,16 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "21.4.0-beta.4",
-    "@nx/jest": "21.4.0-beta.4",
-    "@nx/js": "21.4.0-beta.4",
-    "@nx/eslint": "21.4.0-beta.4",
-    "@nx/docker": "21.4.0-beta.4",
+    "@nx/devkit": "21.4.0-beta.6",
+    "@nx/jest": "21.4.0-beta.6",
+    "@nx/js": "21.4.0-beta.6",
+    "@nx/eslint": "21.4.0-beta.6",
+    "@nx/docker": "21.4.0-beta.6",
     "tcp-port-used": "^1.0.2",
     "kill-port": "^1.6.1"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.4"
+    "nx": "21.4.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwClC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAgL5E;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwClC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAwL5E;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -50,11 +50,12 @@ async function applicationGenerator(tree, schema) {
 }
 async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
+    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         skipFormat: true,
-        addTsPlugin: schema.useTsSolution,
+        addTsPlugin,
     });
     tasks.push(jsInitTask);
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
@@ -86,7 +87,7 @@ async function applicationGeneratorInternal(tree, schema) {
         skipFormat: true,
     });
     tasks.push(initTask);
-    const installTask = (0, lib_1.addProjectDependencies)(tree, options);
+    const { installTask, frameworkDependencies } = (0, lib_1.addProjectDependencies)(tree, options);
     tasks.push(installTask);
     if (options.bundler === 'webpack') {
         const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
@@ -104,7 +105,7 @@ async function applicationGeneratorInternal(tree, schema) {
         }
     }
     (0, lib_1.addAppFiles)(tree, options);
-    (0, lib_1.addProject)(tree, options);
+    (0, lib_1.addProject)(tree, options, frameworkDependencies);
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {

package/src/generators/application/lib/add-dependencies.d.ts

@@ -1,4 +1,7 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from './normalized-schema';
-export declare function addProjectDependencies(tree: Tree, options: NormalizedSchema): GeneratorCallback;
+export declare function addProjectDependencies(tree: Tree, options: NormalizedSchema): {
+    installTask: GeneratorCallback;
+    frameworkDependencies: Record<string, string>;
+};
 //# sourceMappingURL=add-dependencies.d.ts.map

package/src/generators/application/lib/add-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/add-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,iBAAiB,CA0DnB"}
+{"version":3,"file":"add-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/add-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB;IACD,WAAW,EAAE,iBAAiB,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/C,CAkDA"}

package/src/generators/application/lib/add-dependencies.js

@@ -37,19 +37,15 @@ function addProjectDependencies(tree, options) {
         },
         fastify: {},
     };
-    const projectPackageJson = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json');
-    if (tree.exists(projectPackageJson)) {
-        (0, devkit_1.updateJson)(tree, projectPackageJson, (json) => {
-            json.dependencies ??= { ...frameworkDependencies };
-            return json;
-        });
-    }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        ...frameworkDependencies[options.framework],
-        tslib: versions_2.tslibVersion,
-    }, {
-        ...frameworkDevDependencies[options.framework],
-        ...bundlers[options.bundler],
-        '@types/node': versions_2.typesNodeVersion,
-    });
+    return {
+        installTask: (0, devkit_1.addDependenciesToPackageJson)(tree, {
+            ...frameworkDependencies[options.framework],
+            tslib: versions_2.tslibVersion,
+        }, {
+            ...frameworkDevDependencies[options.framework],
+            ...bundlers[options.bundler],
+            '@types/node': versions_2.typesNodeVersion,
+        }),
+        frameworkDependencies: frameworkDependencies[options.framework],
+    };
 }

package/src/generators/application/lib/create-project.d.ts

@@ -1,4 +1,4 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from './normalized-schema';
-export declare function addProject(tree: Tree, options: NormalizedSchema): void;
+export declare function addProject(tree: Tree, options: NormalizedSchema, frameworkDependencies: Record<string, string>): void;
 //# sourceMappingURL=create-project.d.ts.map

package/src/generators/application/lib/create-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/create-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AASvD,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAwD/D"}
+{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/create-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AASvD,wBAAgB,UAAU,CACxB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QA0D9C"}

package/src/generators/application/lib/create-project.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const create_targets_1 = require("./create-targets");
-function addProject(tree, options) {
+function addProject(tree, options, frameworkDependencies) {
     const project = {
         root: options.appProjectRoot,
         sourceRoot: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src'),
@@ -37,6 +37,7 @@ function addProject(tree, options) {
         name: options.importPath,
         version: '0.0.1',
         private: true,
+        dependencies: { ...frameworkDependencies },
     };
     if (!options.useProjectJson) {
         packageJson.nx = {

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

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0ExE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASlC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0ExE;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -92,7 +92,11 @@ async function normalizeOptions(tree, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    // this helper is called before the jsLibraryGenerator is called, so, if the
+    // TS solution setup is not configured, we additionally check if the TS
+    // solution setup will be configured by the jsLibraryGenerator
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ||
+        (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, options.addPlugin);
     return {
         ...options,
         fileName,

package/src/generators/setup-docker/files/Dockerfile__tmpl__

@@ -10,18 +10,19 @@ FROM docker.io/node:lts-alpine
 
 ENV HOST=0.0.0.0
 ENV PORT=3000
+<% if(packageManager === "pnpm" || packageManager === 'yarn') { %>
+RUN corepack enable
+<% } %>
 
 WORKDIR /app
 
-RUN addgroup --system <%= sanitizedProjectName %> && \
-          adduser --system -G <%= sanitizedProjectName %> <%= sanitizedProjectName %>
-
-COPY <%= buildLocation %> <%= sanitizedProjectName %>/
-<% if (skipDockerPlugin) { %>COPY <%= projectPath %>/package.json <%= sanitizedProjectName %>/<% } else { %>COPY package.json <%= sanitizedProjectName %>/<% } %>
-RUN chown -R <%= sanitizedProjectName %>:<%= sanitizedProjectName %> .
+COPY <%= buildLocation %> .
 
 # You can remove this install step if you build with `--bundle` option.
 # The bundled output will include external dependencies.
-RUN npm --prefix <%= sanitizedProjectName %> --omit=dev -f install
-
-CMD [ "node", "<%= sanitizedProjectName %>" ]
+<% if(packageManager === 'npm') { %>
+RUN npm --omit=dev -f install
+<% } else { %>
+RUN <%= packageManager %> install
+<% } %>
+CMD [ "node", "main.js" ]

package/src/generators/setup-docker/setup-docker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-docker.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/setup-docker/setup-docker.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AA4E9C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,QAqB1E;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,8BAcjC;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"setup-docker.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/setup-docker/setup-docker.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAML,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAsF9C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,QAqB1E;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,8BAcjC;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/setup-docker/setup-docker.js

@@ -5,6 +5,7 @@ exports.setupDockerGenerator = setupDockerGenerator;
 const devkit_1 = require("@nx/devkit");
 const generators_1 = require("@nx/docker/generators");
 const path_1 = require("path");
+const fs_1 = require("fs");
 function normalizeOptions(tree, setupOptions) {
     return {
         ...setupOptions,
@@ -41,7 +42,8 @@ async function addDocker(tree, options) {
     let buildLocation;
     if (options.skipDockerPlugin) {
         // Legacy mode: use workspace-relative paths
-        buildLocation = finalOutputPath;
+        // docker target is set to run at project root, so ensure offset to workspace root
+        buildLocation = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(projectConfig.root), finalOutputPath);
     }
     else {
         // New mode: use project-relative paths
@@ -53,6 +55,9 @@ async function addDocker(tree, options) {
                 ? finalOutputPath.substring(projectConfig.root.length)
                 : 'dist';
     }
+    const packageManager = (0, fs_1.existsSync)(projectConfig.root)
+        ? (0, devkit_1.detectPackageManager)(projectConfig.root)
+        : (0, devkit_1.detectPackageManager)(devkit_1.workspaceRoot);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectConfig.root, {
         tmpl: '',
         buildLocation,
@@ -60,6 +65,7 @@ async function addDocker(tree, options) {
         projectPath: projectConfig.root,
         sanitizedProjectName,
         skipDockerPlugin: options.skipDockerPlugin,
+        packageManager,
     });
     return installTask;
 }