Skip to content

Commit 3adfaad

Browse files
committed
fix(bundler): commonjs before user's plugins
1 parent d8bec5a commit 3adfaad

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

src/compiler/app-core/bundle-app-core.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@ export async function bundleApp(config: d.Config, compilerCtx: d.CompilerCtx, bu
3333
stencilBuildConditionalsPlugin(build, config.fsNamespace),
3434
globalScriptsPlugin(config, compilerCtx),
3535
componentEntryPlugin(config, compilerCtx, buildCtx, build, buildCtx.entryModules),
36-
...config.plugins,
37-
config.sys.rollup.plugins.nodeResolve({
38-
mainFields: ['collection:main', 'jsnext:main', 'es2017', 'es2015', 'module', 'main'],
39-
...config.nodeResolve
40-
}),
41-
config.sys.rollup.plugins.emptyJsResolver(),
4236
config.sys.rollup.plugins.commonjs({
4337
include: /node_modules/,
4438
sourceMap: false,
4539
...config.commonjs
4640
}),
41+
...config.plugins,
42+
config.sys.rollup.plugins.nodeResolve({
43+
mainFields: ['collection:main', 'jsnext:main', 'es2017', 'es2015', 'module', 'main'],
44+
...config.nodeResolve
45+
}),
4746
bundleJson(config),
4847
imagePlugin(config, buildCtx),
4948
inMemoryFsRead(config, compilerCtx),

src/compiler/component-hydrate/bundle-hydrate-app.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,16 @@ export async function bundleHydrateApp(config: d.Config, compilerCtx: d.Compiler
2626
stencilBuildConditionalsPlugin(build, config.fsNamespace),
2727
globalScriptsPlugin(config, compilerCtx),
2828
componentEntryPlugin(config, compilerCtx, buildCtx, build, buildCtx.entryModules),
29-
...config.plugins,
30-
config.sys.rollup.plugins.nodeResolve({
31-
mainFields: ['collection:main', 'jsnext:main', 'es2017', 'es2015', 'module', 'main'],
32-
...config.nodeResolve
33-
}),
34-
config.sys.rollup.plugins.emptyJsResolver(),
3529
config.sys.rollup.plugins.commonjs({
3630
include: /node_modules/,
3731
sourceMap: false,
3832
...config.commonjs
3933
}),
34+
...config.plugins,
35+
config.sys.rollup.plugins.nodeResolve({
36+
mainFields: ['collection:main', 'jsnext:main', 'es2017', 'es2015', 'module', 'main'],
37+
...config.nodeResolve
38+
}),
4039
bundleJson(config),
4140
inMemoryFsRead(config, compilerCtx),
4241
config.sys.rollup.plugins.replace({

0 commit comments

Comments
 (0)