@umijs/bundler-vite 4.0.0-beta.13 → 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'),
@@ -80,12 +80,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/config.js

@@ -18,7 +18,7 @@ const plugins_1 = __importDefault(require("../plugins"));
 const transformer_1 = __importDefault(require("./transformer"));
 function getConfig(opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        const applyOpts = Object.assign(Object.assign({}, opts.userConfig), { extraBabelPlugins: [
+        const applyOpts = Object.assign(Object.assign({}, opts.userConfig), { entry: opts.entry, extraBabelPlugins: [
                 ...(opts.extraBabelPlugins || []),
                 ...(opts.userConfig.extraBabelPlugins || []),
             ], extraBabelPresets: [

package/dist/config/transformer/alias.d.ts

@@ -0,0 +1,6 @@
+import type { IConfigProcessor } from '.';
+declare const _default: IConfigProcessor;
+/**
+ * transform umi alias to vite alias
+ */
+export default _default;

package/dist/config/transformer/alias.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * transform umi alias to vite alias
+ */
+exports.default = (function alias(userConfig) {
+    const config = {};
+    if (typeof userConfig.alias === 'object') {
+        config.resolve = {
+            alias: Object.entries(userConfig.alias).map(([name, target]) => ({
+                // supports webpack suffix $ and less-loader prefix ~
+                // example:
+                //   - dep => ^~?dep(?=\/|$)
+                //   - dep$ => ^~?dep$
+                find: new RegExp(`^~?${name.replace(/(?<!\$)$/, '(?=/|$)')}`),
+                replacement: target,
+            })),
+        };
+    }
+    return config;
+});

package/dist/config/transformer/css.js

@@ -23,7 +23,7 @@ exports.default = (function css(userConfig) {
         css: { postcss: {}, preprocessorOptions: {} },
         resolve: {
             alias: [
-                // to fix less import issue https://github.com/vitejs/vite/issues/2185
+                // to support less-loader ~ for local deps, refer: https://github.com/vitejs/vite/issues/2185
                 { find: /^~/, replacement: '' },
             ],
         },

package/dist/config/transformer/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const vite_1 = require("vite");
+const alias_1 = __importDefault(require("./alias"));
 const css_1 = __importDefault(require("./css"));
 const define_1 = __importDefault(require("./define"));
 const devServer_1 = __importDefault(require("./devServer"));
@@ -19,6 +20,7 @@ exports.default = (userConfig) => {
     const transformers = [
         rename_1.default,
         devServer_1.default,
+        alias_1.default,
         css_1.default,
         rollup_1.default,
         react_1.default,

package/dist/config/transformer/optimizeDeps.js

@@ -4,7 +4,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * transform user config to vite optimizeDeps config
  */
 exports.default = (function optimizeDeps(userConfig) {
-    const config = { optimizeDeps: {} };
+    const config = {
+        // configure pre-bundling entries
+        optimizeDeps: { entries: Object.values(userConfig.entry) },
+    };
     // include alias which within node_modules for optimize dependencies
     if (typeof userConfig.alias === 'object') {
         config.optimizeDeps.include = Object.keys(userConfig.alias).filter((name) => userConfig.alias[name].includes('node_modules'));

package/dist/config/transformer/rename.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const MAPPING = {
-    alias: 'resolve.alias',
     extraVitePlugins: 'plugins',
     inlineLimit: 'build.assetsInlineLimit',
     manifest: 'build.manifest',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-vite",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.17",
   "description": "@umijs/bundler-vite",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-vite#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,15 +25,15 @@
   },
   "dependencies": {
     "@svgr/core": "6.0.0",
-    "@umijs/bundler-utils": "4.0.0-beta.13",
-    "@umijs/utils": "4.0.0-beta.13",
+    "@umijs/bundler-utils": "4.0.0-beta.17",
+    "@umijs/utils": "4.0.0-beta.17",
     "@vitejs/plugin-legacy": "1.6.3",
     "@vitejs/plugin-react": "1.1.0",
     "postcss-preset-env": "7.0.1",
     "rollup-plugin-copy": "3.4.0",
     "rollup-plugin-polyfill": "3.0.0",
     "rollup-plugin-visualizer": "5.5.2",
-    "vite": "2.6.14"
+    "vite": "2.7.6"
   },
   "devDependencies": {
     "express": "4.17.1"