@angular/cli 1.7.0 → 1.7.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.
@@ -4,6 +4,8 @@ const chalk_1 = require("chalk");
4
4
  const stringUtils = require('ember-cli-string-utils');
5
5
  const common_tags_1 = require("common-tags");
6
6
  const config_1 = require("../models/config");
7
+ const core_1 = require("@angular-devkit/core");
8
+ const operators_1 = require("rxjs/operators");
7
9
  const schematics_1 = require("../utilities/schematics");
8
10
  const dynamic_path_parser_1 = require("../utilities/dynamic-path-parser");
9
11
  const app_utils_1 = require("../utilities/app-utils");
@@ -170,12 +172,37 @@ exports.default = Command.extend({
170
172
  if (collectionName === '@schematics/angular' && schematicName === 'interface' && rawArgs[2]) {
171
173
  commandOptions.type = rawArgs[2];
172
174
  }
175
+ const logger = new core_1.logging.IndentLogger('cling');
176
+ const loggerSubscription = logger.pipe(operators_1.filter(entry => (entry.level != 'debug')))
177
+ .subscribe(entry => {
178
+ let color = (x) => core_1.terminal.dim(core_1.terminal.white(x));
179
+ let output = process.stdout;
180
+ switch (entry.level) {
181
+ case 'info':
182
+ color = core_1.terminal.white;
183
+ break;
184
+ case 'warn':
185
+ color = core_1.terminal.yellow;
186
+ break;
187
+ case 'error':
188
+ color = core_1.terminal.red;
189
+ output = process.stderr;
190
+ break;
191
+ case 'fatal':
192
+ color = (x) => core_1.terminal.bold(core_1.terminal.red(x));
193
+ output = process.stderr;
194
+ break;
195
+ }
196
+ output.write(color(entry.message) + '\n');
197
+ });
173
198
  return schematicRunTask.run({
174
199
  taskOptions: commandOptions,
175
200
  workingDir: cwd,
176
201
  collectionName,
177
- schematicName
178
- });
202
+ schematicName,
203
+ logger: this.logger
204
+ })
205
+ .then(() => loggerSubscription.unsubscribe());
179
206
  },
180
207
  printDetailedHelp: function (_options, rawArgs) {
181
208
  const engineHost = schematics_1.getEngineHost();
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["commands/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["commands/generate.ts"],"names":[],"mappings":"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"}
package/lib/cli/index.js CHANGED
@@ -1,4 +1,10 @@
1
1
  "use strict";
2
+ // TODO: remove this commented AJV require.
3
+ // We don't actually require AJV, but there is a bug with NPM and peer dependencies that is
4
+ // whose workaround is to depend on AJV.
5
+ // See https://github.com/angular/angular-cli/issues/9691#issuecomment-367322703 for details.
6
+ // We need to add a require here to satisfy the dependency checker.
7
+ // require('ajv');
2
8
  Object.defineProperty(exports, "__esModule", { value: true });
3
9
  const path = require("path");
4
10
  const cli = require('../../ember-cli/lib/cli');
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["lib/cli/index.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAE7B,MAAM,GAAG,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC/C,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAG7C;IACE,MAAM,CAAC;QACL,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,UAAU,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,OAAO;QACtD,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO;QACpD,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO;QACpD,YAAY,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO;QAC1D,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,QAAQ,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO;QAElD,eAAe;QACf,mBAAmB,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO;QAEjE,iBAAiB;QACjB,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;KAC7C,CAAC;AACJ,CAAC;AAED,mBAAwB,OAAY;IAElC,8EAA8E;IAC9E,EAAE,CAAC,SAAS,CAAC,aAAa,GAAG,cAAc,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,GAAG;QACZ,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;QACtC,UAAU,EAAE,cAAc;KAC3B,CAAC;IAEF,OAAO,CAAC,QAAQ,GAAG,YAAY,EAAE,CAAC;IAElC,oDAAoD;IACpD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEnF,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACtB,CAAC;AAlBD,4BAkBC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["lib/cli/index.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,2FAA2F;AAC3F,wCAAwC;AACxC,6FAA6F;AAC7F,mEAAmE;AACnE,kBAAkB;;AAElB,6BAA6B;AAE7B,MAAM,GAAG,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC/C,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAG7C;IACE,MAAM,CAAC;QACL,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,UAAU,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,OAAO;QACtD,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO;QACpD,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO;QACpD,YAAY,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO;QAC1D,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,QAAQ,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO;QAElD,eAAe;QACf,mBAAmB,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO;QAEjE,iBAAiB;QACjB,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;KAC7C,CAAC;AACJ,CAAC;AAED,mBAAwB,OAAY;IAElC,8EAA8E;IAC9E,EAAE,CAAC,SAAS,CAAC,aAAa,GAAG,cAAc,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,GAAG;QACZ,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;QACtC,UAAU,EAAE,cAAc;KAC3B,CAAC;IAEF,OAAO,CAAC,QAAQ,GAAG,YAAY,EAAE,CAAC;IAElC,oDAAoD;IACpD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEnF,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACtB,CAAC;AAlBD,4BAkBC"}
@@ -112,7 +112,10 @@ function getProdConfig(wco) {
112
112
  // https://github.com/mapbox/mapbox-gl-js/issues/4359#issuecomment-303880888
113
113
  // https://github.com/angular/angular-cli/issues/5804
114
114
  // https://github.com/angular/angular-cli/pull/7931
115
- typeofs: false
115
+ typeofs: false,
116
+ // Workaround known uglify-es issue
117
+ // See https://github.com/mishoo/UglifyJS2/issues/2949#issuecomment-368070307
118
+ inline: wco.supportES2015 ? 1 : 3,
116
119
  };
117
120
  if (buildOptions.buildOptimizer) {
118
121
  // This plugin must be before webpack.optimize.UglifyJsPlugin.
@@ -1 +1 @@
1
- {"version":3,"file":"production.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["models/webpack-configs/production.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"production.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["models/webpack-configs/production.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@angular/cli",
3
- "version": "1.7.0",
3
+ "version": "1.7.4",
4
4
  "description": "CLI tool for Angular",
5
5
  "main": "lib/cli/index.js",
6
6
  "trackingCode": "UA-8594346-19",
@@ -27,18 +27,19 @@
27
27
  },
28
28
  "homepage": "https://github.com/angular/angular-cli",
29
29
  "dependencies": {
30
- "@angular-devkit/build-optimizer": "0.3.1",
31
- "@angular-devkit/core": "0.3.1",
32
- "@angular-devkit/schematics": "0.3.1",
30
+ "@angular-devkit/build-optimizer": "0.3.2",
31
+ "@angular-devkit/core": "0.3.2",
32
+ "@angular-devkit/schematics": "0.3.2",
33
33
  "@ngtools/json-schema": "1.2.0",
34
- "@ngtools/webpack": "1.10.0",
35
- "@schematics/angular": "0.3.1",
36
- "@schematics/package-update": "0.3.1",
34
+ "@ngtools/webpack": "1.10.2",
35
+ "@schematics/angular": "0.3.2",
36
+ "@schematics/package-update": "0.3.2",
37
+ "ajv": "^6.1.1",
37
38
  "autoprefixer": "^7.2.3",
38
39
  "cache-loader": "^1.2.0",
39
40
  "chalk": "~2.2.0",
40
41
  "circular-dependency-plugin": "^4.2.1",
41
- "clean-css": "^4.1.9",
42
+ "clean-css": "^4.1.11",
42
43
  "common-tags": "^1.3.1",
43
44
  "copy-webpack-plugin": "~4.4.1",
44
45
  "core-object": "^3.1.0",
@@ -100,32 +100,36 @@ exports.default = postcss.plugin('postcss-cli-resources', (options) => {
100
100
  const resourceCache = new Map();
101
101
  return Promise.all(urlDeclarations.map((decl) => __awaiter(this, void 0, void 0, function* () {
102
102
  const value = decl.value;
103
- const urlRegex = /url\(\s*['"]?([ \S]+?)['"]??\s*\)/g;
103
+ const urlRegex = /url\(\s*(?:"([^"]+)"|'([^']+)'|(.+?))\s*\)/g;
104
104
  const segments = [];
105
105
  let match;
106
106
  let lastIndex = 0;
107
107
  let modified = false;
108
108
  // tslint:disable-next-line:no-conditional-assignment
109
109
  while (match = urlRegex.exec(value)) {
110
+ const originalUrl = match[1] || match[2] || match[3];
110
111
  let processedUrl;
111
112
  try {
112
- processedUrl = yield process(match[1], resourceCache);
113
+ processedUrl = yield process(originalUrl, resourceCache);
113
114
  }
114
115
  catch (err) {
115
- loader.emitError(decl.error(err.message, { word: match[1] }).toString());
116
+ loader.emitError(decl.error(err.message, { word: originalUrl }).toString());
116
117
  continue;
117
118
  }
118
- if (lastIndex !== match.index) {
119
+ if (lastIndex < match.index) {
119
120
  segments.push(value.slice(lastIndex, match.index));
120
121
  }
121
- if (!processedUrl || match[1] === processedUrl) {
122
+ if (!processedUrl || originalUrl === processedUrl) {
122
123
  segments.push(match[0]);
123
124
  }
124
125
  else {
125
126
  segments.push(wrapUrl(processedUrl));
126
127
  modified = true;
127
128
  }
128
- lastIndex = urlRegex.lastIndex;
129
+ lastIndex = match.index + match[0].length;
130
+ }
131
+ if (lastIndex < value.length) {
132
+ segments.push(value.slice(lastIndex));
129
133
  }
130
134
  if (modified) {
131
135
  decl.value = segments.join('');
@@ -1 +1 @@
1
- {"version":3,"file":"postcss-cli-resources.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["plugins/postcss-cli-resources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"postcss-cli-resources.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["plugins/postcss-cli-resources.ts"],"names":[],"mappings":"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"}
package/tasks/lint.js CHANGED
@@ -74,9 +74,9 @@ exports.default = Task.extend({
74
74
  .reduce((total, current) => {
75
75
  const failures = current.failures
76
76
  .filter(cf => !total.failures.some(ef => ef.equals(cf)));
77
- total.failures = total.failures.concat(...failures);
77
+ total.failures = total.failures.concat(failures);
78
78
  if (current.fixes) {
79
- total.fixes = (total.fixes || []).concat(...current.fixes);
79
+ total.fixes = (total.fixes || []).concat(current.fixes);
80
80
  }
81
81
  if (current.errorCount !== undefined) {
82
82
  total.errorCount += current.errorCount;
package/tasks/lint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lint.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/lint.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lint.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/lint.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,11 @@
1
+ import { logging } from '@angular-devkit/core';
1
2
  export interface SchematicRunOptions {
2
3
  taskOptions: SchematicOptions;
3
4
  workingDir: string;
4
5
  emptyHost: boolean;
5
6
  collectionName: string;
6
7
  schematicName: string;
8
+ logger: logging.Logger;
7
9
  }
8
10
  export interface SchematicOptions {
9
11
  dryRun: boolean;
@@ -13,7 +13,7 @@ const { green, red, yellow } = chalk_1.default;
13
13
  const Task = require('../ember-cli/lib/models/task');
14
14
  exports.default = Task.extend({
15
15
  run: function (options) {
16
- const { taskOptions, workingDir, emptyHost, collectionName, schematicName } = options;
16
+ const { taskOptions, workingDir, emptyHost, collectionName, schematicName, logger } = options;
17
17
  const ui = this.ui;
18
18
  const packageManager = config_1.CliConfig.fromGlobal().get('packageManager');
19
19
  const engineHost = schematics_2.getEngineHost();
@@ -77,7 +77,7 @@ exports.default = Task.extend({
77
77
  }
78
78
  });
79
79
  return new Promise((resolve, reject) => {
80
- schematic.call(opts, host).pipe(operators_1.map((tree) => schematics_1.Tree.optimize(tree)), operators_1.concatMap((tree) => {
80
+ schematic.call(opts, host, { logger }).pipe(operators_1.map((tree) => schematics_1.Tree.optimize(tree)), operators_1.concatMap((tree) => {
81
81
  return dryRunSink.commit(tree).pipe(operators_1.ignoreElements(), operators_1.concat(of_1.of(tree)));
82
82
  }), operators_1.concatMap((tree) => {
83
83
  if (!error) {
@@ -1 +1 @@
1
- {"version":3,"file":"schematic-run.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/schematic-run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schematic-run.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/schematic-run.ts"],"names":[],"mappings":"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"}
package/tasks/serve.js CHANGED
@@ -94,8 +94,15 @@ exports.default = Task.extend({
94
94
  if (serveTaskOptions.liveReload) {
95
95
  // This allows for live reload of page when changes are made to repo.
96
96
  // https://webpack.js.org/configuration/dev-server/#devserver-inline
97
+ let webpackDevServerPath;
98
+ try {
99
+ webpackDevServerPath = require.resolve('webpack-dev-server/client');
100
+ }
101
+ catch (_a) {
102
+ throw new SilentError('The "webpack-dev-server" package could not be found.');
103
+ }
97
104
  let entryPoints = [
98
- `webpack-dev-server/client?${clientAddress}`
105
+ `${webpackDevServerPath}?${clientAddress}`
99
106
  ];
100
107
  if (serveTaskOptions.hmr) {
101
108
  const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
@@ -1 +1 @@
1
- {"version":3,"file":"serve.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/serve.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAC/B,6BAA6B;AAC7B,mCAAmC;AACnC,2BAA2B;AAC3B,iCAA0B;AAC1B,6CAAoD;AACpD,2DAAwE;AACxE,6DAA8D;AAE9D,6CAA6C;AAC7C,sDAA0D;AAC1D,8CAA+F;AAE/F,MAAM,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACvD,MAAM,IAAI,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AACrD,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAC3B,MAAM,MAAM,GAAG,eAAK,CAAC,MAAM,CAAC;AAE5B,8BAA8B,QAAgB,EAAE,SAAiB;IAC/D,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC;IACZ,CAAC;IAED,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACpE,gEAAgE;QAChE,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAED,qBAAqB;IACrB,6DAA6D;IAC7D,wCAAwC;IACxC,MAAM,aAAa,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;SACnC,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAC/B,EAAE,CAAC,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxC,aAAa,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IACD,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAE7F,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QACtC,EAAE,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC;YACxE,0FAA0F;YAC1F,MAAM,CAAC,IAAI,CAAC;QACd,CAAC;QACD,MAAM,CAAC,SAAS,CAAC;IACnB,CAAC;IAED,uCAAuC;IACvC,MAAM,CAAC,GAAG,kBAAkB,GAAG,SAAS,IAAI,EAAE,EAAE,CAAC;AACnD,CAAC;AAED,kBAAe,IAAI,CAAC,MAAM,CAAC;IACzB,GAAG,EAAE,UAAU,gBAAkC,EAAE,aAAkB;QACnE,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAEnB,IAAI,eAAoB,CAAC;QACzB,MAAM,aAAa,GAAG,kBAAS,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;QACrD,MAAM,SAAS,GAAG,4BAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAEzD,MAAM,UAAU,GAAG,gBAAgB,CAAC,UAAU,IAAI,SAAS,CAAC,MAAM,CAAC;QACnE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,IAAI,WAAW,CAAC,iDAAiD,CAAC,CAAC;QAC3E,CAAC;QACD,EAAE,CAAC,CAAC,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3D,MAAM,IAAI,WAAW,CAAC,0DAA0D,CAAC,CAAC;QACpF,CAAC;QACD,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC;YACpC,MAAM,IAAI,WAAW,CAAC,2DAA2D,CAAC,CAAC;QACrF,CAAC;QACD,EAAE,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACtC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,aAAa,GAAG;YACpB,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,EAAE;YACpC,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAC7B,CAAC;QAEF,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAEtE,IAAI,aAAa,GAAG,IAAI,mCAAkB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;QAEtF,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;YACjD,QAAQ,EAAE,gBAAgB,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI;YACnF,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE;SACvC,CAAC,CAAC;QAEH,EAAE,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACtC,EAAE,CAAC,SAAS,CAAC,qBAAO,CAAA;YACd,MAAM,CAAC,SAAS,CAAC;;;SAGpB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,aAAa,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC;QAC7E,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;YAChC,IAAI,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAC;YAC7C,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAClC,UAAU,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,MAAM,UAAU,EAAE,CAAC;YAC5E,CAAC;YACD,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACxC,gBAAgB,CAAC,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;YAC7C,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;YAChC,qEAAqE;YACrE,oEAAoE;YACpE,IAAI,WAAW,GAAG;gBAChB,6BAA6B,aAAa,EAAE;aAC7C,CAAC;YACF,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzB,MAAM,cAAc,GAAG,sDAAsD,CAAC;gBAE9E,EAAE,CAAC,SAAS,CAAC,qBAAO,CAAA;YAChB,MAAM,CAAC,QAAQ,CAAC;SACnB,CAAC,CAAC;gBAEH,MAAM,WAAW,GAAG,kBAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBACvE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;oBAChB,EAAE,CAAC,SAAS,CAAC,2DAA2D,CAAC,CAAC;oBAC1E,EAAE,CAAC,SAAS,CAAC,wEAAwE,CAAC,CAAC;oBACvF,EAAE,CAAC,SAAS,CAAC,wDAAwD,CAAC,CAAC;oBACvE,EAAE,CAAC,SAAS,CAAC,SAAS,eAAK,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;oBACpD,EAAE,CAAC,SAAS,CAAC,oDAAoD,CAAC,CAAC;oBACnE,EAAE,CAAC,SAAS,CAAC,qBAAO,CAAA;cAChB,MAAM,CAAC,gEAAgE,CAAC;WAC3E,CAAC,CAAC;gBACL,CAAC;gBACD,WAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBAC3C,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAAC;gBACrE,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;oBAChC,EAAE,CAAC,SAAS,CAAC,qBAAO,CAAA;cAChB,MAAM,CAAC,QAAQ,CAAC;;WAEnB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBAAC,aAAa,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;YAAC,CAAC;YACjE,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,WAAW,CAAC,CAAC;QACnD,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;YAChC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,8CAA8C,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;YAC5B,yEAAyE;YACzE,4CAA4C;YAC5C,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC5B,KAAK,EAAE,CAAC,QAAa,EAAE,EAAE;oBACvB,QAAQ,CAAC,MAAM,CAAC,mBAAmB,EAAE,GAAG,EAAE;wBACxC,QAAQ,CAAC,eAAe,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;oBAClD,CAAC,CAAC,CAAC;gBACL,CAAC;aACF,CAAC,CAAC;QACL,CAAC;QAED,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QAEzC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;YAClB,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,WAAW,GAAG,6BAAqB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpE,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,EAAE,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;YACjC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAChF,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC7B,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;YACnC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,MAAM,OAAO,GAAG,oBAAoB,GAAG,SAAS,GAAG,kBAAkB,CAAC;gBACtE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;QAED,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,OAAO,GAAW,IAAI,CAAC;QAC3B,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACzE,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC3B,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC3E,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC5B,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,IAAI,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC;QAC3C,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC;YACnC,MAAM,gBAAgB,GACpB,oBAAoB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC9E,MAAM,WAAW,GAAG,kBAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YAC7E,EAAE,CAAC,CAAC,gBAAgB,IAAI,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC;gBAC5C,EAAE,CAAC,SAAS,CAAC,qBAAO,CAAA;cACd,eAAK,CAAC,MAAM,CAAC,SAAS,CAAC;;;WAG1B,CAAC,CAAC;YACP,CAAC;YACD,SAAS,GAAG,gBAAgB,IAAI,EAAE,CAAC;QACrC,CAAC;QACD,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5B,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC/B,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAC9B,CAAC;QACD,MAAM,6BAA6B,GAA0C;YAC3E,OAAO,EAAE,EAAE,6BAA6B,EAAE,GAAG,EAAE;YAC/C,kBAAkB,EAAE;gBAClB,KAAK,EAAE,GAAG,SAAS,IAAI,SAAS,CAAC,KAAK,EAAE;gBACxC,cAAc,EAAE,IAAI;gBACpB,iBAAiB,EAAE,CAAC,WAAW,EAAE,uBAAuB,CAAC;aAC1D;YACD,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM;YACtD,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,WAAW;YAClB,QAAQ,EAAE,gBAAgB,CAAC,MAAM,KAAK,YAAY;YAClD,YAAY,EAAE;gBACZ,IAAI,EAAE,gBAAgB,CAAC,IAAI;aAC5B;YACD,KAAK,EAAE,gBAAgB,CAAC,GAAG;YAC3B,OAAO,EAAE;gBACP,MAAM,EAAE,gBAAgB,CAAC,MAAM,KAAK,aAAa;gBACjD,QAAQ,EAAE,KAAK;aAChB;YACD,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,gBAAgB,CAAC,UAAU;YACnC,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB;YACnD,UAAU,EAAE,SAAS;SACtB,CAAC;QAEF,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC;YACtC,6BAA6B,CAAC,GAAG,GAAG,MAAM,CAAC;YAC3C,6BAA6B,CAAC,IAAI,GAAG,OAAO,CAAC;QAC/C,CAAC;QAED,6BAA6B,CAAC,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC;QAEzD,EAAE,CAAC,CAAC,gBAAgB,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC;YAC7C,EAAE,CAAC,SAAS,CAAC,eAAK,CAAC,GAAG,CAAC,0BAAY,CAAA;;;;;;;OAOlC,CAAC,CAAC,CAAC;QACN,CAAC;QAED,EAAE,CAAC,SAAS,CAAC,eAAK,CAAC,KAAK,CAAC,qBAAO,CAAA;;mDAEe,gBAAgB,CAAC,IAAI,IAAI,gBAAgB,CAAC,IAAI;6BACpE,aAAa,GAAG,SAAS;;KAEjD,CAAC,CAAC,CAAC;QAEJ,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,eAAe,EAAE,6BAA6B,CAAC,CAAC;QACpF,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9B,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE;gBAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACvC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;gBACpD,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;oBACxB,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,6BAAqB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;gBAC9D,CAAC;gBACD,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;oBACtB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,2BAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAC9B,gBAAgB,CAAC,IAAI,EACrB,gBAAgB,CAAC,IAAI,EACrB,CAAC,GAAQ,EAAE,MAAW,EAAE,EAAE;gBACxB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBACR,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACrB,CAAC;gBACD,EAAE,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC1B,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC,CAAC,CAAC;YACL,8EAA8E;YAC9E,yFAAyF;YACzF,0FAA0F;YAC1F,uDAAuD;YACvD,qDAAqD;YACrD,8CAA8C;YAC9C,iFAAiF;YACjF,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBACxC,UAAU,CAAC,gBAAgB,GAAG,KAAK,CAAC,CAAC,aAAa;YACpD,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACpB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBACR,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,wCAAwC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;YAC7F,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC"}
1
+ {"version":3,"file":"serve.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/serve.ts"],"names":[],"mappings":"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"}
@@ -19,11 +19,11 @@ function packageChunkSort(appConfig) {
19
19
  entryPoints.push(...['vendor', 'main']);
20
20
  function sort(left, right) {
21
21
  let leftIndex = entryPoints.indexOf(left.names[0]);
22
- let rightindex = entryPoints.indexOf(right.names[0]);
23
- if (leftIndex > rightindex) {
22
+ let rightIndex = entryPoints.indexOf(right.names[0]);
23
+ if (leftIndex > rightIndex) {
24
24
  return 1;
25
25
  }
26
- else if (leftIndex < rightindex) {
26
+ else if (leftIndex < rightIndex) {
27
27
  return -1;
28
28
  }
29
29
  else {