Merge pull request #278 from angular/master

Delete the redundant define test

Author: GulajavaMinistudio

WORKSPACE

@@ -12,7 +12,7 @@ http_archive(
 # We use protocol buffers for the Build Event Protocol
 git_repository(
     name = "com_google_protobuf",
-    commit = "b6375e03aa80274dae89410efdf46346413b2247",
+    commit = "beaeaeda34e97a6ff9735b33a66e011102ab506b",
     remote = "https://github.com/protocolbuffers/protobuf",
 )
 

etc/api/angular_devkit/architect/src/index.d.ts

@@ -38,7 +38,7 @@ export declare type BuilderInput = json.JsonObject & RealBuilderInput;
 
 export declare type BuilderOutput = json.JsonObject & RealBuilderOutput;
 
-export declare type BuilderOutputLike = Observable<BuilderOutput> | Promise<BuilderOutput> | BuilderOutput;
+export declare type BuilderOutputLike = SubscribableOrPromise<BuilderOutput> | BuilderOutput;
 
 export declare type BuilderProgress = json.JsonObject & RealBuilderProgress & TypedBuilderProgress;
 
@@ -60,6 +60,8 @@ export interface BuilderRun {
 
 export declare function createBuilder<OptT extends json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(fn: BuilderHandlerFn<OptT>): Builder<OptT>;
 
+export declare function isBuilderOutput(obj: any): obj is BuilderOutput;
+
 export interface ScheduleOptions {
     analytics?: analytics.Analytics;
     logger?: logging.Logger;

package.json

@@ -127,7 +127,7 @@
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
-    "semver": "6.1.0",
+    "semver": "6.1.1",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",

packages/angular/cli/commands/update-impl.ts

@@ -83,12 +83,19 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
 
     // If not asking for status then check for a clean git repository.
     // This allows the user to easily reset any changes from the update.
-    if ((packages.length !== 0 || options.all) && !this.checkCleanGit()) {
-      this.logger.error(
-        'Repository is not clean.  Please commit or stash any changes before updating.',
-      );
+    const statusCheck = packages.length === 0 && !options.all;
+    if (!statusCheck && !this.checkCleanGit()) {
+      if (options.allowDirty) {
+        this.logger.warn(
+          'Repository is not clean.  Update changes will be mixed with pre-existing changes.',
+        );
+      } else {
+        this.logger.error(
+          'Repository is not clean.  Please commit or stash any changes before updating.',
+        );
 
-      return 2;
+        return 2;
+      }
     }
 
     const packageManager = getPackageManager(this.workspace.root);

packages/angular/cli/commands/update.json

@@ -53,6 +53,10 @@
         "to": {
           "description": "Version up to which to apply migrations. Only available with a single package being updated, and only on migrations only. Requires from to be specified. Default to the installed version detected.",
           "type": "string"
+        },
+        "allowDirty": {
+          "description": "Whether to allow updating when the repository contains modified or untracked files.",
+          "type": "boolean"
         }
       }
     }

packages/angular/cli/package.json

@@ -38,7 +38,7 @@
     "open": "6.3.0",
     "pacote": "9.5.0",
     "read-package-tree": "5.2.2",
-    "semver": "6.1.0",
+    "semver": "6.1.1",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
     "uuid": "^3.3.2"

packages/angular/cli/utilities/tty.ts

@@ -11,5 +11,5 @@ export function isTTY(): boolean {
     return !(force === '0' || force.toUpperCase() === 'FALSE');
   }
 
-  return !!process.stdout.isTTY && !!process.stdin.isTTY;
+  return !!process.stdout.isTTY && !!process.stdin.isTTY && !('CI' in process.env);
 }

packages/angular_devkit/architect/src/api.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { analytics, experimental, json, logging } from '@angular-devkit/core';
-import { Observable, from } from 'rxjs';
+import { Observable, SubscribableOrPromise, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
 import { Schema as RealBuilderOutput } from './output-schema';
@@ -250,8 +250,16 @@ export interface BuilderContext {
 /**
  * An accepted return value from a builder. Can be either an Observable, a Promise or a vector.
  */
-export type BuilderOutputLike = Observable<BuilderOutput> | Promise<BuilderOutput> | BuilderOutput;
+export type BuilderOutputLike = SubscribableOrPromise<BuilderOutput> | BuilderOutput;
 
+// tslint:disable-next-line:no-any
+export function isBuilderOutput(obj: any): obj is BuilderOutput {
+  if (!obj || typeof obj.then === 'function' || typeof obj.subscribe === 'function') {
+    return false;
+  }
+
+  return typeof obj.success === 'boolean';
+}
 
 /**
  * A builder handler function. The function signature passed to `createBuilder()`.

packages/angular_devkit/architect/src/create-builder.ts

@@ -5,20 +5,20 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { analytics, experimental, isPromise, json, logging } from '@angular-devkit/core';
-import { Observable, Subscription, from, isObservable, of, throwError } from 'rxjs';
+import { analytics, experimental, json, logging } from '@angular-devkit/core';
+import { Observable, Subscription, from, of, throwError } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import {
   BuilderContext,
   BuilderHandlerFn,
   BuilderInfo,
   BuilderInput,
   BuilderOutput,
-  BuilderOutputLike,
   BuilderProgressState,
   ScheduleOptions,
   Target,
   TypedBuilderProgress,
+  isBuilderOutput,
   targetStringFromTarget,
 } from './api';
 import { Builder, BuilderSymbol, BuilderVersionSymbol } from './internal';
@@ -189,19 +189,18 @@ export function createBuilder<
         };
 
         context.reportRunning();
-        let result: BuilderOutputLike;
+        let result;
         try {
           result = fn(i.options as OptT, context);
+          if (isBuilderOutput(result)) {
+            result = of(result);
+          } else {
+            result = from(result);
+          }
         } catch (e) {
           result = throwError(e);
         }
 
-        if (isPromise(result)) {
-          result = from(result);
-        } else if (!isObservable(result)) {
-          result = of(result);
-        }
-
         // Manage some state automatically.
         progress({ state: BuilderProgressState.Running, current: 0, total: 1 }, context);
         subscriptions.push(result.pipe(

packages/angular_devkit/build_angular/package.json

@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
-    "browserslist": "4.6.0",
+    "browserslist": "4.6.1",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
@@ -39,7 +39,7 @@
     "rxjs": "6.4.0",
     "sass": "1.20.1",
     "sass-loader": "7.1.0",
-    "semver": "6.1.0",
+    "semver": "6.1.1",
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts

@@ -48,6 +48,7 @@ class BundleCalculator extends Calculator {
     const size: number = this.compilation.chunks
       .filter(chunk => chunk.name === this.budget.name)
       .reduce((files, chunk) => [...files, ...chunk.files], [])
+      .filter((file: string) => !file.endsWith('.map'))
       .map((file: string) => this.compilation.assets[file].size())
       .reduce((total: number, size: number) => total + size, 0);
 

packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts

@@ -65,6 +65,18 @@ describe('Browser Builder bundle budgets', () => {
   });
 
   describe(`should ignore '.map' files`, () => {
+    it(`when 'bundle' budget`, async () => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'bundle', name: 'main', maximumError: '3Kb' }],
+      };
+
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
+    });
+
     it(`when 'intial' budget`, async () => {
       const overrides = {
         optimization: true,

packages/angular_devkit/schematics/tools/node-module-engine-host.ts

@@ -79,7 +79,7 @@ export class NodeModulesEngineHost extends FileSystemEngineHostBase {
   protected _resolveCollectionPath(name: string): string {
     let collectionPath: string | undefined = undefined;
 
-    if (name.replace(/\\/, '/').split('/').length > (name[0] == '@' ? 2 : 1)) {
+    if (name.replace(/\\/g, '/').split('/').length > (name[0] == '@' ? 2 : 1)) {
       try {
         collectionPath = this._resolvePath(name, process.cwd());
       } catch {

packages/angular_devkit/schematics/tools/node-module-engine-host_spec.ts

@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+// tslint:disable:no-implicit-dependencies
+
+import { SchematicEngine } from '@angular-devkit/schematics';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { NodeModulesEngineHost } from './node-module-engine-host';
+
+const TMP_DIR = process.env['$TEST_TMPDIR'] || os.tmpdir();
+
+describe('NodeModulesEngineHost', () => {
+  let tmpDir!: string;
+  let previousDir!: string;
+
+  beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(TMP_DIR,
+        'angular-devkit-schematics-tools-node-module-engine-host'));
+    previousDir = process.cwd();
+    process.chdir(tmpDir);
+  });
+
+  afterEach(() => process.chdir(previousDir));
+
+  /** Creates a fake NPM module that can be used to test the node module engine host. */
+  function createFakeNpmModule() {
+    fs.mkdirSync(path.join(tmpDir, 'node_modules'));
+    fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/'));
+    fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/core'));
+    fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/core/schematics'));
+    fs.writeFileSync(path.join(tmpDir, 'node_modules/@angular/core/package.json'),
+      JSON.stringify({name: '@angular/core'}));
+    fs.writeFileSync(path.join(tmpDir, 'node_modules/@angular/core/schematics/migrations.json'),
+      JSON.stringify({schematics: {}}));
+  }
+
+  it('should properly create collections with explicit collection path', () => {
+    createFakeNpmModule();
+
+    const engineHost = new NodeModulesEngineHost();
+    const engine = new SchematicEngine(engineHost);
+
+    expect(() => {
+      engine.createCollection(path.join('@angular/core', './schematics/migrations.json'));
+    }).not.toThrow();
+  });
+});

packages/ngtools/webpack/src/angular_compiler_plugin.ts

@@ -152,7 +152,7 @@ export class AngularCompilerPlugin {
   }
 
   static isSupported() {
-    return VERSION && parseInt(VERSION.major) >= 5;
+    return VERSION && parseInt(VERSION.major) >= 8;
   }
 
   private _setupOptions(options: AngularCompilerPluginOptions) {
@@ -660,24 +660,13 @@ export class AngularCompilerPlugin {
 
       let ngccProcessor: NgccProcessor | undefined;
       if (this._compilerOptions.enableIvy) {
-        let ngcc: typeof import('@angular/compiler-cli/ngcc') | undefined;
-        try {
-          // this is done for the sole reason that @ngtools/webpack
-          // support versions of Angular that don't have NGCC API
-          ngcc = require('@angular/compiler-cli/ngcc');
-        } catch {
-        }
-
-        if (ngcc) {
-          ngccProcessor = new NgccProcessor(
-            ngcc,
-            this._mainFields,
-            compilerWithFileSystems.inputFileSystem,
-            this._warnings,
-            this._errors,
-            this._basePath,
-          );
-        }
+        ngccProcessor = new NgccProcessor(
+          this._mainFields,
+          compilerWithFileSystems.inputFileSystem,
+          this._warnings,
+          this._errors,
+          this._basePath,
+        );
       }
 
       // Create the webpack compiler host.

packages/ngtools/webpack/src/ngcc_processor.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Logger } from '@angular/compiler-cli/ngcc';
+import { Logger, process as mainNgcc } from '@angular/compiler-cli/ngcc';
 import { existsSync } from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
@@ -29,7 +29,6 @@ export class NgccProcessor {
   private _nodeModulesDirectory: string;
 
   constructor(
-    private readonly ngcc: typeof import('@angular/compiler-cli/ngcc'),
     private readonly propertiesToConsider: string[],
     private readonly inputFileSystem: InputFileSystem,
     private readonly compilationWarnings: (Error | string)[],
@@ -63,7 +62,7 @@ export class NgccProcessor {
 
     const timeLabel = `NgccProcessor.processModule.ngcc.process+${moduleName}`;
     time(timeLabel);
-    this.ngcc.process({
+    mainNgcc({
       basePath: this._nodeModulesDirectory,
       targetEntryPointPath: path.dirname(packageJsonPath),
       propertiesToConsider: this.propertiesToConsider,

packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts

@@ -106,7 +106,7 @@ function dropES2015PolyfillsFromFile(polyfillPath: string): Rule {
     }
 
     const sourceFile = ts.createSourceFile(polyfillPath,
-      content,
+      content.replace(/^\uFEFF/, ''),
       ts.ScriptTarget.Latest,
       true,
     );

packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts

@@ -17,7 +17,7 @@ function* visit(directory: DirEntry): IterableIterator<ts.SourceFile> {
         if (content.includes('loadChildren')) {
           const source = ts.createSourceFile(
             entry.path,
-            content.toString(),
+            content.toString().replace(/^\uFEFF/, ''),
             ts.ScriptTarget.Latest,
             true,
           );

packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts

@@ -73,5 +73,19 @@ describe('Migration to version 8', () => {
       expect(routes).toContain(
         `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
     });
+
+    it('should replace the module path string when file has BOM', async () => {
+      tree.create(lazyRoutePath, '\uFEFF' + Buffer.from(lazyRoute).toString());
+
+      schematicRunner.runSchematic('migration-08', {}, tree);
+      await schematicRunner.engine.executePostTasks().toPromise();
+
+      const routes = tree.readContent(lazyRoutePath);
+
+      expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
+      expect(routes).toContain(
+        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+    });
+
   });
 });