Commit 2d095b0

authored

Merge pull request vue-zone#24 from leo4developer/main

fix(dev): 🐛 fixed `mock` value judgments (vue-zone#24)

2 parents 7a3b38c + beb29b6 commit 2d095b0Copy full SHA for 2d095b0

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ import mock from './build/mock/createMockServer'`
`20`	`20`	`export default ({ command, mode }: ConfigEnv): UserConfig => {`
`21`	`21`	`const root = process.cwd()`
`22`	`22`	`const env = loadEnv(mode, root)`
`23`		`-`
	`23`	`+ const isHttpMock = env.VITE_HTTP_MOCK === 'true'`
	`24`	`+ const isViteMock = env.VITE_MOCK === 'true'`
`24`	`25`	`return {`
`25`	`26`	`base: env.VITE_APP_PUBLIC_PATH,`
`26`	`27`
`@@ -72,7 +73,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {`
`72`	`73`	`watch: true,`
`73`	`74`	`mockUrlList: [/api/],`
`74`	`75`	`cwd: process.cwd(),`
`75`		`- enable: env.VITE_HTTP_MOCK && env.VITE_MOCK && process.env.NODE_ENV !== 'production',`
	`76`	`+ enable: isHttpMock && isViteMock && process.env.NODE_ENV !== 'production',`
`76`	`77`	`}),`
`77`	`78`	`],`
`78`	`79`
`@@ -103,7 +104,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {`
`103`	`104`	`server: {`
`104`	`105`	`host: true,`
`105`	`106`	`port: 3000,`
`106`		`- proxy: env.VITE_HTTP_MOCK && env.VITE_MOCK && process.env.NODE_ENV !== 'production'`
	`107`	`+ proxy: isHttpMock && isViteMock && process.env.NODE_ENV !== 'production'`
`107`	`108`	`? undefined`
`108`	`109`	`: {`
`109`	`110`	`'/api': {`

Comments

(0)