@angular/cli 12.1.3 → 12.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@angular/cli",
3
- "version": "12.1.3",
3
+ "version": "12.1.4",
4
4
  "description": "CLI tool for Angular",
5
5
  "main": "lib/cli/index.js",
6
6
  "bin": {
@@ -28,10 +28,10 @@
28
28
  },
29
29
  "homepage": "https://github.com/angular/angular-cli",
30
30
  "dependencies": {
31
- "@angular-devkit/architect": "0.1201.3",
32
- "@angular-devkit/core": "12.1.3",
33
- "@angular-devkit/schematics": "12.1.3",
34
- "@schematics/angular": "12.1.3",
31
+ "@angular-devkit/architect": "0.1201.4",
32
+ "@angular-devkit/core": "12.1.4",
33
+ "@angular-devkit/schematics": "12.1.4",
34
+ "@schematics/angular": "12.1.4",
35
35
  "@yarnpkg/lockfile": "1.1.0",
36
36
  "ansi-colors": "4.1.1",
37
37
  "debug": "4.3.1",
@@ -51,12 +51,12 @@
51
51
  "ng-update": {
52
52
  "migrations": "@schematics/angular/migrations/migration-collection.json",
53
53
  "packageGroup": {
54
- "@angular/cli": "12.1.3",
55
- "@angular-devkit/architect": "0.1201.3",
56
- "@angular-devkit/build-angular": "12.1.3",
57
- "@angular-devkit/build-webpack": "0.1201.3",
58
- "@angular-devkit/core": "12.1.3",
59
- "@angular-devkit/schematics": "12.1.3"
54
+ "@angular/cli": "12.1.4",
55
+ "@angular-devkit/architect": "0.1201.4",
56
+ "@angular-devkit/build-angular": "12.1.4",
57
+ "@angular-devkit/build-webpack": "0.1201.4",
58
+ "@angular-devkit/core": "12.1.4",
59
+ "@angular-devkit/schematics": "12.1.4"
60
60
  }
61
61
  },
62
62
  "engines": {
@@ -87,7 +87,7 @@ function readOptions(logger, yarn = false, showPotentials = false) {
87
87
  // Normalize RC options that are needed by 'npm-registry-fetch'.
88
88
  // See: https://github.com/npm/npm-registry-fetch/blob/ebddbe78a5f67118c1f7af2e02c8a22bcaf9e850/index.js#L99-L126
89
89
  const rcConfig = yarn ? lockfile.parse(data) : ini.parse(data);
90
- rcOptions = normalizeOptions(rcConfig, location);
90
+ rcOptions = normalizeOptions(rcConfig, location, rcOptions);
91
91
  }
92
92
  }
93
93
  const envVariablesOptions = {};
@@ -108,14 +108,11 @@ function readOptions(logger, yarn = false, showPotentials = false) {
108
108
  normalizedName = normalizedName.replace(/(?!^)_/g, '-'); // don't replace _ at the start of the key.s
109
109
  envVariablesOptions[normalizedName] = value;
110
110
  }
111
- return {
112
- ...rcOptions,
113
- ...normalizeOptions(envVariablesOptions),
114
- };
111
+ return normalizeOptions(envVariablesOptions, undefined, rcOptions);
115
112
  }
116
- function normalizeOptions(rawOptions, location = process.cwd()) {
113
+ function normalizeOptions(rawOptions, location = process.cwd(), existingNormalizedOptions = {}) {
117
114
  var _a;
118
- const options = {};
115
+ const options = { ...existingNormalizedOptions };
119
116
  for (const [key, value] of Object.entries(rawOptions)) {
120
117
  let substitutedValue = value;
121
118
  // Substitute any environment variable references.