@nx/node 21.1.2 → 21.1.3

package/README.md

@@ -1,7 +1,7 @@
 <p style="text-align: center;">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <img alt="Nx - Smart Repos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
   </picture>
 </p>
 
@@ -20,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart Repos · Fast Builds
 
-Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
+An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
 
 ## Getting Started
 
@@ -62,5 +62,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://nx.dev/blog)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart Repos · Fast Builds"></a></p>
 

package/package.json

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

package/src/generators/application/application.js

@@ -35,7 +35,9 @@ function getWebpackBuildConfig(project, options) {
             generatePackageJson: options.isUsingTsSolutionConfig ? undefined : true,
         },
         configurations: {
-            development: {},
+            development: {
+                outputHashing: 'none',
+            },
             production: {
                 ...(options.docker && { generateLockfile: true }),
             },
@@ -127,7 +129,7 @@ function addProject(tree, options) {
         project.targets.build = getEsBuildConfig(project, options);
     }
     else if (options.bundler === 'webpack') {
-        if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) {
+        if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree) && options.addPlugin === false) {
             (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/webpack:webpack`);
             project.targets.build = getWebpackBuildConfig(project, options);
         }
@@ -165,7 +167,7 @@ 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)
+        webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree) && options.addPlugin !== false
             ? {
                 outputPath: options.isUsingTsSolutionConfig
                     ? 'dist'

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

@@ -3,7 +3,7 @@
 # Build the docker image with `npx nx docker-build <%= project %>`.
 # Tip: Modify "docker-build" options in project.json to change docker build args.
 #
-# Run the container with `docker run -p 3000:3000 -t <%= project %>`.
+# Run the container with `docker run -p 3000:3000 -t <%= sanitizedProjectName %>`.
 FROM docker.io/node:lts-alpine
 
 ENV HOST=0.0.0.0
@@ -11,14 +11,15 @@ ENV PORT=3000
 
 WORKDIR /app
 
-RUN addgroup --system <%= project %> && \
-          adduser --system -G <%= project %> <%= project %>
+RUN addgroup --system <%= sanitizedProjectName %> && \
+          adduser --system -G <%= sanitizedProjectName %> <%= sanitizedProjectName %>
 
-COPY <%= buildLocation %> <%= project %>/
-RUN chown -R <%= project %>:<%= project %> .
+COPY <%= buildLocation %> <%= sanitizedProjectName %>/
+COPY <%= projectPath %>/package.json <%= sanitizedProjectName %>/
+RUN chown -R <%= sanitizedProjectName %>:<%= sanitizedProjectName %> .
 
 # You can remove this install step if you build with `--bundle` option.
 # The bundled output will include external dependencies.
-RUN npm --prefix <%= project %> --omit=dev -f install
+RUN npm --prefix <%= sanitizedProjectName %> --omit=dev -f install
 
-CMD [ "node", "<%= project %>" ]
+CMD [ "node", "<%= sanitizedProjectName %>" ]

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

@@ -12,6 +12,14 @@ function normalizeOptions(tree, setupOptions) {
         buildTarget: setupOptions.buildTarget ?? 'build',
     };
 }
+function sanitizeProjectName(projectName) {
+    return projectName
+        .toLowerCase()
+        .replace(/[@\/]/g, '-')
+        .replace(/[^a-z0-9._-]/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^-|-$/g, '');
+}
 function addDocker(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const outputPath = projectConfig.targets[options.buildTarget]?.options['outputPath'];
@@ -21,17 +29,22 @@ function addDocker(tree, options) {
     if (!outputPath && !options.outputPath) {
         throw new Error(`The output path for the project ${options.project} is not defined. Please provide it as an option to the generator.`);
     }
+    const sanitizedProjectName = sanitizeProjectName(options.project);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectConfig.root, {
         tmpl: '',
         buildLocation: options.outputPath ?? outputPath,
         project: options.project,
+        projectPath: projectConfig.root,
+        sanitizedProjectName,
     });
 }
 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 ${options.project}`,
+        command: `docker build -f ${(0, devkit_1.joinPathFragments)(projectConfig.root, 'Dockerfile')} . -t ${sanitizedProjectName}`,
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
 }