Skip to content
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

feat(bundler-mako): generate dynamicImportToRequire from babel and webpack config #1479

Merged
merged 2 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default {
mako: {},
extraBabelPlugins: ['babel-plugin-dynamic-import-node'],
};
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default 'a';
11 changes: 11 additions & 0 deletions e2e/fixtures.umi/config.babel-plugin-dynamic-import-node/expect.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const assert = require("assert");
const { parseBuildResult } = require("../../../scripts/test-utils");
const { files } = parseBuildResult(__dirname);

const jsFilesCount = Object.keys(files).filter(f => f.endsWith('.js')).length;

assert.equal(
jsFilesCount,
1,
'should output one js file',
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
console.log('single file');

import('../async');
36 changes: 27 additions & 9 deletions packages/bundler-mako/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,10 @@ function checkConfig(opts) {
.some((p) => {
const isImportPlugin = /^import$|babel-plugin-import/.test(p[0]);
const isEmotionPlugin = p === '@emotion' || p === '@emotion/babel-plugin';
if (!isImportPlugin && !isEmotionPlugin) {
const isDynamicImportNode = /^(babel-plugin-)?dynamic-import-node$/.test(
p,
);
if (!isImportPlugin && !isEmotionPlugin && !isDynamicImportNode) {
warningKeys.push('extraBabelPlugins');
return true;
}
Expand Down Expand Up @@ -446,12 +449,20 @@ async function getMakoConfig(opts) {
}
const webpackConfig = webpackChainConfig.toConfig();
let umd = false;
if (
webpackConfig.output &&
webpackConfig.output.libraryTarget === 'umd' &&
webpackConfig.output.library
) {
umd = webpackConfig.output.library;
let { dynamicImportToRequire } = opts.config;
if (webpackConfig.output) {
// handle asyncChunks config
if (webpackConfig.output.asyncChunks === false) {
dynamicImportToRequire = true;
}

// handle umd output config
if (
webpackConfig.output.libraryTarget === 'umd' &&
webpackConfig.output.library
) {
umd = webpackConfig.output.library;
}
}

let platform = 'browser';
Expand All @@ -466,7 +477,6 @@ async function getMakoConfig(opts) {
mdx,
devtool,
cjs,
dynamicImportToRequire,
jsMinifier,
externals,
copy = [],
Expand Down Expand Up @@ -516,11 +526,19 @@ async function getMakoConfig(opts) {
if (process.env.COMPRESS === 'none') {
minify = false;
}
// transform babel-plugin-import plugins to transformImport
const extraBabelPlugins = [
...(opts.extraBabelPlugins || []),
...(opts.config.extraBabelPlugins || []),
];

// transform babel-plugin-dynamic-import-node to dynamicImportToRequire
dynamicImportToRequire ??= Boolean(
extraBabelPlugins.find((p) =>
/^(babel-plugin-)?dynamic-import-node$/.test(p),
),
);

// transform babel-plugin-import plugins to transformImport
const transformImport = extraBabelPlugins
.filter((p) => /^import$|babel-plugin-import/.test(p[0]))
.map(([_, v]) => {
Expand Down