Skip to content

Commit 0f88f8d

Browse files
sokrasokra
authored
Merge pull request webpack#6468 from webpack/bugfix/issue-6459
fixes webpack#6459
2 parents 74fefc9 + 85ff550 commit 0f88f8d

File tree

7 files changed

+18
-2
lines changed

7 files changed

+18
-2
lines changed

‎lib/WebpackOptionsDefaulter.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,16 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
4141
this.set("module.strictThisContextOnImports", false);
4242
this.set("module.unsafeCache", "make", options => !!options.cache);
4343
this.set("module.rules", []);
44-
this.set("module.defaultRules", [{
44+
this.set("module.defaultRules", "make", options => [{
4545
type: "javascript/auto",
4646
resolve: {}
4747
},
4848
{
4949
test: /\.mjs$/i,
50-
type: "javascript/esm"
50+
type: "javascript/esm",
51+
resolve: {
52+
mainFields: options.target === "web" || options.target === "webworker" ? ["browser", "main"] : ["main"]
53+
}
5154
},
5255
{
5356
test: /\.json$/i,

‎test/cases/mjs/no-module-main-field/index.mjs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import result from "m";
2+
3+
it("should use the correct entry point", function() {
4+
result.should.be.eql("yep");
5+
});

‎test/cases/mjs/no-module-main-field/node_modules/m/a.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/mjs/no-module-main-field/node_modules/m/a.mjs‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/mjs/no-module-main-field/node_modules/m/b.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/mjs/no-module-main-field/node_modules/m/b.mjs‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/mjs/no-module-main-field/node_modules/m/package.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)