@umijs/preset-vue 4.0.0-rc.14 → 4.0.0-rc.15

package/dist/features/config/assetRules.js

@@ -1,49 +1,38 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAssetRules = void 0;
-function addAssetRules({ config, api }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // bundler-webpack 本身自带的静态资源会触发 vue-loader currently does not support vue rules with oneOf. 需要禁用掉
-        config.module.rules.delete('asset');
-        const { userConfig } = api;
-        const inlineLimit = parseInt(userConfig.inlineLimit || '10000', 10);
-        const staticPathPrefix = api.config.staticPathPrefix !== undefined
-            ? api.config.staticPathPrefix
-            : 'static/';
-        config.module
-            .rule('avif')
-            .test(/\.avif$/)
-            .type('asset')
-            .mimetype('image/avif')
-            .parser({
-            dataUrlCondition: {
-                maxSize: inlineLimit,
-            },
-        })
-            .generator({
-            filename: `${staticPathPrefix}[name].[hash:8].[ext]`,
-        });
-        config.module
-            .rule('image')
-            .test(/\.(bmp|gif|jpg|jpeg|png)$/)
-            .type('asset')
-            .parser({
-            dataUrlCondition: {
-                maxSize: inlineLimit,
-            },
-        })
-            .generator({
-            filename: `${staticPathPrefix}[name].[hash:8].[ext]`,
-        });
+async function addAssetRules({ config, api }) {
+    // bundler-webpack 本身自带的静态资源会触发 vue-loader currently does not support vue rules with oneOf. 需要禁用掉
+    config.module.rules.delete('asset');
+    const { userConfig } = api;
+    const inlineLimit = parseInt(userConfig.inlineLimit || '10000', 10);
+    const staticPathPrefix = api.config.staticPathPrefix !== undefined
+        ? api.config.staticPathPrefix
+        : 'static/';
+    config.module
+        .rule('avif')
+        .test(/\.avif$/)
+        .type('asset')
+        .mimetype('image/avif')
+        .parser({
+        dataUrlCondition: {
+            maxSize: inlineLimit,
+        },
+    })
+        .generator({
+        filename: `${staticPathPrefix}[name].[hash:8].[ext]`,
+    });
+    config.module
+        .rule('image')
+        .test(/\.(bmp|gif|jpg|jpeg|png)$/)
+        .type('asset')
+        .parser({
+        dataUrlCondition: {
+            maxSize: inlineLimit,
+        },
+    })
+        .generator({
+        filename: `${staticPathPrefix}[name].[hash:8].[ext]`,
     });
 }
 exports.addAssetRules = addAssetRules;

package/dist/features/default.js

@@ -18,13 +18,21 @@ exports.default = (api) => {
     }) || require.resolve('vue/dist/vue.runtime.esm-bundler.js');
     api.modifyDefaultConfig((config) => {
         var _a;
-        config.alias = Object.assign(Object.assign({}, config.alias), { vue$: ((_a = api.userConfig.vue) === null || _a === void 0 ? void 0 : _a.runtimeCompiler) ? vuePath : vueRuntimePath, 'vue-router': (0, resolveProjectDep_1.resolveProjectDep)({
+        config.alias = {
+            ...config.alias,
+            vue$: ((_a = api.userConfig.vue) === null || _a === void 0 ? void 0 : _a.runtimeCompiler) ? vuePath : vueRuntimePath,
+            'vue-router': (0, resolveProjectDep_1.resolveProjectDep)({
                 pkg: api.pkg,
                 cwd: api.cwd,
                 dep: 'vue-router',
-            }) || (0, path_1.dirname)(require.resolve('vue-router/package.json')) });
+            }) || (0, path_1.dirname)(require.resolve('vue-router/package.json')),
+        };
         // feature flags https://link.vuejs.org/feature-flags.
-        config.define = Object.assign(Object.assign({}, config.define), { __VUE_OPTIONS_API__: true, __VUE_PROD_DEVTOOLS__: false });
+        config.define = {
+            ...config.define,
+            __VUE_OPTIONS_API__: true,
+            __VUE_PROD_DEVTOOLS__: false,
+        };
         return config;
     });
     api.modifyConfig((memo) => {

package/dist/features/tmpFiles/tmpFiles.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
@@ -16,9 +7,9 @@ exports.default = (api) => {
     api.describe({
         key: 'preset-vue:tmpFiles',
     });
-    api.onGenerateFiles(() => __awaiter(void 0, void 0, void 0, function* () {
+    api.onGenerateFiles(async () => {
         // useAppData.ts
-        const rendererPath = (0, plugin_utils_1.winPath)(yield api.applyPlugins({
+        const rendererPath = (0, plugin_utils_1.winPath)(await api.applyPlugins({
             key: 'modifyRendererPath',
         }));
         api.writeTmpFile({
@@ -29,12 +20,12 @@ exports.default = (api) => {
                 rendererPath,
             },
         });
-    }));
+    });
     api.register({
         key: 'onGenerateFiles',
-        fn: () => __awaiter(void 0, void 0, void 0, function* () {
+        fn: async () => {
             // history.ts
-            const rendererPath = (0, plugin_utils_1.winPath)(yield api.applyPlugins({
+            const rendererPath = (0, plugin_utils_1.winPath)(await api.applyPlugins({
                 key: 'modifyRendererPath',
             }));
             api.writeTmpFile({
@@ -69,7 +60,7 @@ export default defineComponent({
 </template>
         `,
             });
-        }),
+        },
         stage: Infinity,
     });
 };

package/dist/features/webpack.js

@@ -13,10 +13,13 @@ exports.default = (api) => {
         // 处理 mfsu 包含vue 模块的依赖处理
         const enableMFSU = memo.mfsu !== false;
         if (enableMFSU) {
-            memo.mfsu = Object.assign(Object.assign({}, (memo.mfsu || {})), { chainWebpack(config) {
+            memo.mfsu = {
+                ...(memo.mfsu || {}),
+                chainWebpack(config) {
                     (0, config_1.getConfig)(config, api);
                     return config;
-                } });
+                },
+            };
         }
         return memo;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-vue",
-  "version": "4.0.0-rc.14",
+  "version": "4.0.0-rc.15",
   "description": "@umijs/preset-vue",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/preset-vue#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -22,13 +22,13 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/renderer-vue": "4.0.0-rc.14",
+    "@umijs/renderer-vue": "4.0.0-rc.15",
     "vue": "3.2.31",
     "vue-loader": "17.0.0",
     "vue-router": "4.0.12"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.14"
+    "umi": "4.0.0-rc.15"
   },
   "publishConfig": {
     "access": "public"