Skip to content

Commit 692b378

Browse files
laco0416Brocco
laco0416
authored andcommitted
feat(@angular/cli): add baseHref property to appConfig
1 parent 01cbf65 commit 692b378

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

packages/@angular/cli/lib/config/schema.json

+4
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
"type": "string",
8080
"description": "URL where files will be deployed."
8181
},
82+
"baseHref": {
83+
"type": "string",
84+
"description": "Base url for the application being built."
85+
},
8286
"index": {
8387
"type": "string",
8488
"default": "index.html",

packages/@angular/cli/models/webpack-config.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ export class NgCliWebpackConfig {
9797
public mergeConfigs(buildOptions: BuildOptions, appConfig: any) {
9898
const mergeableOptions = {
9999
outputPath: appConfig.outDir,
100-
deployUrl: appConfig.deployUrl
100+
deployUrl: appConfig.deployUrl,
101+
baseHref: appConfig.baseHref
101102
};
102103

103104
return Object.assign({}, mergeableOptions, buildOptions);

tests/e2e/tests/build/base-href.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {ng} from '../../utils/process';
22
import {expectFileToMatch} from '../../utils/fs';
33
import {getGlobalVariable} from '../../utils/env';
4+
import {updateJsonFile} from '../../utils/project';
45

56

67
export default function() {
@@ -10,5 +11,11 @@ export default function() {
1011
}
1112

1213
return ng('build', '--base-href', '/myUrl')
13-
.then(() => expectFileToMatch('dist/index.html', /<base href="\/myUrl">/));
14+
.then(() => expectFileToMatch('dist/index.html', /<base href="\/myUrl">/))
15+
.then(() => updateJsonFile('.angular-cli.json', configJson => {
16+
const app = configJson['apps'][0];
17+
app['baseHref'] = '/myUrl';
18+
}))
19+
.then(() => ng('build'))
20+
.then(() => expectFileToMatch('dist/index.html', /<base href="\/myUrl">/))
1421
}

0 commit comments

Comments
 (0)