diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js index 3f3eb023f44086f9f69607058681850d626d624f..da18039a186a334f3abdb208c96ba9e9bbb65b9b 100644 --- a/packages/vue-cli-plugin-uni/lib/env.js +++ b/packages/vue-cli-plugin-uni/lib/env.js @@ -83,14 +83,15 @@ if ( const defaultOutputDir = '../../../../dist/' + (process.env.NODE_ENV === 'production' ? 'build' : 'dev') + '/' + (process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM) - + +process.env.UNI_OUTPUT_DEFAULT_DIR = path.resolve(__dirname, defaultOutputDir) if (process.env.UNI_OUTPUT_DIR && process.env.UNI_OUTPUT_DIR.indexOf('./') === 0) { process.env.UNI_OUTPUT_DIR = path.resolve(process.cwd(), process.env.UNI_OUTPUT_DIR) } process.env.UNI_PLATFORM = process.env.UNI_PLATFORM || 'h5' process.env.VUE_APP_PLATFORM = process.env.UNI_PLATFORM -process.env.UNI_OUTPUT_DIR = process.env.UNI_OUTPUT_DIR || path.resolve(__dirname, defaultOutputDir) +process.env.UNI_OUTPUT_DIR = process.env.UNI_OUTPUT_DIR || process.env.UNI_OUTPUT_DEFAULT_DIR if (process.env.UNI_PLATFORM === 'app-plus') { process.env.UNI_OUTPUT_TMP_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, '../.tmp/app-plus') diff --git a/packages/vue-cli-plugin-uni/lib/mp/index.js b/packages/vue-cli-plugin-uni/lib/mp/index.js index 5ef4cced2b18295238bd053a79ba64380e30132d..a1ac93d969020f1ad948ab717de5005a893ec003 100644 --- a/packages/vue-cli-plugin-uni/lib/mp/index.js +++ b/packages/vue-cli-plugin-uni/lib/mp/index.js @@ -121,7 +121,9 @@ class PreprocessAssetsPlugin { } function initSubpackageConfig (webpackConfig, vueOptions) { - process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, process.env.UNI_SUBPACKGE) + if (process.env.UNI_OUTPUT_DEFAULT_DIR === process.env.UNI_OUTPUT_DIR) { // 未自定义output + process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, process.env.UNI_SUBPACKGE) + } vueOptions.outputDir = process.env.UNI_OUTPUT_DIR webpackConfig.output.path(process.env.UNI_OUTPUT_DIR) webpackConfig.output.jsonpFunction('webpackJsonp_' + process.env.UNI_SUBPACKGE)