Skip to content

Commit 5174c67

Browse files
author
Angular Builds
committed
4633562 fix(@angular/build): disable dev-server websocket when live reload is disabled
1 parent b10a69e commit 5174c67

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "19.1.0-next.0+sha-ae9dfdd",
3+
"version": "19.1.0-next.0+sha-4633562",
44
"description": "Angular Webpack Build Facade",
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
88
"dependencies": {
99
"@ampproject/remapping": "2.3.0",
10-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ae9dfdd",
11-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ae9dfdd",
12-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#ae9dfdd",
13-
"@angular/build": "github:angular/angular-build-builds#ae9dfdd",
10+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4633562",
11+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#4633562",
12+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#4633562",
13+
"@angular/build": "github:angular/angular-build-builds#4633562",
1414
"@babel/core": "7.26.0",
1515
"@babel/generator": "7.26.2",
1616
"@babel/helper-annotate-as-pure": "7.25.9",
@@ -21,7 +21,7 @@
2121
"@babel/preset-env": "7.26.0",
2222
"@babel/runtime": "7.26.0",
2323
"@discoveryjs/json-ext": "0.6.3",
24-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#ae9dfdd",
24+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#4633562",
2525
"@vitejs/plugin-basic-ssl": "1.1.0",
2626
"ansi-colors": "4.1.3",
2727
"autoprefixer": "10.4.20",
@@ -70,7 +70,7 @@
7070
"@angular/localize": "^19.0.0-next.0",
7171
"@angular/platform-server": "^19.0.0-next.0",
7272
"@angular/service-worker": "^19.0.0-next.0",
73-
"@angular/ssr": "github:angular/angular-ssr-builds#ae9dfdd",
73+
"@angular/ssr": "github:angular/angular-ssr-builds#4633562",
7474
"@web/test-runner": "^0.19.0",
7575
"browser-sync": "^3.0.2",
7676
"jest": "^29.5.0",
@@ -91,7 +91,7 @@
9191
"@angular/service-worker": {
9292
"optional": true
9393
},
94-
"@angular/ssr": "github:angular/angular-ssr-builds#ae9dfdd",
94+
"@angular/ssr": "github:angular/angular-ssr-builds#4633562",
9595
"@web/test-runner": {
9696
"optional": true
9797
},

src/builders/dev-server/builder.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ function execute(options, context, transforms = {}, extensions) {
7272
if (options.disableHostCheck) {
7373
context.logger.warn(`The "disableHostCheck" option will not be used because it is not supported by the "${builderName}" builder.`);
7474
}
75+
// New build system defaults hmr option to the value of liveReload
76+
normalizedOptions.hmr ??= normalizedOptions.liveReload;
7577
return (0, rxjs_1.defer)(() => Promise.all([Promise.resolve().then(() => __importStar(require('@angular/build/private'))), Promise.resolve().then(() => __importStar(require('../browser-esbuild')))])).pipe((0, rxjs_1.switchMap)(([{ serveWithVite, buildApplicationInternal }, { convertBrowserOptions }]) => serveWithVite(normalizedOptions, builderName, (options, context, codePlugins) => {
7678
return builderName === '@angular-devkit/build-angular:browser-esbuild'
7779
? // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -91,6 +93,8 @@ function execute(options, context, transforms = {}, extensions) {
9193
if (extensions?.middleware?.length) {
9294
throw new Error('Only the "application" and "browser-esbuild" builders support middleware.');
9395
}
96+
// Webpack based build systems default to false for hmr option
97+
normalizedOptions.hmr ??= false;
9498
// Use Webpack for all other browser targets
9599
return (0, rxjs_1.defer)(() => Promise.resolve().then(() => __importStar(require('./webpack-server')))).pipe((0, rxjs_1.switchMap)(({ serveWebpackBrowser }) => serveWebpackBrowser(normalizedOptions, builderName, context, transforms)));
96100
}));

src/builders/dev-server/options.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
2626
open: boolean | undefined;
2727
verbose: boolean | undefined;
2828
watch: boolean | undefined;
29-
liveReload: boolean | undefined;
29+
liveReload: boolean;
3030
hmr: boolean | undefined;
3131
headers: {
3232
[key: string]: string;

src/builders/dev-server/options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ async function normalizeOptions(context, projectName, options) {
8585
open,
8686
verbose,
8787
watch,
88-
liveReload,
88+
liveReload: !!liveReload,
8989
hmr,
9090
headers,
9191
workspaceRoot,

src/builders/dev-server/schema.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@
8484
},
8585
"hmr": {
8686
"type": "boolean",
87-
"description": "Enable hot module replacement.",
88-
"default": false
87+
"description": "Enable hot module replacement."
8988
},
9089
"watch": {
9190
"type": "boolean",

src/utils/normalize-cache.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
1010
exports.normalizeCacheOptions = normalizeCacheOptions;
1111
const node_path_1 = require("node:path");
1212
/** Version placeholder is replaced during the build process with actual package version */
13-
const VERSION = '19.1.0-next.0+sha-ae9dfdd';
13+
const VERSION = '19.1.0-next.0+sha-4633562';
1414
function hasCacheMetadata(value) {
1515
return (!!value &&
1616
typeof value === 'object' &&

uniqueId

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Tue Nov 05 2024 09:35:59 GMT+0000 (Coordinated Universal Time)
1+
Tue Nov 05 2024 10:04:17 GMT+0000 (Coordinated Universal Time)

0 commit comments

Comments
 (0)