fix: 修复开关生产环境 mock

dishait · Mar 6, 2022 · f4c3dff · f4c3dff
1 parent 75158c9
commit f4c3dff
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "@vitejs/plugin-vue-jsx": "^1.3.8",
     "@vueuse/components": "^7.7.0",
     "@vueuse/core": "^7.7.0",
+    "axios": "^0.26.0",
     "c8": "^7.11.0",
     "esno": "^0.14.1",
     "ityped": "^1.0.3",
@@ -82,6 +83,7 @@
     "optimizeDeps": {
       "include": [
         "@vueuse/core",
+        "axios",
         "ityped",
         "mockjs",
         "nprogress",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/presets/shared/mock.ts b/presets/shared/mock.ts
@@ -6,10 +6,7 @@
 import Mock from 'mockjs'
 
 export function createFetchSever(mockList: any[]) {
-	if (
-		!window['originFetch'] &&
-		import.meta.env.VITE_APP_MOCK_IN_PRODUCTION
-	) {
+	if (!window['originFetch']) {
 		window['originFetch'] = window.fetch
 		window.fetch = function (
 			fetchUrl: string,

diff --git a/presets/types/auto-imports.d.ts b/presets/types/auto-imports.d.ts
@@ -114,6 +114,7 @@ declare global {
   const useCssVars: typeof import('vue')['useCssVars']
   const useCycleList: typeof import('@vueuse/core')['useCycleList']
   const useDark: typeof import('@vueuse/core')['useDark']
+  const useDarks: typeof import('/src/composables/useDarks')['default']
   const useDebounce: typeof import('@vueuse/core')['useDebounce']
   const useDebouncedRefHistory: typeof import('@vueuse/core')['useDebouncedRefHistory']
   const useDebounceFn: typeof import('@vueuse/core')['useDebounceFn']

diff --git a/src/mock.ts b/src/mock.ts
diff --git a/src/modules/mock.ts b/src/modules/mock.ts
@@ -4,8 +4,12 @@
 import { createProdMockServer } from 'vite-plugin-mock/es/createProdMockServer'
 import { createFetchSever } from '../../presets/shared/mock'
 
+const shouldCreateServer =
+	!import.meta.env.DEV &&
+	import.meta.env.VITE_APP_MOCK_IN_PRODUCTION
+
 // 生产环境时才创建服务
-if (!import.meta.env.DEV) {
+if (shouldCreateServer) {
 	const mockModules: any[] = []
 	const modules = import.meta.globEager('../../mock/*.ts')
 	Object.values(modules).forEach(v => {