@dcloudio/uni-cli-shared 2.0.2-4030620241128001 → 2.0.2-4040420241231001

package/components/ad-fullscreen-video.vue

@@ -2,7 +2,8 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
     <!-- #ifdef MP-ALIPAY -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>

package/components/ad-interstitial.vue

@@ -2,7 +2,8 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
     <!-- #ifdef MP-ALIPAY -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>

package/components/ad-rewarded-video.vue

@@ -1,8 +1,9 @@
 <template>
   <view @click="_onclick">
-    <slot :options="options" :loading="loading" :error="errorMessage" />
-    <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <slot :options="options" :loading="loading" :error="errorMessage" />
+    <!-- #ifdef MP-WEIXIN -->
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
     <!-- #ifdef MP-ALIPAY -->
     <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>

package/components/ad.mixin.mp-weixin.js

@@ -1,9 +1,24 @@
+/* eslint-disable no-undef */
+const adPlugin = requirePlugin('uni-ad')
+
 const EventType = {
   Load: 'load',
   Close: 'close',
   Error: 'error'
 }
 
+const AdType = {
+  Banner: 'banner',
+  RewardedVideo: 'rewardedVideo',
+  Interstitial: 'interstitial'
+}
+
+const ProviderType = {
+  WeChat: 10018,
+  UserWeChat: 10017,
+  ShanHu: 10020
+}
+
 export default {
   props: {
     options: {
@@ -38,13 +53,21 @@ export default {
   data () {
     return {
       loading: false,
+      userwx: false,
+      userUnitId: '',
+      customFullscreen: '',
+      wxchannel: false,
       errorMessage: null
     }
   },
   created () {
     this._ad = null
-    if (this.preload && this._canCreateAd()) {
-      this.load()
+    this._loading = false
+    this._wxRewardedAd = null
+    this._wxInterstitialAd = null
+    this._providerType = ProviderType.ShanHu
+    if (this.preload && this._canCreateAd()) {
+      this.load()
     }
   },
   methods: {
@@ -53,35 +76,22 @@ export default {
         return
       }
       this._startLoading()
+      if (this._providerType === ProviderType.ShanHu) {
+      } else if (this._providerType === ProviderType.WeChat) {
+        this.selectComponent('.uniad-plugin-wx').load()
+      } else if (this._providerType === ProviderType.UserWeChat) {
+        this._loadWxAd()
+      }
     },
 
-    show () {
+    show (e) {
       this.errorMessage = null
-      this._ad = this.selectComponent('.uniad-plugin')
-      if (this._hasCallback()) {
-        const userCryptoManager = wx.getUserCryptoManager()
-        userCryptoManager.getLatestUserKey({
-          success: ({
-            encryptKey,
-            iv,
-            version,
-            expireTime
-          }) => {
-            this._ad.show({
-              userId: this.urlCallback.userId || '',
-              extra: this.urlCallback.extra || '',
-              encryptKey,
-              iv,
-              version,
-              expireTime
-            })
-          },
-          fail: (err) => {
-            this._dispatchEvent(EventType.Error, err)
-          }
-        })
-      } else {
-        this._ad.show()
+      if (this._providerType === ProviderType.ShanHu) {
+        this._showAdInPlugin(this.selectComponent('.uniad-plugin'))
+      } else if (this._providerType === ProviderType.WeChat) {
+        this._showAdInPlugin(this.selectComponent('.uniad-plugin-wx'))
+      } else if (this._providerType === ProviderType.UserWeChat) {
+        this._showWxAd(e)
       }
     },
 
@@ -148,10 +158,217 @@ export default {
       this._dispatchEvent(EventType.Error, e.detail)
     },
 
+    _onnextchannel (e) {
+      this.wxchannel = true
+      const adData = e.detail[0]
+      this.$nextTick(() => {
+        if (adData.provider === 10017) {
+          this._providerType = ProviderType.UserWeChat
+          switch (adData._nt_) {
+            case 4:
+              this.wxAdType = AdType.Banner
+              this.userwx = true
+              this.userUnitId = adData.posid
+              if (adData.tmpl_type === 24) {
+                this.customFullscreen = 'uni-ad-custom-fullscreen'
+              }
+              break
+            case 9:
+              this.wxAdType = AdType.RewardedVideo
+              this._createRewardedAd(adData.posid)
+              break
+            case 15:
+              this.wxAdType = AdType.Interstitial
+              this._createInterstitialAd(adData.posid)
+              break
+          }
+        } else if (adData.provider === 10018) {
+          this._providerType = ProviderType.WeChat
+          this.selectComponent('.uniad-plugin-wx').setConfig(adData)
+        }
+      })
+    },
+
+    _onwxchannelerror (e) {
+      this.wxchannel = false
+      this.$nextTick(() => {
+        this._providerType = ProviderType.ShanHu
+        this.selectComponent('.uniad-plugin').shanhuChannel()
+      })
+    },
+
     _dispatchEvent (type, data) {
       this.$emit(type, {
         detail: data
       })
+    },
+
+    _showAdInPlugin (adComponent) {
+      if (this._hasCallback()) {
+        const userCryptoManager = wx.getUserCryptoManager()
+        userCryptoManager.getLatestUserKey({
+          success: ({
+            encryptKey,
+            iv,
+            version,
+            expireTime
+          }) => {
+            adComponent.show({
+              userId: this.urlCallback.userId || '',
+              extra: this.urlCallback.extra || '',
+              encryptKey,
+              iv,
+              version,
+              expireTime
+            })
+          },
+          fail: (err) => {
+            this._dispatchEvent(EventType.Error, err)
+          }
+        })
+      } else {
+        adComponent.show({
+          userId: this.urlCallback.userId || '',
+          extra: this.urlCallback.extra || ''
+        })
+      }
+    },
+
+    _loadWxAd () {
+      switch (this.wxAdType) {
+        case AdType.RewardedVideo:
+          if (this._wxRewardedAd) {
+            this._wxRewardedAd.load()
+          }
+          break
+        case AdType.Interstitial:
+          if (this._wxInterstitialAd) {
+            this._wxInterstitialAd.load()
+          }
+          break
+      }
+    },
+
+    // 加载/显示广告
+    _showWxAd (options) {
+      this._urlCallback = options || this.urlCallback
+      if (this.loading === true) {
+        this._userInvokeShowFlag = true
+        return
+      }
+      switch (this.wxAdType) {
+        case AdType.RewardedVideo:
+          if (!this._wxRewardedAd) {
+            return
+          }
+          // eslint-disable-next-line handle-callback-err
+          this._wxRewardedAd.show().catch((err) => {
+            this._wxRewardedAd.load().then(() => {
+              this._wxRewardedAd.show()
+            }).catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
+          })
+          break
+        case AdType.Interstitial:
+          if (!this._wxInterstitialAd) {
+            return
+          }
+          // eslint-disable-next-line handle-callback-err
+          this._wxInterstitialAd.show().catch((err) => {
+            this._wxInterstitialAd.load().then(() => {
+              this._wxInterstitialAd.show()
+            }).catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
+          })
+          break
+      }
+    },
+
+    // 微信激励视频
+    _createRewardedAd (adUnitId) {
+      if (this._wxRewardedAd) {
+        return
+      }
+
+      this._wxRewardedAd = wx.createRewardedVideoAd({ adUnitId: adUnitId, multiton: true })
+
+      this._wxRewardedAd.onLoad(() => {
+        this.loading = false
+        this._dispatchEvent(EventType.Load, {})
+        if (this._userInvokeShowFlag) {
+          this._userInvokeShowFlag = false
+          this._wxRewardedAd.show()
+        }
+      })
+
+      this._wxRewardedAd.onError(err => {
+        this.loading = false
+        this._dispatchEvent(EventType.Error, err)
+      })
+
+      this._wxRewardedAd.onClose(res => {
+        if (res.isEnded) {
+          this._callServer()
+        } else {
+          this._dispatchEvent(EventType.Close, res)
+        }
+      })
+
+      this.loading = true
+    },
+
+    // 微信插屏
+    _createInterstitialAd (adUnitId) {
+      if (this._wxInterstitialAd) {
+        return
+      }
+
+      this._wxInterstitialAd = wx.createInterstitialAd({ adUnitId: adUnitId })
+
+      this._wxInterstitialAd.onLoad(() => {
+        this.loading = false
+        this._dispatchEvent(EventType.Load, {})
+        if (this._userInvokeShowFlag) {
+          this._userInvokeShowFlag = false
+          this._wxInterstitialAd.show()
+        }
+      })
+
+      this._wxInterstitialAd.onError(err => {
+        this.loading = false
+        this._dispatchEvent(EventType.Error, err)
+      })
+
+      this._wxInterstitialAd.onClose(res => {
+        this._dispatchEvent(EventType.Close, res)
+      })
+
+      this.loading = true
+    },
+
+    _callServer () {
+      const userCryptoManager = wx.getUserCryptoManager()
+      userCryptoManager.getLatestUserKey({
+        success: (encryptConfig) => {
+          const callbackData = adPlugin.buildCallbackData(this.adpid, this.urlCallback, {}, encryptConfig)
+          uniCloud.callFunction({
+            name: 'uniAdCallback',
+            data: callbackData,
+            secretType: 'both',
+            success: (res) => {
+              this._dispatchEvent(EventType.Close, res)
+            },
+            fail: (err) => {
+              this._dispatchEvent(EventType.Error, err)
+            }
+          })
+        },
+        fail: (err) => {
+          this._dispatchEvent(EventType.Error, err)
+        }
+      })
     }
   }
 }

package/components/uniad.vue

@@ -5,8 +5,13 @@
       :adpid="adpid"
       @load="_onmpload"
       @close="_onmpclose"
-      @error="_onmperror"
-    />
+      @error="_onmperror"
+      @nextChannel="_onnextchannel"
+    />
+    <!-- #ifdef MP-WEIXIN -->
+    <ad-custom v-if="userwx" :unit-id="userUnitId" class="uni-ad-custom" :class="[customFullscreen]"></ad-custom>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <!-- #endif -->
   </view>
 </template>
 
@@ -26,3 +31,9 @@ export default {
   }
 }
 </script>
+
+<style>
+.uni-ad-custom-fullscreen {
+  height: 100vh;
+}
+</style>

package/components/unicloud-db.vue

@@ -393,7 +393,7 @@
           needLoading: true,
           loadingTitle: ''
         }, options);
-        if (!options.needConfirm) {
+        if (options.needConfirm) {
           uni.showModal({
             title: options.confirmTitle || t('uniCloud.component.update.showModal.title'),
             content: options.confirmContent || t('uniCloud.component.update.showModal.content'),

package/lib/preprocess.js

@@ -52,14 +52,14 @@ module.exports = function initPreprocess (name, platforms, userDefines = {}) {
     nvueContext.APP_NVUE = true
     nvueContext.APP_PLUS_NVUE = true
 
-    if (process.env.UNI_APP_PLATFORM === 'android') {
-      defaultContext.APP_ANDROID = true
-    } else if (process.env.UNI_APP_PLATFORM === 'ios') {
-      defaultContext.APP_IOS = true
-    } else {
-      defaultContext.APP_ANDROID = true
-      defaultContext.APP_IOS = true
-    }
+    // if (process.env.UNI_APP_PLATFORM === 'android') {
+    // defaultContext.APP_ANDROID = true
+    // } else if (process.env.UNI_APP_PLATFORM === 'ios') {
+    // defaultContext.APP_IOS = true
+    // } else {
+    // defaultContext.APP_ANDROID = true
+    // defaultContext.APP_IOS = true
+    // }
   }
   if (name === 'h5') {
     defaultContext.WEB = true

package/lib/uts/uts.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.getUTSComponentAutoImports = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
+exports.isUniHelpers = exports.isUTSProxy = exports.tscOutDir = exports.uvueOutDir = exports.genUniExtApiDeclarationFileOnce = exports.initUTSSwiftAutoImportsOnce = exports.initUTSKotlinAutoImportsOnce = exports.resolveUniTypeScript = exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.getUTSComponentAutoImports = exports.isUTSComponent = exports.resolveUTSCompilerVersion = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
 // 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -105,8 +105,12 @@ function resolveUTSFile(dir, extensions = ['.uts', '.ts', '.js']) {
         }
     }
 }
-function resolveUTSCompiler() {
+function resolveUTSCompiler(throwError = false) {
     let compilerPath = '';
+    if (process.env.UNI_COMPILE_TARGET === 'ext-api' &&
+        process.env.UNI_APP_NEXT_WORKSPACE) {
+        return require(path_1.default.resolve(process.env.UNI_APP_NEXT_WORKSPACE, 'packages/uni-uts-v1'));
+    }
     if ((0, hbx_1.isInHBuilderX)()) {
         try {
             compilerPath = require.resolve(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uniapp-uts-v1'));
@@ -120,27 +124,34 @@ function resolveUTSCompiler() {
             });
         }
         catch (e) {
-            let utsCompilerVersion = '';
-            try {
-                utsCompilerVersion = require('../package.json').version;
-            }
-            catch (e) {
-                try {
-                    // vue2
-                    utsCompilerVersion = require('../../package.json').version;
-                }
-                catch (e) { }
-            }
-            if (utsCompilerVersion.startsWith('2.0.')) {
-                utsCompilerVersion = '^3.0.0-alpha-3060920221117001';
+            if (throwError) {
+                throw `Error: Cannot find module '@dcloudio/uni-uts-v1'`;
             }
-            console.error((0, utils_1.installDepTips)('devDependencies', '@dcloudio/uni-uts-v1', utsCompilerVersion));
+            console.error((0, utils_1.installDepTips)('devDependencies', '@dcloudio/uni-uts-v1', resolveUTSCompilerVersion()));
             process.exit(0);
         }
     }
     return require(compilerPath);
 }
 exports.resolveUTSCompiler = resolveUTSCompiler;
+function resolveUTSCompilerVersion() {
+    let utsCompilerVersion = '';
+    try {
+        utsCompilerVersion = require('../package.json').version;
+    }
+    catch (e) {
+        try {
+            // vue2
+            utsCompilerVersion = require('../../package.json').version;
+        }
+        catch (e) { }
+    }
+    if (utsCompilerVersion.startsWith('2.0.')) {
+        utsCompilerVersion = '^3.0.0-alpha-3060920221117001';
+    }
+    return utsCompilerVersion;
+}
+exports.resolveUTSCompilerVersion = resolveUTSCompilerVersion;
 const utsComponents = new Map();
 function isUTSComponent(name) {
     return utsComponents.has(name);
@@ -189,9 +200,14 @@ function initUTSComponents(inputDir, platform) {
             ? path_1.default.basename(path_1.default.dirname(dir))
             : path_1.default.basename(dir);
         if (is_uni_modules_utssdk || is_ussdk) {
+            // dir 是 uni_modules/test-plugin/utssdk 或者 utssdk/test-plugin
+            // 需要分平台解析，不能直接解析 utssdk 目录下的文件，因为 utssdk 目录下可能存在多个平台的文件
+            const cwd = isApp
+                ? dir
+                : path_1.default.join(dir, platform === 'h5' ? 'web' : platform);
             fast_glob_1.default
                 .sync('**/*.vue', {
-                cwd: dir,
+                cwd,
                 absolute: true,
             })
                 .forEach((file) => {
@@ -235,17 +251,19 @@ exports.initUTSComponents = initUTSComponents;
 function resolveUTSComponentDirs(inputDir) {
     const utssdkDir = path_1.default.resolve(inputDir, 'utssdk');
     const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
-    return fast_glob_1.default
-        .sync('*', {
-        cwd: utssdkDir,
-        absolute: true,
-        onlyDirectories: true,
-    })
-        .concat(fast_glob_1.default.sync('*/utssdk', {
-        cwd: uniModulesDir,
-        absolute: true,
-        onlyDirectories: true,
-    }));
+    return (fs_extra_1.default.existsSync(utssdkDir)
+        ? fast_glob_1.default.sync('*', {
+            cwd: utssdkDir,
+            absolute: true,
+            onlyDirectories: true,
+        })
+        : []).concat(fs_extra_1.default.existsSync(uniModulesDir)
+        ? fast_glob_1.default.sync('*/utssdk', {
+            cwd: uniModulesDir,
+            absolute: true,
+            onlyDirectories: true,
+        })
+        : []);
 }
 const nameRE = /name\s*:\s*['|"](.*)['|"]/;
 function parseVueComponentName(file) {
@@ -434,3 +452,13 @@ function tscOutDir(platform) {
     return path_1.default.join(process.env.UNI_APP_X_TSC_DIR, platform);
 }
 exports.tscOutDir = tscOutDir;
+const UTSProxyRE = /\?uts-proxy$/;
+const UniHelpersRE = /\?uni_helpers$/;
+function isUTSProxy(id) {
+    return UTSProxyRE.test(id);
+}
+exports.isUTSProxy = isUTSProxy;
+function isUniHelpers(id) {
+    return UniHelpersRE.test(id);
+}
+exports.isUniHelpers = isUniHelpers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-4030620241128001",
+  "version": "2.0.2-4040420241231001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -27,5 +27,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "260d428e1b77f54051f87b758586e3333ca58619"
+  "gitHead": "f5a282a67f3eda3204e8fa48882b129f47c17cd3"
 }