@dcloudio/uni-cli-shared 2.0.2-alpha-4070620250731001 → 2.0.2-alpha-4080120250905001

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

@@ -199,14 +199,17 @@ export default {
           if (adData.tmpl_type === 24) {
             this.customFullscreen = 'uni-ad-custom-fullscreen'
           }
-          this.loading = true
+          this.loading = true
+          if (!adData.dcloudAdpid) {
+            adData.dcloudAdpid = this.adpid
+          }
           this.selectComponent('.uniad-plugin-wx').setConfig(adData)
         }
       })
     },
 
     _onwxchannelerror (e) {
-      this._dispatchEvent(EventType.Error, e.detail)
+      this._dispatchEvent(EventType.Error, e.detail || e)
     },
 
     _dispatchEvent (type, data) {
@@ -224,14 +227,18 @@ export default {
             iv,
             version,
             expireTime
-          }) => {
+          }) => {
+            const uniOptions = {
+              adpid: this.adpid
+            }
             adComponent.show({
               userId: this.urlCallback.userId || '',
               extra: this.urlCallback.extra || '',
               encryptKey,
               iv,
               version,
-              expireTime
+              expireTime,
+              uniOptions
             })
           },
           fail: (err) => {
@@ -250,12 +257,16 @@ export default {
       switch (this.wxAdType) {
         case AdType.RewardedVideo:
           if (this._wxRewardedAd) {
-            this._wxRewardedAd.load()
+            this._wxRewardedAd.load().catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
           }
           break
         case AdType.Interstitial:
           if (this._wxInterstitialAd) {
-            this._wxInterstitialAd.load()
+            this._wxInterstitialAd.load().catch((err) => {
+              this._dispatchEvent(EventType.Error, err)
+            })
           }
           break
       }
@@ -275,11 +286,7 @@ export default {
           }
           // 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)
-            })
+            this._dispatchEvent(EventType.Error, err)
           })
           break
         case AdType.Interstitial:
@@ -288,11 +295,7 @@ export default {
           }
           // 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)
-            })
+            this._dispatchEvent(EventType.Error, err)
           })
           break
       }
@@ -326,8 +329,6 @@ export default {
           this._callServer()
         }
       })
-
-      this._wxRewardedAd.load().then(() => { }).catch((_) => { })
 
       this.loading = true
     },
@@ -345,7 +346,9 @@ export default {
         this._dispatchEvent(EventType.Load, {})
         if (this._userInvokeShowFlag) {
           this._userInvokeShowFlag = false
-          this._wxInterstitialAd.show()
+          this._wxInterstitialAd.show().catch((err) => {
+            this._dispatchEvent(EventType.Error, err)
+          })
         }
       })
 
@@ -358,7 +361,9 @@ export default {
         this._dispatchEvent(EventType.Close, res)
       })
 
-      this._wxInterstitialAd.load().then(() => { }).catch((_) => { })
+      this._wxInterstitialAd.load().catch((err) => {
+        this._dispatchEvent(EventType.Error, err)
+      })
 
       this.loading = true
     },

package/lib/uts/uts-loader.js

@@ -59,12 +59,36 @@ function createUniModulesSyncFilePreprocessor (
     } else if (extname === '.uts' || extname === '.ts') {
       return preJs(content)
     } else if (extname === '.uvue' || extname === '.vue') {
-      return preJs(preHtml(content))
+      return preUTSSDKVueFile(fileName, preJs(preHtml(content)))
     }
     return content
   }
 }
 
+function preUTSSDKVueFile (filename, content) {
+  if (
+    filename.includes('utssdk') &&
+    (filename.includes('app-android') || filename.includes('app-ios'))
+  ) {
+    const {
+      parseComponent
+    } = require('vue-template-compiler')
+    const descriptor = parseComponent(content, {
+      sourceMap: false,
+      pad: 'line'
+    })
+    if (descriptor.script?.content) {
+      return (
+        descriptor.script.content +
+        // 补充 template 内容
+        `/*${descriptor.template?.content}*/`
+      )
+    }
+    return content
+  }
+  return content
+}
+
 function once (fn, ctx = null) {
   let res
   return (...args) => {
@@ -96,7 +120,8 @@ module.exports = async function (content) {
 
   const {
     syncUniModuleFilesByCompiler,
-    resolveTscUniModuleIndexFileName
+    resolveTscUniModuleIndexFileName,
+    resolveTscUniModuleUTSSDKVueFileNames
   } = resolveUTSCompiler()
 
   const compilePlugin = async (pluginDir) => {
@@ -127,8 +152,16 @@ module.exports = async function (content) {
     if (!utsPlugins.has(pluginId)) {
       utsPlugins.add(pluginId)
       if (uniXKotlinCompiler) {
+        const platform = 'app-android'
+        const vueFiles = resolveTscUniModuleUTSSDKVueFileNames(
+          platform,
+          pluginDir
+        )
+        for (const vueFile of vueFiles) {
+          await uniXKotlinCompiler.addRootFile(vueFile)
+        }
         const indexFileName = resolveTscUniModuleIndexFileName(
-          'app-android',
+          platform,
           pluginDir
         )
         if (indexFileName) {
@@ -136,8 +169,16 @@ module.exports = async function (content) {
         }
       }
       if (uniXSwiftCompiler) {
+        const platform = 'app-ios'
+        const vueFiles = resolveTscUniModuleUTSSDKVueFileNames(
+          platform,
+          pluginDir
+        )
+        for (const vueFile of vueFiles) {
+          await uniXSwiftCompiler.addRootFile(vueFile)
+        }
         const indexFileName = resolveTscUniModuleIndexFileName(
-          'app-ios',
+          platform,
           pluginDir
         )
         if (indexFileName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-alpha-4070620250731001",
+  "version": "2.0.2-alpha-4080120250905001",
   "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": "19d2e9fb70abf2e0f6bd14e7ea2074eccdc2b749"
+  "gitHead": "2b970c1e601c12ec3cfa696bd0c3ee546a731434"
 }