chore: merge

packages/uni-cli-shared/src/json/mp/types.ts

@@ -125,4 +125,5 @@ export interface AppJson {
   lazyCodeLoading?: 'requiredComponents' | string
   singlePage?: SinglePage
   restartStrategy?: RestartStrategy
+  [name: string]: unknown
 }

packages/uni-mp-alipay/dist/uni.compiler.js

@@ -221,6 +221,11 @@ const options = {
         darkmode: false,
         subpackages: true,
         plugins: true,
+        normalize(appJson) {
+            // 支付宝小程序默认主包，分包 js 模块不共享，会导致 getCurrentInstance，setCurrentInstance 不一致
+            appJson.subPackageBuildType = 'shared';
+            return appJson;
+        },
     },
     project: {
         filename: projectConfigFilename,

packages/uni-mp-alipay/src/compiler/options.ts

@@ -102,6 +102,11 @@ export const options: UniMiniProgramPluginOptions = {
     darkmode: false,
     subpackages: true,
     plugins: true,
+    normalize(appJson) {
+      // 支付宝小程序默认主包，分包 js 模块不共享，会导致 getCurrentInstance，setCurrentInstance 不一致
+      appJson.subPackageBuildType = 'shared'
+      return appJson
+    },
   },
   project: {
     filename: projectConfigFilename,

packages/uni-mp-vite/src/plugin/index.ts

@@ -10,6 +10,7 @@ import {
   MiniProgramCompilerOptions,
   initPostcssPlugin,
   parseRpx2UnitOnce,
+  AppJson,
 } from '@dcloudio/uni-cli-shared'
 import type {
   SFCDescriptor,
@@ -58,6 +59,7 @@ export interface UniMiniProgramPluginOptions {
      * 是否支持发行插件
      */
     plugins?: boolean
+    normalize?: (appJson: AppJson) => AppJson
   }
   project?: {
     filename: string

packages/uni-mp-vite/src/plugins/pagesJson.ts

@@ -69,7 +69,8 @@ export function uniPagesJsonPlugin(
         if (options.json?.formatAppJson) {
           options.json.formatAppJson(appJson, manifestJson, pageJsons)
         }
-        addMiniProgramAppJson(appJson)
+        const { normalize } = options.app
+        addMiniProgramAppJson(normalize ? normalize(appJson) : appJson)
         Object.keys(pageJsons).forEach((name) => {
           addMiniProgramPageJson(name, pageJsons[name])
         })

packages/uni-mp-vue/dist/vue.runtime.esm.js

@@ -1413,12 +1413,6 @@ function queueFlush() {
         currentFlushPromise = resolvedPromise.then(flushJobs);
     }
 }
-function invalidateJob(job) {
-    const i = queue.indexOf(job);
-    if (i > flushIndex) {
-        queue.splice(i, 1);
-    }
-}
 function queueCb(cb, activeQueue, pendingQueue, index) {
     if (!isArray(cb)) {
         if (!activeQueue ||
@@ -4430,6 +4424,12 @@ function unwrapper(target) {
 }
 function defineAsyncComponent(source) {
     console.error('defineAsyncComponent is unsupported');
+}
+function invalidateJob(job) {
+    const i = queue.indexOf(job);
+    if (i > -1) {
+        queue.splice(i, 1);
+    }
 }
 
 // import deepCopy from './deepCopy'

packages/uni-mp-vue/lib/vue.runtime.esm.js

@@ -1413,12 +1413,6 @@ function queueFlush() {
         currentFlushPromise = resolvedPromise.then(flushJobs);
     }
 }
-function invalidateJob(job) {
-    const i = queue.indexOf(job);
-    if (i > flushIndex) {
-        queue.splice(i, 1);
-    }
-}
 function queueCb(cb, activeQueue, pendingQueue, index) {
     if (!isArray(cb)) {
         if (!activeQueue ||
@@ -4430,6 +4424,12 @@ function unwrapper(target) {
 }
 function defineAsyncComponent(source) {
     console.error('defineAsyncComponent is unsupported');
+}
+function invalidateJob(job) {
+    const i = queue.indexOf(job);
+    if (i > -1) {
+        queue.splice(i, 1);
+    }
 }
 
 // import deepCopy from './deepCopy'