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

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

@@ -70,6 +70,7 @@ export default {
     if (this.preload && this._canCreateAd()) {
       this.load()
     }
+    this._dispatchEvent('adcreated', { instance: this })
   },
   methods: {
     load () {
@@ -199,14 +200,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 +228,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 +258,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 +287,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 +296,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
       }
@@ -316,7 +320,8 @@ export default {
       })
 
       this._wxRewardedAd.onError(err => {
-        this.loading = false
+        this.loading = false
+        this.errorMessage = JSON.stringify(err)
         this._dispatchEvent(EventType.Error, err)
       })
 
@@ -327,7 +332,9 @@ export default {
         }
       })
 
-      this._wxRewardedAd.load().then(() => { }).catch((_) => { })
+      this._wxRewardedAd.load().then(() => {
+      }).catch((_) => {
+      })
 
       this.loading = true
     },
@@ -345,12 +352,15 @@ 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)
+          })
         }
       })
 
       this._wxInterstitialAd.onError(err => {
-        this.loading = false
+        this.loading = false
+        this.errorMessage = JSON.stringify(err)
         this._dispatchEvent(EventType.Error, err)
       })
 
@@ -358,7 +368,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
     },
@@ -384,6 +396,10 @@ export default {
           this._dispatchEvent(EventType.Error, err)
         }
       })
+    },
+
+    toJSON () {
+      return ''
     }
   }
 }

package/components/page-meta.vue

@@ -64,8 +64,9 @@ export default {
     }
   },
   created () {
-    const page = getCurrentPages()[0]
-    this.$pageVm = page.$vm || page
+    const pages = getCurrentPages()
+    const currentPage = pages[pages.length - 1]
+    this.$pageVm = currentPage.$vm || currentPage
     // event
     // h5 暂不支持生命周期 onResize,补充后，可以移除该条件编译
     // #ifdef H5
@@ -84,7 +85,7 @@ export default {
     })
 
     // #ifdef APP-PLUS
-    this._currentWebview = page.$getAppWebview()
+    this._currentWebview = currentPage.$getAppWebview()
     if (this.enablePullDownRefresh) {
       this.setPullDownRefresh(this._currentWebview, true)
     }
@@ -102,7 +103,7 @@ export default {
       this.rootFontSize,
       this.pageStyle
     ], () => {
-      this.setPageMeta()
+      this.setPageMeta(currentPage.$page.id)
     })
     this.$watch(() => [
       this.backgroundColor,
@@ -128,6 +129,11 @@ export default {
   mounted () {
     this.scrollTop && this.pageScrollTo()
   },
+  // #ifdef H5
+  activated () {
+    this.setPageMeta()
+  },
+  // #endif
   methods: {
     setPullDownRefresh (webview, enabled) {
       webview.setStyle({
@@ -137,12 +143,15 @@ export default {
         }
       })
     },
-    setPageMeta () {
+    setPageMeta (pageId) {
       // h5 和 app-plus 设置 rootFontSize
       // #ifdef H5 || APP-PLUS
-      uni.setPageMeta({
-        pageStyle: this.pageStyle,
-        rootFontSize: this.rootFontSize
+      this.$nextTick(() => {
+        uni.setPageMeta({
+          pageStyle: this.pageStyle,
+          rootFontSize: this.rootFontSize,
+          pageId
+        })
       })
       // #endif
     },

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) => {
@@ -124,27 +149,44 @@ module.exports = async function (content) {
       )
     }
 
-    if (!utsPlugins.has(pluginId)) {
-      utsPlugins.add(pluginId)
-      if (uniXKotlinCompiler) {
-        const indexFileName = resolveTscUniModuleIndexFileName(
-          'app-android',
-          pluginDir
-        )
-        if (indexFileName) {
-          await uniXKotlinCompiler.addRootFile(indexFileName)
-        }
+    // 不判重了，不然nvue，vue并发同一个插件时，其中一个会跳过tsc编译，直接走到rust那里，导致一些文件还没有生成，比如vue兼容模式组件之类的
+    // 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)
       }
-      if (uniXSwiftCompiler) {
-        const indexFileName = resolveTscUniModuleIndexFileName(
-          'app-ios',
-          pluginDir
-        )
-        if (indexFileName) {
-          await uniXSwiftCompiler.addRootFile(indexFileName)
-        }
+      const indexFileName = resolveTscUniModuleIndexFileName(
+        platform,
+        pluginDir
+      )
+      if (indexFileName) {
+        await uniXKotlinCompiler.addRootFile(indexFileName)
+      }
+    }
+    if (uniXSwiftCompiler) {
+      const platform = 'app-ios'
+      const vueFiles = resolveTscUniModuleUTSSDKVueFileNames(
+        platform,
+        pluginDir
+      )
+      for (const vueFile of vueFiles) {
+        await uniXSwiftCompiler.addRootFile(vueFile)
+      }
+      const indexFileName = resolveTscUniModuleIndexFileName(
+        platform,
+        pluginDir
+      )
+      if (indexFileName) {
+        await uniXSwiftCompiler.addRootFile(indexFileName)
       }
     }
+    // }
 
     // 处理uni_modules中的文件变更
     const files = changedFiles.get(pluginId)

package/package.json

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