Merge pull request #281 from angular/master

Rounded Border TextField Elevation

Author: GulajavaMinistudio

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

@@ -104,15 +104,18 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
     this.logger.info(`Using package manager: '${packageManager}'`);
 
     // Special handling for Angular CLI 1.x migrations
-    if (options.migrateOnly === undefined && options.from === undefined) {
-      if (!options.all && packages.length === 1 && packages[0].name === '@angular/cli') {
-        const oldConfigFilePath = findUp(oldConfigFileNames, process.cwd());
-        if (oldConfigFilePath) {
+    if (
+      options.migrateOnly === undefined &&
+      options.from === undefined &&
+      !options.all &&
+      packages.length === 1 &&
+      packages[0].name === '@angular/cli' &&
+      this.workspace.configFile &&
+      oldConfigFileNames.includes(this.workspace.configFile)
+    ) {
           options.migrateOnly = true;
           options.from = '1.0.0';
         }
-      }
-    }
 
     this.logger.info('Collecting installed dependencies...');
 

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts

@@ -49,17 +49,16 @@ function _pluginOptionsOverrides(
 
 function _createAotPlugin(
   wco: WebpackConfigOptions,
-  options: any,
-  useMain = true,
-  extract = false,
+  options: AngularCompilerPluginOptions,
+  i18nExtract = false,
 ) {
   const { root, buildOptions } = wco;
 
   const i18nInFile = buildOptions.i18nFile
     ? path.resolve(root, buildOptions.i18nFile)
     : undefined;
 
-  const i18nFileAndFormat = extract
+  const i18nFileAndFormat = i18nExtract
     ? {
       i18nOutFile: buildOptions.i18nFile,
       i18nOutFormat: buildOptions.i18nFormat,
@@ -79,7 +78,7 @@ function _createAotPlugin(
   }
 
   let pluginOptions: AngularCompilerPluginOptions = {
-    mainPath: useMain ? path.join(root, buildOptions.main) : undefined,
+    mainPath: path.join(root, buildOptions.main),
     ...i18nFileAndFormat,
     locale: buildOptions.i18nLocale,
     platform: buildOptions.platform === 'server' ? PLATFORM.Server : PLATFORM.Browser,
@@ -108,7 +107,7 @@ export function getNonAotConfig(wco: WebpackConfigOptions) {
   };
 }
 
-export function getAotConfig(wco: WebpackConfigOptions, extract = false) {
+export function getAotConfig(wco: WebpackConfigOptions, i18nExtract = false) {
   const { tsConfigPath, buildOptions } = wco;
 
   const loaders: any[] = [NgToolsLoader];
@@ -123,7 +122,7 @@ export function getAotConfig(wco: WebpackConfigOptions, extract = false) {
 
   return {
     module: { rules: [{ test, use: loaders }] },
-    plugins: [_createAotPlugin(wco, { tsConfigPath }, true, extract)]
+    plugins: [_createAotPlugin(wco, { tsConfigPath }, i18nExtract)]
   };
 }
 

packages/angular_devkit/build_angular/src/extract-i18n/index.ts

@@ -72,6 +72,7 @@ async function execute(options: ExtractI18nBuilderOptions, context: BuilderConte
         scripts: false,
         styles: false,
       },
+      buildOptimizer: false,
       i18nLocale: options.i18nLocale,
       i18nFormat: options.i18nFormat,
       i18nFile: outFile,

packages/ngtools/webpack/src/interfaces.ts

@@ -7,6 +7,7 @@
  */
 
 import { logging, virtualFs } from '@angular-devkit/core';
+import { CompilerOptions } from '@angular/compiler-cli';
 import * as fs from 'fs';
 import * as ts from 'typescript';
 
@@ -59,7 +60,7 @@ export interface AngularCompilerPluginOptions {
   contextElementDependencyConstructor?: ContextElementDependencyConstructor;
 
   // Use tsconfig to include path globs.
-  compilerOptions?: ts.CompilerOptions;
+  compilerOptions?: CompilerOptions;
 
   host?: virtualFs.Host<fs.Stats>;
   platformTransformers?: ts.TransformerFactory<ts.SourceFile>[];