diff --git a/packages/uni-quickapp-vue/lib/uni.config.js b/packages/uni-quickapp-vue/lib/uni.config.js index d4bab4ef82a3170d4ca11ae33575c405d60b91f6..4ba52ba2c8df6758685c8f65f490306b5c44eb76 100644 --- a/packages/uni-quickapp-vue/lib/uni.config.js +++ b/packages/uni-quickapp-vue/lib/uni.config.js @@ -1,9 +1 @@ -global.framework = {} - -const chainWebpack = require('./chain-webpack') -const configureWebpack = require('./configure-webpack') - -module.exports = { - chainWebpack, - configureWebpack -} +module.exports = {} diff --git a/packages/uni-quickapp-vue/lib/vue.config.js b/packages/uni-quickapp-vue/lib/vue.config.js new file mode 100644 index 0000000000000000000000000000000000000000..d4bab4ef82a3170d4ca11ae33575c405d60b91f6 --- /dev/null +++ b/packages/uni-quickapp-vue/lib/vue.config.js @@ -0,0 +1,9 @@ +global.framework = {} + +const chainWebpack = require('./chain-webpack') +const configureWebpack = require('./configure-webpack') + +module.exports = { + chainWebpack, + configureWebpack +} diff --git a/packages/uni-quickapp-vue/package.json b/packages/uni-quickapp-vue/package.json index 97bc6f63ca332ef39f09a2b7c4834c4f60c04330..e65f614fb27193e30766724cac671c7b1e41e8d1 100644 --- a/packages/uni-quickapp-vue/package.json +++ b/packages/uni-quickapp-vue/package.json @@ -21,7 +21,7 @@ "license": "Apache-2.0", "gitHead": "110501ffb0313e417858dec92acf07522d4ded00", "uni-app": { - "name": "quickapp", + "name": "quickapp-vue", "title": "快应用(Vue)版" }, "dependencies": { diff --git a/packages/uni-template-compiler/lib/index.js b/packages/uni-template-compiler/lib/index.js index 8cf7037ff10f8ca7cea2766cebc761cffd75e22c..f6205148addd7607fed20d6280601c786bd94131 100644 --- a/packages/uni-template-compiler/lib/index.js +++ b/packages/uni-template-compiler/lib/index.js @@ -80,12 +80,12 @@ module.exports = { console.error(source) throw e } - } else if (options.quickapp) { + } else if (options['quickapp-vue']) { // 后续改版,应统一由具体包实现 - (options.modules || (options.modules = [])).push(require('@dcloudio/uni-quickapp/lib/compiler-module')) + (options.modules || (options.modules = [])).push(require('@dcloudio/uni-quickapp-vue/lib/compiler-module')) } - if (!options.mp) { // h5,quickapp + if (!options.mp) { // h5,quickapp-vue return compileTemplate(source, options, compile) } diff --git a/packages/vue-cli-plugin-uni/index.js b/packages/vue-cli-plugin-uni/index.js index f05111a48b0afc170a3f8aa2625d91c959ca9041..20bd60e1ce654ef98c2a27b326b3258a197882cf 100644 --- a/packages/vue-cli-plugin-uni/index.js +++ b/packages/vue-cli-plugin-uni/index.js @@ -19,7 +19,7 @@ module.exports = (api, options) => { initBuildCommand(api, options) - if (process.env.UNI_PLATFORM === 'quickapp') { + if (process.env.UNI_PLATFORM === 'quickapp-vue') { process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, 'build') Object.assign(options, { assetsDir, @@ -35,7 +35,7 @@ module.exports = (api, options) => { api.configureWebpack(require('./lib/configure-webpack')(platformOptions, manifestPlatformOptions, options, api)) api.chainWebpack(require('./lib/chain-webpack')(platformOptions, options, api)) - const vueConfig = require('@dcloudio/uni-quickapp/lib/vue.config.js') + const vueConfig = require('@dcloudio/uni-quickapp-vue/lib/vue.config.js') api.configureWebpack(vueConfig.configureWebpack) api.chainWebpack(vueConfig.chainWebpack) return diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js index 9b58185bb29fb6ae1e49cd118977d9f1ef803380..3c356436078095930babc9c14bf3e1ddaad95f04 100644 --- a/packages/vue-cli-plugin-uni/lib/env.js +++ b/packages/vue-cli-plugin-uni/lib/env.js @@ -287,7 +287,7 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) { console.log('当前nvue编译模式' + (process.env.UNI_USING_V3_NATIVE ? '(v3)' : '') + ':' + (isNVueCompiler ? 'uni-app' : 'weex') + ' 。编译模式差异见:https://ask.dcloud.net.cn/article/36074') -} else if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'quickapp') { +} else if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'quickapp-vue') { try { let info = '' if (process.env.UNI_PLATFORM === 'app-plus') { diff --git a/packages/vue-cli-plugin-uni/packages/postcss/index.js b/packages/vue-cli-plugin-uni/packages/postcss/index.js index c36ff7fd473f9091b38f91d6a74fd2b2bdef2cf3..0eaae1063e4a1330b122295c17dfa0db5a09f0b0 100644 --- a/packages/vue-cli-plugin-uni/packages/postcss/index.js +++ b/packages/vue-cli-plugin-uni/packages/postcss/index.js @@ -241,7 +241,7 @@ if (process.env.UNI_USING_V3) { // Transform each property declaration here decl.value = tranformValue(decl, opts) }) - if (process.env.UNI_PLATFORM !== 'quickapp') { + if (process.env.UNI_PLATFORM !== 'quickapp-vue') { rule.selectors = rule.selectors.map(complexSelector => { return transformSelector(complexSelector, simpleSelectors => { return simpleSelectors.walkTags(tag => { diff --git a/packages/webpack-uni-pages-loader/lib/platforms/quickapp.js b/packages/webpack-uni-pages-loader/lib/platforms/quickapp-vue.js similarity index 100% rename from packages/webpack-uni-pages-loader/lib/platforms/quickapp.js rename to packages/webpack-uni-pages-loader/lib/platforms/quickapp-vue.js