fix(angular): use the correct output path for mf ssr #18849

nrwl · Aug 30, 2023 · 10bc223 · 10bc223
1 parent 83f2001
commit 10bc223
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/packages/angular/src/generators/host/__snapshots__/host.spec.ts.snap b/packages/angular/src/generators/host/__snapshots__/host.spec.ts.snap
@@ -51,7 +51,7 @@ import { AppServerModule } from './bootstrap.server';
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const browserBundles = join(process.cwd(), 'dist/apps/test/browser');
+  const browserBundles = join(process.cwd(), 'dist/test/browser');
 
   server.use(cors());
   const indexHtml = existsSync(join(browserBundles, 'index.original.html'))
@@ -223,7 +223,7 @@ import bootstrap from './bootstrap.server';
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const browserBundles = join(process.cwd(), 'dist/apps/test/browser');
+  const browserBundles = join(process.cwd(), 'dist/test/browser');
 
   server.use(cors());
   const indexHtml = existsSync(join(browserBundles, 'index.original.html'))

diff --git a/packages/angular/src/generators/host/files/src/main.server.ts__tmpl__ b/packages/angular/src/generators/host/files/src/main.server.ts__tmpl__
@@ -12,7 +12,7 @@ import<% if(standalone) { %> bootstrap <% } else { %> { AppServerModule } <% } %
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const browserBundles = join(process.cwd(), 'dist/apps/<%= appName %>/browser');
+  const browserBundles = join(process.cwd(), '<%= browserBundleOutput %>');
 
   server.use(cors());
   const indexHtml = existsSync(join(browserBundles, 'index.original.html'))

diff --git a/packages/angular/src/generators/host/host.spec.ts b/packages/angular/src/generators/host/host.spec.ts
@@ -1,4 +1,4 @@
-import { stripIndents, updateJson } from '@nx/devkit';
+import { stripIndents, updateJson, updateNxJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import {
   getProjects,

diff --git a/packages/angular/src/generators/host/lib/add-ssr.ts b/packages/angular/src/generators/host/lib/add-ssr.ts
@@ -35,8 +35,14 @@ export async function addSsr(tree: Tree, options: Schema, appName: string) {
     "import('./src/main.server');"
   );
 
+  const browserBundleOutput = joinPathFragments(
+    project.targets.build.options.outputPath,
+    'browser'
+  );
+
   generateFiles(tree, join(__dirname, '../files'), project.root, {
     appName,
+    browserBundleOutput,
     standalone: options.standalone,
     tmpl: '',
   });

diff --git a/packages/angular/src/generators/remote/__snapshots__/remote.spec.ts.snap b/packages/angular/src/generators/remote/__snapshots__/remote.spec.ts.snap
@@ -60,8 +60,8 @@ import { AppServerModule } from './bootstrap.server';
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const browserBundles = join(process.cwd(), 'dist/apps/test/browser');
-  const serverBundles = join(process.cwd(), 'dist/apps/test/server');
+  const browserBundles = join(process.cwd(), 'dist/test/browser');
+  const serverBundles = join(process.cwd(), 'dist/test/server');
 
   server.use(cors());
   const indexHtml = existsSync(join(browserBundles, 'index.original.html'))

diff --git a/packages/angular/src/generators/remote/files/base/src/main.server.ts__tmpl__ b/packages/angular/src/generators/remote/files/base/src/main.server.ts__tmpl__
@@ -12,8 +12,8 @@ import<% if(standalone) { %> bootstrap <% } else { %> { AppServerModule } <% } %
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const browserBundles = join(process.cwd(), 'dist/apps/<%= appName %>/browser');
-  const serverBundles = join(process.cwd(), 'dist/apps/<%= appName %>/server');
+  const browserBundles = join(process.cwd(), '<%= browserBundleOutput %>');
+  const serverBundles = join(process.cwd(), '<%= serverBundleOutput %>');
 
   server.use(cors());
   const indexHtml = existsSync(join(browserBundles, 'index.original.html'))

diff --git a/packages/angular/src/generators/remote/lib/add-ssr.ts b/packages/angular/src/generators/remote/lib/add-ssr.ts
@@ -41,12 +41,23 @@ export async function addSsr(
     "import('./src/main.server');"
   );
 
+  const browserBundleOutput = joinPathFragments(
+    project.targets.build.options.outputPath,
+    'browser'
+  );
+  const serverBundleOutput = joinPathFragments(
+    project.targets.build.options.outputPath,
+    'server'
+  );
+
   generateFiles(
     tree,
     joinPathFragments(__dirname, '../files/base'),
     project.root,
     {
       appName,
+      browserBundleOutput,
+      serverBundleOutput,
       standalone,
       tmpl: '',
     }