fix(cli): fix build error

affects: @varlet/cli
varletjs · Jul 19, 2021 · 27f1947 · 27f1947
1 parent d60158a
commit 27f1947
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/varlet-cli/src/commands/build.ts b/packages/varlet-cli/src/commands/build.ts
@@ -3,14 +3,16 @@ import logger from '../shared/logger'
 import { buildMobileSiteRoutes, buildPcSiteRoutes } from '../compiler/compileRoutes'
 import { getBuildConfig } from '../config/webpack.build.config'
 import { ensureDirSync } from 'fs-extra'
-import { SRC_DIR } from '../shared/constant'
+import { SITE_MOBILE, SITE_PC, SRC_DIR } from '../shared/constant'
+import { resolve } from 'path'
 
 export async function build() {
   ensureDirSync(SRC_DIR)
 
-  await Promise.all([buildMobileSiteRoutes(), buildPcSiteRoutes()])
-
+  const [mobileRouteId, pcRouteId] = await Promise.all([buildMobileSiteRoutes(), buildPcSiteRoutes()])
   const config = getBuildConfig()
+  config.resolve.alias['@pc-routes'] = resolve(SITE_PC, `./${pcRouteId}.routes.ts`)
+  config.resolve.alias['@mobile-routes'] = resolve(SITE_MOBILE, `./${mobileRouteId}.routes.ts`)
 
   webpack(config, (err, stats) => {
     err && logger.error(err.toString())

diff --git a/packages/varlet-cli/src/commands/dev.ts b/packages/varlet-cli/src/commands/dev.ts
@@ -8,14 +8,9 @@ import { ensureDirSync } from 'fs-extra'
 import { resolve } from 'path'
 import { SRC_DIR, SITE_PC, SITE_MOBILE } from '../shared/constant'
 
-let mobileRouteId: string
-let pcRouteId: string
-
 export function runDevServer(port: number, config: any) {
   const { host } = config.devServer
   config.devServer.port = port
-  config.resolve.alias['@pc-routes'] = resolve(SITE_PC, `./${pcRouteId}.routes.ts`)
-  config.resolve.alias['@mobile-routes'] = resolve(SITE_MOBILE, `./${mobileRouteId}.routes.ts`)
   const server = new WebpackDevServer(webpack(config), config.devServer)
 
   ;(server as any).showStatus = function () {}
@@ -32,9 +27,12 @@ export function runDevServer(port: number, config: any) {
 
 export async function dev() {
   ensureDirSync(SRC_DIR)
-  ;[mobileRouteId, pcRouteId] = await Promise.all([buildMobileSiteRoutes(), buildPcSiteRoutes()])
 
+  const [mobileRouteId, pcRouteId] = await Promise.all([buildMobileSiteRoutes(), buildPcSiteRoutes()])
   const config = getDevConfig()
+  config.resolve.alias['@pc-routes'] = resolve(SITE_PC, `./${pcRouteId}.routes.ts`)
+  config.resolve.alias['@mobile-routes'] = resolve(SITE_MOBILE, `./${mobileRouteId}.routes.ts`)
+
   const { port } = config.devServer
   getPort(
     {

diff --git a/packages/varlet-cli/src/config/webpack.build.config.ts b/packages/varlet-cli/src/config/webpack.build.config.ts
@@ -1,9 +1,9 @@
 import merge from 'webpack-merge'
 import WebpackBarPlugin from 'webpackbar'
+import CopyWebpackPlugin from 'copy-webpack-plugin'
 import { BASE_CONFIG } from './webpack.base.config'
 import { SITE_OUTPUT_PATH, PRIMARY_COLOR, SITE_PUBLIC_PATH } from '../shared/constant'
 import { CleanWebpackPlugin } from 'clean-webpack-plugin'
-import CopyWebpackPlugin from 'copy-webpack-plugin'
 import { HTML_WEBPACK_PLUGINS } from './webpack.dev.config'
 
 export function getBuildConfig() {