Skip to content

Commit 292af94

Browse files
author
Angular Builds
committed
faf650c99 refactor(@angular-devkit/build-angular): remove legacy server bundle guess logic
1 parent 941643e commit 292af94

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "0.1100.0-next.7+78.f122b2f",
3+
"version": "0.1100.0-next.7+77.faf650c",
44
"description": "Angular Webpack Build Facade",
55
"experimental": true,
66
"main": "src/index.js",
77
"typings": "src/index.d.ts",
88
"builders": "builders.json",
99
"dependencies": {
10-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#f122b2f35",
11-
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#f122b2f35",
12-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#f122b2f35",
13-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#f122b2f35",
10+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#faf650c99",
11+
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#faf650c99",
12+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#faf650c99",
13+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#faf650c99",
1414
"@babel/core": "7.12.3",
1515
"@babel/generator": "7.12.1",
1616
"@babel/plugin-transform-runtime": "7.12.1",
1717
"@babel/preset-env": "7.12.1",
1818
"@babel/runtime": "7.12.1",
1919
"@babel/template": "7.10.4",
2020
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
21-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#f122b2f35",
21+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#faf650c99",
2222
"ansi-colors": "4.1.1",
2323
"autoprefixer": "9.8.6",
2424
"babel-loader": "8.1.0",

src/webpack/configs/dev-server.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ function getDevServerConfig(wco) {
2222
const { styles: stylesOptimization, scripts: scriptsOptimization } = utils_1.normalizeOptimization(optimization);
2323
const extraPlugins = [];
2424
// Resolve public host and client address.
25+
let sockPath;
2526
let publicHost = wco.buildOptions.publicHost;
2627
if (publicHost) {
2728
if (!/^\w+:\/\//.test(publicHost)) {
2829
publicHost = `${ssl ? 'https' : 'http'}://${publicHost}`;
2930
}
3031
const parsedHost = url.parse(publicHost);
3132
publicHost = parsedHost.host;
33+
if (parsedHost.pathname) {
34+
sockPath = path_1.posix.join(parsedHost.pathname, 'sockjs-node');
35+
}
3236
}
3337
if (!watch) {
3438
// There's no option to turn off file watching in webpack-dev-server, but
@@ -72,7 +76,7 @@ function getDevServerConfig(wco) {
7276
},
7377
],
7478
},
75-
sockPath: path_1.posix.join(servePath, 'sockjs-node'),
79+
sockPath,
7680
stats: false,
7781
compress: stylesOptimization || scriptsOptimization,
7882
watchOptions: helpers_1.getWatchOptions(poll),

uniqueId

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Thu Oct 22 2020 14:26:31 GMT+0000 (Coordinated Universal Time)
1+
Thu Oct 22 2020 14:29:16 GMT+0000 (Coordinated Universal Time)

0 commit comments

Comments
 (0)