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

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 () {
@@ -389,6 +390,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

@@ -149,43 +149,44 @@ 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(
-          platform,
-          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 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)
-        }
+      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-alpha-4080120250905001",
+  "version": "2.0.2-alpha-4080120250919002",
   "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": "2b970c1e601c12ec3cfa696bd0c3ee546a731434"
+  "gitHead": "91fa2c9eb7302c71706bf306f1e5c3df15e67a50"
 }