- 
+ 
diff --git a/package.json b/package.json
index 88953b8cc8d324f93b8cda2937da5ffd26178fdc..71d84fadeafc9483d91b5515203465b003d45081 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
"version": "2.0.0-rc.14",
"scripts": {
"bootstrap": "yarn install",
- "serve": "esno ./build/script/preserve.ts && cross-env NODE_ENV=development vite",
- "build": "cross-env NODE_ENV=production vite build && esno ./build/script/postBuild.ts",
+ "serve": "cross-env vite --mode=development",
+ "build": "cross-env vite build --mode=production && esno ./build/script/postBuild.ts",
"build:site": "cross-env SITE=true npm run build ",
"build:no-cache": "yarn clean:cache && npm run build",
"typecheck": "typecheck .",
diff --git a/src/main.ts b/src/main.ts
index 136d2523643068024c95c6b066f579a73e1fc95e..8eb959df1e0b8db7f5b5e492c0b1e8ea72e116b8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -38,7 +38,7 @@ setupErrorHandle(app);
// Mount when the route is ready
router.isReady().then(() => {
- app.mount('#app');
+ app.mount('#app', true);
});
// The development environment takes effect
diff --git a/src/router/index.ts b/src/router/index.ts
index 5cf1cda463f609d0a0aa059f454861193b5d0242..8525c3be6253821d3f2cb5870c8bdeda4abffea4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -9,11 +9,9 @@ import { basicRoutes } from './routes/';
import { scrollBehavior } from './scrollBehavior';
import { REDIRECT_NAME } from './constant';
-export const hashRouter = createWebHashHistory();
-
// app router
const router = createRouter({
- history: hashRouter,
+ history: createWebHashHistory(),
routes: basicRoutes as RouteRecordRaw[],
strict: true,
scrollBehavior: scrollBehavior,
diff --git a/vite.config.ts b/vite.config.ts
index 29e4ae8c14d887840c8d360c1b05a501b613407f..662f42fbad1fed16a2bb85342c11db97c58b4b7d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,6 +1,8 @@
import type { UserConfig, Resolver } from 'vite';
import { resolve } from 'path';
+import { loadEnv } from 'vite';
+
import { modifyVars } from './build/config/lessModifyVars';
import { createProxy } from './build/vite/proxy';
import { configManualChunk } from './build/vite/optimizer';
@@ -8,16 +10,12 @@ import { configManualChunk } from './build/vite/optimizer';
import globbyTransform from './build/vite/plugin/transform/globby';
import dynamicImportTransform from './build/vite/plugin/transform/dynamic-import';
-import { loadEnv } from './build/utils';
+import { wrapperEnv } from './build/utils';
import { createRollupPlugin, createVitePlugins } from './build/vite/plugin';
const pkg = require('./package.json');
-const viteEnv = loadEnv();
-
-const { VITE_PORT, VITE_PUBLIC_PATH, VITE_PROXY, VITE_DROP_CONSOLE, VITE_DYNAMIC_IMPORT } = viteEnv;
-
function pathResolve(dir: string) {
return resolve(__dirname, '.', dir);
}
@@ -30,84 +28,93 @@ const root: string = process.cwd();
const resolvers: Resolver[] = [];
-const viteConfig: UserConfig = {
- root,
- alias,
- /**
- * port
- * @default '3000'
- */
- port: VITE_PORT,
-
- /**
- * Base public path when served in production.
- * @default '/'
- */
- base: VITE_PUBLIC_PATH,
-
- /**
- * Transpile target for esbuild.
- * @default 'es2020'
- */
- esbuildTarget: 'es2019',
-
- // terser options
- terserOptions: {
- compress: {
- keep_infinity: true,
- drop_console: VITE_DROP_CONSOLE,
+export default (mode: 'development' | 'production'): UserConfig => {
+ const env = loadEnv(mode, root);
+ const viteEnv = wrapperEnv(env);
+ const {
+ VITE_PORT,
+ VITE_PUBLIC_PATH,
+ VITE_PROXY,
+ VITE_DROP_CONSOLE,
+ VITE_DYNAMIC_IMPORT,
+ } = viteEnv;
+ return {
+ root,
+ alias,
+ /**
+ * port
+ * @default '3000'
+ */
+ port: VITE_PORT,
+
+ /**
+ * Base public path when served in production.
+ * @default '/'
+ */
+ base: VITE_PUBLIC_PATH,
+
+ /**
+ * Transpile target for esbuild.
+ * @default 'es2020'
+ */
+ esbuildTarget: 'es2019',
+
+ // terser options
+ terserOptions: {
+ compress: {
+ keep_infinity: true,
+ drop_console: VITE_DROP_CONSOLE,
+ },
+ },
+
+ define: {
+ __VERSION__: pkg.version,
+ // setting vue-i18-next
+ // Suppress warning
+ __VUE_I18N_LEGACY_API__: false,
+ __VUE_I18N_FULL_INSTALL__: false,
+ __INTLIFY_PROD_DEVTOOLS__: false,
+ },
+
+ cssPreprocessOptions: {
+ less: {
+ modifyVars: modifyVars,
+ javascriptEnabled: true,
+ },
},
- },
-
- define: {
- __VERSION__: pkg.version,
- // setting vue-i18-next
- // Suppress warning
- __VUE_I18N_LEGACY_API__: false,
- __VUE_I18N_FULL_INSTALL__: false,
- __INTLIFY_PROD_DEVTOOLS__: false,
- },
-
- cssPreprocessOptions: {
- less: {
- modifyVars: modifyVars,
- javascriptEnabled: true,
+
+ // The package will be recompiled using rollup, and the new package compiled into the esm module specification will be put into node_modules/.vite_opt_cache
+ optimizeDeps: {
+ include: [
+ 'qs',
+ 'echarts/map/js/china',
+ 'ant-design-vue/es/locale/zh_CN',
+ 'ant-design-vue/es/locale/en_US',
+ '@ant-design/icons-vue',
+ ],
},
- },
-
- // The package will be recompiled using rollup, and the new package compiled into the esm module specification will be put into node_modules/.vite_opt_cache
- optimizeDeps: {
- include: [
- 'qs',
- 'echarts/map/js/china',
- 'ant-design-vue/es/locale/zh_CN',
- 'ant-design-vue/es/locale/en_US',
- '@ant-design/icons-vue',
+
+ transforms: [
+ globbyTransform({
+ resolvers: resolvers,
+ root: root,
+ alias: alias,
+ includes: [resolve('src/router'), resolve('src/locales')],
+ }),
+ dynamicImportTransform(VITE_DYNAMIC_IMPORT),
],
- },
-
- transforms: [
- globbyTransform({
- resolvers: resolvers,
- root: root,
- alias: alias,
- includes: [resolve('src/router'), resolve('src/locales')],
- }),
- dynamicImportTransform(VITE_DYNAMIC_IMPORT),
- ],
-
- proxy: createProxy(VITE_PROXY),
-
- plugins: createVitePlugins(viteEnv),
-
- rollupInputOptions: {
- plugins: createRollupPlugin(),
- },
-
- rollupOutputOptions: {
- compact: true,
- manualChunks: configManualChunk,
- },
-};
-export default viteConfig;
+ proxy: createProxy(VITE_PROXY),
+
+ plugins: createVitePlugins(viteEnv, mode),
+
+ rollupInputOptions: {
+ plugins: createRollupPlugin(),
+ },
+
+ rollupOutputOptions: {
+ compact: true,
+ manualChunks: configManualChunk,
+ },
+ };
+};
+