@nx/angular 17.3.0-rc.1 → 17.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.3.0-rc.1",
+  "version": "17.3.0",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -78,16 +78,16 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "17.3.0-rc.1",
-    "@nx/cypress": "17.3.0-rc.1",
-    "@nx/jest": "17.3.0-rc.1",
-    "@nx/js": "17.3.0-rc.1",
-    "@nx/eslint": "17.3.0-rc.1",
-    "@nx/webpack": "17.3.0-rc.1",
-    "@nx/web": "17.3.0-rc.1",
-    "@nx/workspace": "17.3.0-rc.1",
+    "@nx/devkit": "17.3.0",
+    "@nx/cypress": "17.3.0",
+    "@nx/jest": "17.3.0",
+    "@nx/js": "17.3.0",
+    "@nx/eslint": "17.3.0",
+    "@nx/webpack": "17.3.0",
+    "@nx/web": "17.3.0",
+    "@nx/workspace": "17.3.0",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "17.3.0-rc.1"
+    "@nrwl/angular": "17.3.0"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/generators/setup-ssr/files/server/application-builder/__serverFileName__

@@ -9,7 +9,7 @@ import <% if (standalone) { %>bootstrap<% } else { %>{ <%= rootModuleClassName %
 export function app(): express.Express {
   const server = express();
   const serverDistFolder = dirname(fileURLToPath(import.meta.url));
-  const browserDistFolder = resolve(serverDistFolder, '../browser');
+  const browserDistFolder = resolve(serverDistFolder, '../<%= browserBundleOutputPath %>');
   const indexHtml = join(serverDistFolder, 'index.server.html');
 
   const commonEngine = new CommonEngine();

package/src/generators/setup-ssr/lib/add-server-file.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nx/devkit';
+import type { Schema } from '../schema';
+export declare function addServerFile(tree: Tree, schema: Schema, isUsingApplicationBuilder: boolean): void;

package/src/generators/setup-ssr/lib/add-server-file.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addServerFile = void 0;
+const devkit_1 = require("@nx/devkit");
+const version_utils_1 = require("../../utils/version-utils");
+const constants_1 = require("./constants");
+function addServerFile(tree, schema, isUsingApplicationBuilder) {
+    const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    const { outputPath } = targets.build.options;
+    const browserBundleOutputPath = isUsingApplicationBuilder
+        ? getApplicationBuilderBrowserOutputPath(outputPath)
+        : outputPath;
+    const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'server', ...(isUsingApplicationBuilder
+        ? ['application-builder']
+        : angularMajorVersion >= 17
+            ? ['server-builder', 'v17+']
+            : ['server-builder', 'pre-v17'])), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+}
+exports.addServerFile = addServerFile;
+function getApplicationBuilderBrowserOutputPath(outputPath) {
+    if (outputPath) {
+        if (typeof outputPath === 'string') {
+            // when `outputPath` is a string, it's the base path, so we return the default browser path
+            return constants_1.DEFAULT_BROWSER_DIR;
+        }
+        return outputPath.browser ?? constants_1.DEFAULT_BROWSER_DIR;
+    }
+    return constants_1.DEFAULT_BROWSER_DIR;
+}

package/src/generators/setup-ssr/lib/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const DEFAULT_BROWSER_DIR = "browser";
+export declare const DEFAULT_MEDIA_DIR = "media";
+export declare const DEFAULT_SERVER_DIR = "server";

package/src/generators/setup-ssr/lib/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_SERVER_DIR = exports.DEFAULT_MEDIA_DIR = exports.DEFAULT_BROWSER_DIR = void 0;
+exports.DEFAULT_BROWSER_DIR = 'browser';
+exports.DEFAULT_MEDIA_DIR = 'media';
+exports.DEFAULT_SERVER_DIR = 'server';

package/src/generators/setup-ssr/lib/generate-files.js

@@ -6,23 +6,21 @@ const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function generateSSRFiles(tree, schema, isUsingApplicationBuilder) {
     const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    const baseOutputPath = targets.build.options.outputPath;
-    const browserBundleOutputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
+    if (targets.server ||
+        (isUsingApplicationBuilder && targets.build.options?.server !== undefined)) {
+        // server has already been added
+        return;
+    }
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    const { version: angularVersion, major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, tpl: '' });
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, tpl: '' });
         if ((0, semver_1.lt)(angularVersion, '15.2.0')) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, tpl: '' });
         }
     }
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'server', ...(isUsingApplicationBuilder
-        ? ['application-builder']
-        : angularMajorVersion >= 17
-            ? ['server-builder', 'v17+']
-            : ['server-builder', 'pre-v17'])), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
 }
 exports.generateSSRFiles = generateSSRFiles;

package/src/generators/setup-ssr/lib/generate-server-ts-config.js

@@ -7,11 +7,14 @@ function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
     const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const tsConfigPath = targets.build.options.tsConfig;
     (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
-        json.files ??= [];
-        json.files.push((0, devkit_1.joinPathFragments)('src', options.main), (0, devkit_1.joinPathFragments)(options.serverFileName));
+        const files = new Set(json.files ?? []);
+        files.add((0, devkit_1.joinPathFragments)('src', options.main));
+        files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
+        json.files = Array.from(files);
         json.compilerOptions ??= {};
-        json.compilerOptions.types ??= [];
-        json.compilerOptions.types.push('node');
+        const types = new Set(json.compilerOptions.types ?? []);
+        types.add('node');
+        json.compilerOptions.types = Array.from(types);
         return json;
     });
 }

package/src/generators/setup-ssr/lib/index.d.ts

@@ -1,4 +1,5 @@
 export * from './add-dependencies';
+export * from './add-server-file';
 export * from './generate-files';
 export * from './generate-server-ts-config';
 export * from './normalize-options';

package/src/generators/setup-ssr/lib/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./add-dependencies"), exports);
+tslib_1.__exportStar(require("./add-server-file"), exports);
 tslib_1.__exportStar(require("./generate-files"), exports);
 tslib_1.__exportStar(require("./generate-server-ts-config"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -3,10 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfigForBrowserBuilder = exports.updateProjectConfigForApplicationBuilder = void 0;
 const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../../utils/version-utils");
+const constants_1 = require("./constants");
 function updateProjectConfigForApplicationBuilder(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const buildTarget = project.targets.build;
+    let outputPath = buildTarget.options?.outputPath;
+    if (outputPath &&
+        typeof outputPath !== 'string' &&
+        outputPath.browser === '') {
+        const base = outputPath.base;
+        devkit_1.logger.warn(`The output location of the browser build has been updated from "${base}" to "${(0, devkit_1.joinPathFragments)(base, constants_1.DEFAULT_BROWSER_DIR)}".
+          You might need to adjust your deployment pipeline.`);
+        if ((outputPath.media && outputPath.media !== constants_1.DEFAULT_MEDIA_DIR) ||
+            (outputPath.server && outputPath.server !== constants_1.DEFAULT_SERVER_DIR)) {
+            delete outputPath.browser;
+        }
+        else {
+            outputPath = outputPath.base;
+        }
+    }
     buildTarget.options ??= {};
+    buildTarget.options.outputPath = outputPath;
     buildTarget.options.server = (0, devkit_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src'), options.main);
     buildTarget.options.prerender = true;
     buildTarget.options.ssr = {

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

@@ -29,6 +29,7 @@ async function setupSsr(tree, schema) {
         (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
         (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
     }
+    (0, lib_1.addServerFile)(tree, options, isUsingApplicationBuilder);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }