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

Fix comparison tests under WSL #1109

Merged
merged 11 commits into from
May 27, 2020
+12 −4
Merged

Fix comparison tests under WSL #1109

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e241dc7
Ensure a separate webpack instance is created if different loader opt…
appzuka May 10, 2020
89d6e85
Fix import order (lint error)
appzuka May 10, 2020
62ae3c2
Update version to 7.04 and include in changelog
appzuka May 11, 2020
448568b
Tweak to Changelog
appzuka May 11, 2020
eaa6287
Add a delay before starting the comparison tests
appzuka May 14, 2020
2e1e3c9
Update pull request number in changelog
appzuka May 14, 2020
cdc2d37
Merge remote-tracking branch 'upstream/master'
appzuka May 24, 2020
2067575
Add comments to link to pull request
appzuka May 24, 2020
21d7025
Merge remote-tracking branch 'upstream/master'
appzuka May 24, 2020
6b95470
Merge branch 'master' into master
johnnyreilly May 25, 2020
3670a78
Merge branch 'master' into master
johnnyreilly May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## v7.0.5
* [Add a delay before starting the comparison tests to avoid failures under WSL](https://github.com/TypeStrong/ts-loader/pull/1109) - thanks @appzuka

## v7.0.4
* [Ensure a separate webpack instance is created for different loader options](https://github.com/TypeStrong/ts-loader/pull/1104) - thanks @appzuka

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ts-loader",
"version": "7.0.4",
"version": "7.0.5",
"description": "TypeScript loader for webpack",
"main": "index.js",
"types": "dist",
Expand Down
13 changes: 9 additions & 4 deletions test/comparison-tests/create-and-execute-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,15 @@ function createTest(test, testPath, options) {
mkdirp.sync(paths.actualOutput);
mkdirp.sync(paths.webpackOutput);

// execute webpack
testState.watcher = webpack(
createWebpackConfig(paths, options, nonWatchNonCompositePath !== testPath)
).watch({ aggregateTimeout: 1500 }, createWebpackWatchHandler(done, paths, testState, options, test));

// Need to wait > FS_ACCURACY as defined in watchpack.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have a link to the details in watchpack that discuss this? Would be super useful for anyone else taking a look at this.

setTimeout(() => {
// execute webpack
testState.watcher = webpack(
createWebpackConfig(paths, options, nonWatchNonCompositePath !== testPath)
).watch({ aggregateTimeout: 1500 }, createWebpackWatchHandler(done, paths, testState, options, test));
}, 200);

};
}

Expand Down