fix: 修复 vite html 配置问题 (#200)

* fix: 修复 vite html 配置问题

* chore: lock @babel/preset-env

packages/fes-builder-vite/src/common/getConfig.js

@@ -36,19 +36,24 @@ export function getInnerCommonConfig(api) {
                 vue(api.config.viteVuePlugin || {}),
                 SFCConfigBlockPlugin,
                 vueJsx(api.config.viteVueJsx || {}),
-                createHtmlPlugin({
+                createHtmlPlugin(
-                    minify: true,
+                    deepmerge(
-                    // 使用绝对地址在win下会提示没有权限
+                        {
-                    entry: `/src/${api.paths.tmpDir}/fes.js`,
+                            minify: true,
-                    template: 'index.html',
+                            // 使用绝对地址在win下会提示没有权限
-                    inject: {
+                            entry: `/src/${api.paths.tmpDir}/fes.js`,
-                        data: {
+                            template: 'index.html',
-                            ...resolveRuntimeEnv(publicPath),
+                            inject: {
-                            title: api.config.title || 'Fes.js',
+                                data: {
-                            mountElementId: api.config.mountElementId,
+                                    ...resolveRuntimeEnv(publicPath),
+                                    title: api.config.title || 'Fes.js',
+                                    mountElementId: api.config.mountElementId,
+                                },
+                            },
                         },
-                    },
+                        api.config.viteHtml,
-                }),
+                    ),
+                ),
             ],
             resolve: {
                 alias: {

packages/fes-builder-vite/src/index.js

@@ -6,6 +6,7 @@ export default function () {
             require.resolve('./registerType'),
 
             // bundle configs
+            require.resolve('./features/viteHtml'),
             require.resolve('./features/viteOption'),
             require.resolve('./features/viteVueJsx'),
             require.resolve('./features/viteVuePlugin'),

packages/fes-builder-webpack/package.json

@@ -32,7 +32,7 @@
     "@babel/plugin-proposal-function-bind": "^7.18.9",
     "@babel/plugin-proposal-pipeline-operator": "^7.18.9",
     "@babel/plugin-transform-runtime": "^7.21.0",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-env": "7.20.2",
     "@babel/preset-typescript": "^7.21.0",
     "@fesjs/utils": "^3.0.0",
     "@vue/babel-plugin-jsx": "^1.1.1",

packages/fes-template-vite/.fes.js

@@ -1,7 +1,7 @@
 import { defineBuildConfig } from '@fesjs/fes';
 
 export default defineBuildConfig({
-    builder: 'webpack',
+    builder: 'vite',
     define: {
         __DEV__: false,
     },
@@ -71,6 +71,9 @@ export default defineBuildConfig({
             ['1', '有效的'],
         ],
     },
+    viteHtml: {
+        template: 'hello.html',
+    },
     dynamicImport: true,
     monacoEditor: {
         languages: ['javascript', 'typescript', 'html', 'json'],

pnpm-lock.yaml

@@ -193,7 +193,7 @@ importers:
         specifier: ^7.21.0
         version: 7.21.0(@babel/core@7.21.3)
       '@babel/preset-env':
-        specifier: ^7.20.2
+        specifier: 7.20.2
         version: 7.20.2(@babel/core@7.21.3)
       '@babel/preset-typescript':
         specifier: ^7.21.0