;
diff --git a/tests/e2e/tests/build/css-urls.ts b/tests/e2e/tests/build/css-urls.ts
index 4b651631c8..c3561b336a 100644
--- a/tests/e2e/tests/build/css-urls.ts
+++ b/tests/e2e/tests/build/css-urls.ts
@@ -15,8 +15,7 @@ const imgSvg = `
`;
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
// Verify absolute/relative paths in global/component css.
@@ -41,16 +40,16 @@ export default function () {
.then(() => expectFileToMatch('dist/styles.css',
/url\('\/assets\/global-img-absolute\.svg'\)/))
.then(() => expectFileToMatch('dist/styles.css',
- /global-img-relative\.[0-9a-f]{20}\.png/))
+ /global-img-relative\.png/))
.then(() => expectFileToMatch('dist/main.js',
'/assets/component-img-absolute.svg'))
.then(() => expectFileToMatch('dist/main.js',
- /component-img-relative\.[0-9a-f]{20}\.png/))
+ /component-img-relative\.png/))
// Check files are correctly created.
.then(() => expectToFail(() => expectFileToExist('dist/global-img-absolute.svg')))
.then(() => expectToFail(() => expectFileToExist('dist/component-img-absolute.svg')))
- .then(() => expectFileMatchToExist('./dist', /global-img-relative\.[0-9a-f]{20}\.png/))
- .then(() => expectFileMatchToExist('./dist', /component-img-relative\.[0-9a-f]{20}\.png/))
+ .then(() => expectFileMatchToExist('./dist', /global-img-relative\.png/))
+ .then(() => expectFileMatchToExist('./dist', /component-img-relative\.png/))
// Check urls with deploy-url scheme are used as is.
.then(() => ng('build', '--base-href=/base/', '--deploy-url=http://deploy.url/',
'--extract-css'))
@@ -78,31 +77,31 @@ export default function () {
.then(() => expectFileToMatch('dist/styles.css',
'/base/deploy/assets/global-img-absolute.svg'))
.then(() => expectFileToMatch('dist/styles.css',
- /global-img-relative\.[0-9a-f]{20}\.png/))
+ /global-img-relative\.png/))
.then(() => expectFileToMatch('dist/main.js',
'/base/deploy/assets/component-img-absolute.svg'))
.then(() => expectFileToMatch('dist/main.js',
- /deploy\/component-img-relative\.[0-9a-f]{20}\.png/))
+ /deploy\/component-img-relative\.png/))
// Check with identical base-href and deploy-url flags.
.then(() => ng('build', '--base-href=/base/', '--deploy-url=/base/',
'--extract-css', '--aot'))
.then(() => expectFileToMatch('dist/styles.css',
'/base/assets/global-img-absolute.svg'))
.then(() => expectFileToMatch('dist/styles.css',
- /global-img-relative\.[0-9a-f]{20}\.png/))
+ /global-img-relative\.png/))
.then(() => expectFileToMatch('dist/main.js',
'/base/assets/component-img-absolute.svg'))
.then(() => expectFileToMatch('dist/main.js',
- /\/base\/component-img-relative\.[0-9a-f]{20}\.png/))
+ /\/base\/component-img-relative\.png/))
// Check with only base-href flag.
.then(() => ng('build', '--base-href=/base/',
'--extract-css', '--aot'))
.then(() => expectFileToMatch('dist/styles.css',
'/base/assets/global-img-absolute.svg'))
.then(() => expectFileToMatch('dist/styles.css',
- /global-img-relative\.[0-9a-f]{20}\.png/))
+ /global-img-relative\.png/))
.then(() => expectFileToMatch('dist/main.js',
'/base/assets/component-img-absolute.svg'))
.then(() => expectFileToMatch('dist/main.js',
- /component-img-relative\.[0-9a-f]{20}\.png/));
+ /component-img-relative\.png/));
}
diff --git a/tests/e2e/tests/build/delete-output-path.ts b/tests/e2e/tests/build/delete-output-path.ts
index 29aa40f0cb..c59e23ac22 100644
--- a/tests/e2e/tests/build/delete-output-path.ts
+++ b/tests/e2e/tests/build/delete-output-path.ts
@@ -4,8 +4,7 @@ import {deleteFile, expectFileToExist} from '../../utils/fs';
import {getGlobalVariable} from '../../utils/env';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Skip this in ejected tests.
if (getGlobalVariable('argv').eject) {
@@ -16,7 +15,7 @@ export default function() {
// This is supposed to fail since there's a missing file
.then(() => deleteFile('src/app/app.component.ts'))
// The build fails but we don't delete the output of the previous build.
- .then(() => expectToFail(() => ng('build', '--no-delete-output-path')))
+ .then(() => expectToFail(() => ng('build', '--delete-output-path=false')))
.then(() => expectFileToExist('dist'))
// By default, output path is always cleared.
.then(() => expectToFail(() => ng('build')))
diff --git a/tests/e2e/tests/build/deploy-url.ts b/tests/e2e/tests/build/deploy-url.ts
index fed914b2ff..948e62668a 100644
--- a/tests/e2e/tests/build/deploy-url.ts
+++ b/tests/e2e/tests/build/deploy-url.ts
@@ -6,8 +6,7 @@ import { getGlobalVariable } from '../../utils/env';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => writeMultipleFiles({
@@ -19,26 +18,19 @@ export default function () {
.then(() => expectFileToMatch('dist/index.html', 'deployUrl/main.js'))
// verify --deploy-url isn't applied to extracted css urls
.then(() => expectFileToMatch('dist/styles.css',
- /url\(['"]?more\.[0-9a-f]{20}\.png['"]?\)/))
+ /url\(['"]?more\.png['"]?\)/))
.then(() => ng('build', '--deploy-url=http://example.com/some/path/', '--extract-css'))
.then(() => expectFileToMatch('dist/index.html', 'http://example.com/some/path/main.js'))
- // verify option also works in config
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- const app = configJson['apps'][0];
- app['deployUrl'] = 'config-deployUrl/';
- }))
- .then(() => ng('build'))
- .then(() => expectFileToMatch('dist/index.html', 'config-deployUrl/main.js'))
// verify --deploy-url is applied to non-extracted css urls
.then(() => ng('build', '--deploy-url=deployUrl/', '--extract-css=false'))
.then(() => expectFileToMatch('dist/styles.js',
- /\(['"]?deployUrl\/more\.[0-9a-f]{20}\.png['"]?\)/))
+ /\(['"]?deployUrl\/more\.png['"]?\)/))
.then(() => expectFileToMatch('dist/runtime.js',
/__webpack_require__\.p = "deployUrl\/";/))
- // verify slash is appended to the end of --deploy-url if missing
- .then(() => ng('build', '--deploy-url=deployUrl', '--extract-css=false'))
- // skip this in ejected tests
- .then(() => getGlobalVariable('argv').eject
- ? Promise.resolve()
- : expectFileToMatch('dist/runtime.js', /__webpack_require__\.p = "deployUrl\/";/));
+ // // verify slash is appended to the end of --deploy-url if missing
+ // .then(() => ng('build', '--deploy-url=deployUrl', '--extract-css=false'))
+ // // skip this in ejected tests
+ // .then(() => getGlobalVariable('argv').eject
+ // ? Promise.resolve()
+ // : expectFileToMatch('dist/runtime.js', /__webpack_require__\.p = "deployUrl\/";/));
}
diff --git a/tests/e2e/tests/build/dynamic-import.ts b/tests/e2e/tests/build/dynamic-import.ts
index d29f883138..ab3954a8a5 100644
--- a/tests/e2e/tests/build/dynamic-import.ts
+++ b/tests/e2e/tests/build/dynamic-import.ts
@@ -5,7 +5,7 @@ import { updateJsonFile } from '../../utils/project';
export default async function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): lazyModules is not yet handled by the compat layer.
return;
// Add a lazy module
diff --git a/tests/e2e/tests/build/eval-sourcemap.ts b/tests/e2e/tests/build/eval-sourcemap.ts
index 5c4528e8b8..2c62f4b25f 100644
--- a/tests/e2e/tests/build/eval-sourcemap.ts
+++ b/tests/e2e/tests/build/eval-sourcemap.ts
@@ -3,7 +3,7 @@ import {getGlobalVariable} from '../../utils/env';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Dev-server does not yet do this. Fix, reenable, validate, then delete this test.
return;
// Skip this in ejected tests.
diff --git a/tests/e2e/tests/build/extract-licenses.ts b/tests/e2e/tests/build/extract-licenses.ts
index 3f0cec9e4e..bfa2fff7a8 100644
--- a/tests/e2e/tests/build/extract-licenses.ts
+++ b/tests/e2e/tests/build/extract-licenses.ts
@@ -4,8 +4,7 @@ import {expectToFail} from '../../utils/utils';
import {ng} from '../../utils/process';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('build', '--prod', '--extract-licenses=false')
.then(() => expectFileToExist(join(process.cwd(), 'dist')))
diff --git a/tests/e2e/tests/build/filename.ts b/tests/e2e/tests/build/filename.ts
deleted file mode 100644
index 50927523df..0000000000
--- a/tests/e2e/tests/build/filename.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {ng} from '../../utils/process';
-import {expectFileToExist} from '../../utils/fs';
-import {updateJsonFile} from '../../utils/project';
-import {copyFile} from '../../utils/fs';
-
-
-export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
-
- return Promise.resolve()
- .then(() => copyFile('src/index.html', 'src/config-index.html'))
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- const app = configJson['apps'][0];
- app['outDir'] = 'config-build-output';
- app['index'] = 'config-index.html';
- }))
- .then(() => ng('build'))
- .then(() => expectFileToExist('./config-build-output/config-index.html'));
-}
diff --git a/tests/e2e/tests/build/json.ts b/tests/e2e/tests/build/json.ts
index 826b89522f..f54a521101 100644
--- a/tests/e2e/tests/build/json.ts
+++ b/tests/e2e/tests/build/json.ts
@@ -5,8 +5,7 @@ import {getGlobalVariable} from '../../utils/env';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Skip this in ejected tests.
if (getGlobalVariable('argv').eject) {
diff --git a/tests/e2e/tests/build/no-entry-module.ts b/tests/e2e/tests/build/no-entry-module.ts
index 44d8b5ddc6..9b6bed2931 100644
--- a/tests/e2e/tests/build/no-entry-module.ts
+++ b/tests/e2e/tests/build/no-entry-module.ts
@@ -3,8 +3,7 @@ import { ng } from '../../utils/process';
export default async function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
const mainTs = await readFile('src/main.ts');
diff --git a/tests/e2e/tests/build/output-dir.ts b/tests/e2e/tests/build/output-dir.ts
index 3d28d29746..d0cefe7691 100644
--- a/tests/e2e/tests/build/output-dir.ts
+++ b/tests/e2e/tests/build/output-dir.ts
@@ -7,15 +7,14 @@ import {expectToFail} from '../../utils/utils';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Skip this in ejected tests.
if (getGlobalVariable('argv').eject) {
return Promise.resolve();
}
- return ng('build', '--output-path', './build-output')
+ return ng('build', '--output-path', '../build-output')
.then(() => expectFileToExist('./build-output/index.html'))
.then(() => expectFileToExist('./build-output/main.js'))
.then(() => expectToFail(expectGitToBeClean))
diff --git a/tests/e2e/tests/build/output-hashing.ts b/tests/e2e/tests/build/output-hashing.ts
index fc3baace0d..251bbc8ff5 100644
--- a/tests/e2e/tests/build/output-hashing.ts
+++ b/tests/e2e/tests/build/output-hashing.ts
@@ -9,8 +9,7 @@ function verifyMedia(css: RegExp, content: RegExp) {
}
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => writeMultipleFiles({
diff --git a/tests/e2e/tests/build/poll.ts b/tests/e2e/tests/build/poll.ts
index 7341e96ad6..38014637cc 100644
--- a/tests/e2e/tests/build/poll.ts
+++ b/tests/e2e/tests/build/poll.ts
@@ -9,7 +9,8 @@ import {expectToFail, wait} from '../../utils/utils';
const webpackGoodRegEx = /: Compiled successfully./;
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+ // It seems to be because of file watchers.
return;
@@ -22,7 +23,7 @@ export default function() {
}
- return execAndWaitForOutputToMatch('ng', ['serve', '--poll=10000'], webpackGoodRegEx)
+ return execAndWaitForOutputToMatch('ng', ['build', '--watch', '--poll=10000'], webpackGoodRegEx)
// Wait before editing a file.
// Editing too soon seems to trigger a rebuild and throw polling out of whack.
.then(() => wait(3000))
diff --git a/tests/e2e/tests/build/polyfills.ts b/tests/e2e/tests/build/polyfills.ts
index c0f19cd69a..02e200771a 100644
--- a/tests/e2e/tests/build/polyfills.ts
+++ b/tests/e2e/tests/build/polyfills.ts
@@ -3,8 +3,7 @@ import { ng } from '../../utils/process';
import { oneLineTrim } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => ng('build'))
diff --git a/tests/e2e/tests/build/prod-build.ts b/tests/e2e/tests/build/prod-build.ts
index b4643ef77a..7d5dbabd45 100644
--- a/tests/e2e/tests/build/prod-build.ts
+++ b/tests/e2e/tests/build/prod-build.ts
@@ -7,15 +7,14 @@ import {getGlobalVariable} from '../../utils/env';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Skip this in ejected tests.
const ejected = getGlobalVariable('argv').eject;
// Can't use the `ng` helper because somewhere the environment gets
// stuck to the first build done
- return ng('build', '--optimization-level', '1')
+ return ng('build', '--prod')
.then(() => expectFileToExist(join(process.cwd(), 'dist')))
// Check for cache busting hash script src
.then(() => expectFileToMatch('dist/index.html', /main\.[0-9a-f]{20}\.js/))
diff --git a/tests/e2e/tests/build/rebuild-css-change.ts b/tests/e2e/tests/build/rebuild-css-change.ts
index 6f284a9c65..18fc1a2873 100644
--- a/tests/e2e/tests/build/rebuild-css-change.ts
+++ b/tests/e2e/tests/build/rebuild-css-change.ts
@@ -9,8 +9,7 @@ import {getGlobalVariable} from '../../utils/env';
const webpackGoodRegEx = /: Compiled successfully./;
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
if (process.platform.startsWith('win')) {
return Promise.resolve();
diff --git a/tests/e2e/tests/build/rebuild-deps-type-check.ts b/tests/e2e/tests/build/rebuild-deps-type-check.ts
index e3968cdcba..299a797ebd 100644
--- a/tests/e2e/tests/build/rebuild-deps-type-check.ts
+++ b/tests/e2e/tests/build/rebuild-deps-type-check.ts
@@ -13,8 +13,7 @@ const errorRe = /ERROR in/;
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
if (process.platform.startsWith('win')) {
return Promise.resolve();
diff --git a/tests/e2e/tests/build/rebuild-error.ts b/tests/e2e/tests/build/rebuild-error.ts
index 14dfbd49ea..a3b7fd7348 100644
--- a/tests/e2e/tests/build/rebuild-error.ts
+++ b/tests/e2e/tests/build/rebuild-error.ts
@@ -18,7 +18,8 @@ const extraErrors = [
];
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+ // It seems to be because of file watchers.
return;
if (process.platform.startsWith('win')) {
@@ -43,7 +44,7 @@ export default function () {
// Add a major static analysis error on a non-main file to the initial build.
.then(() => replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`))
// Should have an error.
- .then(() => execAndWaitForOutputToMatch('ng', ['serve', '--aot'], failedRe))
+ .then(() => execAndWaitForOutputToMatch('ng', ['build', '--watch', '--aot'], failedRe))
.then((results) => {
const stderr = results.stderr;
if (!stderr.includes('Function calls are not supported')
diff --git a/tests/e2e/tests/build/rebuild-ngfactories.ts b/tests/e2e/tests/build/rebuild-ngfactories.ts
index 4611f25932..875833efb5 100644
--- a/tests/e2e/tests/build/rebuild-ngfactories.ts
+++ b/tests/e2e/tests/build/rebuild-ngfactories.ts
@@ -3,14 +3,14 @@ import {
waitForAnyProcessOutputToMatch,
execAndWaitForOutputToMatch,
} from '../../utils/process';
-import { appendToFile, writeMultipleFiles, replaceInFile } from '../../utils/fs';
-import { request } from '../../utils/http';
+import { appendToFile, writeMultipleFiles, replaceInFile, expectFileToMatch } from '../../utils/fs';
import { getGlobalVariable } from '../../utils/env';
const validBundleRegEx = /: Compiled successfully./;
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+ // It seems to be because of file watchers.
return;
if (process.platform.startsWith('win')) {
@@ -26,7 +26,7 @@ export default function () {
return Promise.resolve();
}
- return execAndWaitForOutputToMatch('ng', ['serve', '--aot'], validBundleRegEx)
+ return execAndWaitForOutputToMatch('ng', ['build', '--watch', '--aot'], validBundleRegEx)
.then(() => writeMultipleFiles({
'src/app/app.component.css': `
@import './imported-styles.css';
@@ -49,53 +49,24 @@ export default function () {
waitForAnyProcessOutputToMatch(validBundleRegEx, 10000),
appendToFile('src/app/app.component.html', 'HTML_REBUILD_STRING
')
]))
- .then(() => request('http://localhost:4200/main.js'))
- .then((body) => {
- if (!body.match(/HTML_REBUILD_STRING/)) {
- throw new Error('Expected HTML_REBUILD_STRING but it wasn\'t in bundle.');
- }
- })
+ .then(() => expectFileToMatch('dist/main.js', 'HTML_REBUILD_STRING'))
// Check if css changes are built.
.then(() => Promise.all([
waitForAnyProcessOutputToMatch(validBundleRegEx, 10000),
appendToFile('src/app/app.component.css', 'CSS_REBUILD_STRING {color: #f00;}')
]))
- .then(() => request('http://localhost:4200/main.js'))
- .then((body) => {
- if (!body.match(/CSS_REBUILD_STRING/)) {
- throw new Error('Expected CSS_REBUILD_STRING but it wasn\'t in bundle.');
- }
- })
+ .then(() => expectFileToMatch('dist/main.js', 'CSS_REBUILD_STRING'))
// Check if css dependency changes are built.
.then(() => Promise.all([
waitForAnyProcessOutputToMatch(validBundleRegEx, 10000),
appendToFile('src/app/imported-styles.css', 'CSS_DEP_REBUILD_STRING {color: #f00;}')
]))
- .then(() => request('http://localhost:4200/main.js'))
- .then((body) => {
- if (!body.match(/CSS_DEP_REBUILD_STRING/)) {
- throw new Error('Expected CSS_DEP_REBUILD_STRING but it wasn\'t in bundle.');
- }
- })
- .then(() => {
- // Skip this part of the test in Angular 2/4.
- if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
- return Promise.resolve();
- }
-
- // Check if component metadata changes are built.
- return Promise.resolve()
- .then(() => Promise.all([
- waitForAnyProcessOutputToMatch(validBundleRegEx, 10000),
- replaceInFile('src/app/app.component.ts', 'app-root', 'app-root-FACTORY_REBUILD_STRING')
- ]))
- .then(() => request('http://localhost:4200/main.js'))
- .then((body) => {
- if (!body.match(/FACTORY_REBUILD_STRING/)) {
- throw new Error('Expected FACTORY_REBUILD_STRING but it wasn\'t in bundle.');
- }
- });
- })
+ .then(() => expectFileToMatch('dist/main.js', 'CSS_DEP_REBUILD_STRING'))
+ .then(() => Promise.all([
+ waitForAnyProcessOutputToMatch(validBundleRegEx, 10000),
+ replaceInFile('src/app/app.component.ts', 'app-root', 'app-root-FACTORY_REBUILD_STRING')
+ ]))
+ .then(() => expectFileToMatch('dist/main.js', 'FACTORY_REBUILD_STRING'))
.then(() => killAllProcesses(), (err: any) => {
killAllProcesses();
throw err;
diff --git a/tests/e2e/tests/build/rebuild-types.ts b/tests/e2e/tests/build/rebuild-types.ts
index 7ef1dc2cd4..6d0ecf9dbf 100644
--- a/tests/e2e/tests/build/rebuild-types.ts
+++ b/tests/e2e/tests/build/rebuild-types.ts
@@ -10,8 +10,7 @@ import {getGlobalVariable} from '../../utils/env';
const successRe = /: Compiled successfully/;
export default async function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
if (process.platform.startsWith('win')) {
return;
diff --git a/tests/e2e/tests/build/script-target.ts b/tests/e2e/tests/build/script-target.ts
index a44873f466..13de6b4482 100644
--- a/tests/e2e/tests/build/script-target.ts
+++ b/tests/e2e/tests/build/script-target.ts
@@ -5,8 +5,7 @@ import { getGlobalVariable } from '../../utils/env';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Skip this test in Angular 2, it had different bundles.
if (getGlobalVariable('argv').ng2) {
diff --git a/tests/e2e/tests/build/sourcemap.ts b/tests/e2e/tests/build/sourcemap.ts
index a75d22f1fa..699ecfe0cd 100644
--- a/tests/e2e/tests/build/sourcemap.ts
+++ b/tests/e2e/tests/build/sourcemap.ts
@@ -4,8 +4,7 @@ import {expectToFail} from '../../utils/utils';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('build', '--source-map')
.then(() => expectFileToExist('dist/main.js.map'))
diff --git a/tests/e2e/tests/build/styles/empty-style-urls.ts b/tests/e2e/tests/build/styles/empty-style-urls.ts
index 4542bd2d50..1ff15af2b2 100644
--- a/tests/e2e/tests/build/styles/empty-style-urls.ts
+++ b/tests/e2e/tests/build/styles/empty-style-urls.ts
@@ -3,8 +3,7 @@ import { ng } from '../../../utils/process';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
// Write assets.
diff --git a/tests/e2e/tests/build/styles/extract-css.ts b/tests/e2e/tests/build/styles/extract-css.ts
index dbe2221920..d6048fede4 100644
--- a/tests/e2e/tests/build/styles/extract-css.ts
+++ b/tests/e2e/tests/build/styles/extract-css.ts
@@ -9,8 +9,7 @@ import { expectToFail } from '../../../utils/utils';
import { oneLineTrim } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => writeMultipleFiles({
diff --git a/tests/e2e/tests/build/styles/imports.ts b/tests/e2e/tests/build/styles/imports.ts
index bb8d93a598..768bf7136b 100644
--- a/tests/e2e/tests/build/styles/imports.ts
+++ b/tests/e2e/tests/build/styles/imports.ts
@@ -10,8 +10,7 @@ import { updateJsonFile } from '../../../utils/project';
import { getGlobalVariable } from '../../../utils/env';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Disable parts of it in webpack tests.
const ejected = getGlobalVariable('argv').eject;
diff --git a/tests/e2e/tests/build/styles/include-paths.ts b/tests/e2e/tests/build/styles/include-paths.ts
index 6d0b5070fe..5568c3f970 100644
--- a/tests/e2e/tests/build/styles/include-paths.ts
+++ b/tests/e2e/tests/build/styles/include-paths.ts
@@ -8,7 +8,7 @@ import { ng } from '../../../utils/process';
import { updateJsonFile } from '../../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): The compat layer doesn't yet process `includePaths`.
return;
return Promise.resolve()
diff --git a/tests/e2e/tests/build/styles/inline-urls.ts b/tests/e2e/tests/build/styles/inline-urls.ts
index 8efa22ee82..256ee44d5e 100644
--- a/tests/e2e/tests/build/styles/inline-urls.ts
+++ b/tests/e2e/tests/build/styles/inline-urls.ts
@@ -16,8 +16,7 @@ const imgSvg = `
`;
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => silentNpm('install', 'font-awesome@4.7.0'))
@@ -50,17 +49,17 @@ export default function () {
})
// Check paths are correctly generated.
.then(() => expectFileToMatch('dist/styles.css',
- /url\(['"]?large\.[0-9a-f]{20}\.png['"]?\),\s+linear-gradient\(to bottom, #0e40fa 25%, #0654f4 75%\);/))
+ /url\(['"]?large\.png['"]?\),\s+linear-gradient\(to bottom, #0e40fa 25%, #0654f4 75%\);/))
.then(() => expectFileToMatch('dist/styles.css',
/url\(\\?['"]data:image\/svg\+xml/))
.then(() => expectFileToMatch('dist/styles.css',
- /url\(['"]?small-id\.[0-9a-f]{20}\.svg#testID['"]?\)/))
+ /url\(['"]?small-id\.svg#testID['"]?\)/))
.then(() => expectFileToMatch('dist/main.js',
/url\(\\?['"]data:image\/svg\+xml/))
.then(() => expectFileToMatch('dist/main.js',
- /url\((?:['"]|\\')?large\.[0-9a-f]{20}\.png(?:['"]|\\')?\)/))
+ /url\((?:['"]|\\')?large\.png(?:['"]|\\')?\)/))
// Check files are correctly created.
.then(() => expectToFail(() => expectFileToExist('dist/small.svg')))
- .then(() => expectFileMatchToExist('./dist', /large\.[0-9a-f]{20}\.png/))
- .then(() => expectFileMatchToExist('./dist', /small-id\.[0-9a-f]{20}\.svg/));
+ .then(() => expectFileMatchToExist('./dist', /large\.png/))
+ .then(() => expectFileMatchToExist('./dist', /small-id\.svg/));
}
diff --git a/tests/e2e/tests/build/styles/less.ts b/tests/e2e/tests/build/styles/less.ts
index e60e16b9ae..6b4db2a925 100644
--- a/tests/e2e/tests/build/styles/less.ts
+++ b/tests/e2e/tests/build/styles/less.ts
@@ -10,8 +10,7 @@ import { stripIndents } from 'common-tags';
import { updateJsonFile } from '../../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return writeMultipleFiles({
'src/styles.less': stripIndents`
diff --git a/tests/e2e/tests/build/styles/loaders.ts b/tests/e2e/tests/build/styles/loaders.ts
index 5fc9c9cb3e..38c78f856c 100644
--- a/tests/e2e/tests/build/styles/loaders.ts
+++ b/tests/e2e/tests/build/styles/loaders.ts
@@ -10,8 +10,7 @@ import { updateJsonFile } from '../../../utils/project';
import { expectToFail } from '../../../utils/utils';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return writeMultipleFiles({
'src/styles.scss': stripIndents`
diff --git a/tests/e2e/tests/build/styles/material-import.ts b/tests/e2e/tests/build/styles/material-import.ts
index bfd12a9771..0871617ba2 100644
--- a/tests/e2e/tests/build/styles/material-import.ts
+++ b/tests/e2e/tests/build/styles/material-import.ts
@@ -7,8 +7,7 @@ import { stripIndents } from 'common-tags';
import { updateJsonFile } from '../../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
const extensions = ['css', 'scss', 'less', 'styl'];
let promise: Promise = Promise.resolve()
diff --git a/tests/e2e/tests/build/styles/postcss.ts b/tests/e2e/tests/build/styles/postcss.ts
index 790f31561b..29e26eae0a 100644
--- a/tests/e2e/tests/build/styles/postcss.ts
+++ b/tests/e2e/tests/build/styles/postcss.ts
@@ -4,8 +4,7 @@ import { ng } from '../../../utils/process';
import { stripIndents } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return writeFile('src/styles.css', stripIndents`
/* normal-comment */
@@ -20,7 +19,7 @@ export default function () {
div { -webkit-box-flex: 1; -ms-flex: 1; flex: 1 }
`))
// uses postcss-discard-comments plugin for prod
- .then(() => ng('build', '--optimization-level', '1'))
+ .then(() => ng('build', '--prod'))
.then(() => glob.sync('dist/styles.*.css').find(file => !!file))
.then((stylesBundle) => expectFileToMatch(stylesBundle, stripIndents`
/*! important-comment */div{-webkit-box-flex:1;-ms-flex:1;flex:1}
diff --git a/tests/e2e/tests/build/styles/scss.ts b/tests/e2e/tests/build/styles/scss.ts
index 7a3545f409..371489f028 100644
--- a/tests/e2e/tests/build/styles/scss.ts
+++ b/tests/e2e/tests/build/styles/scss.ts
@@ -10,8 +10,7 @@ import { stripIndents } from 'common-tags';
import { updateJsonFile } from '../../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return writeMultipleFiles({
'src/styles.scss': stripIndents`
diff --git a/tests/e2e/tests/build/styles/stylus.ts b/tests/e2e/tests/build/styles/stylus.ts
index 154fc169dd..5636834f4e 100644
--- a/tests/e2e/tests/build/styles/stylus.ts
+++ b/tests/e2e/tests/build/styles/stylus.ts
@@ -10,8 +10,7 @@ import { stripIndents } from 'common-tags';
import { updateJsonFile } from '../../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return writeMultipleFiles({
'src/styles.styl': stripIndents`
diff --git a/tests/e2e/tests/build/subresource-integrity.ts b/tests/e2e/tests/build/subresource-integrity.ts
index e931c55635..a9423a4934 100644
--- a/tests/e2e/tests/build/subresource-integrity.ts
+++ b/tests/e2e/tests/build/subresource-integrity.ts
@@ -5,8 +5,7 @@ import { expectToFail } from '../../utils/utils';
const integrityRe = /integrity="\w+-[A-Za-z0-9\/\+=]+"/;
export default async function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// WEBPACK4_DISABLED - disabled pending a webpack 4 version
return;
diff --git a/tests/e2e/tests/build/ts-paths.ts b/tests/e2e/tests/build/ts-paths.ts
index a7a2bf81e2..ed32738ab5 100644
--- a/tests/e2e/tests/build/ts-paths.ts
+++ b/tests/e2e/tests/build/ts-paths.ts
@@ -5,8 +5,7 @@ import {stripIndents} from 'common-tags';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return updateTsConfig(json => {
json['compilerOptions']['baseUrl'] = './';
diff --git a/tests/e2e/tests/build/vendor-chunk.ts b/tests/e2e/tests/build/vendor-chunk.ts
index 84577e5a2a..77f05f6b72 100644
--- a/tests/e2e/tests/build/vendor-chunk.ts
+++ b/tests/e2e/tests/build/vendor-chunk.ts
@@ -4,11 +4,10 @@ import {expectToFail} from '../../utils/utils';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('build')
.then(() => expectFileToExist('dist/vendor.js'))
- .then(() => ng('build', '--no-vendor-chunk'))
+ .then(() => ng('build', '--vendor-chunk=false'))
.then(() => expectToFail(() => expectFileToExist('dist/vendor.js')));
}
diff --git a/tests/e2e/tests/build/watch.ts b/tests/e2e/tests/build/watch.ts
index c07f20bd48..ea462cb2f9 100644
--- a/tests/e2e/tests/build/watch.ts
+++ b/tests/e2e/tests/build/watch.ts
@@ -10,7 +10,8 @@ import { expectToFail } from '../../utils/utils';
const webpackGoodRegEx = /: Compiled successfully./;
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+ // It seems to be because of file watchers.
return;
if (process.platform.startsWith('win')) {
diff --git a/tests/e2e/tests/commands/build/build-outdir.ts b/tests/e2e/tests/commands/build/build-outdir.ts
index 38a50b3129..7c83d3de9d 100644
--- a/tests/e2e/tests/commands/build/build-outdir.ts
+++ b/tests/e2e/tests/commands/build/build-outdir.ts
@@ -3,7 +3,7 @@ import {updateJsonFile} from '../../../utils/project';
import {expectToFail} from '../../../utils/utils';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This isn't working correctly in devkit/build-webpack, due to module resolution.
return;
return Promise.resolve()
diff --git a/tests/e2e/tests/commands/serve/serve-path.ts b/tests/e2e/tests/commands/serve/serve-path.ts
index 20afa7b8a3..a39e8214c0 100644
--- a/tests/e2e/tests/commands/serve/serve-path.ts
+++ b/tests/e2e/tests/commands/serve/serve-path.ts
@@ -3,8 +3,7 @@ import { killAllProcesses } from '../../../utils/process';
import { ngServe } from '../../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => ngServe('--serve-path', 'test/'))
@@ -21,12 +20,12 @@ export default function () {
}
})
.then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
- .then(() => ngServe('--base-href', 'test/'))
- .then(() => request('http://localhost:4200/test'))
- .then(body => {
- if (!body.match(/<\/app-root>/)) {
- throw new Error('Response does not match expected value.');
- }
- })
- .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; });
+ // .then(() => ngServe('--base-href', 'test/'))
+ // .then(() => request('http://localhost:4200/test'))
+ // .then(body => {
+ // if (!body.match(/<\/app-root>/)) {
+ // throw new Error('Response does not match expected value.');
+ // }
+ // })
+ // .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; });
}
diff --git a/tests/e2e/tests/i18n/build-locale.ts b/tests/e2e/tests/i18n/build-locale.ts
index e40ae9d6c3..ba5fda4a91 100644
--- a/tests/e2e/tests/i18n/build-locale.ts
+++ b/tests/e2e/tests/i18n/build-locale.ts
@@ -4,8 +4,7 @@ import { getGlobalVariable } from '../../utils/env';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Skip this test in Angular 2/4.
if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
diff --git a/tests/e2e/tests/i18n/extract-default.ts b/tests/e2e/tests/i18n/extract-default.ts
index 206933f226..0cdb1f3637 100644
--- a/tests/e2e/tests/i18n/extract-default.ts
+++ b/tests/e2e/tests/i18n/extract-default.ts
@@ -7,8 +7,7 @@ import {
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('generate', 'component', 'i18n-test')
.then(() => writeFile(
diff --git a/tests/e2e/tests/i18n/extract-errors.ts b/tests/e2e/tests/i18n/extract-errors.ts
index 28b466ce70..5e8ab15947 100644
--- a/tests/e2e/tests/i18n/extract-errors.ts
+++ b/tests/e2e/tests/i18n/extract-errors.ts
@@ -4,8 +4,7 @@ import { expectToFail } from '../../utils/utils';
import { join } from 'path';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('generate', 'component', 'i18n-test')
.then(() => writeFile(
diff --git a/tests/e2e/tests/i18n/extract-locale.ts b/tests/e2e/tests/i18n/extract-locale.ts
index 1381632a90..710038695f 100644
--- a/tests/e2e/tests/i18n/extract-locale.ts
+++ b/tests/e2e/tests/i18n/extract-locale.ts
@@ -4,8 +4,7 @@ import { writeFile, expectFileToMatch } from '../../utils/fs';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('generate', 'component', 'i18n-test')
.then(() => writeFile(
diff --git a/tests/e2e/tests/i18n/extract-outfile.ts b/tests/e2e/tests/i18n/extract-outfile.ts
index 270a7d836c..add259100c 100644
--- a/tests/e2e/tests/i18n/extract-outfile.ts
+++ b/tests/e2e/tests/i18n/extract-outfile.ts
@@ -4,8 +4,7 @@ import { writeFile, expectFileToMatch } from '../../utils/fs';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('generate', 'component', 'i18n-test')
.then(() => writeFile(
diff --git a/tests/e2e/tests/i18n/extract-xmb.ts b/tests/e2e/tests/i18n/extract-xmb.ts
index a06cc9cd6d..191450b12b 100644
--- a/tests/e2e/tests/i18n/extract-xmb.ts
+++ b/tests/e2e/tests/i18n/extract-xmb.ts
@@ -7,8 +7,7 @@ import {
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('generate', 'component', 'i18n-test')
.then(() => writeFile(
diff --git a/tests/e2e/tests/lint/lint-no-config-section.ts b/tests/e2e/tests/lint/lint-no-config-section.ts
index 92bc79c6c3..a74a663384 100644
--- a/tests/e2e/tests/lint/lint-no-config-section.ts
+++ b/tests/e2e/tests/lint/lint-no-config-section.ts
@@ -2,7 +2,7 @@ import { ng } from '../../utils/process';
import { oneLine } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
return Promise.resolve()
diff --git a/tests/e2e/tests/lint/lint-no-project.ts b/tests/e2e/tests/lint/lint-no-project.ts
index aa1095e021..e9a679ae90 100644
--- a/tests/e2e/tests/lint/lint-no-project.ts
+++ b/tests/e2e/tests/lint/lint-no-project.ts
@@ -5,7 +5,7 @@ import { oneLine } from 'common-tags';
import { updateJsonFile } from '../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
return Promise.resolve()
diff --git a/tests/e2e/tests/lint/lint-with-exclude.ts b/tests/e2e/tests/lint/lint-with-exclude.ts
index 3239f20b37..751646a91d 100644
--- a/tests/e2e/tests/lint/lint-with-exclude.ts
+++ b/tests/e2e/tests/lint/lint-with-exclude.ts
@@ -3,7 +3,7 @@ import { writeFile } from '../../utils/fs';
import { oneLine } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo.ts';
diff --git a/tests/e2e/tests/lint/lint-with-fix.ts b/tests/e2e/tests/lint/lint-with-fix.ts
index 5cd787f407..07d7575ccd 100644
--- a/tests/e2e/tests/lint/lint-with-fix.ts
+++ b/tests/e2e/tests/lint/lint-with-fix.ts
@@ -2,7 +2,7 @@ import { ng } from '../../utils/process';
import { readFile, writeFile } from '../../utils/fs';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo.ts';
diff --git a/tests/e2e/tests/lint/lint-with-force.ts b/tests/e2e/tests/lint/lint-with-force.ts
index 0af12b26b1..524524662e 100644
--- a/tests/e2e/tests/lint/lint-with-force.ts
+++ b/tests/e2e/tests/lint/lint-with-force.ts
@@ -3,7 +3,7 @@ import { writeFile } from '../../utils/fs';
import { oneLine } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo.ts';
diff --git a/tests/e2e/tests/lint/lint-with-format-by-aliases.ts b/tests/e2e/tests/lint/lint-with-format-by-aliases.ts
index b47b12212e..ea2d8039b5 100644
--- a/tests/e2e/tests/lint/lint-with-format-by-aliases.ts
+++ b/tests/e2e/tests/lint/lint-with-format-by-aliases.ts
@@ -3,7 +3,7 @@ import { writeFile } from '../../utils/fs';
import { oneLine } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo.ts';
diff --git a/tests/e2e/tests/lint/lint-with-format.ts b/tests/e2e/tests/lint/lint-with-format.ts
index e5be87172c..11356722f3 100644
--- a/tests/e2e/tests/lint/lint-with-format.ts
+++ b/tests/e2e/tests/lint/lint-with-format.ts
@@ -3,7 +3,7 @@ import { writeFile } from '../../utils/fs';
import { oneLine } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo.ts';
diff --git a/tests/e2e/tests/lint/lint-with-nested-configs.ts b/tests/e2e/tests/lint/lint-with-nested-configs.ts
index 9a4675400c..c359dc7026 100644
--- a/tests/e2e/tests/lint/lint-with-nested-configs.ts
+++ b/tests/e2e/tests/lint/lint-with-nested-configs.ts
@@ -4,7 +4,7 @@ import { expectToFail } from '../../utils/utils';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo/foo.ts';
diff --git a/tests/e2e/tests/lint/lint-with-non-project.ts b/tests/e2e/tests/lint/lint-with-non-project.ts
index d31502a020..232d0071b3 100644
--- a/tests/e2e/tests/lint/lint-with-non-project.ts
+++ b/tests/e2e/tests/lint/lint-with-non-project.ts
@@ -2,7 +2,7 @@ import { ng } from '../../utils/process';
import { expectToFail } from '../../utils/utils';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
return Promise.resolve()
diff --git a/tests/e2e/tests/lint/lint-with-type-check-fail.ts b/tests/e2e/tests/lint/lint-with-type-check-fail.ts
index 8aedbf9f7a..0b69944eb7 100644
--- a/tests/e2e/tests/lint/lint-with-type-check-fail.ts
+++ b/tests/e2e/tests/lint/lint-with-type-check-fail.ts
@@ -4,7 +4,7 @@ import { writeFile } from '../../utils/fs';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo.ts';
diff --git a/tests/e2e/tests/lint/lint-with-type-check.ts b/tests/e2e/tests/lint/lint-with-type-check.ts
index 2d0e72de1c..db9668637c 100644
--- a/tests/e2e/tests/lint/lint-with-type-check.ts
+++ b/tests/e2e/tests/lint/lint-with-type-check.ts
@@ -3,7 +3,7 @@ import { writeFile } from '../../utils/fs';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out how this test should look like post devkit/build-webpack.
return;
const fileName = 'src/app/foo.ts';
diff --git a/tests/e2e/tests/lint/lint.ts b/tests/e2e/tests/lint/lint.ts
index 56a31073fd..048f887d89 100644
--- a/tests/e2e/tests/lint/lint.ts
+++ b/tests/e2e/tests/lint/lint.ts
@@ -2,8 +2,7 @@ import { ng } from '../../utils/process';
import { oneLine } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return ng('lint')
.then(({ stdout }) => {
diff --git a/tests/e2e/tests/misc/assets.ts b/tests/e2e/tests/misc/assets.ts
index f742209c58..625d8353a5 100644
--- a/tests/e2e/tests/misc/assets.ts
+++ b/tests/e2e/tests/misc/assets.ts
@@ -5,8 +5,7 @@ import {expectToFail} from '../../utils/utils';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return writeFile('src/assets/.file', '')
.then(() => writeFile('src/assets/test.abc', 'hello world'))
diff --git a/tests/e2e/tests/misc/circular-dependency.ts b/tests/e2e/tests/misc/circular-dependency.ts
index 68d8e090a0..f939f87880 100644
--- a/tests/e2e/tests/misc/circular-dependency.ts
+++ b/tests/e2e/tests/misc/circular-dependency.ts
@@ -3,8 +3,7 @@ import { ng } from '../../utils/process';
export default async function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
await prependToFile('src/app/app.component.ts',
`import { AppModule } from './app.module'; console.log(AppModule);`);
@@ -12,10 +11,4 @@ export default async function () {
if (!output.stdout.match(/WARNING in Circular dependency detected/)) {
throw new Error('Expected to have circular dependency warning in output.');
}
-
- await ng('config', 'defaults.build.showCircularDependencies', 'false');
- output = await ng('build');
- if (output.stdout.match(/WARNING in Circular dependency detected/)) {
- throw new Error('Expected to not have circular dependency warning in output.');
- }
}
diff --git a/tests/e2e/tests/misc/common-async.ts b/tests/e2e/tests/misc/common-async.ts
index dc299e6b6b..dac72ccd10 100644
--- a/tests/e2e/tests/misc/common-async.ts
+++ b/tests/e2e/tests/misc/common-async.ts
@@ -7,7 +7,8 @@ import {expectToFail} from '../../utils/utils';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): The common chunk seems to have a different name in devkit/build-webpack.
+ // Investigate, validate, then delete this test.
return;
return Promise.resolve();
diff --git a/tests/e2e/tests/misc/coverage.ts b/tests/e2e/tests/misc/coverage.ts
index 353964a22e..1921ec1650 100644
--- a/tests/e2e/tests/misc/coverage.ts
+++ b/tests/e2e/tests/misc/coverage.ts
@@ -5,7 +5,8 @@ import {ng} from '../../utils/process';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This test is broken in devkit/build-webpack, istanbul and
+ // istanbul-instrumenter-loader are missing from the dependencies.
return;
return ng('test', '--watch=false', '--code-coverage')
diff --git a/tests/e2e/tests/misc/default-port.ts b/tests/e2e/tests/misc/default-port.ts
deleted file mode 100644
index 1ae62c3b25..0000000000
--- a/tests/e2e/tests/misc/default-port.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { request } from '../../utils/http';
-import { killAllProcesses } from '../../utils/process';
-import { ngServe } from '../../utils/project';
-import { updateJsonFile } from '../../utils/project';
-
-
-export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
-
- return Promise.resolve()
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- const app = configJson.defaults;
- app.serve = { port: 4201 };
- }))
- .then(() => ngServe())
- .then(() => request('http://localhost:4201/'))
- .then(body => {
- if (!body.match(/<\/app-root>/)) {
- throw new Error('Response does not match expected value.');
- }
- })
- .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; });
-}
diff --git a/tests/e2e/tests/misc/deploy-url.ts b/tests/e2e/tests/misc/deploy-url.ts
deleted file mode 100644
index 177e1c23f6..0000000000
--- a/tests/e2e/tests/misc/deploy-url.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { killAllProcesses } from '../../utils/process';
-import { request } from '../../utils/http';
-import { ngServe, updateJsonFile } from '../../utils/project';
-import { writeMultipleFiles } from '../../utils/fs';
-
-export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
-
- return Promise.resolve()
- .then(() => writeMultipleFiles({
- 'src/string-script.js': 'console.log(\'string-script\'); var number = 1+1;',
- })
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- configJson['apps'][0]['scripts'] = [
- 'string-script.js',
- ];
- }))
- // check when setup through command line arguments
- .then(() => ngServe('--deploy-url', '/deployurl/', '--base-href', '/deployurl/'))
- .then(() => request('http://localhost:4200'))
- .then(body => {
- if (!body.match(/<\/app-root>/)) {
- throw new Error('Response does not match expected value. (1)');
- }
- if (!body.match(/"\/deployurl\/scripts.js"/)) {
- throw new Error('Response does not match expected value. (2)');
- }
- })
- .then(() => request('http://localhost:4200/deployurl/'))
- .then(body => {
- if (!body.match(/<\/app-root>/)) {
- throw new Error('Response does not match expected value. (3)');
- }
- })
- .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; });
-}
diff --git a/tests/e2e/tests/misc/fallback.ts b/tests/e2e/tests/misc/fallback.ts
index 3bb6af8230..59a380016b 100644
--- a/tests/e2e/tests/misc/fallback.ts
+++ b/tests/e2e/tests/misc/fallback.ts
@@ -6,8 +6,7 @@ import { moveFile } from '../../utils/fs';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// should fallback to config.app[0].index (index.html by default)
return Promise.resolve()
diff --git a/tests/e2e/tests/misc/lazy-module.ts b/tests/e2e/tests/misc/lazy-module.ts
index 4feca5a9c8..8c99615595 100644
--- a/tests/e2e/tests/misc/lazy-module.ts
+++ b/tests/e2e/tests/misc/lazy-module.ts
@@ -5,8 +5,7 @@ import {appendToFile, writeFile, prependToFile, replaceInFile} from '../../utils
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
let oldNumberOfFiles = 0;
return Promise.resolve()
diff --git a/tests/e2e/tests/misc/minimal-config.ts b/tests/e2e/tests/misc/minimal-config.ts
index 2c35dcb8fc..dafe96229f 100644
--- a/tests/e2e/tests/misc/minimal-config.ts
+++ b/tests/e2e/tests/misc/minimal-config.ts
@@ -3,7 +3,7 @@ import { ng } from '../../utils/process';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out what a minimal config is for architect apps.
return;
return Promise.resolve()
diff --git a/tests/e2e/tests/misc/non-relative-module-resolution.ts b/tests/e2e/tests/misc/non-relative-module-resolution.ts
index 526c698906..cad36b63b6 100644
--- a/tests/e2e/tests/misc/non-relative-module-resolution.ts
+++ b/tests/e2e/tests/misc/non-relative-module-resolution.ts
@@ -3,8 +3,7 @@ import { ng } from '../../utils/process';
export default async function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
await writeMultipleFiles({
'./src/app/foo.ts': `
diff --git a/tests/e2e/tests/misc/proxy-config.ts b/tests/e2e/tests/misc/proxy-config.ts
index dd14df2458..d27635c7da 100644
--- a/tests/e2e/tests/misc/proxy-config.ts
+++ b/tests/e2e/tests/misc/proxy-config.ts
@@ -9,8 +9,7 @@ import {updateJsonFile} from '../../utils/project';
import {expectToFail} from "../../utils/utils";
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Create an express app that serves as a proxy.
const app = express();
@@ -34,7 +33,7 @@ export default function() {
return Promise.resolve()
.then(() => writeFile(proxyConfigFile, JSON.stringify(proxyConfig, null, 2)))
- .then(() => ngServe('--proxy-config', proxyConfigFile))
+ .then(() => ngServe('--proxy-config', '../' + proxyConfigFile))
.then(() => request('http://localhost:4200/api/test'))
.then(body => {
if (!body.match(/TEST_API_RETURN/)) {
@@ -43,30 +42,30 @@ export default function() {
})
.then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- const app = configJson.defaults;
- app.serve = {
- proxyConfig: proxyConfigFile
- };
- }))
- .then(() => ngServe())
- .then(() => request('http://localhost:4200/api/test'))
- .then(body => {
- if (!body.match(/TEST_API_RETURN/)) {
- throw new Error('Response does not match expected value.');
- }
- })
- .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
+ // .then(() => updateJsonFile('.angular-cli.json', configJson => {
+ // const app = configJson.defaults;
+ // app.serve = {
+ // proxyConfig: proxyConfigFile
+ // };
+ // }))
+ // .then(() => ngServe())
+ // .then(() => request('http://localhost:4200/api/test'))
+ // .then(body => {
+ // if (!body.match(/TEST_API_RETURN/)) {
+ // throw new Error('Response does not match expected value.');
+ // }
+ // })
+ // .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
.then(() => server.close(), (err) => { server.close(); throw err; })
- // A non-existing proxy file should error.
- .then(() => expectToFail(() => ng('serve', '--proxy-config', 'proxy.non-existent.json')))
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- const app = configJson.defaults;
- app.serve = {
- proxyConfig: 'proxy.non-existent.json'
- };
- }))
- .then(() => expectToFail(() => ng('serve')));
+ // // A non-existing proxy file should error.
+ // .then(() => expectToFail(() => ng('serve', '--proxy-config', 'proxy.non-existent.json')))
+ // .then(() => updateJsonFile('.angular-cli.json', configJson => {
+ // const app = configJson.defaults;
+ // app.serve = {
+ // proxyConfig: 'proxy.non-existent.json'
+ // };
+ // }))
+ // .then(() => expectToFail(() => ng('serve')));
}
diff --git a/tests/e2e/tests/misc/public-host.ts b/tests/e2e/tests/misc/public-host.ts
index 085a1ea21a..8a0ca80669 100644
--- a/tests/e2e/tests/misc/public-host.ts
+++ b/tests/e2e/tests/misc/public-host.ts
@@ -6,8 +6,7 @@ import { killAllProcesses } from '../../utils/process';
import { ngServe } from '../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
const firstLocalIp = _(os.networkInterfaces())
.values()
diff --git a/tests/e2e/tests/misc/ssl-default-config.ts b/tests/e2e/tests/misc/ssl-default-config.ts
deleted file mode 100644
index de8070d147..0000000000
--- a/tests/e2e/tests/misc/ssl-default-config.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { request } from '../../utils/http';
-import { killAllProcesses } from '../../utils/process';
-import { ngServe } from '../../utils/project';
-import { updateJsonFile } from '../../utils/project';
-
-
-export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
-
- return Promise.resolve()
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- const app = configJson.defaults;
- app.serve = { ssl: true };
- }))
- .then(() => ngServe())
- .then(() => request('https://localhost:4200/'))
- .then(body => {
- if (!body.match(/<\/app-root>/)) {
- throw new Error('Response does not match expected value.');
- }
- })
- .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; });
-}
diff --git a/tests/e2e/tests/misc/ssl-default.ts b/tests/e2e/tests/misc/ssl-default.ts
index 7e4975bfbc..d8578b7703 100644
--- a/tests/e2e/tests/misc/ssl-default.ts
+++ b/tests/e2e/tests/misc/ssl-default.ts
@@ -4,8 +4,7 @@ import { ngServe } from '../../utils/project';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => ngServe('--ssl', 'true'))
diff --git a/tests/e2e/tests/misc/ssl-with-cert-config.ts b/tests/e2e/tests/misc/ssl-with-cert-config.ts
deleted file mode 100644
index a3c7f61385..0000000000
--- a/tests/e2e/tests/misc/ssl-with-cert-config.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { request } from '../../utils/http';
-import { assetDir } from '../../utils/assets';
-import { killAllProcesses } from '../../utils/process';
-import { ngServe } from '../../utils/project';
-import { updateJsonFile } from '../../utils/project';
-
-
-export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
-
- return Promise.resolve()
- .then(() => updateJsonFile('.angular-cli.json', configJson => {
- const app = configJson.defaults;
- app.serve = {
- ssl: true,
- sslKey: assetDir('ssl/server.key'),
- sslCert: assetDir('ssl/server.crt')
- };
- }))
- .then(() => ngServe())
- .then(() => request('https://localhost:4200/'))
- .then(body => {
- if (!body.match(/<\/app-root>/)) {
- throw new Error('Response does not match expected value.');
- }
- })
- .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; });
-
-}
diff --git a/tests/e2e/tests/misc/ssl-with-cert.ts b/tests/e2e/tests/misc/ssl-with-cert.ts
index e2418d4948..732cbe0221 100644
--- a/tests/e2e/tests/misc/ssl-with-cert.ts
+++ b/tests/e2e/tests/misc/ssl-with-cert.ts
@@ -5,8 +5,7 @@ import { ngServe } from '../../utils/project';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => ngServe(
diff --git a/tests/e2e/tests/test/e2e-baseurl.ts b/tests/e2e/tests/test/e2e-baseurl.ts
index f8e8232b9e..5894aebeba 100644
--- a/tests/e2e/tests/test/e2e-baseurl.ts
+++ b/tests/e2e/tests/test/e2e-baseurl.ts
@@ -5,19 +5,18 @@ import { updateJsonFile } from '../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out why this test is not working.
return;
return Promise.resolve()
- .then(() => expectToFail(() => ng('e2e', '--no-serve')))
+ .then(() => expectToFail(() => ng('e2e', '--devServerTarget=')))
.then(() => updateJsonFile('.angular-cli.json', configJson => {
const app = configJson.defaults;
app.serve = { port: 4400 };
}))
.then(() => ngServe())
- .then(() => expectToFail(() => ng('e2e', '--no-serve')))
- .then(() => ng('e2e', '--no-serve', '--base-href=http://localhost:4400'))
- .then(() => ng('e2e', '--no-serve', '--port=4400'))
+ .then(() => ng('e2e', '--devServerTarget=', '--base-url=http://localhost:4400'))
+ .then(() => ng('e2e', '--devServerTarget=', '--port=4400'))
.then(() => killAllProcesses(), (err: any) => {
killAllProcesses();
throw err;
diff --git a/tests/e2e/tests/test/test-assets.ts b/tests/e2e/tests/test/test-assets.ts
index 6c37492c51..cf144cbcea 100644
--- a/tests/e2e/tests/test/test-assets.ts
+++ b/tests/e2e/tests/test/test-assets.ts
@@ -6,7 +6,7 @@ import { stripIndent } from 'common-tags';
// Make sure asset files are served
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): Figure out why this test is not working.
return;
return Promise.resolve()
diff --git a/tests/e2e/tests/test/test-backwards-compat.ts b/tests/e2e/tests/test/test-backwards-compat.ts
deleted file mode 100644
index 8baf5c5443..0000000000
--- a/tests/e2e/tests/test/test-backwards-compat.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ng } from '../../utils/process';
-import { replaceInFile } from '../../utils/fs';
-
-
-export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
-
- // Old configs (with the cli preprocessor listed) should still supported.
- return Promise.resolve()
- .then(() => replaceInFile('karma.conf.js',
- 'coverageIstanbulReporter: {', `
- files: [
- { pattern: './src/test.ts', watched: false }
- ],
- preprocessors: {
- './src/test.ts': ['@angular/cli']
- },
- mime: {
- 'text/x-typescript': ['ts','tsx']
- },
- coverageIstanbulReporter: {
- `))
- .then(() => ng('test', '--watch=false'));
-}
diff --git a/tests/e2e/tests/test/test-environment.ts b/tests/e2e/tests/test/test-environment.ts
index b7e944013b..fd34d6a31f 100644
--- a/tests/e2e/tests/test/test-environment.ts
+++ b/tests/e2e/tests/test/test-environment.ts
@@ -2,7 +2,7 @@ import { ng } from '../../utils/process';
import { writeFile } from '../../utils/fs';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): re-enable after build-webpack supports this functionality.
return;
// Tests run in 'dev' environment by default.
diff --git a/tests/e2e/tests/test/test-fail-single-run.ts b/tests/e2e/tests/test/test-fail-single-run.ts
index 86249af731..0ae178ce6e 100644
--- a/tests/e2e/tests/test/test-fail-single-run.ts
+++ b/tests/e2e/tests/test/test-fail-single-run.ts
@@ -4,8 +4,7 @@ import { expectToFail } from '../../utils/utils';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
// Fails on single run with broken compilation.
return writeFile('src/app.component.spec.ts', ' definitely not typescript
')
diff --git a/tests/e2e/tests/test/test-fail-watch.ts b/tests/e2e/tests/test/test-fail-watch.ts
index 7af8417b60..0194c02be1 100644
--- a/tests/e2e/tests/test/test-fail-watch.ts
+++ b/tests/e2e/tests/test/test-fail-watch.ts
@@ -11,7 +11,8 @@ import { readFile, writeFile } from '../../utils/fs';
const karmaGoodRegEx = /Executed 3 of 3 SUCCESS \(\d+\.\d+ secs/;
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This test is behaving oddly both here and in devkit/build-webpack.
+ // It seems to be because of file watchers.
return;
let originalSpec: string;
diff --git a/tests/e2e/tests/test/test-scripts.ts b/tests/e2e/tests/test/test-scripts.ts
index 7a8325d756..f56c2d81b2 100644
--- a/tests/e2e/tests/test/test-scripts.ts
+++ b/tests/e2e/tests/test/test-scripts.ts
@@ -6,8 +6,7 @@ import { stripIndent } from 'common-tags';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => ng('test', '--watch=false'))
diff --git a/tests/e2e/tests/test/test-target.ts b/tests/e2e/tests/test/test-target.ts
index e5c8958f51..56a23fcbe6 100644
--- a/tests/e2e/tests/test/test-target.ts
+++ b/tests/e2e/tests/test/test-target.ts
@@ -2,7 +2,8 @@ import { ng } from '../../utils/process';
import { updateJsonFile } from '../../utils/project';
export default function () {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
+ // TODO(architect): This is giving odd errors in devkit/build-webpack.
+ // TypeError: Assignment to constant variable.
return;
return updateJsonFile('tsconfig.json', configJson => {
diff --git a/tests/e2e/tests/third-party/bootstrap.ts b/tests/e2e/tests/third-party/bootstrap.ts
index 74e4f38877..9e88a6bbb0 100644
--- a/tests/e2e/tests/third-party/bootstrap.ts
+++ b/tests/e2e/tests/third-party/bootstrap.ts
@@ -5,8 +5,7 @@ import {oneLineTrim} from 'common-tags';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => silentNpm('install', 'bootstrap@4.0.0-beta.3'))
@@ -29,9 +28,10 @@ export default function() {
`))
.then(() => ng(
'build',
- '--optimization-level', '1',
+ '--optimization-level=1',
'--extract-css',
- '--output-hashing=none'
+ '--output-hashing=none',
+ '--vendor-chunk=false',
))
.then(() => expectFileToMatch('dist/scripts.js', 'jQuery'))
.then(() => expectFileToMatch('dist/styles.css', '* Bootstrap'))
diff --git a/tests/e2e/tests/third-party/material-icons.ts b/tests/e2e/tests/third-party/material-icons.ts
index 6d680d750b..9fffd9957e 100644
--- a/tests/e2e/tests/third-party/material-icons.ts
+++ b/tests/e2e/tests/third-party/material-icons.ts
@@ -4,8 +4,7 @@ import {expectFileToMatch} from '../../utils/fs';
export default function() {
- // TODO(architect): reenable, validate, then delete this test. It is now in devkit/build-webpack.
- return;
+ // TODO(architect): Delete this test. It is now in devkit/build-webpack.
return Promise.resolve()
.then(() => silentNpm('install', 'material-design-icons@3.0.1'))