Skip to content

Commit 49ce5f1

Browse files
refactor(build): replace source in environments with separate environmentDefault entry
Replace `source` in environments with separate `environmentDefault` entry and updated docs to reflect this change BREAKING CHANGE: angular-cli.json has changed. A new `environmentDefault` entry replaces the previous `source` entry inside `environments`. To migrate the code follow the example below: Before: "environments": { "source": "environments/environment.ts", "dev": "environments/environment.ts", "prod": "environments/environment.prod.ts" } After: "environmentSource": "environments/environment.ts", "environments": { "dev": "environments/environment.ts", "prod": "environments/environment.prod.ts" } Closes angular#3857
1 parent 3547abc commit 49ce5f1

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

packages/angular-cli/lib/config/schema.d.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface CliConfig {
1212
apps?: {
1313
root?: string;
1414
outDir?: string;
15-
assets?: string;
15+
assets?: string | string[];
1616
deployUrl?: string;
1717
index?: string;
1818
main?: string;
@@ -23,15 +23,21 @@ export interface CliConfig {
2323
/**
2424
* Global styles to be included in the build.
2525
*/
26-
styles?: string[];
26+
styles?: (string | {
27+
[name: string]: any;
28+
input?: string;
29+
})[];
2730
/**
2831
* Global scripts to be included in the build.
2932
*/
30-
scripts?: string[];
33+
scripts?: (string | {
34+
[name: string]: any;
35+
input?: string;
36+
})[];
3137
/**
3238
* Environment source file.
3339
*/
34-
environmentSource?: string,
40+
environmentSource?: string;
3541
/**
3642
* Name and corresponding file for environment config.
3743
*/

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

+5
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@
110110
},
111111
"additionalProperties": false
112112
},
113+
"environmentSource": {
114+
"description": "Environment source file.",
115+
"type": "string",
116+
"additionalProperties": true
117+
},
113118
"environments": {
114119
"description": "Name and corresponding file for environment config.",
115120
"type": "object",

packages/angular-cli/models/webpack-build-common.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export function getWebpackCommonConfig(
102102

103103
// process environment file replacement
104104
if (appConfig.environments) {
105-
if (!('environmentSource' in appConfig.environments)) {
105+
if (!(appConfig.environmentSource)) {
106106
throw new SilentError(`Environment configuration does not contain
107107
"environmentSource" entry.`);
108108
}

0 commit comments

Comments
 (0)