@dcloudio/vue-cli-plugin-uni 2.0.1-alpha-36320220919002 → 2.0.1-alpha-36720221017001

package/commands/build.js

@@ -210,8 +210,7 @@ async function build (args, api, options) {
 
           if (process.env.UNI_PLATFORM === 'h5' && !isInHBuilderX) {
             console.log()
-            console.log('欢迎将H5站部署到uniCloud前端网页托管平台，高速、免费、安全、省心，详见：')
-            console.log('https://uniapp.dcloud.io/uniCloud/hosting')
+            console.log('欢迎将web站点部署到uniCloud前端网页托管平台，高速、免费、安全、省心，详见：https://uniapp.dcloud.io/uniCloud/hosting')
           }
         } else {
           const dirMsg = runByHBuilderX ? ''

package/generator.js

@@ -52,6 +52,7 @@ module.exports = (api, options, rootOptions) => {
         scripts: {}
       },
       dependencies: {
+        '@dcloudio/uni-app': version,
         '@dcloudio/uni-app-plus': version,
         '@dcloudio/uni-h5': version,
         '@dcloudio/uni-mp-vue': version,

package/lib/app-plus/index.js

@@ -163,7 +163,7 @@ const v3 = {
               compiler: vueLoader.compiler,
               before: [
                 beforeCode + require('../util').getAutomatorCode() + statCode + pushCode + uniCloudCode +
-                getGlobalUsingComponentsCode()
+                  getGlobalUsingComponentsCode()
               ]
             }
           }]
@@ -278,4 +278,4 @@ if (process.env.UNI_USING_V3) {
   module.exports = v3
 } else {
   module.exports = require('../mp')
-}
+}

package/lib/chain-webpack.js

@@ -135,6 +135,7 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       'process.env.UNI_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM),
       'process.env.UNI_SUB_PLATFORM': JSON.stringify(process.env.UNI_SUB_PLATFORM),
       'process.env.UNI_CLOUD_PROVIDER': process.env.UNI_CLOUD_PROVIDER,
+      'process.env.UNI_SECURE_NETWORK': process.env.UNI_SECURE_NETWORK,
       'process.env.UNICLOUD_DEBUG': process.env.UNICLOUD_DEBUG,
       'process.env.RUN_BY_HBUILDERX': process.env.RUN_BY_HBUILDERX,
       'process.env.UNI_AUTOMATOR_WS_ENDPOINT': JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
@@ -160,6 +161,14 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       defines.__UNI_ROUTER_MODE__ = JSON.stringify('hash')
     }
 
+    if (process.env.UNI_CLOUD_PROVIDER && process.env.NODE_ENV !== 'development') {
+      webpackConfig.optimization.minimizer('terser').tap((args) => {
+        // reduce_vars 优化常量
+        args[0].terserOptions.compress.reduce_vars = true
+        return args
+      })
+    }
+
     webpackConfig
       .plugin('uni-define')
       .use(require.resolve('webpack/lib/DefinePlugin'), [defines])

package/lib/configure-webpack.js

@@ -73,8 +73,8 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         const normalized = RuleSet.normalizeRule(clone, {}, '')
         return (
           !rule.enforce &&
-        normalized.resource &&
-        normalized.resource(fakeFile)
+          normalized.resource &&
+          normalized.resource(fakeFile)
         )
       }
     }
@@ -230,7 +230,10 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       webpackConfig.resolve.modules = webpackConfig.resolve.modules.filter(module => module !== 'node_modules')
     }
 
-    const plugins = []
+    const plugins = [
+      new webpack.ProvidePlugin(require('@dcloudio/uni-cli-shared/lib/uni_modules/uni_modules')
+        .parseUniExtApis())
+    ]
 
     const isAppView = process.env.UNI_PLATFORM === 'app-plus' &&
       vueOptions.pluginOptions &&
@@ -239,7 +242,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
 
     if (!isAppView) { // app-plus view不需要copy
       const patterns = getCopyWebpackPluginOptions(manifestPlatformOptions, vueOptions)
-      plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? { patterns } : patterns))
+      plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? {
+        patterns
+      } : patterns))
     }
     if (!process.env.UNI_SUBPACKGE || !process.env.UNI_MP_PLUGIN) {
       try {
@@ -258,8 +263,10 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
             return ''
           }
         }]
-        plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? { patterns } : patterns))
-      } catch (e) { }
+        plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? {
+          patterns
+        } : patterns))
+      } catch (e) {}
     }
 
     if (process.UNI_SCRIPT_ENV && Object.keys(process.UNI_SCRIPT_ENV).length) {
@@ -309,7 +316,8 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       })
     }
 
-    if (process.env.NODE_ENV === 'development' || (process.env.NODE_ENV === 'production' && process.env.SOURCEMAP === 'true')) {
+    if (process.env.NODE_ENV === 'development' || (process.env.NODE_ENV === 'production' && process.env
+      .SOURCEMAP === 'true')) {
       const sourceMap = require('@dcloudio/uni-cli-shared/lib/source-map')
       let isAppService = false
       if (
@@ -331,7 +339,9 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
           noSources: true,
           append: false
         }
-        if (isInHBuilderX && process.env.SOURCEMAP_PATH) { sourceMapOptions.filename = process.env.SOURCEMAP_PATH }
+        if (isInHBuilderX && process.env.SOURCEMAP_PATH) {
+          sourceMapOptions.filename = process.env.SOURCEMAP_PATH
+        }
         if (useEvalSourceMap || useSourceMap) {
           plugins.push(sourceMap.createSourceMapDevToolPlugin(!sourceMapOptions.filename, sourceMapOptions))
         }
@@ -339,7 +349,8 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         if (useEvalSourceMap) {
           plugins.push(sourceMap.createEvalSourceMapDevToolPlugin())
         } else if (useSourceMap) {
-          plugins.push(sourceMap.createSourceMapDevToolPlugin(process.env.UNI_PLATFORM === 'mp-weixin' || process.env.UNI_PLATFORM === 'mp-toutiao'))
+          plugins.push(sourceMap.createSourceMapDevToolPlugin(process.env.UNI_PLATFORM === 'mp-weixin' || process
+            .env.UNI_PLATFORM === 'mp-toutiao'))
         }
       }
     }
@@ -383,7 +394,8 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
             JSON.stringify({
               type: 'stat'
             }),
-          vuex: require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3')
+          vuex: require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3'),
+          '@vue/composition-api': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api')
         },
         modules: [
           process.env.UNI_INPUT_DIR,
@@ -406,4 +418,4 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       watchOptions: require('./util').getWatchOptions()
     }, platformWebpackConfig)
   }
-}
+}

package/lib/env.js

@@ -24,7 +24,8 @@ const {
   getManifestJson,
   isEnableUniPushV1,
   isEnableUniPushV2,
-  isUniPushOffline
+  isUniPushOffline,
+  isEnableSecureNetwork
 } = require('@dcloudio/uni-cli-shared/lib/manifest')
 
 const manifestJsonObj = getManifestJson()
@@ -129,6 +130,9 @@ if (!process.env.UNI_CLOUD_PROVIDER && process.env.UNI_CLOUD_SPACES) {
   } catch (e) {}
 }
 
+// 安全网络
+process.env.UNI_SECURE_NETWORK = isEnableSecureNetwork(manifestJsonObj, process.env.UNI_PLATFORM)
+
 // 初始化环境变量
 process.env.UNI_CLI_CONTEXT = require('@dcloudio/uni-cli-shared/lib/util').getCLIContext()
 

package/lib/h5/index.js

@@ -194,4 +194,4 @@ module.exports = {
       require('./cssnano-options')(webpackConfig)
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.1-alpha-36320220919002",
+  "version": "2.0.1-alpha-36720221017001",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.1-alpha-36320220919002",
+    "@dcloudio/uni-stat": "^2.0.1-alpha-36720221017001",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "cross-env": "^5.2.0",
@@ -41,5 +41,5 @@
     "copy-webpack-plugin": ">=5",
     "postcss": ">=7"
   },
-  "gitHead": "b2851f78cf0ce4c18aa1e9c0033ab1bcc9306444"
+  "gitHead": "7d7030aaaffab530253dc4cf02f87a13023c0d1f"
 }

package/packages/@vue/composition-api/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019-present, liximomo(X.L)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.