@umijs/bundler-webpack 4.0.0-beta.16 → 4.0.0-beta.17

package/dist/cli.js

@@ -22,7 +22,7 @@ const dev_1 = require("./dev");
 const args = (0, utils_1.yParser)(process.argv.slice(2), {});
 const command = args._[0];
 const cwd = process.cwd();
-const entry = tryPaths([
+const entry = (0, utils_1.tryPaths)([
     (0, path_1.join)(cwd, 'src/index.tsx'),
     (0, path_1.join)(cwd, 'src/index.ts'),
     (0, path_1.join)(cwd, 'index.tsx'),
@@ -69,6 +69,9 @@ else if (command === 'dev') {
                 entry: {
                     [getEntryKey(entry)]: entry,
                 },
+                cache: {
+                    buildDependencies: [].filter(Boolean),
+                },
             });
         }
         catch (e) {
@@ -82,12 +85,6 @@ else {
 function error(msg) {
     console.error(utils_1.chalk.red(msg));
 }
-function tryPaths(paths) {
-    for (const path of paths) {
-        if ((0, fs_1.existsSync)(path))
-            return path;
-    }
-}
 function getEntryKey(path) {
     return (0, path_1.basename)(path, (0, path_1.extname)(path));
 }

package/dist/config/assetRules.js

@@ -40,13 +40,17 @@ function addAssetRules(opts) {
             .generator({
             filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
         });
-        rule
+        const fallback = rule
             .oneOf('fallback')
             .exclude.add(/^$/) /* handle data: resources */
             .add(/\.(js|mjs|jsx|ts|tsx)$/)
             .add(/\.(css|less|sass|scss|stylus)$/)
             .add(/\.html$/)
-            .add(/\.json$/)
+            .add(/\.json$/);
+        if (userConfig.mdx) {
+            fallback.add(/\.mdx?$/);
+        }
+        fallback
             .end()
             .type('asset/resource')
             .generator({

package/dist/config/javaScriptRules.js

@@ -19,6 +19,7 @@ const autoCSSModules_1 = __importDefault(require("../swcPlugins/autoCSSModules")
 const types_1 = require("../types");
 const depMatch_1 = require("../utils/depMatch");
 function addJavaScriptRules(opts) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const { config, userConfig, cwd, name } = opts;
         const isDev = opts.env === types_1.Env.development;
@@ -54,6 +55,9 @@ function addJavaScriptRules(opts) {
             })
                 .end(),
         ];
+        if (userConfig.mdx) {
+            srcRules.push(config.module.rule('markdown').test(/\.mdx?$/));
+        }
         const depRules = [
             config.module
                 .rule('dep')
@@ -124,6 +128,14 @@ function addJavaScriptRules(opts) {
                 throw new Error(`Unsupported srcTranspiler ${srcTranspiler}.`);
             }
         });
+        if (userConfig.mdx) {
+            config.module
+                .rule('mdx')
+                .test(/\.mdx?$/)
+                .use('mdx-loader')
+                .loader((_a = userConfig.mdx) === null || _a === void 0 ? void 0 : _a.loader)
+                .options((_b = userConfig.mdx) === null || _b === void 0 ? void 0 : _b.loaderOptions);
+        }
         const depTranspiler = userConfig.depTranspiler || types_1.Transpiler.none;
         depRules.forEach((_rule) => {
             if (depTranspiler === types_1.Transpiler.none) {

package/dist/dev.js

@@ -55,8 +55,7 @@ function dev(opts) {
             modifyWebpackConfig: opts.modifyWebpackConfig,
             hmr: true,
             analyze: process.env.ANALYZE,
-            // disable cache since it's conflict with mfsu
-            // cache: opts.cache,
+            cache: opts.cache,
         });
         const depConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,

package/dist/schema.js

@@ -50,6 +50,10 @@ function getSchemas() {
         jsMinifierOptions: (Joi) => Joi.object(),
         lessLoader: (Joi) => Joi.object(),
         manifest: (Joi) => Joi.object(),
+        mdx: (Joi) => Joi.object({
+            loader: Joi.string(),
+            loaderOptions: Joi.object(),
+        }),
         mfsu: (Joi) => Joi.alternatives(Joi.object({
             esbuild: Joi.boolean(),
             mfName: Joi.string(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-beta.16",
+  "version": "4.0.0-beta.17",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -34,9 +34,9 @@
     "@svgr/plugin-svgo": "^6.1.0",
     "@swc/core": "1.2.117",
     "@types/hapi__joi": "17.1.7",
-    "@umijs/babel-preset-umi": "4.0.0-beta.16",
-    "@umijs/mfsu": "4.0.0-beta.16",
-    "@umijs/utils": "4.0.0-beta.16",
+    "@umijs/babel-preset-umi": "4.0.0-beta.17",
+    "@umijs/mfsu": "4.0.0-beta.17",
+    "@umijs/utils": "4.0.0-beta.17",
     "css-loader": "6.5.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.4.2",