@dcloudio/uni-cli-shared 2.0.2-4060620250520001 → 2.0.2-4070620250821001

package/components/ad-fullscreen-video.vue

@@ -2,8 +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" @nextChannel="_onnextchannel"></uniad-plugin>
-    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @load="_onmpload" @close="_onmpclose" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <uniad-plugin class="uniad-plugin" data-com-type="wx" :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" data-com-type="wx" @load="_onmpload" @close="_onmpclose" @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,8 +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" @nextChannel="_onnextchannel"></uniad-plugin>
-    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @load="_onmpload" @close="_onmpclose" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <uniad-plugin class="uniad-plugin" data-com-type="wx" :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" data-com-type="wx" @load="_onmpload" @close="_onmpclose" @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

@@ -2,8 +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" @nextChannel="_onnextchannel"></uniad-plugin>
-    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @load="_onmpload" @close="_onmpclose" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <uniad-plugin class="uniad-plugin" data-com-type="wx" :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" data-com-type="wx" @load="_onmpload" @close="_onmpclose" @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

@@ -64,7 +64,8 @@ export default {
     this._ad = null
     this._loading = false
     this._wxRewardedAd = null
-    this._wxInterstitialAd = null
+    this._wxInterstitialAd = null
+    this._userInvokeShowFlag = false
     this._providerType = ProviderType.ShanHu
     if (this.preload && this._canCreateAd()) {
       this.load()
@@ -85,7 +86,11 @@ export default {
     },
 
     show (e) {
-      this.errorMessage = null
+      this.errorMessage = null
+      if (this.loading) {
+        this._userInvokeShowFlag = true
+        return
+      }
       if (this._providerType === ProviderType.ShanHu) {
         this._showAdInPlugin(this.selectComponent('.uniad-plugin'))
       } else if (this._providerType === ProviderType.WeChat) {
@@ -120,15 +125,22 @@ export default {
 
     _onmpload (e) {
       this.loading = false
-      this._dispatchEvent(EventType.Load, {})
+      this._dispatchEvent(EventType.Load, {})
+      if (this._userInvokeShowFlag) {
+        this._userInvokeShowFlag = false
+        setTimeout(() => {
+          this.show()
+        }, 1)
+      }
     },
 
-    _onmpclose (e) {
-      this._dispatchEvent(EventType.Close, e.detail)
-      if (e.detail.adsdata) {
-        const adv = e.detail.adv
-        const adsdata = e.detail.adsdata
-        const version = e.detail.version
+    _onmpclose (e) {
+      const detail = e.detail || e
+      this._dispatchEvent(EventType.Close, detail)
+      if (detail.adsdata) {
+        const adv = detail.adv
+        const adsdata = detail.adsdata
+        const version = detail.version
 
         /* eslint-disable no-undef */
         uniCloud.callFunction({
@@ -146,9 +158,9 @@ export default {
           }
         })
 
-        delete e.detail.adv
-        delete e.detail.adsdata
-        delete e.detail.version
+        delete detail.adv
+        delete detail.adsdata
+        delete detail.version
       }
     },
 
@@ -183,18 +195,18 @@ export default {
               break
           }
         } else if (adData.provider === 10018) {
-          this._providerType = ProviderType.WeChat
+          this._providerType = ProviderType.WeChat
+          if (adData.tmpl_type === 24) {
+            this.customFullscreen = 'uni-ad-custom-fullscreen'
+          }
+          this.loading = true
           this.selectComponent('.uniad-plugin-wx').setConfig(adData)
         }
       })
     },
 
-    _onwxchannelerror (e) {
-      this.wxchannel = false
-      this.$nextTick(() => {
-        this._providerType = ProviderType.ShanHu
-        this.selectComponent('.uniad-plugin').shanhuChannel()
-      })
+    _onwxchannelerror (e) {
+      this._dispatchEvent(EventType.Error, e.detail)
     },
 
     _dispatchEvent (type, data) {
@@ -313,7 +325,9 @@ export default {
         if (res.isEnded && this._hasCallback()) {
           this._callServer()
         }
-      })
+      })
+
+      this._wxRewardedAd.load().then(() => { }).catch((_) => { })
 
       this.loading = true
     },
@@ -342,7 +356,9 @@ export default {
 
       this._wxInterstitialAd.onClose(res => {
         this._dispatchEvent(EventType.Close, res)
-      })
+      })
+
+      this._wxInterstitialAd.load().then(() => { }).catch((_) => { })
 
       this.loading = true
     },

package/components/uniad.vue

@@ -9,8 +9,8 @@
       @nextChannel="_onnextchannel"
     />
     <!-- #ifdef MP-WEIXIN -->
-    <ad-custom v-if="userwx" :unit-id="userUnitId" class="uni-ad-custom" :class="[customFullscreen]" @load="_onmpload" @error="_onmperror"></ad-custom>
-    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" @load="_onmpload" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <ad-custom v-if="userwx" :unit-id="userUnitId" class="uni-ad-custom" data-com-type="wx" :class="[customFullscreen]" @load="_onmpload" @error="_onmperror"></ad-custom>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" :class="[customFullscreen]" data-com-type="wx" @load="_onmpload" @error="_onwxchannelerror"></uniad-plugin-wx>
     <!-- #endif -->
   </view>
 </template>
@@ -33,7 +33,8 @@ export default {
 </script>
 
 <style>
-.uni-ad-custom-fullscreen {
+.uni-ad-custom-fullscreen {
+  display: flex;
   height: 100vh;
 }
 </style>

package/lib/preprocessor/index.js

@@ -0,0 +1,61 @@
+function resolveNativeBinding () {
+  const { platform, arch } = process
+  let nativeBinding = ''
+  switch (platform) {
+    case 'win32':
+      switch (arch) {
+        case 'x64':
+          nativeBinding = 'preprocessor-windows-x86_64'
+          break
+        default:
+          throw new Error(`Unsupported architecture on Windows: ${arch}`)
+      }
+      break
+    case 'darwin':
+      switch (arch) {
+        case 'x64':
+          nativeBinding = 'preprocessor-macos-x86_64'
+          break
+        case 'arm64':
+          nativeBinding = 'preprocessor-macos-arm64'
+          break
+        default:
+          throw new Error(`Unsupported architecture on macOS: ${arch}`)
+      }
+      break
+    default:
+      throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+  }
+  return require('./' + nativeBinding)
+}
+
+async function runProcess (vue3 = false) {
+  try {
+    /* eslint-disable no-undef */
+    globalThis.preprocessor_require = require
+    await resolveNativeBinding().process(vue3)
+  } catch (error) {
+  }
+}
+
+class PreprocessorWebpackPlugin {
+  apply (compiler) {
+    compiler.hooks.afterEmit.tapPromise('d', (params) => {
+      return runProcess(false)
+    })
+  }
+}
+
+function PreprocessorVitePlugin () {
+  return {
+    name: 'preprocessor',
+    async writeBundle (_) {
+      await runProcess(true)
+    }
+  }
+}
+
+module.exports = {
+  PreprocessorWebpackPlugin,
+  PreprocessorVitePlugin
+}

package/lib/util.js

@@ -192,7 +192,8 @@ function showRunPrompt (delay = 300) {
     clearTimeout(runPromptTimer)
   }
   runPromptTimer = setTimeout(() => {
-    if (!isInHBuilderX) {
+    const { runByHBuilderX } = require('./platform')
+    if (!runByHBuilderX) {
       const chalk = require('chalk')
       const outputDir = path.relative(
         process.env.UNI_CLI_CONTEXT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-4060620250520001",
+  "version": "2.0.2-4070620250821001",
   "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": "f8e1b7ce5a0f6b98e42e137b04287b99fafa51e8"
+  "gitHead": "83322ec9f7cc592b2052ff78370e12f4689f5966"
 }