@dcloudio/vue-cli-plugin-uni 2.0.1-alpha-36720221017003 → 2.0.1-alpha-36720221018002

package/lib/configure-webpack.js

@@ -106,7 +106,6 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
   const tsLoaderOptions = {
     context,
     configFile: tsConfigJsonFile,
-    transpileOnly: false,
     compilerOptions: {
       baseUrl: context,
       typeRoots: [resolveModule('@dcloudio/types'), resolveModule('@types')],
@@ -135,6 +134,12 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         ],
         'mpvue-page-factory': [
           resolveModule('@dcloudio/vue-cli-plugin-uni/packages/mpvue-page-factory')
+        ],
+        '@vue/composition-api': [
+          resolveModule('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api')
+        ],
+        '@dcloudio/uni-app': [
+          resolveModule('@dcloudio/uni-app')
         ]
       }
     },
@@ -155,7 +160,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
   function updateTsLoader (rawRules, fakeFile, loader) {
     const matchRule = rawRules.find(createMatcher(fakeFile))
     if (matchRule && matchRule.use) {
-      if (runByHBuilderX) {
+      if (isInHBuilderX) {
         matchRule.use.forEach(matchUse => {
           if (matchUse.loader.includes('ts-loader')) {
             Object.assign(matchUse.options, tsLoaderOptions)
@@ -230,10 +235,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       webpackConfig.resolve.modules = webpackConfig.resolve.modules.filter(module => module !== 'node_modules')
     }
 
-    const plugins = [
-      new webpack.ProvidePlugin(require('@dcloudio/uni-cli-shared/lib/uni_modules/uni_modules')
-        .parseUniExtApis())
-    ]
+    const plugins = []
 
     const isAppView = process.env.UNI_PLATFORM === 'app-plus' &&
       vueOptions.pluginOptions &&
@@ -245,6 +247,19 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? {
         patterns
       } : patterns))
+
+      const uniExtApis = require('@dcloudio/uni-cli-shared/lib/uni_modules/uni_modules')
+        .parseUniExtApis(false)
+      const keys = Object.keys(uniExtApis)
+      if (keys.length) {
+        if (process.env.UNI_PLATFORM === 'app-plus') {
+          keys.forEach(key => {
+            console.warn(`[${uniExtApis[key][0].split('/')[2]}]: uts目前仅支持vue3`)
+          })
+        } else {
+          plugins.push(new webpack.ProvidePlugin(uniExtApis))
+        }
+      }
     }
     if (!process.env.UNI_SUBPACKGE || !process.env.UNI_MP_PLUGIN) {
       try {
@@ -266,7 +281,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? {
           patterns
         } : patterns))
-      } catch (e) {}
+      } catch (e) { }
     }
 
     if (process.UNI_SCRIPT_ENV && Object.keys(process.UNI_SCRIPT_ENV).length) {
@@ -365,7 +380,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
           dir: process.env.UNI_INPUT_DIR
         }))
       }
-    } catch (e) {}
+    } catch (e) { }
 
     const resolveLoaderAlias = {}
     const modules = ['@vue/cli-plugin-babel', '@vue/cli-service']
@@ -418,4 +433,4 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       watchOptions: require('./util').getWatchOptions()
     }, platformWebpackConfig)
   }
-}
+}

package/lib/env.js

@@ -148,6 +148,23 @@ if (process.env.UNI_OUTPUT_DIR && process.env.UNI_OUTPUT_DIR.indexOf('./') === 0
 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 || process.env.UNI_OUTPUT_DEFAULT_DIR
+initUtsPlatform()
+
+function initUtsPlatform () {
+  if (process.env.UNI_APP_PLATFORM === 'android') {
+    process.env.UNI_UTS_PLATFORM = 'app-android'
+  }
+  if (process.env.UNI_APP_PLATFORM === 'ios') {
+    process.env.UNI_UTS_PLATFORM = 'app-ios'
+  }
+  if (process.env.UNI_PLATFORM === 'h5') {
+    process.env.UNI_UTS_PLATFORM = 'web'
+  } else {
+    if (!process.env.UNI_UTS_PLATFORM) {
+      process.env.UNI_UTS_PLATFORM = process.env.UNI_PLATFORM
+    }
+  }
+}
 
 if (process.env.UNI_PLATFORM === 'app-plus') {
   process.env.UNI_OUTPUT_TMP_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, '../.tmp/app-plus')
@@ -367,7 +384,9 @@ if (
         } else {
           uniStatLog(`已开启 uni统计${uniStatistics.version}.0 版本`)
           if (version === '2') {
-            uniStatLog('【重要】因 HBuilderX 3.4.9 版本起，uni统计2.0 调整了安卓端 deviceId 获取方式，导致 uni统计2.0 App-Android平台部分统计数据不准确。如使用了HBuilderX 3.4.9 - 3.6.4版本且开通了uni统计2.0的应用，需要使用HBuilderX3.6.7及以上版本重新发布应用并升级 uniAdmin 云函数解决，详见：https://ask.dcloud.net.cn/article/40097')
+            uniStatLog(
+              '【重要】因 HBuilderX 3.4.9 版本起，uni统计2.0 调整了安卓端 deviceId 获取方式，导致 uni统计2.0 App-Android平台部分统计数据不准确。如使用了HBuilderX 3.4.9 - 3.6.4版本且开通了uni统计2.0的应用，需要使用HBuilderX3.6.7及以上版本重新发布应用并升级 uniAdmin 云函数解决，详见：https://ask.dcloud.net.cn/article/40097'
+            )
           }
         }
       }
@@ -379,7 +398,9 @@ if (
       } else {
         uniStatLog(`已开启 uni统计${uniStatistics.version}.0 版本`)
         if (version === '2') {
-          uniStatLog('【重要】因 HBuilderX 3.4.9 版本起，uni统计2.0 调整了安卓端 deviceId 获取方式，导致 uni统计2.0 App-Android平台部分统计数据不准确。如使用了HBuilderX 3.4.9 - 3.6.4版本且开通了uni统计2.0的应用，需要使用HBuilderX3.6.7及以上版本重新发布应用并升级 uniAdmin 云函数解决，详见：https://ask.dcloud.net.cn/article/40097')
+          uniStatLog(
+            '【重要】因 HBuilderX 3.4.9 版本起，uni统计2.0 调整了安卓端 deviceId 获取方式，导致 uni统计2.0 App-Android平台部分统计数据不准确。如使用了HBuilderX 3.4.9 - 3.6.4版本且开通了uni统计2.0的应用，需要使用HBuilderX3.6.7及以上版本重新发布应用并升级 uniAdmin 云函数解决，详见：https://ask.dcloud.net.cn/article/40097'
+          )
         }
       }
     }
@@ -569,4 +590,4 @@ runByHBuilderX && console.log(uniI18n.__('compiling'))
 
 module.exports = {
   manifestPlatformOptions: platformOptions
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.1-alpha-36720221017003",
+  "version": "2.0.1-alpha-36720221018002",
   "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-36720221017003",
+    "@dcloudio/uni-stat": "^2.0.1-alpha-36720221018002",
     "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": "146ab03a2bdebbdcc44e99dfc540cefca15cebe4"
+  "gitHead": "595dafce3471cb9a16766b6b6feaccf752481dc3"
 }