diff --git a/packages/@angular/cli/models/webpack-xi18n-config.ts b/packages/@angular/cli/models/webpack-xi18n-config.ts index 7699492b865b..d46ba6c3f48d 100644 --- a/packages/@angular/cli/models/webpack-xi18n-config.ts +++ b/packages/@angular/cli/models/webpack-xi18n-config.ts @@ -37,6 +37,6 @@ export class XI18nWebpackConfig extends NgCliWebpackConfig { this.extractOptions.i18nFormat); this.config = webpackMerge([this.config, extractI18nConfig]); - return this.config(); + return this.config; } } diff --git a/packages/@angular/cli/tasks/extract-i18n.ts b/packages/@angular/cli/tasks/extract-i18n.ts index 4fdea3d210a5..5ec1df3d5bcb 100644 --- a/packages/@angular/cli/tasks/extract-i18n.ts +++ b/packages/@angular/cli/tasks/extract-i18n.ts @@ -24,7 +24,7 @@ export const Extracti18nTask = Task.extend({ i18nFormat: runTaskOptions.i18nFormat, verbose: runTaskOptions.verbose, progress: runTaskOptions.progress - }).config; + }).buildConfig(); const webpackCompiler = webpack(config); diff --git a/tests/e2e/tests/build/styles/imports.ts b/tests/e2e/tests/build/styles/imports.ts index 99d98dec8407..5d7d71b7f077 100644 --- a/tests/e2e/tests/build/styles/imports.ts +++ b/tests/e2e/tests/build/styles/imports.ts @@ -1,6 +1,5 @@ import { writeMultipleFiles, - deleteFile, expectFileToMatch, replaceInFile } from '../../../utils/fs'; @@ -8,8 +7,12 @@ import { expectToFail } from '../../../utils/utils'; import { ng } from '../../../utils/process'; import { stripIndents } from 'common-tags'; import { updateJsonFile } from '../../../utils/project'; +import { getGlobalVariable } from '../../../utils/env'; export default function () { + // Disable parts of it in webpack tests. + const ejected = getGlobalVariable('argv').eject; + const extensions = ['css', 'scss', 'less', 'styl']; let promise = Promise.resolve(); @@ -57,7 +60,7 @@ export default function () { .then(() => expectFileToMatch('dist/main.bundle.js', /h1.*background:\s*#000+/)) // Also check imports work on ng test - .then(() => ng('test', '--single-run')) + .then(() => !ejected && ng('test', '--single-run')) // change files back .then(() => updateJsonFile('.angular-cli.json', configJson => { const app = configJson['apps'][0];