@nx/node 0.0.0-pr-32119-240ff46 → 0.0.0-pr-32120-8333cfc

package/package.json

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

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;AAQvD,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAoD/D"}

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

@@ -28,10 +28,6 @@ function addProject(tree, options) {
             project.targets.build = (0, create_targets_1.getNestWebpackBuildConfig)();
         }
     }
-    project.targets = {
-        ...project.targets,
-        ...(0, create_targets_1.getPruneTargets)('build'),
-    };
     project.targets.serve = (0, create_targets_1.getServeConfig)(options);
     const packageJson = {
         name: options.importPath,

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

@@ -4,9 +4,4 @@ export declare function getWebpackBuildConfig(tree: Tree, project: ProjectConfig
 export declare function getEsBuildConfig(tree: Tree, project: ProjectConfiguration, options: NormalizedSchema): TargetConfiguration;
 export declare function getServeConfig(options: NormalizedSchema): TargetConfiguration;
 export declare function getNestWebpackBuildConfig(): TargetConfiguration;
-export declare function getPruneTargets(buildTarget: string): {
-    prune: TargetConfiguration;
-    'prune-lockfile': TargetConfiguration;
-    'copy-workspace-modules': TargetConfiguration;
-};
 //# sourceMappingURL=create-targets.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"create-targets.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/create-targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,IAAI,EACJ,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CA+BrB;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CAqCrB;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAuB7E;AAED,wBAAgB,yBAAyB,IAAI,mBAAmB,CAa/D;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG;IACpD,KAAK,EAAE,mBAAmB,CAAC;IAC3B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,wBAAwB,EAAE,mBAAmB,CAAC;CAC/C,CAsBA"}
+{"version":3,"file":"create-targets.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/create-targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,IAAI,EACJ,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CA+BrB;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CAqCrB;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAuB7E;AAED,wBAAgB,yBAAyB,IAAI,mBAAmB,CAa/D"}

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

@@ -4,7 +4,6 @@ exports.getWebpackBuildConfig = getWebpackBuildConfig;
 exports.getEsBuildConfig = getEsBuildConfig;
 exports.getServeConfig = getServeConfig;
 exports.getNestWebpackBuildConfig = getNestWebpackBuildConfig;
-exports.getPruneTargets = getPruneTargets;
 const devkit_1 = require("@nx/devkit");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function getWebpackBuildConfig(tree, project, options) {
@@ -106,26 +105,3 @@ function getNestWebpackBuildConfig() {
         },
     };
 }
-function getPruneTargets(buildTarget) {
-    return {
-        'prune-lockfile': {
-            cache: true,
-            executor: '@nx/js:prune-lockfile',
-            options: {
-                buildTarget,
-            },
-        },
-        'copy-workspace-modules': {
-            cache: true,
-            executor: '@nx/js:copy-workspace-modules',
-            options: {
-                buildTarget,
-            },
-        },
-        prune: {
-            cache: true,
-            dependsOn: ['prune-lockfile', 'copy-workspace-modules'],
-            executor: 'nx:noop',
-        },
-    };
-}

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,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAmD9C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,QAe1E;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,8BAajC;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,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAsD9C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,QAQ1E;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,8BAcjC;AAED,eAAe,oBAAoB,CAAC"}

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

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfig = updateProjectConfig;
 exports.setupDockerGenerator = setupDockerGenerator;
 const devkit_1 = require("@nx/devkit");
+const docker_1 = require("@nx/docker");
 const path_1 = require("path");
 function normalizeOptions(tree, setupOptions) {
     return {
         ...setupOptions,
         project: setupOptions.project ?? (0, devkit_1.readNxJson)(tree).defaultProject,
-        targetName: setupOptions.targetName ?? 'docker-build',
+        targetName: setupOptions.targetName ?? 'docker:build',
         buildTarget: setupOptions.buildTarget ?? 'build',
     };
 }
@@ -20,7 +21,8 @@ function sanitizeProjectName(projectName) {
         .replace(/-+/g, '-')
         .replace(/^-|-$/g, '');
 }
-function addDocker(tree, options) {
+async function addDocker(tree, options) {
+    const installTask = await (0, docker_1.initGenerator)(tree, { skipFormat: true });
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const outputPath = projectConfig.targets[options.buildTarget]?.options['outputPath'];
     if (!projectConfig) {
@@ -37,22 +39,20 @@ function addDocker(tree, options) {
         projectPath: projectConfig.root,
         sanitizedProjectName,
     });
+    return installTask;
 }
 function updateProjectConfig(tree, options) {
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    // Use sanitized project name for Docker image tag
-    const sanitizedProjectName = sanitizeProjectName(options.project);
     projectConfig.targets[`${options.targetName}`] = {
-        dependsOn: [`${options.buildTarget}`],
-        command: `docker build -f ${(0, devkit_1.joinPathFragments)(projectConfig.root, 'Dockerfile')} . -t ${sanitizedProjectName}`,
+        dependsOn: [`${options.buildTarget}`, 'prune'],
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
 }
 async function setupDockerGenerator(tree, setupOptions) {
     const tasks = [];
     const options = normalizeOptions(tree, setupOptions);
-    // Should check if the node project exists
-    addDocker(tree, options);
+    const installTask = await addDocker(tree, options);
+    tasks.push(installTask);
     updateProjectConfig(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);