feat(@angular/cli): load deployUrl and baseHref from app config for ng serve

admosity · clydin · commit b6b8acc1bf99 · 2018-01-10T09:54:55.000-05:00
diff --git a/packages/@angular/cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts
@@ -73,8 +73,8 @@ export default Task.extend({
     }
 
     const serveDefaults = {
-      // default deployUrl to '' on serve to prevent the default from .angular-cli.json
-      deployUrl: ''
+      deployUrl: appConfig.deployUrl || '',
+      baseHref: appConfig.baseHref || '',
     };
 
     serveTaskOptions = Object.assign({}, serveDefaults, serveTaskOptions);

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ export default Task.extend({`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`const serveDefaults = {`
`76`		`- // default deployUrl to '' on serve to prevent the default from .angular-cli.json`
`77`		`- deployUrl: ''`
	`76`	`+ deployUrl: appConfig.deployUrl \|\| '',`
	`77`	`+ baseHref: appConfig.baseHref \|\| '',`
`78`	`78`	`};`
`79`	`79`
`80`	`80`	`serveTaskOptions = Object.assign({}, serveDefaults, serveTaskOptions);`