Fix support for DynamicEntryPlugin #1319
Merged
Conversation
This file contains 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
mikegreiling
force-pushed
the
fix-dynamic-entry
branch
from
e9f4819
to
de82922
Compare
mikegreiling
commented
Feb 25, 2018
| wpOpt.entry[key] = devClient.concat(wpOpt.entry[key]); | ||
| const prependDevClient = (entry) => { | ||
| if (typeof entry === 'function') { | ||
| return () => Promise.resolve(entry()).then(prependDevClient); |
There was a problem hiding this comment.
This will handle both functions which return entry objects and functions which return a Promise due to the behavior of Promise.resolve. It is the same technique used in the DynamicEntryPlugin itself (link).
mikegreiling
commented
Feb 25, 2018
| const webpackOptions = {}; | ||
| const devServerOptions = {}; | ||
|
|
||
| addDevServerEntrypoints(webpackOptions, devServerOptions); | ||
|
|
||
| assert(webpackOptions.entry.length, 2); | ||
| assert(webpackOptions.entry[1], './src'); | ||
| assert.equal(webpackOptions.entry.length, 2); |
There was a problem hiding this comment.
I've fixed this test also. By using assert and not assert.equal, these tests were not doing anything other than ensuring webpackOptions.entry.length was not falsey.
|
Thanks for this fine PR!! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For Bugs and Features; did you add new tests?
Yes. I have added tests for this change and I have added new tests for prior behavior to prove that this doesn't break anything.
Motivation / Use-Case
The support for DynamicEntryPlugin added in #802 was incorrect. This fixes
addDevServerEntrypoints.jsas it applies to dynamic endpoints (functions which return an entry object and functions which return a Promise)Breaking Changes
none.
Additional Info
This pull request targets the
webpack-4v3.x branch, but I would like to port this back to2.xas well if you plan to make any more releases under that major version. The only conflict would be the default entry point added in #1310. I could simply exclude that behavior from this change and open up a separate PR targeting the master branch.Closes: #1318