Unverified Commit e3c6739e authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

make code consistent with babel externals (#28867)

* make code consistent with babel externals

* update compiled
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent e6690841
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -763,16 +763,18 @@ export async function ncc_mini_css_extract_plugin(task, opts) { ...@@ -763,16 +763,18 @@ export async function ncc_mini_css_extract_plugin(task, opts) {
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
export async function ncc_webpack_bundle4(task, opts) { export async function ncc_webpack_bundle4(task, opts) {
const webpackExternals = { const bundleExternals = {
...externals, ...externals,
} }
delete webpackExternals['webpack/lib/NormalModule'] for (const pkg of Object.keys(webpackBundlePackages)) {
delete bundleExternals[pkg]
}
await task await task
.source(opts.src || 'bundles/webpack/bundle4.js') .source(opts.src || 'bundles/webpack/bundle4.js')
.ncc({ .ncc({
packageName: 'webpack', packageName: 'webpack',
bundleName: 'webpack', bundleName: 'webpack',
externals: webpackExternals, externals: bundleExternals,
minify: false, minify: false,
target: 'es5', target: 'es5',
}) })
...@@ -781,6 +783,12 @@ export async function ncc_webpack_bundle4(task, opts) { ...@@ -781,6 +783,12 @@ export async function ncc_webpack_bundle4(task, opts) {
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
export async function ncc_webpack_bundle5(task, opts) { export async function ncc_webpack_bundle5(task, opts) {
const bundleExternals = {
...externals,
}
for (const pkg of Object.keys(webpackBundlePackages)) {
delete bundleExternals[pkg]
}
await task await task
.source(opts.src || 'bundles/webpack/bundle5.js') .source(opts.src || 'bundles/webpack/bundle5.js')
.ncc({ .ncc({
...@@ -790,7 +798,7 @@ export async function ncc_webpack_bundle5(task, opts) { ...@@ -790,7 +798,7 @@ export async function ncc_webpack_bundle5(task, opts) {
if (path.endsWith('.runtime.js')) return `'./${basename(path)}'` if (path.endsWith('.runtime.js')) return `'./${basename(path)}'`
}, },
externals: { externals: {
...externals, ...bundleExternals,
'schema-utils': 'next/dist/compiled/schema-utils3', 'schema-utils': 'next/dist/compiled/schema-utils3',
'webpack-sources': 'next/dist/compiled/webpack-sources3', 'webpack-sources': 'next/dist/compiled/webpack-sources3',
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment