Fix e2e tests after rebase master

Author: cladera

packages/@ngtools/webpack/src/extract_i18n_plugin.ts

@@ -28,7 +28,7 @@ export class ExtractI18nPlugin implements Tapable {
   private _rootFilePath: string[];
   private _compilerOptions: any = null;
   private _angularCompilerOptions: any = null;
-  //private _compilerHost: WebpackCompilerHost;
+  // private _compilerHost: WebpackCompilerHost;
   private _compilerHost: ts.CompilerHost;
   private _program: ts.Program;
 
@@ -94,12 +94,10 @@ export class ExtractI18nPlugin implements Tapable {
     // By default messages will be generated in basePath
     let genDir = basePath;
 
-    if(options.hasOwnProperty('genDir')) {
+    if (options.hasOwnProperty('genDir')) {
       genDir = path.resolve(process.cwd(), options.genDir);
     }
 
-    console.log(genDir);
-
     this._compilerOptions = tsConfig.options;
     this._angularCompilerOptions = Object.assign(
       { genDir },
@@ -111,7 +109,7 @@ export class ExtractI18nPlugin implements Tapable {
     this._basePath = basePath;
     this._genDir = genDir;
 
-    //this._compilerHost = new WebpackCompilerHost(this._compilerOptions, this._basePath);
+    // this._compilerHost = new WebpackCompilerHost(this._compilerOptions, this._basePath);
     this._compilerHost = ts.createCompilerHost(this._compilerOptions, true);
     this._program = ts.createProgram(
       this._rootFilePath, this._compilerOptions, this._compilerHost);
@@ -136,8 +134,9 @@ export class ExtractI18nPlugin implements Tapable {
 
   private _make(compilation: any, cb: (err?: any, request?: any) => void) {
     this._compilation = compilation;
-    if(this._compilation._ngToolsWebpackXi18nPluginInstance) {
-      return cb(new Error('An @ngtools/webpack xi18n plugin already exist for this compilation.'));
+    if (this._compilation._ngToolsWebpackXi18nPluginInstance) {
+      return cb(new Error('An @ngtools/webpack xi18n plugin already exist for ' +
+        'this compilation.'));
     }
 
     this._compilation._ngToolsWebpackXi18nPluginInstance = this;

packages/@ngtools/webpack/src/index.ts

@@ -1,5 +1,6 @@
 import 'reflect-metadata';
 
 export * from './plugin';
+export * from './extract_i18n_plugin';
 export {ngcLoader as default} from './loader';
 export {PathsPlugin} from './paths-plugin';

packages/angular-cli/commands/xi18n.ts

@@ -19,7 +19,7 @@ const Xi18nCommand = Command.extend({
       default: 'xlf',
       aliases: ['f', {'xmb': 'xmb'}, {'xlf': 'xlf'}, {'xliff': 'xlf'}]
     },
-    { name: 'output-path',    type: 'Path', default: null, aliases: ['o']},
+    { name: 'output-path',    type: 'Path', default: null, aliases: ['op']},
     { name: 'verbose',        type: Boolean, default: false},
     { name: 'progress',       type: Boolean, default: true }
 

packages/angular-cli/models/webpack-configs/index.ts

@@ -4,3 +4,4 @@ export * from './production';
 export * from './styles';
 export * from './typescript';
 export * from './utils';
+export * from './xi18n';

packages/angular-cli/models/webpack-extract-i18n.ts renamed to packages/angular-cli/models/webpack-configs/xi18n.ts

@@ -1,11 +1,11 @@
 import * as path from 'path';
-import {ExtractI18nPlugin} from '../../@ngtools/webpack/src/extract_i18n_plugin';
+import {ExtractI18nPlugin} from '@ngtools/webpack';
 
 export const getWebpackExtractI18nConfig = function(
   projectRoot: string,
   appConfig: any,
   genDir: string,
-  i18nFormat: string):any {
+  i18nFormat: string): any {
 
   let exclude: string[] = [];
   if (appConfig.test) {
@@ -21,5 +21,5 @@ export const getWebpackExtractI18nConfig = function(
         i18nFormat: i18nFormat
       })
     ]
-  }
+  };
 };

packages/angular-cli/models/webpack-xi18n-config.ts

@@ -3,14 +3,14 @@ import * as path from 'path';
 import {CliConfig} from './config';
 import {NgCliWebpackConfig} from './webpack-config';
 const webpackMerge = require('webpack-merge');
-import {getWebpackExtractI18nConfig} from './webpack-extract-i18n';
+import {getWebpackExtractI18nConfig} from './webpack-configs';
 
 export interface XI18WebpackOptions {
-  genDir?: string,
-  buildDir?: string,
-  i18nFormat?: string,
-  verbose?: boolean,
-  progress?: boolean
+  genDir?: string;
+  buildDir?: string;
+  i18nFormat?: string;
+  verbose?: boolean;
+  progress?: boolean;
 }
 export class XI18nWebpackConfig extends NgCliWebpackConfig {
 

packages/angular-cli/tasks/extract-i18n.ts

@@ -27,7 +27,6 @@ export const Extracti18nTask = Task.extend({
     }).config;
 
     const webpackCompiler = webpack(config);
-    //const statsConfig = getWebpackStatsConfig(runTaskOptions.verbose);
 
     return new Promise((resolve, reject) => {
       const callback: webpack.compiler.CompilerCallback = (err, stats) => {
@@ -50,7 +49,8 @@ export const Extracti18nTask = Task.extend({
       })
       .catch((err: Error) => {
         if (err) {
-          this.ui.writeError('\nAn error occured during the i18n extraction:\n' + ((err && err.stack) || err));
+          this.ui.writeError('\nAn error occured during the i18n extraction:\n'
+            + ((err && err.stack) || err));
         }
         throw err;
       });

tests/e2e/tests/i18n/extract-default.ts

@@ -13,7 +13,7 @@ export default function() {
     .then(() => writeFile(
       join(testComponentDir, 'i18n-test.component.html'),
       '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n'))
+    .then(() => ng('xi18n', '--no-progress'))
     .then(() => expectFileToExist(join('src', 'messages.xlf')))
     .then(() => expectFileToMatch(join('src', 'messages.xlf'), /Hello world/));
 }

tests/e2e/tests/i18n/extract-output.ts

@@ -13,7 +13,7 @@ export default function() {
     .then(() => writeFile(
       join(testComponentDir, 'i18n-test.component.html'),
       '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n -o src/locale'))
+    .then(() => ng('xi18n', '--no-progress', '--output-path', 'src/locale'))
     .then(() => expectFileToExist(join('src', 'locale', 'messages.xlf')))
     .then(() => expectFileToMatch(join('src', 'locale', 'messages.xlf'), /Hello world/));
 }

tests/e2e/tests/i18n/extract-xmb.ts

@@ -13,7 +13,7 @@ export default function() {
     .then(() => writeFile(
       join(testComponentDir, 'i18n-test.component.html'),
       '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n', '--i18n-format=xmb'))
+    .then(() => ng('xi18n', '--no-progress', '--i18n-format', 'xmb'))
     .then(() => expectFileToExist(join('src', 'messages.xmb')))
     .then(() => expectFileToMatch(join('src', 'messages.xmb'), /Hello world/));
 }