Skip to content

fix(@angular/ssr): correctly resolve pre-transform resources in Vite SSR without AppEngine #29144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import assert from 'node:assert';
import { readFile } from 'node:fs/promises';
import { dirname, join, relative } from 'node:path';
import { basename, dirname, join, relative } from 'node:path';
import type { Plugin } from 'vite';
import { loadEsmModule } from '../../../utils/load-esm';
import { AngularMemoryOutputFiles } from '../utils';
Expand Down Expand Up @@ -51,6 +51,18 @@ export async function createAngularMemoryPlugin(
// Remove query if present
const [importerFile] = importer.split('?', 1);
source = '/' + join(dirname(relative(virtualProjectRoot, importerFile)), source);
} else if (
!ssr &&
source[0] === '/' &&
importer.endsWith('index.html') &&
normalizePath(importer).startsWith(virtualProjectRoot)
) {
// This is only needed when using SSR and `angularSsrMiddleware` (old style) to correctly resolve
// .js files when using lazy-loading.
// Remove query if present
const [importerFile] = importer.split('?', 1);
source =
'/' + join(dirname(relative(virtualProjectRoot, importerFile)), basename(source));
}
}

Expand Down
53 changes: 53 additions & 0 deletions tests/legacy-cli/e2e/tests/vite/ssr-no-server-entry-sub-path.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import assert from 'node:assert';
import {
execAndWaitForOutputToMatch,
ng,
silentNg,
waitForAnyProcessOutputToMatch,
} from '../../utils/process';
import { installWorkspacePackages, uninstallPackage } from '../../utils/packages';
import { useSha } from '../../utils/project';
import { getGlobalVariable } from '../../utils/env';
import { findFreePort } from '../../utils/network';
import { writeFile } from '../../utils/fs';

export default async function () {
assert(
getGlobalVariable('argv')['esbuild'],
'This test should not be called in the Webpack suite.',
);

// Forcibly remove in case another test doesn't clean itself up.
await uninstallPackage('@angular/ssr');
await ng('add', '@angular/ssr', '--no-server-routing', '--skip-confirmation', '--skip-install');
await useSha();
await installWorkspacePackages();

await silentNg('generate', 'component', 'home');
await writeFile(
'src/app/app.routes.ts',
`
import { Routes } from '@angular/router';
import {HomeComponent} from './home/home.component';

export const routes: Routes = [{
path: 'sub/home',
component: HomeComponent
}];
`,
);

const port = await findFreePort();
await execAndWaitForOutputToMatch('ng', ['serve', '--port', `${port}`], /complete/, {
NO_COLOR: 'true',
});

const [, response] = await Promise.all([
assert.rejects(
waitForAnyProcessOutputToMatch(/Pre-transform error: Failed to load url/, 8_000),
),
fetch(`http://localhost:${port}/sub/home`),
]);

assert(response.ok, `Expected 'response.ok' to be 'true'.`);
}
Loading