@taro-minify-pack/plugin-async-pack 0.0.5-alpha.3 → 0.0.5-alpha.4

package/dist/inject-style-component.js

@@ -13,9 +13,16 @@ exports.InjectStyleComponentName = 'inject-style';
 const injectStyleComponentCode = `
 const { SingletonPromise } = require('~/singleton-promise.js')
 Component({ 
+  properties: {
+    route: String,
+  },
   lifetimes: { 
-    attached: () => SingletonPromise.loaded("DYNAMIC_PACKAGE_NAME"),
-    detached: () => SingletonPromise.unloaded("DYNAMIC_PACKAGE_NAME")
+    attached: function () {
+      return SingletonPromise.loaded({dynamicPackageName:"DYNAMIC_PACKAGE_NAME",pageRoute:this.data.route})
+    },
+    detached: function () {
+      return SingletonPromise.unloaded({dynamicPackageName:"DYNAMIC_PACKAGE_NAME",pageRoute:this.data.route})
+    }
   } 
 })
 `;

package/dist/inject-style-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject-style-component.js","sourceRoot":"","sources":["../src/inject-style-component.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAEvB,+DAAsC;AACtC,iEAAwC;AACxC,mCAAwF;AAE3E,QAAA,WAAW,GAAG,sBAAsB,CAAA;AAEpC,QAAA,wBAAwB,GAAG,cAAc,CAAA;AAEtD,MAAM,wBAAwB,GAAG;;;;;;;;CAQhC,CAAA;AAID,MAAa,0BAA0B;IASrC,YAAa,GAAQ;QANJ,gBAAW,GAAW,UAAU,CAAA;QAEhC,gBAAW,GAAU,gDAAgD,CAAA;QAErE,cAAS,GAAW,wBAAwB,CAAA;QAG3D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,KAAK,CAAE,QAAkB;QACvB,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,mBAAW,EAAE,CAAC,WAAwB,EAAE,EAAE;YACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,+BAA+B,CAAA,CAAC,YAAY;YAEvF,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,mBAAW,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC3E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE,CAAC;oBAClE,MAAM,kBAAkB,GAAG,IAAA,kCAA0B,kCAAM,IAAI,CAAC,GAAG,KAAE,KAAK,IAAG,CAAA;oBAE7E,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAA,mBAAS,EAAC,kBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAA;oBACzH,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;wBACxE,IAAI,CAAC,IAAA,0CAAkC,kCAAM,IAAI,CAAC,GAAG,KAAE,KAAK,KAAI,SAAS,CAAC;4BAAE,OAAO,MAAM,CAAA;wBACzF,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAA;wBACjE,MAAM,IAAI,GAAG,cAAc,YAAY,IAAI,CAAA;wBAC3C,OAAO,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;oBAC7B,CAAC,EAAE,EAAE,CAAC,CAAA;oBAEN,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAA;oBAC9C,MAAM,aAAa,GAAG,GAAG,kBAAkB,IAAI,gCAAwB,EAAE,CAAA;oBACzE,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,KAAK,CAAC,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;oBACxE,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAAA;oBAC7E,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAC7E,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC/E,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAvCD,gEAuCC"}
+{"version":3,"file":"inject-style-component.js","sourceRoot":"","sources":["../src/inject-style-component.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAEvB,+DAAsC;AACtC,iEAAwC;AACxC,mCAAwF;AAE3E,QAAA,WAAW,GAAG,sBAAsB,CAAA;AAEpC,QAAA,wBAAwB,GAAG,cAAc,CAAA;AAEtD,MAAM,wBAAwB,GAAG;;;;;;;;;;;;;;;CAehC,CAAA;AAID,MAAa,0BAA0B;IASrC,YAAa,GAAQ;QANJ,gBAAW,GAAW,UAAU,CAAA;QAEhC,gBAAW,GAAU,gDAAgD,CAAA;QAErE,cAAS,GAAW,wBAAwB,CAAA;QAG3D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,KAAK,CAAE,QAAkB;QACvB,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,mBAAW,EAAE,CAAC,WAAwB,EAAE,EAAE;YACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,+BAA+B,CAAA,CAAC,YAAY;YAEvF,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,mBAAW,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC3E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE,CAAC;oBAClE,MAAM,kBAAkB,GAAG,IAAA,kCAA0B,kCAAM,IAAI,CAAC,GAAG,KAAE,KAAK,IAAG,CAAA;oBAE7E,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAA,mBAAS,EAAC,kBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAA;oBACzH,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;wBACxE,IAAI,CAAC,IAAA,0CAAkC,kCAAM,IAAI,CAAC,GAAG,KAAE,KAAK,KAAI,SAAS,CAAC;4BAAE,OAAO,MAAM,CAAA;wBACzF,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAA;wBACjE,MAAM,IAAI,GAAG,cAAc,YAAY,IAAI,CAAA;wBAC3C,OAAO,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;oBAC7B,CAAC,EAAE,EAAE,CAAC,CAAA;oBAEN,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAA;oBAC9C,MAAM,aAAa,GAAG,GAAG,kBAAkB,IAAI,gCAAwB,EAAE,CAAA;oBACzE,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,KAAK,CAAC,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;oBACxE,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAAA;oBAC7E,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAC7E,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,OAAO,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC/E,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAvCD,gEAuCC"}

package/dist/singleton-promise.d.ts

@@ -1,12 +1,16 @@
+interface Opt {
+    dynamicPackageName: string;
+    pageRoute: string;
+}
 export declare class SingletonPromise {
     private static instance?;
-    private loadTimes;
     private promise?;
     private resolve?;
     constructor();
-    static getInstance(key: string): SingletonPromise;
     private resetPromise;
-    static wait(key: string): Promise<void> | undefined;
-    static loaded(key: string): void;
-    static unloaded(key: string): void;
+    static getInstance(opt: Pick<Opt, 'dynamicPackageName'>): Map<string, SingletonPromise>;
+    static wait(opt: Pick<Opt, 'dynamicPackageName'>): Promise<(void | undefined)[]>;
+    static loaded(opt: Opt): void;
+    static unloaded(opt: Opt): void;
 }
+export {};

package/dist/singleton-promise.js

@@ -3,34 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingletonPromise = void 0;
 class SingletonPromise {
     constructor() {
-        this.loadTimes = 0;
         this.resetPromise();
     }
-    static getInstance(key) {
-        if (!SingletonPromise.instance)
-            SingletonPromise.instance = {};
-        if (!SingletonPromise.instance[key])
-            SingletonPromise.instance[key] = new SingletonPromise();
-        return SingletonPromise.instance[key];
-    }
     resetPromise() {
         this.promise = new Promise((resolve) => {
             this.resolve = resolve;
         });
     }
-    static wait(key) {
-        return this.getInstance(key).promise;
+    static getInstance(opt) {
+        const { dynamicPackageName } = opt;
+        if (!SingletonPromise.instance)
+            SingletonPromise.instance = new Map();
+        if (!SingletonPromise.instance.has(dynamicPackageName))
+            SingletonPromise.instance.set(dynamicPackageName, new Map());
+        return SingletonPromise.instance.get(dynamicPackageName);
+    }
+    static wait(opt) {
+        const instance = this.getInstance(opt);
+        const currentPages = getCurrentPages();
+        return Promise.all(currentPages.map(page => {
+            var _a;
+            if (!instance.has(page.route))
+                instance.set(page.route, new SingletonPromise());
+            return (_a = instance.get(page.route)) === null || _a === void 0 ? void 0 : _a.promise;
+        }));
     }
-    static loaded(key) {
+    static loaded(opt) {
         var _a, _b;
-        (_b = (_a = this.getInstance(key)).resolve) === null || _b === void 0 ? void 0 : _b.call(_a);
-        this.getInstance(key).loadTimes += 1;
+        const { pageRoute } = opt;
+        const instance = this.getInstance(opt);
+        if (!instance.has(pageRoute))
+            instance.set(pageRoute, new SingletonPromise());
+        (_b = (_a = instance.get(pageRoute)) === null || _a === void 0 ? void 0 : _a.resolve) === null || _b === void 0 ? void 0 : _b.call(_a);
     }
-    static unloaded(key) {
-        this.getInstance(key).loadTimes -= 1;
-        if (this.getInstance(key).loadTimes > 0)
-            return;
-        this.getInstance(key).resetPromise();
+    static unloaded(opt) {
+        const { pageRoute } = opt;
+        const instance = this.getInstance(opt);
+        instance.delete(pageRoute);
     }
 }
 exports.SingletonPromise = SingletonPromise;

package/dist/singleton-promise.js.map

@@ -1 +1 @@
-{"version":3,"file":"singleton-promise.js","sourceRoot":"","sources":["../src/singleton-promise.ts"],"names":[],"mappings":";;;AAAA,MAAa,gBAAgB;IAU3B;QANQ,cAAS,GAAG,CAAC,CAAA;QAOnB,IAAI,CAAC,YAAY,EAAE,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,WAAW,CAAE,GAAU;QAC5B,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YAAE,gBAAgB,CAAC,QAAQ,GAAG,EAAE,CAAA;QAC9D,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC5F,OAAO,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACvC,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACxB,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAE,GAAU;QACrB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,MAAM,CAAE,GAAU;;QACvB,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAC,OAAO,kDAAI,CAAA;QACjC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,QAAQ,CAAE,GAAU;QACzB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAA;QACpC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,CAAC;YAAE,OAAM;QAC/C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,CAAA;IACtC,CAAC;CACF;AAxCD,4CAwCC"}
+{"version":3,"file":"singleton-promise.js","sourceRoot":"","sources":["../src/singleton-promise.ts"],"names":[],"mappings":";;;AAKA,MAAa,gBAAgB;IAQ3B;QACE,IAAI,CAAC,YAAY,EAAE,CAAA;IACrB,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACxB,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAE,GAAoC;QACtD,MAAM,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAA;QAClC,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YAAE,gBAAgB,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;QACrE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC;YAAE,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QACpH,OAAO,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAE,CAAA;IAC3D,CAAC;IAED,MAAM,CAAC,IAAI,CAAE,GAAoC;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAA;QACtC,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;;YACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;gBAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,gBAAgB,EAAE,CAAC,CAAA;YAC/E,OAAO,MAAA,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,0CAAE,OAAO,CAAA;QAC1C,CAAC,CAAC,CAAC,CAAA;IACL,CAAC;IAED,MAAM,CAAC,MAAM,CAAE,GAAQ;;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAA;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,gBAAgB,EAAE,CAAC,CAAA;QAC7E,MAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,0CAAE,OAAO,kDAAI,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,QAAQ,CAAE,GAAQ;QACvB,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAA;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACtC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAC5B,CAAC;CACF;AA9CD,4CA8CC"}

package/dist/transform-pages-wxml.js

@@ -6,7 +6,7 @@ const appConfigAssetKey = 'app.json';
 const transformPagesWXml = (opts) => {
     const { assets, asyncComponents } = opts;
     const curAppConfig = JSON.parse(assets[appConfigAssetKey].source());
-    const pagesPath = (() => {
+    const pageWXmlPaths = (() => {
         var _a;
         const { pages = [], subpackages, subPackages, tabBar } = curAppConfig;
         const tabBarPagePaths = ((_a = tabBar === null || tabBar === void 0 ? void 0 : tabBar.list) === null || _a === void 0 ? void 0 : _a.map((item) => item.pagePath)) || [];
@@ -17,11 +17,12 @@ const transformPagesWXml = (opts) => {
         }, []);
         return [...pages, ...tabBarPagePaths, ...subPackagePagePaths].map((item) => `${item}.wxml`);
     })();
-    const asyncComponentCode = Object.keys(asyncComponents).map((item) => `<${item}/>`);
     Object.keys(assets).forEach((assetPath) => {
-        if (!pagesPath.includes(assetPath))
+        if (!pageWXmlPaths.includes(assetPath))
             return;
         const source = assets[assetPath].source();
+        const pageRoute = assetPath.replace(/\.wxml$/, '');
+        const asyncComponentCode = Object.keys(asyncComponents).map((item) => `<${item} route="${pageRoute}"/>`);
         const tempCode = [source, ...asyncComponentCode].join('\n');
         assets[assetPath] = new webpack_sources_1.RawSource(tempCode);
     });

package/dist/transform-pages-wxml.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform-pages-wxml.js","sourceRoot":"","sources":["../src/transform-pages-wxml.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAO3C,MAAM,iBAAiB,GAAG,UAAU,CAAA;AAE7B,MAAM,kBAAkB,GAAG,CAAC,IAAU,EAAE,EAAE;IAC/C,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAA;IAExC,MAAM,YAAY,GAAc,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAY,CAAC,CAAA;IAExF,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;;QACtB,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,YAAY,CAAA;QACrE,MAAM,eAAe,GAAG,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAI,EAAE,CAAA;QACxE,MAAM,cAAc,GAAG,WAAW,IAAI,WAAW,IAAI,EAAE,CAAA;QACvD,MAAM,mBAAmB,GAAG,cAAc,CAAC,MAAM,CAAW,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YAC3E,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;YAC1C,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,kBAAkB,IAAI,IAAI,EAAE,CAAC,CAAC,CAAA;QAC1F,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,eAAe,EAAE,GAAG,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,OAAO,CAAC,CAAA;IAC7F,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;IAEnF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACxC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAM;QAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAY,CAAA;QACnD,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,GAAG,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3D,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,2BAAS,CAAC,QAAQ,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAxBY,QAAA,kBAAkB,sBAwB9B"}
+{"version":3,"file":"transform-pages-wxml.js","sourceRoot":"","sources":["../src/transform-pages-wxml.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAO3C,MAAM,iBAAiB,GAAG,UAAU,CAAA;AAE7B,MAAM,kBAAkB,GAAG,CAAC,IAAU,EAAE,EAAE;IAC/C,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAA;IAExC,MAAM,YAAY,GAAc,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAY,CAAC,CAAA;IAExF,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;;QAC1B,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,YAAY,CAAA;QACrE,MAAM,eAAe,GAAG,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAI,EAAE,CAAA;QACxE,MAAM,cAAc,GAAG,WAAW,IAAI,WAAW,IAAI,EAAE,CAAA;QACvD,MAAM,mBAAmB,GAAG,cAAc,CAAC,MAAM,CAAW,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YAC3E,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAA;YAC1C,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,kBAAkB,IAAI,IAAI,EAAE,CAAC,CAAC,CAAA;QAC1F,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,eAAe,EAAE,GAAG,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,OAAO,CAAC,CAAA;IAC7F,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACxC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAM;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAY,CAAA;QACnD,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;QAClD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,WAAW,SAAS,KAAK,CAAC,CAAA;QACxG,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,GAAG,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3D,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,2BAAS,CAAC,QAAQ,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAxBY,QAAA,kBAAkB,sBAwB9B"}

package/dist/transform-webpack-runtime.js

@@ -174,7 +174,7 @@ loadStylesheet = function (chunkId) {
   const dynamicPackageNameRegex = DYNAMIC_PACKAGE_NAME_REGEX;
   const [,dynamicPackageName] = fullHref.match(dynamicPackageNameRegex) || [];
   const { SingletonPromise } = require('~/singleton-promise.js');
-  return SingletonPromise.wait(dynamicPackageName)
+  return SingletonPromise.wait({ dynamicPackageName })
 }
 `;
 const replaceLoadStylesheetFn = (nodePath, opts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taro-minify-pack/plugin-async-pack",
-  "version": "0.0.5-alpha.3",
+  "version": "0.0.5-alpha.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,6 +33,7 @@
     "@types/babel__traverse": "^7.20.6",
     "@types/node": "^18.19.130",
     "@types/webpack-sources": "^3.2.3",
+    "@types/wechat-miniprogram": "^3.4.9",
     "@typescript-eslint/eslint-plugin": "^8.26.1",
     "@typescript-eslint/parser": "^8.26.1",
     "eslint": "^8.19.0",

package/src/inject-style-component.ts

@@ -12,9 +12,16 @@ export const InjectStyleComponentName = 'inject-style'
 const injectStyleComponentCode = `
 const { SingletonPromise } = require('~/singleton-promise.js')
 Component({ 
+  properties: {
+    route: String,
+  },
   lifetimes: { 
-    attached: () => SingletonPromise.loaded("DYNAMIC_PACKAGE_NAME"),
-    detached: () => SingletonPromise.unloaded("DYNAMIC_PACKAGE_NAME")
+    attached: function () {
+      return SingletonPromise.loaded({dynamicPackageName:"DYNAMIC_PACKAGE_NAME",pageRoute:this.data.route})
+    },
+    detached: function () {
+      return SingletonPromise.unloaded({dynamicPackageName:"DYNAMIC_PACKAGE_NAME",pageRoute:this.data.route})
+    }
   } 
 })
 `

package/src/singleton-promise.ts

@@ -1,8 +1,11 @@
+interface Opt {
+  dynamicPackageName: string
+  pageRoute: string
+}
+
 export class SingletonPromise {
   // 静态属性存放单例
-  private static instance?: Record<string, SingletonPromise>
-
-  private loadTimes = 0
+  private static instance?: Map<string, Map<string, SingletonPromise>>
 
   private promise?: Promise<void>
 
@@ -12,30 +15,38 @@ export class SingletonPromise {
     this.resetPromise()
   }
 
-  static getInstance (key:string) {
-    if (!SingletonPromise.instance) SingletonPromise.instance = {}
-    if (!SingletonPromise.instance[key]) SingletonPromise.instance[key] = new SingletonPromise()
-    return SingletonPromise.instance[key]
-  }
-
   private resetPromise () {
     this.promise = new Promise<void>((resolve) => {
       this.resolve = resolve
     })
   }
 
-  static wait (key:string) {
-    return this.getInstance(key).promise
+  static getInstance (opt: Pick<Opt, 'dynamicPackageName'>) {
+    const { dynamicPackageName } = opt
+    if (!SingletonPromise.instance) SingletonPromise.instance = new Map()
+    if (!SingletonPromise.instance.has(dynamicPackageName)) SingletonPromise.instance.set(dynamicPackageName, new Map())
+    return SingletonPromise.instance.get(dynamicPackageName)!
+  }
+
+  static wait (opt: Pick<Opt, 'dynamicPackageName'>) {
+    const instance = this.getInstance(opt)
+    const currentPages = getCurrentPages()
+    return Promise.all(currentPages.map(page => {
+      if (!instance.has(page.route)) instance.set(page.route, new SingletonPromise())
+      return instance.get(page.route)?.promise
+    }))
   }
 
-  static loaded (key:string) {
-    this.getInstance(key).resolve?.()
-    this.getInstance(key).loadTimes += 1
+  static loaded (opt: Opt) {
+    const { pageRoute } = opt
+    const instance = this.getInstance(opt)
+    if (!instance.has(pageRoute)) instance.set(pageRoute, new SingletonPromise())
+    instance.get(pageRoute)?.resolve?.()
   }
 
-  static unloaded (key:string) {
-    this.getInstance(key).loadTimes -= 1
-    if (this.getInstance(key).loadTimes > 0) return
-    this.getInstance(key).resetPromise()
+  static unloaded (opt: Opt) {
+    const { pageRoute } = opt
+    const instance = this.getInstance(opt)
+    instance.delete(pageRoute)
   }
 }

package/src/transform-pages-wxml.ts

@@ -13,7 +13,7 @@ export const transformPagesWXml = (opts: Opts) => {
 
   const curAppConfig: AppConfig = JSON.parse(assets[appConfigAssetKey].source() as string)
 
-  const pagesPath = (() => {
+  const pageWXmlPaths = (() => {
     const { pages = [], subpackages, subPackages, tabBar } = curAppConfig
     const tabBarPagePaths = tabBar?.list?.map((item) => item.pagePath) || []
     const curSubPackages = subPackages || subpackages || []
@@ -24,11 +24,11 @@ export const transformPagesWXml = (opts: Opts) => {
     return [...pages, ...tabBarPagePaths, ...subPackagePagePaths].map((item) => `${item}.wxml`)
   })()
 
-  const asyncComponentCode = Object.keys(asyncComponents).map((item) => `<${item}/>`)
-
   Object.keys(assets).forEach((assetPath) => {
-    if (!pagesPath.includes(assetPath)) return
+    if (!pageWXmlPaths.includes(assetPath)) return
     const source = assets[assetPath].source() as string
+    const pageRoute = assetPath.replace(/\.wxml$/, '')
+    const asyncComponentCode = Object.keys(asyncComponents).map((item) => `<${item} route="${pageRoute}"/>`)
     const tempCode = [source, ...asyncComponentCode].join('\n')
     assets[assetPath] = new RawSource(tempCode)
   })

package/src/transform-webpack-runtime.ts

@@ -175,7 +175,7 @@ loadStylesheet = function (chunkId) {
   const dynamicPackageNameRegex = DYNAMIC_PACKAGE_NAME_REGEX;
   const [,dynamicPackageName] = fullHref.match(dynamicPackageNameRegex) || [];
   const { SingletonPromise } = require('~/singleton-promise.js');
-  return SingletonPromise.wait(dynamicPackageName)
+  return SingletonPromise.wait({ dynamicPackageName })
 }
 `
 

package/tsconfig.json

@@ -14,7 +14,7 @@
     "forceConsistentCasingInFileNames": true,
     "jsx": "react",
     "lib": ["esnext", "dom"],
-    "types": ["@types/node"]
+    "types": ["@types/node","@types/wechat-miniprogram"]
   },
   "include": ["src"]
 }