@nx/angular 20.3.0-rc.0 → 20.4.0-canary.20241221-c7e2782

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.3.0-rc.0",
+  "version": "20.4.0-canary.20241221-c7e2782",
   "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, Playwright 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- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -71,13 +71,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "20.3.0-rc.0",
-    "@nx/js": "20.3.0-rc.0",
-    "@nx/eslint": "20.3.0-rc.0",
-    "@nx/webpack": "20.3.0-rc.0",
-    "@nx/module-federation": "20.3.0-rc.0",
-    "@nx/web": "20.3.0-rc.0",
-    "@nx/workspace": "20.3.0-rc.0",
+    "@nx/devkit": "20.4.0-canary.20241221-c7e2782",
+    "@nx/js": "20.4.0-canary.20241221-c7e2782",
+    "@nx/eslint": "20.4.0-canary.20241221-c7e2782",
+    "@nx/webpack": "20.4.0-canary.20241221-c7e2782",
+    "@nx/module-federation": "20.4.0-canary.20241221-c7e2782",
+    "@nx/web": "20.4.0-canary.20241221-c7e2782",
+    "@nx/workspace": "20.4.0-canary.20241221-c7e2782",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/generators/host/lib/update-ssr-setup.js

@@ -6,10 +6,13 @@ const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
-    tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19
+        ? project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src')
+        : project.root, 'server.ts');
+    tree.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,
         browserBundleOutput: project.targets.build.options.outputPath,

package/src/generators/remote/lib/update-ssr-setup.js

@@ -6,12 +6,15 @@ const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfiguration, skipPackageJson, }) {
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
-    tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
+    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19
+        ? project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src')
+        : project.root, 'server.ts');
+    tree.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
     const browserBundleOutput = project.targets.build.options.outputPath;
     const serverBundleOutput = project.targets.build.options.outputPath.replace(/\/browser$/, '/server');
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,
         browserBundleOutput,