From 3d8f3c36aa1b0848cceb27079a249e5107f39ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Mon, 2 Dec 2019 16:17:24 +0800 Subject: [PATCH] fix(cli): always use '/' as publicPath in dev mode --- packages/vant-cli/src/common/index.ts | 4 ++++ packages/vant-cli/src/config/webpack.site.prd.ts | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/vant-cli/src/common/index.ts b/packages/vant-cli/src/common/index.ts index 9048bbda8..8b80c2587 100644 --- a/packages/vant-cli/src/common/index.ts +++ b/packages/vant-cli/src/common/index.ts @@ -99,4 +99,8 @@ export function setNodeEnv(value: NodeEnv) { process.env.NODE_ENV = value; } +export function isDev() { + return process.env.NODE_ENV === 'development'; +} + export { decamelize }; diff --git a/packages/vant-cli/src/config/webpack.site.prd.ts b/packages/vant-cli/src/config/webpack.site.prd.ts index 7ee6a8e70..60e0fbc5b 100644 --- a/packages/vant-cli/src/config/webpack.site.prd.ts +++ b/packages/vant-cli/src/config/webpack.site.prd.ts @@ -1,11 +1,13 @@ import merge from 'webpack-merge'; import { get } from 'lodash'; -import { getWebpackConfig } from '../common'; +import { isDev, getWebpackConfig } from '../common'; import { siteDevBaseConfig } from './webpack.site.dev'; import { CONFIG, SITE_DIST_DIR } from '../common/constant'; const outputDir = get(CONFIG, 'build.site.outputDir', SITE_DIST_DIR); -const publicPath = get(CONFIG, 'build.site.publicPath', '/'); + +// always use '/' as publicPath in dev mode +const publicPath = isDev() ? '/' : get(CONFIG, 'build.site.publicPath', '/'); export const sitePrdConfig = merge( siteDevBaseConfig,