mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
restore devServer config in Angular integration to fix CI 504 errors and ensure compatibility with Meteor proxy
This commit is contained in:
@@ -766,11 +766,38 @@ module.exports = async function (inMeteor = {}, argv = {}) {
|
||||
...loggingConfig,
|
||||
};
|
||||
|
||||
// Establish Angular overrides to ensure proper integration
|
||||
// Establish Angular overrides to ensure proper integration.
|
||||
// Angular's createConfig() from @nx/angular-rspack may overwrite the entire
|
||||
// devServer block (webpack-merge does a shallow merge for devServer), losing
|
||||
// critical settings like static.publicPath that the Meteor proxy relies on.
|
||||
// Re-apply the full devServer config here so it's restored after the merge.
|
||||
// TODO: Extract the devServer block into a shared helper to avoid duplicating
|
||||
// it between clientConfig and angularExpandConfig. Blocked until we confirm
|
||||
// this fix resolves the Angular 504 on CI.
|
||||
const angularExpandConfig = isAngularEnabled
|
||||
? {
|
||||
mode: isProd ? "production" : "development",
|
||||
devServer: { port: devServerPort },
|
||||
...(isDevEnvironment && {
|
||||
devServer: {
|
||||
...createRemoteDevServerConfig(),
|
||||
static: { directory: clientOutputDir, publicPath: "/__rspack__/" },
|
||||
hot: true,
|
||||
liveReload: true,
|
||||
port: devServerPort,
|
||||
devMiddleware: {
|
||||
writeToDisk: (filePath) =>
|
||||
/\.(html)$/.test(filePath) || filePath.endsWith('sw.js'),
|
||||
},
|
||||
onListening(devServer) {
|
||||
if (!devServer) return;
|
||||
const { host, port } = devServer.options;
|
||||
const protocol =
|
||||
devServer.options.server?.type === "https" ? "https" : "http";
|
||||
const devServerUrl = `${protocol}://${host || "localhost"}:${port}`;
|
||||
outputMeteorRspack({ devServerUrl });
|
||||
},
|
||||
},
|
||||
}),
|
||||
stats: { preset: "normal" },
|
||||
infrastructureLogging: { level: "info" },
|
||||
...(isProd && isClient && { output: { module: false } }),
|
||||
|
||||
Reference in New Issue
Block a user