diff --git a/packages/uni-cli-shared/lib/manifest.js b/packages/uni-cli-shared/lib/manifest.js index e28412473ed7a46d7e79920cc21be6a5028d4d69..ab9fd8e8f5301500773fdda14f5e47eba0144a56 100644 --- a/packages/uni-cli-shared/lib/manifest.js +++ b/packages/uni-cli-shared/lib/manifest.js @@ -50,11 +50,7 @@ function getH5Options (manifestJson) { h5.title = h5.title || manifestJson.name || '' - if (process.env.UNI_SUB_PLATFORM === 'mp-360') { // 360 小程序仅支持 hash 模式 - h5.router = Object.assign({}, defaultRouter) - } else { - h5.router = Object.assign({}, defaultRouter, h5.router || {}) - } + h5.router = Object.assign({}, defaultRouter, h5.router || {}) h5['async'] = Object.assign({}, defaultAsync, h5['async'] || {}) @@ -80,11 +76,6 @@ function getH5Options (manifestJson) { h5.publicPath = base } - if (process.env.UNI_SUB_PLATFORM === 'mp-360') { - h5.router.base = '/' - h5.publicPath = '/' - } - /* eslint-disable no-mixed-operators */ h5.template = h5.template && path.resolve(process.env.UNI_INPUT_DIR, h5.template) || path.resolve(__dirname, '../../../../public/index.html') diff --git a/packages/uni-cli-shared/lib/platform.js b/packages/uni-cli-shared/lib/platform.js index 466717d6ddfd0d78d00900fbb262b6d258041285..26e1e78f12a26e7b7a66552b819990c1f4a8f209 100644 --- a/packages/uni-cli-shared/lib/platform.js +++ b/packages/uni-cli-shared/lib/platform.js @@ -332,10 +332,6 @@ const PLATFORMS = { } } // 解决 vue-cli-service lint 时 UNI_PLATFORM 不存在 -if (process.env.UNI_PLATFORM === 'mp-360') { - process.env.UNI_PLATFORM = 'h5' - process.env.UNI_SUB_PLATFORM = 'mp-360' -} process.env.UNI_PLATFORM = process.env.UNI_PLATFORM || 'h5' const platform = PLATFORMS[process.env.UNI_PLATFORM] @@ -371,14 +367,6 @@ if (process.env.UNI_PLATFORM.indexOf('app-') === 0) { preprocessContext['APP'] = true } -preprocessContext['MP-360'] = false -preprocessContext['MP_360'] = false -if (process.env.UNI_SUB_PLATFORM === 'mp-360') { - preprocessContext['H5'] = false - preprocessContext['MP-360'] = true - preprocessContext['MP_360'] = true -} - if (process.UNI_SCRIPT_DEFINE && Object.keys(process.UNI_SCRIPT_DEFINE).length) { Object.keys(process.UNI_SCRIPT_DEFINE).forEach(name => { preprocessContext[name] = process.UNI_SCRIPT_DEFINE[name] diff --git a/packages/vue-cli-plugin-uni/generator.js b/packages/vue-cli-plugin-uni/generator.js index 8a7e1ad85be987b0eebded7a67392264fca350fe..fe8e2359e4c5071ca8bd189a9d42a4b5771441cd 100644 --- a/packages/vue-cli-plugin-uni/generator.js +++ b/packages/vue-cli-plugin-uni/generator.js @@ -17,7 +17,6 @@ module.exports = (api, options, rootOptions) => { 'dev:mp-alipay': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch', 'dev:mp-toutiao': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch', 'dev:quickapp': 'cross-env NODE_ENV=development UNI_PLATFORM=quickapp vue-cli-service uni-build --watch', - 'dev:mp-360': 'cross-env NODE_ENV=development UNI_PLATFORM=mp-360 vue-cli-service uni-build --watch', 'build:h5': 'cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build', 'build:mp-qq': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build', 'build:mp-weixin': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build', @@ -25,7 +24,6 @@ module.exports = (api, options, rootOptions) => { 'build:mp-alipay': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build', 'build:mp-toutiao': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build', 'build:quickapp': 'cross-env NODE_ENV=production UNI_PLATFORM=quickapp vue-cli-service uni-build', - 'build:mp-360': 'cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build', 'dev:custom': 'cross-env NODE_ENV=development uniapp-cli custom', 'build:custom': 'cross-env NODE_ENV=production uniapp-cli custom' }, diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js index eb1066f2d02fb5325f7e3fec814fbefdaf384fc8..e92a72a862ee760fc5d7466fcf0312e50e94b0c5 100644 --- a/packages/vue-cli-plugin-uni/lib/env.js +++ b/packages/vue-cli-plugin-uni/lib/env.js @@ -48,10 +48,6 @@ if ( console.warn(`发布H5,需要在uniCloud后台操作,绑定安全域名,否则会因为跨域问题而无法访问。教程参考:https://uniapp.dcloud.io/uniCloud/quickstart-H5`) } -if (process.env.UNI_PLATFORM === 'mp-360') { - process.env.UNI_PLATFORM = 'h5' - process.env.UNI_SUB_PLATFORM = 'mp-360' -} // 初始化环境变量 const defaultInputDir = '../../../../src' @@ -71,11 +67,6 @@ process.env.VUE_APP_PLATFORM = process.env.UNI_PLATFORM process.env.UNI_INPUT_DIR = process.env.UNI_INPUT_DIR || path.resolve(__dirname, defaultInputDir) process.env.UNI_OUTPUT_DIR = process.env.UNI_OUTPUT_DIR || path.resolve(__dirname, defaultOutputDir) -if (process.env.UNI_SUB_PLATFORM === 'mp-360') { - const outputDir = process.env.UNI_OUTPUT_DIR - process.env.UNI_OUTPUT_DIR = path.resolve(outputDir.substr(0, outputDir.lastIndexOf('h5')), 'mp-360/dist') -} - 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/h5/index.js b/packages/vue-cli-plugin-uni/lib/h5/index.js index d3b2407249c07f5cf2af24235cf3518d1b27b4a2..9888f4dd92f2ee610d38245657f85508051f2f20 100644 --- a/packages/vue-cli-plugin-uni/lib/h5/index.js +++ b/packages/vue-cli-plugin-uni/lib/h5/index.js @@ -104,13 +104,6 @@ module.exports = { const beforeCode = (useBuiltIns === 'entry' ? `import '@babel/polyfill';` : '') + `import 'uni-pages';import 'uni-${process.env.UNI_PLATFORM}';` - const qihooCode = process.env.UNI_SUB_PLATFORM === 'mp-360' - ? ` -import qh from 'uni-qh'; -global.qh = qh; -global.onAppShow = function(){}; -` : '' - return { devtool: process.env.NODE_ENV === 'production' ? false : 'cheap-module-eval-source-map', resolve: { @@ -128,7 +121,7 @@ global.onAppShow = function(){}; loader: 'wrap-loader', options: { before: [ - qihooCode + beforeCode + statCode + getGlobalUsingComponentsCode() + beforeCode + statCode + getGlobalUsingComponentsCode() ] } }] diff --git a/packages/webpack-uni-pages-loader/lib/platforms/h5.js b/packages/webpack-uni-pages-loader/lib/platforms/h5.js index 8e4a736548b8b4b7f4ca4ff9b49c0d029cedfe7d..8c974e1e0b232a0d0d15ec160bbb2f24bc5240ec 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/h5.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/h5.js @@ -66,10 +66,6 @@ const getPageComponents = function (inputDir, pagesJson) { globalStyle['h5'] || {} ) - if (process.env.UNI_SUB_PLATFORM === 'mp-360') { - Object.assign(globalStyle, globalStyle['mp-360'] || {}) - } - process.UNI_H5_PAGES_JSON = { pages: {}, globalStyle @@ -94,10 +90,6 @@ const getPageComponents = function (inputDir, pagesJson) { // 解析 titleNView,pullToRefresh const h5Options = Object.assign({}, props['app-plus'] || {}, props['h5'] || {}) - if (process.env.UNI_SUB_PLATFORM === 'mp-360') { - Object.assign(h5Options, props['mp-360'] || {}) - Object.assign(props, props['mp-360'] || {}) - } removePlatformStyle(h5Options) if (h5Options.hasOwnProperty('titleNView')) { @@ -130,7 +122,6 @@ const getPageComponents = function (inputDir, pagesJson) { // 删除 app-plus 平台配置 delete props['app-plus'] delete props['h5'] - delete props['mp-360'] process.UNI_H5_PAGES_JSON.pages[page.path] = props