-
-
Notifications
You must be signed in to change notification settings - Fork 381
feat(plugin): implement close method for plugin mode handling #2347
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.
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
Merged
+71
−0
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
fff38ec
feat(plugin): implement close method for plugin mode handling
bjohansebas 6bff291
fix(plugin): resolve crash on close() in plugin mode
bjohansebas 899744a
fix(plugin): add warning for missing watching instance in plugin mode
bjohansebas c82442d
test(plugin): add snapshots and warnings for close method in plugin mode
bjohansebas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "webpack-dev-middleware": patch | ||
| --- | ||
|
|
||
| Fixed a crash when calling `close()` in plugin mode (`isPlugin = true`). Since the host (webpack-cli, webpack-dev-server, etc.) owns `compiler.watch()`, the middleware has no `watching` of its own to close, so `close()` now just calls the callback instead of throwing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing | ||
|
|
||
| exports[`plugin mode close method should not close the watching owned by the host: warning 1`] = `"The \`close\` method was called, but there is no own \`watching\` instance to close. When using the middleware as a plugin, the host owns watching, so use \`compiler.close()\` instead."`; | ||
|
|
||
| exports[`plugin mode close method should not throw and call the callback when the host is not watching: warning 1`] = `"The \`close\` method was called, but there is no own \`watching\` instance to close. When using the middleware as a plugin, the host owns watching, so use \`compiler.close()\` instead."`; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import middleware from "../src"; | ||
|
|
||
| import webpackConfig from "./fixtures/webpack.config"; | ||
| import getCompiler from "./helpers/getCompiler"; | ||
|
|
||
| jest.spyOn(globalThis.console, "log").mockImplementation(); | ||
|
|
||
| // When used as a plugin (`isPlugin = true`) the host (webpack-cli, | ||
| // webpack-dev-server, etc.) owns `compiler.watch()`, so the middleware has no | ||
| // `watching` of its own | ||
| describe("plugin mode", () => { | ||
| describe("close method", () => { | ||
| it("should not throw and call the callback when the host is not watching", (done) => { | ||
| const compiler = getCompiler(webpackConfig); | ||
| const instance = middleware(compiler, {}, true); | ||
| const warnSpy = jest | ||
| .spyOn(instance.context.logger, "warn") | ||
| .mockImplementation(); | ||
|
|
||
| instance.close((error) => { | ||
| expect(error).toBeNull(); | ||
| expect(warnSpy).toHaveBeenCalledTimes(1); | ||
| expect(warnSpy.mock.calls[0][0]).toMatchSnapshot("warning"); | ||
|
|
||
| done(); | ||
| }); | ||
| }); | ||
|
|
||
| it("should not close the watching owned by the host", (done) => { | ||
| const compiler = getCompiler(webpackConfig); | ||
| const watching = compiler.watch({}, () => {}); | ||
| const instance = middleware(compiler, {}, true); | ||
| const warnSpy = jest | ||
| .spyOn(instance.context.logger, "warn") | ||
| .mockImplementation(); | ||
|
|
||
| instance.waitUntilValid(() => { | ||
| instance.close((error) => { | ||
| expect(error).toBeNull(); | ||
| expect(watching.closed).toBe(false); | ||
| expect(warnSpy).toHaveBeenCalledTimes(1); | ||
| expect(warnSpy.mock.calls[0][0]).toMatchSnapshot("warning"); | ||
|
|
||
| watching.close(done); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's output a warning here that this usage is not recommended