Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Webpack E2Es #12735

Merged
merged 3 commits into from
Nov 1, 2018
Merged

Enable Webpack E2Es #12735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ded53a2
test: enable webpack e2e tests
alan-agius4 Oct 24, 2018
413b73e
refactor: remove redundant catch block
alan-agius4 Oct 24, 2018
2a30fc9
fix(@ngtools/webpack): when stats is not available call callback with…
alan-agius4 Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/ngtools/webpack/src/virtual_file_system_decorator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
}

stat(path: string, callback: (err: Error, stats: Stats) => void): void {
try {
const result = this._webpackCompilerHost.stat(path);
alan-agius4 marked this conversation as resolved.
Show resolved Hide resolved
if (result) {
// tslint:disable-next-line:no-any
callback(null as any, this._webpackCompilerHost.stat(path) as any);
} catch (e) {
callback(null as any, result);
} else {
// tslint:disable-next-line:no-any
callback(e, undefined as any);
callback(new FileDoesNotExistException(path), undefined as any);
}
}

Expand Down
4 changes: 0 additions & 4 deletions tests/legacy-cli/e2e_runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ const allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore:
.filter(name => !name.includes('tests/commands/new/'))
// NEEDS devkit change
.filter(name => !name.endsWith('/existing-directory.ts'))
// ngtools/webpack is now in devkit and needs to be tested there
.filter(name => !name.endsWith('/packages/webpack/server-ng5.ts'))
.filter(name => !name.endsWith('/packages/webpack/test-ng5.ts'))
.filter(name => !name.endsWith('/packages/webpack/weird-ng5.ts'))
// Disabled on rc.0 due to needed sync with devkit for changes.
.filter(name => !name.endsWith('/service-worker.ts'))
.sort();
Expand Down