npm - @taro-minify-pack/plugin-async-pack - Versions diffs - 0.0.5-alpha.0 → 0.0.5-alpha.2 - Mend

@taro-minify-pack/plugin-async-pack 0.0.5-alpha.0 → 0.0.5-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/README.md +3 -3
package/dist/index.js +7 -0
package/dist/index.js.map +1 -1
package/dist/inject-style-component.js +6 -1
package/dist/inject-style-component.js.map +1 -1
package/dist/singleton-promise.d.ts +4 -1
package/dist/singleton-promise.js +15 -4
package/dist/singleton-promise.js.map +1 -1
package/dist/transform-app-config.js.map +1 -1
package/dist/transform-react-lazy.d.ts +7 -0
package/dist/transform-react-lazy.js +139 -0
package/dist/transform-react-lazy.js.map +1 -0
package/dist/transform-webpack-runtime.js +66 -28
package/dist/transform-webpack-runtime.js.map +1 -1
package/package.json +1 -2
package/src/index.ts +8 -0
package/src/inject-style-component.ts +6 -1
package/src/singleton-promise.ts +17 -4
package/src/transform-app-config.ts +1 -4
package/src/transform-react-lazy.ts +132 -0
package/src/transform-webpack-runtime.ts +83 -31

package/README.md CHANGED Viewed

@@ -5,16 +5,16 @@
 #### npm 安装
 ```bash
-npm install @taro-minify-pack/plugin-async-pack
+npm install @taro-minify-pack/plugin-async-pack @taro-minify-pack/react-lazy-enhanced
 ```
 #### yarn 安装
 ```bash
-yarn add @taro-minify-pack/plugin-async-pack
+yarn add @taro-minify-pack/plugin-async-pack @taro-minify-pack/react-lazy-enhanced
 ```
 #### pnpm 安装
 ```bash
-pnpm add @taro-minify-pack/plugin-async-pack
+pnpm add @taro-minify-pack/plugin-async-pack @taro-minify-pack/react-lazy-enhanced
 ```
 ### 配置

package/dist/index.js CHANGED Viewed

@@ -47,6 +47,13 @@ exports.default = (ctx, pluginOpts) => {
             const chunkFilename = (pathData) => generateChunkFilename(pathData, '.wxss');
             return [Object.assign(Object.assign({}, options), { chunkFilename })];
         });
+        chain.module
+            .rule('script')
+            .use('babelLoader')
+            .tap((opts) => {
+            const pluginConfig = path_1.default.resolve(__dirname, './transform-react-lazy');
+            return Object.assign(Object.assign({}, opts), { plugins: [pluginConfig, ...(opts.plugins || [])] });
+        });
         chain.plugin(transform_before_compression_plugin_1.PLUGIN_NAME).use(transform_before_compression_plugin_1.TransformBeforeCompressionPlugin, [{
                 test: /^(runtime\.js)$/,
                 transform: (opt) => {

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/inject-style-component.js CHANGED Viewed

@@ -12,7 +12,12 @@ exports.PLUGIN_NAME = 'InjectStyleComponent';
 exports.InjectStyleComponentName = 'inject-style';
 const injectStyleComponentCode = `
 const { SingletonPromise } = require('~/singleton-promise.js')
-Component({ lifetimes: { attached: () => SingletonPromise.resolve("DYNAMIC_PACKAGE_NAME") } })
+Component({
+  lifetimes: {
+    attached: () => SingletonPromise.loaded("DYNAMIC_PACKAGE_NAME"),
+    detached: () => SingletonPromise.unloaded("DYNAMIC_PACKAGE_NAME")
+  }
+})
 `;
 class InjectStyleComponentPlugin {
     constructor(opt) {

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

	@@ -1 +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~~;;;CAGhC~~,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"}
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"}

package/dist/singleton-promise.d.ts CHANGED Viewed

@@ -1,9 +1,12 @@
 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 resolve(key: string): void;
+    static loaded(key: string): void;
+    static unloaded(key: string): void;
 }

package/dist/singleton-promise.js CHANGED Viewed

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingletonPromise = void 0;
 class SingletonPromise {
     constructor() {
-        this.promise = new Promise(resolve => {
-            this.resolve = resolve;
-        });
+        this.loadTimes = 0;
+        this.resetPromise();
     }
     static getInstance(key) {
         if (!SingletonPromise.instance)
@@ -14,12 +13,24 @@ class SingletonPromise {
             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 resolve(key) {
+    static loaded(key) {
         var _a, _b;
         (_b = (_a = this.getInstance(key)).resolve) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.getInstance(key).loadTimes += 1;
+    }
+    static unloaded(key) {
+        this.getInstance(key).loadTimes -= 1;
+        if (this.getInstance(key).loadTimes > 0)
+            return;
+        this.getInstance(key).resetPromise();
     }
 }
 exports.SingletonPromise = SingletonPromise;

package/dist/singleton-promise.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"singleton-promise.js","sourceRoot":"","sources":["../src/singleton-promise.ts"],"names":[],"mappings":";;;AAAA,MAAa,gBAAgB;~~IAQ3B~~;~~QACE~~,~~IAAI~~,~~CAAC,OAAO,~~GAAG,~~IAAI,OAAO,CAAO,OAAO,~~CAAC,~~EAAE~~;~~YACzC~~,IAAI,CAAC,~~OAAO~~,~~GAAG~~,~~OAAO,~~CAAA;~~QACxB~~,CAAC~~,CAAC,CAAA~~;~~IACJ,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;IAED,MAAM,CAAC,IAAI,CAAE,GAAU;QACrB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,~~OAAO~~,CAAE,GAAU;;~~QACxB~~,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAC,OAAO,kDAAI,CAAA;~~IACnC~~,CAAC;CACF;~~AA3BD~~,~~4CA2BC~~"}
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"}

package/dist/transform-app-config.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform-app-config.js","sourceRoot":"","sources":["../src/transform-app-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,qDAA2C;AAC3C,mCAAoD;AAOpD,MAAM,iBAAiB,GAAG,UAAU,CAAA;AAE7B,MAAM,kBAAkB,GAAG,CAAC,IAAU,EAAE,EAAE;IAC/C,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IAE7D,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAY,CAAC,CAAA;IAE7E,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,oBAAoB,GAAG,EAAE,KAAsB,YAAY,EAA7B,YAAY,UAAK,YAAY,EAAhI,yFAAiH,CAAe,CAAA;IAEtI,MAAM,gBAAgB,GAAG,WAAW,IAAI,WAAW,IAAI,EAAE,CAAA;IAEzD,MAAM,sBAAsB,GAAG,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACxF,OAAO,EAAE,IAAI,EAAE,IAAA,kCAA0B,kCAAM,IAAI,KAAE,KAAK,IAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IAC5E,CAAC,CAAC,CAAA;IAEF,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACrF,uCAAY,MAAM,KAAE,CAAC,IAAI,CAAC,EAAE,OAAO,IAAE;IACvC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,cAAc,mCACf,YAAY,KACf,eAAe,kCAAO,eAAe,GAAK,eAAe,GACzD,oBAAoB,kCAAO,oBAAoB,GAAK,yBAAyB,GAC7E,WAAW,EAAE,CAAC,GAAG,gBAAgB,EAAE,GAAG,sBAAsB,CAAC,EAC7D,YAAY,~~kCACP~~,YAAY,~~KACf~~,KAAK,EAAE,IAAI,~~MAEd~~,CAAA;IAED,MAAM,CAAC,iBAAiB,CAAC,GAAG,IAAI,2BAAS,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;AAC3E,CAAC,CAAA;~~AA7BY~~,QAAA,kBAAkB,~~sBA6B9B~~"}
1	+ {"version":3,"file":"transform-app-config.js","sourceRoot":"","sources":["../src/transform-app-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,qDAA2C;AAC3C,mCAAoD;AAOpD,MAAM,iBAAiB,GAAG,UAAU,CAAA;AAE7B,MAAM,kBAAkB,GAAG,CAAC,IAAU,EAAE,EAAE;IAC/C,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IAE7D,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAY,CAAC,CAAA;IAE7E,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,oBAAoB,GAAG,EAAE,KAAsB,YAAY,EAA7B,YAAY,UAAK,YAAY,EAAhI,yFAAiH,CAAe,CAAA;IAEtI,MAAM,gBAAgB,GAAG,WAAW,IAAI,WAAW,IAAI,EAAE,CAAA;IAEzD,MAAM,sBAAsB,GAAG,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACxF,OAAO,EAAE,IAAI,EAAE,IAAA,kCAA0B,kCAAM,IAAI,KAAE,KAAK,IAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;IAC5E,CAAC,CAAC,CAAA;IAEF,MAAM,yBAAyB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QACrF,uCAAY,MAAM,KAAE,CAAC,IAAI,CAAC,EAAE,OAAO,IAAE;IACvC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,cAAc,mCACf,YAAY,KACf,eAAe,kCAAO,eAAe,GAAK,eAAe,GACzD,oBAAoB,kCAAO,oBAAoB,GAAK,yBAAyB,GAC7E,WAAW,EAAE,CAAC,GAAG,gBAAgB,EAAE,GAAG,sBAAsB,CAAC,EAC7D,YAAY,kCAAO,YAAY,KAAE,KAAK,EAAE,IAAI,MAC7C,CAAA;IAED,MAAM,CAAC,iBAAiB,CAAC,GAAG,IAAI,2BAAS,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;AAC3E,CAAC,CAAA;AA1BY,QAAA,kBAAkB,sBA0B9B"}

package/dist/transform-react-lazy.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import { PluginObj, PluginPass } from '@babel/core';
+interface State extends PluginPass {
+    reactNamespaces: Set<string>;
+    reactLazyBindings: Set<string>;
+}
+declare const _default: () => PluginObj<State>;
+export default _default;

package/dist/transform-react-lazy.js ADDED Viewed

@@ -0,0 +1,139 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const types = __importStar(require("@babel/types"));
+const customLazySource = '@taro-minify-pack/react-lazy-enhanced';
+exports.default = () => {
+    return {
+        visitor: {
+            Program: {
+                enter(programPath, state) {
+                    const { filename = '' } = state;
+                    if (new RegExp(customLazySource).test(filename))
+                        return;
+                    state.reactNamespaces = new Set();
+                    state.reactLazyBindings = new Set();
+                    programPath.traverse({
+                        ImportDeclaration(path) {
+                            if (!types.isStringLiteral(path.node.source, { value: 'react' }))
+                                return;
+                            const { specifiers } = path.node;
+                            specifiers.forEach((spec) => {
+                                const { name } = spec.local;
+                                //  import React from 'react'
+                                if (types.isImportDefaultSpecifier(spec))
+                                    return state.reactNamespaces.add(name);
+                                //  import * as React from 'react'
+                                if (types.isImportNamespaceSpecifier(spec))
+                                    return state.reactNamespaces.add(name);
+                                // import  { lazy } from 'react'
+                                if (types.isImportSpecifier(spec) && types.isIdentifier(spec.imported, { name: 'lazy' })) {
+                                    state.reactLazyBindings.add(name);
+                                }
+                            });
+                        }
+                    });
+                    programPath.traverse({
+                        VariableDeclarator(path) {
+                            const { id, init } = path.node;
+                            // const a = React.lazy
+                            if (types.isIdentifier(id)) {
+                                if (!types.isMemberExpression(init))
+                                    return;
+                                if (!types.isIdentifier(init.object))
+                                    return;
+                                if (!types.isIdentifier(init.property, { name: 'lazy' }))
+                                    return;
+                                if (!state.reactNamespaces.has(init.object.name))
+                                    return;
+                                state.reactLazyBindings.add(id.name);
+                            }
+                            // const { lazy: a } = React;
+                            if (types.isObjectPattern(id) && types.isIdentifier(init)) {
+                                const { properties } = id;
+                                if (!state.reactNamespaces.has(init.name))
+                                    return;
+                                properties.forEach((prop) => {
+                                    if (!types.isObjectProperty(prop))
+                                        return;
+                                    if (!types.isIdentifier(prop.key, { name: 'lazy' }))
+                                        return;
+                                    if (!types.isIdentifier(prop.value))
+                                        return;
+                                    state.reactLazyBindings.add(prop.value.name);
+                                });
+                            }
+                        }
+                    });
+                },
+                exit(programPath, state) {
+                    const { filename = '' } = state;
+                    if (new RegExp(customLazySource).test(filename))
+                        return;
+                    let needInject = false;
+                    const customLazyId = programPath.scope.generateUidIdentifier('customLazy');
+                    programPath.traverse({
+                        CallExpression(path) {
+                            const { callee } = path.node;
+                            if (types.isMemberExpression(callee)) {
+                                if (!types.isIdentifier(callee.object))
+                                    return;
+                                if (!state.reactNamespaces.has(callee.object.name))
+                                    return;
+                                if (!types.isIdentifier(callee.property, { name: 'lazy' }))
+                                    return;
+                                path.node.callee = customLazyId;
+                                needInject = true;
+                            }
+                            if (types.isIdentifier(callee) && state.reactLazyBindings.has(callee.name)) {
+                                path.node.callee = customLazyId;
+                                needInject = true;
+                            }
+                        }
+                    });
+                    const hasImport = programPath.node.body.some((node) => {
+                        return types.isImportDeclaration(node) && node.source.value === customLazySource;
+                    });
+                    if (hasImport || !needInject)
+                        return;
+                    const specifier = types.importSpecifier(customLazyId, types.identifier('lazy'));
+                    const nodes = types.importDeclaration([specifier], types.stringLiteral(customLazySource));
+                    programPath.unshiftContainer('body', nodes);
+                }
+            }
+        }
+    };
+};
+//# sourceMappingURL=transform-react-lazy.js.map

package/dist/transform-react-lazy.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"transform-react-lazy.js","sourceRoot":"","sources":["../src/transform-react-lazy.ts"],"names":[],"mappings":"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"}

package/dist/transform-webpack-runtime.js CHANGED Viewed

@@ -68,28 +68,17 @@ const webpackLoadDynamicModuleTemplate = `
       return;
     }
-    const dynamicPackageNameRegex = DYNAMIC_PACKAGE_NAME_REGEX;
-    const [,dynamicPackageName] = dynamicModulePath.match(dynamicPackageNameRegex) || [];
     const target = { src: dynamicModulePath };
     if (loadedDynamicModules[dynamicModulePath]) return done({ type: 'loaded', target });
-    const { SingletonPromise } = require('~/singleton-promise.js');
-    const waitStyle = hasStyleDynamicModuleList.includes(dynamicModulePath)?SingletonPromise.wait(dynamicPackageName):Promise.resolve();
-    waitStyle.then(()=>{
-      promiseRetry(function () {
-        return loadDynamicModule(dynamicModulePath)
-      })
-      .then(function () {
-        return done({ type: 'loaded', target })
-      }).catch(function () {
-        return done({ type:'error', target })
-      });
-    })
+    promiseRetry(function () {
+      return loadDynamicModule(dynamicModulePath)
+    }).then(function () {
+      return done({ type: 'loaded', target })
+    }).catch(function () {
+      return done({ type:'error', target })
+    });
   };
 `;
 const replaceWebpackLoadScriptFn = (assignmentExpressionNodePath, opts) => {
@@ -116,7 +105,7 @@ const replaceWebpackLoadScriptFn = (assignmentExpressionNodePath, opts) => {
     });
     const loadDynamicModuleFnMapCode = (() => {
         const dynamicAssetsRequireTempCode = dynamicJsAssets.map((dynamicJsAsset) => {
-            return `'/${dynamicJsAsset}':function (){ return require.async('/${dynamicJsAsset}'); }`;
+            return `'/${dynamicJsAsset}':function (){ return require.async('~/${dynamicJsAsset}'); }`;
         });
         return `var loadDynamicModuleFnMap = {${dynamicAssetsRequireTempCode.join(',')}}`;
     })();
@@ -127,8 +116,7 @@ const replaceWebpackLoadScriptFn = (assignmentExpressionNodePath, opts) => {
         });
         return `var hasStyleDynamicModuleList = [${hasStyleDynamicAssetsList.map(item => `'/${item}'`).join(',')}]`;
     })();
-    const DYNAMIC_PACKAGE_NAME_REGEX = types.regExpLiteral(`(${dynamicPackageNamePrefix}(?:-[a-z]{2})?)\\/`);
-    const templateCodeAst = core_1.template.statement(webpackLoadDynamicModuleTemplate)({ DYNAMIC_PACKAGE_NAME_REGEX });
+    const templateCodeAst = core_1.template.ast(webpackLoadDynamicModuleTemplate);
     const loadDynamicModuleFnMapAst = core_1.template.ast(loadDynamicModuleFnMapCode);
     const hasStyleDynamicAssetsListAst = core_1.template.ast(hasStyleDynamicAssetsListCode);
     const templateCodeDepAst = core_1.template.ast(webpackLoadDynamicModuleTemplateDep);
@@ -137,12 +125,59 @@ const replaceWebpackLoadScriptFn = (assignmentExpressionNodePath, opts) => {
     assignmentExpressionNodePath.insertBefore(hasStyleDynamicAssetsListAst);
     assignmentExpressionNodePath.insertBefore(templateCodeDepAst);
 };
-const webpackLoadDynamicModuleStylesheetTemplate = `
-loadStylesheet = function () {
-  return Promise.resolve()
+const webpackLoadDynamicStylesheetTemplate = `
+  __webpack_require__.f.miniCss = function (dynamicStylesheetChunkId, promises) {
+    var cssChunks = CSS_CHUNKS;
+    if(installedCssChunks[dynamicStylesheetChunkId] !== 0 && cssChunks[dynamicStylesheetChunkId]){
+      promises.push(loadStylesheet(dynamicStylesheetChunkId))
+    }
+  }
+`;
+const replaceWebpackLoadDynamicModuleStylesheetFn = (assignmentExpressionNodePath) => {
+    const { left, right } = assignmentExpressionNodePath.node || {};
+    if (!types.isMemberExpression(left))
+        return;
+    if (!types.isFunctionExpression(right))
+        return;
+    if (!types.isMemberExpression(left.object))
+        return;
+    if (!types.isIdentifier(left.object.object, { name: '__webpack_require__' }))
+        return;
+    if (!types.isIdentifier(left.object.property, { name: 'f' }))
+        return;
+    if (!types.isIdentifier(left.property, { name: 'miniCss' }))
+        return;
+    const isProcessed = right.params.some((item) => {
+        return types.isIdentifier(item, { name: 'dynamicStylesheetChunkId' });
+    });
+    if (isProcessed)
+        return;
+    const cssChunksValueAst = [];
+    assignmentExpressionNodePath.traverse({
+        VariableDeclarator: (nodePath) => {
+            const { id, init } = nodePath.node || {};
+            if (!types.isIdentifier(id, { name: 'cssChunks' }))
+                return;
+            if (!types.isObjectExpression(init))
+                return;
+            cssChunksValueAst.push(...init.properties);
+        }
+    });
+    const CSS_CHUNKS = types.objectExpression(cssChunksValueAst);
+    const templateCodeAst = core_1.template.statement(webpackLoadDynamicStylesheetTemplate)({ CSS_CHUNKS });
+    assignmentExpressionNodePath.replaceWith(templateCodeAst);
+};
+const webpackLoadStylesheetTemplate = `
+loadStylesheet = function (chunkId) {
+  const href = __webpack_require__.miniCssF(chunkId);
+  const fullHref = __webpack_require__.p + href;
+  const dynamicPackageNameRegex = DYNAMIC_PACKAGE_NAME_REGEX;
+  const [,dynamicPackageName] = fullHref.match(dynamicPackageNameRegex) || [];
+  const { SingletonPromise } = require('~/singleton-promise.js');
+  return SingletonPromise.wait(dynamicPackageName)
 }
 `;
-const replaceLoadStylesheetFn = (nodePath) => {
+const replaceLoadStylesheetFn = (nodePath, opts) => {
     const { id, init } = nodePath.node || {};
     if (!types.isIdentifier(id, { name: 'loadStylesheet' }))
         return;
@@ -151,7 +186,9 @@ const replaceLoadStylesheetFn = (nodePath) => {
     const isProcessed = !init.params.length;
     if (isProcessed)
         return;
-    const templateCodeAst = core_1.template.expression(webpackLoadDynamicModuleStylesheetTemplate)();
+    const { dynamicPackageNamePrefix } = opts;
+    const DYNAMIC_PACKAGE_NAME_REGEX = types.regExpLiteral(`(${dynamicPackageNamePrefix}(?:-[a-z]{2})?)\\/`);
+    const templateCodeAst = core_1.template.expression(webpackLoadStylesheetTemplate)({ DYNAMIC_PACKAGE_NAME_REGEX });
     nodePath.replaceWith(templateCodeAst);
 };
 const removeCreateStylesheetFn = (nodePath) => {
@@ -171,9 +208,10 @@ const transformWebpackRuntime = (code, opts) => {
     (0, traverse_1.default)(ast, {
         AssignmentExpression: (nodePath) => {
             replaceWebpackLoadScriptFn(nodePath, opts);
+            replaceWebpackLoadDynamicModuleStylesheetFn(nodePath);
         },
         VariableDeclarator(nodePath) {
-            replaceLoadStylesheetFn(nodePath);
+            replaceLoadStylesheetFn(nodePath, opts);
             removeCreateStylesheetFn(nodePath);
             removeFindStylesheetFn(nodePath);
         }

package/dist/transform-webpack-runtime.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform-webpack-runtime.js","sourceRoot":"","sources":["../src/transform-webpack-runtime.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAgD;AAChD,iEAAwC;AACxC,sDAAuC;AACvC,+~~DAAgD~~;~~AAChD~~,oDAAqC;~~AAGrC~~,mCAA4E;AAM5E,MAAM,mCAAmC,GAAG;;;;;;;;;;;;;;;;;CAiB3C,CAAA;AAED,MAAM,gCAAgC,GAAG~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BxC~~,CAAA;AAED,MAAM,0BAA0B,GAAG,CAAC,4BAA4D,EAAE,IAAU,EAAE,EAAE;IAC9G,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,4BAA4B,CAAC,IAAI,IAAI,EAAE,CAAA;IAE/D,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAAE,OAAM;IAE3C,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAAE,OAAM;IAE9C,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;QAAE,OAAM;IAE7E,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAE,OAAM;IAE7D,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7C,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;IAEF,IAAI,WAAW;QAAE,OAAM;IAEvB,MAAM,EAAE,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAA;IAEjD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QAC/D,OAAO,IAAA,+BAAuB,EAAC,wBAAwB,EAAE,SAAS,CAAC,CAAA;IACrE,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACjE,OAAO,IAAA,iCAAyB,EAAC,wBAAwB,EAAE,SAAS,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;IAEF,MAAM,0BAA0B,GAAG,CAAC,GAAG,EAAE;QACvC,MAAM,4BAA4B,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;YAC1E,OAAO,KAAK,cAAc,~~yCAAyC~~,cAAc,OAAO,CAAA;~~QAC1F~~,CAAC,CAAC,CAAA;QAEF,OAAO,iCAAiC,4BAA4B,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IACnF,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE;QAC1C,MAAM,yBAAyB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;YAC1E,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,iBAAiB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,OAAO,oCAAoC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IAC7G,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,~~0BAA0B,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,wBAAwB,oBAAoB,CAAC,CAAA;IAExG,MAAM,~~eAAe,GAAG,eAAQ,CAAC,~~SAAS~~,CAAC,gCAAgC,~~CAAC~~,~~CAAC,EAAE,0BAA0B,EAAE,CAAC,~~CAAA;~~IAE5G~~,MAAM,yBAAyB,GAAG,eAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IAE1E,MAAM,4BAA4B,GAAG,eAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IAEhF,MAAM,kBAAkB,GAAG,eAAQ,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;IAE5E,4BAA4B,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;IAEzD,4BAA4B,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAA;IAEpE,4BAA4B,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAA;IAEvE,4BAA4B,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,~~0CAA0C~~,GAAG~~;;;;CAIlD~~,CAAA;AAED,MAAM,uBAAuB,GAAG,CAAC,QAAsC,EAAE,EAAE;~~IACzE~~,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAA;IACxC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;QAAE,OAAM;IAC/D,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC;QAAE,OAAM;IAC7C,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IACvC,IAAI,WAAW;QAAE,OAAM;IACvB,MAAM,eAAe,GAAG,eAAQ,CAAC,UAAU,CAAC,~~0CAA0C~~,CAAC,EAAE,CAAA;~~IACzF~~,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,CAAC,QAAsC,EAAE,EAAE;IAC1E,MAAM,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAA;IAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QAAE,OAAM;IACjE,QAAQ,CAAC,MAAM,EAAE,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAAC,QAAsC,EAAE,EAAE;IACxE,MAAM,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAA;IAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;QAAE,OAAM;IAC/D,QAAQ,CAAC,MAAM,EAAE,CAAA;AACnB,CAAC,CAAA;AAEM,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAE,IAAU,EAAE,EAAE;IAClE,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA,CAAC,aAAa;IAC5C,IAAA,kBAAQ,EAAC,GAAG,EAAE;QACZ,oBAAoB,EAAE,CAAC,QAAwC,EAAE,EAAE;YACjE,0BAA0B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;~~QAC5C~~,CAAC;QACD,kBAAkB,CAAE,QAAsC;YACxD,uBAAuB,CAAC,QAAQ,CAAC,CAAA;~~YACjC~~,wBAAwB,CAAC,QAAQ,CAAC,CAAA;YAClC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAClC,CAAC;KACF,CAAC,CAAA;IACF,OAAO,IAAA,mBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAC5B,CAAC,CAAA;~~AAbY~~,QAAA,uBAAuB,~~2BAanC~~"}
1	+ {"version":3,"file":"transform-webpack-runtime.js","sourceRoot":"","sources":["../src/transform-webpack-runtime.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAgD;AAChD,iEAAwC;AACxC,sDAAuC;AACvC,+DAAsC;AACtC,oDAAqC;AAUrC,mCAA4E;AAM5E,MAAM,mCAAmC,GAAG;;;;;;;;;;;;;;;;;CAiB3C,CAAA;AAED,MAAM,gCAAgC,GAAG;;;;;;;;;;;;;;;;;;;CAmBxC,CAAA;AAED,MAAM,0BAA0B,GAAG,CAAC,4BAA4D,EAAE,IAAU,EAAE,EAAE;IAC9G,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,4BAA4B,CAAC,IAAI,IAAI,EAAE,CAAA;IAE/D,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAAE,OAAM;IAE3C,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAAE,OAAM;IAE9C,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;QAAE,OAAM;IAE7E,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAE,OAAM;IAE7D,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7C,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;IAEF,IAAI,WAAW;QAAE,OAAM;IAEvB,MAAM,EAAE,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAA;IAEjD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QAC/D,OAAO,IAAA,+BAAuB,EAAC,wBAAwB,EAAE,SAAS,CAAC,CAAA;IACrE,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACjE,OAAO,IAAA,iCAAyB,EAAC,wBAAwB,EAAE,SAAS,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;IAEF,MAAM,0BAA0B,GAAG,CAAC,GAAG,EAAE;QACvC,MAAM,4BAA4B,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;YAC1E,OAAO,KAAK,cAAc,0CAA0C,cAAc,OAAO,CAAA;QAC3F,CAAC,CAAC,CAAA;QAEF,OAAO,iCAAiC,4BAA4B,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IACnF,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE;QAC1C,MAAM,yBAAyB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;YAC1E,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChE,OAAO,iBAAiB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,OAAO,oCAAoC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;IAC7G,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,eAAe,GAAG,eAAQ,CAAC,GAAG,CAAC,gCAAgC,CAAc,CAAA;IAEnF,MAAM,yBAAyB,GAAG,eAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IAE1E,MAAM,4BAA4B,GAAG,eAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IAEhF,MAAM,kBAAkB,GAAG,eAAQ,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;IAE5E,4BAA4B,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;IAEzD,4BAA4B,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAA;IAEpE,4BAA4B,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAA;IAEvE,4BAA4B,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,oCAAoC,GAAG;;;;;;;CAO5C,CAAA;AAED,MAAM,2CAA2C,GAAG,CAClD,4BAA4D,EAC5D,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,4BAA4B,CAAC,IAAI,IAAI,EAAE,CAAA;IAE/D,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAAE,OAAM;IAE3C,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAAE,OAAM;IAE9C,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAM;IAElD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;QAAE,OAAM;IAEpF,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAE,OAAM;IAEpE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAAE,OAAM;IAEnE,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7C,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;IAEF,IAAI,WAAW;QAAE,OAAM;IAEvB,MAAM,iBAAiB,GAAyD,EAAE,CAAA;IAElF,4BAA4B,CAAC,QAAQ,CAAC;QACpC,kBAAkB,EAAE,CAAC,QAAsC,EAAE,EAAE;YAC7D,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAA;YACxC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;gBAAE,OAAM;YAC1D,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBAAE,OAAM;YAC3C,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;QAC5C,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,KAAK,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAA;IAE5D,MAAM,eAAe,GAAG,eAAQ,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;IAEhG,4BAA4B,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;AAC3D,CAAC,CAAA;AAED,MAAM,6BAA6B,GAAG;;;;;;;;;CASrC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAAC,QAAsC,EAAE,IAAU,EAAE,EAAE;IACrF,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAA;IACxC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;QAAE,OAAM;IAC/D,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC;QAAE,OAAM;IAC7C,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IACvC,IAAI,WAAW;QAAE,OAAM;IACvB,MAAM,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAA;IACzC,MAAM,0BAA0B,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,wBAAwB,oBAAoB,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,eAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC,EAAE,0BAA0B,EAAE,CAAC,CAAA;IAC1G,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,CAAC,QAAsC,EAAE,EAAE;IAC1E,MAAM,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAA;IAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;QAAE,OAAM;IACjE,QAAQ,CAAC,MAAM,EAAE,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAAC,QAAsC,EAAE,EAAE;IACxE,MAAM,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAA;IAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;QAAE,OAAM;IAC/D,QAAQ,CAAC,MAAM,EAAE,CAAA;AACnB,CAAC,CAAA;AAEM,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAE,IAAU,EAAE,EAAE;IAClE,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA,CAAC,aAAa;IAC5C,IAAA,kBAAQ,EAAC,GAAG,EAAE;QACZ,oBAAoB,EAAE,CAAC,QAAwC,EAAE,EAAE;YACjE,0BAA0B,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YAC1C,2CAA2C,CAAC,QAAQ,CAAC,CAAA;QACvD,CAAC;QACD,kBAAkB,CAAE,QAAsC;YACxD,uBAAuB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YACvC,wBAAwB,CAAC,QAAQ,CAAC,CAAA;YAClC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAClC,CAAC;KACF,CAAC,CAAA;IACF,OAAO,IAAA,mBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAC5B,CAAC,CAAA;AAdY,QAAA,uBAAuB,2BAcnC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@taro-minify-pack/plugin-async-pack",
-  "version": "0.0.5-alpha.0",
+  "version": "0.0.5-alpha.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,6 @@
     "@types/babel__generator": "^7.6.8",
     "@types/babel__template": "^7.4.4",
     "@types/babel__traverse": "^7.20.6",
-    "@types/md5": "^2.3.5",
     "@types/node": "^18.19.130",
     "@types/webpack-sources": "^3.2.3",
     "@typescript-eslint/eslint-plugin": "^8.26.1",

package/src/index.ts CHANGED Viewed

@@ -65,6 +65,14 @@ export default (ctx: IPluginContext, pluginOpts: AsyncPackOpts) => {
         return [{ ...options, chunkFilename }]
       })
+    chain.module
+      .rule('script')
+      .use('babelLoader')
+      .tap((opts) => {
+        const pluginConfig = path.resolve(__dirname, './transform-react-lazy')
+        return { ...opts, plugins: [pluginConfig, ...(opts.plugins || [])] }
+      })
     chain.plugin(TransformBeforeCompressionPluginName).use(TransformBeforeCompressionPlugin, [{
       test: /^(runtime\.js)$/,
       transform: (opt: TransformOpt) => {

package/src/inject-style-component.ts CHANGED Viewed

@@ -11,7 +11,12 @@ export const InjectStyleComponentName = 'inject-style'
 const injectStyleComponentCode = `
 const { SingletonPromise } = require('~/singleton-promise.js')
-Component({ lifetimes: { attached: () => SingletonPromise.resolve("DYNAMIC_PACKAGE_NAME") } })
+Component({
+  lifetimes: {
+    attached: () => SingletonPromise.loaded("DYNAMIC_PACKAGE_NAME"),
+    detached: () => SingletonPromise.unloaded("DYNAMIC_PACKAGE_NAME")
+  }
+})
 `
 type Opt = AsyncPackOpts

package/src/singleton-promise.ts CHANGED Viewed

@@ -2,14 +2,14 @@ export class SingletonPromise {
   // 静态属性存放单例
   private static instance?: Record<string, SingletonPromise>
+  private loadTimes = 0
   private promise?: Promise<void>
   private resolve?: () => void
   constructor () {
-    this.promise = new Promise<void>(resolve => {
-      this.resolve = resolve
-    })
+    this.resetPromise()
   }
   static getInstance (key:string) {
@@ -18,11 +18,24 @@ export class 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 resolve (key:string) {
+  static loaded (key:string) {
     this.getInstance(key).resolve?.()
+    this.getInstance(key).loadTimes += 1
+  }
+  static unloaded (key:string) {
+    this.getInstance(key).loadTimes -= 1
+    if (this.getInstance(key).loadTimes > 0) return
+    this.getInstance(key).resetPromise()
   }
 }

package/src/transform-app-config.ts CHANGED Viewed

@@ -31,10 +31,7 @@ export const transformAppConfig = (opts: Opts) => {
     usingComponents: { ...usingComponents, ...asyncComponents },
     componentPlaceholder: { ...componentPlaceholder, ...asyncComponentPlaceholder },
     subPackages: [...finalSubPackages, ...dynamicPackagesConfigs],
-    resolveAlias: {
-      ...resolveAlias,
-      '~/*': '/*'
-    }
+    resolveAlias: { ...resolveAlias, '~/*': '/*' }
   }
   assets[appConfigAssetKey] = new RawSource(JSON.stringify(finalAppConfig))

package/src/transform-react-lazy.ts ADDED Viewed

@@ -0,0 +1,132 @@
+import { PluginObj, NodePath, PluginPass } from '@babel/core'
+import * as types from '@babel/types'
+import { CallExpression, ImportDeclaration, Program, VariableDeclarator } from '@babel/types'
+const customLazySource = '@taro-minify-pack/react-lazy-enhanced'
+interface State extends PluginPass {
+  reactNamespaces: Set<string>;
+  reactLazyBindings: Set<string>;
+}
+export default (): PluginObj<State> => {
+  return {
+    visitor: {
+      Program: {
+        enter (programPath: NodePath<Program>, state: State) {
+          const { filename = '' } = state
+          if (new RegExp(customLazySource).test(filename)) return
+          state.reactNamespaces = new Set()
+          state.reactLazyBindings = new Set()
+          programPath.traverse({
+            ImportDeclaration (path: NodePath<ImportDeclaration>) {
+              if (!types.isStringLiteral(path.node.source, { value: 'react' })) return
+              const { specifiers } = path.node
+              specifiers.forEach((spec) => {
+                const { name } = spec.local
+                //  import React from 'react'
+                if (types.isImportDefaultSpecifier(spec)) return state.reactNamespaces.add(name)
+                //  import * as React from 'react'
+                if (types.isImportNamespaceSpecifier(spec)) return state.reactNamespaces.add(name)
+                // import  { lazy } from 'react'
+                if (types.isImportSpecifier(spec) && types.isIdentifier(spec.imported, { name: 'lazy' })) {
+                  state.reactLazyBindings.add(name)
+                }
+              })
+            }
+          })
+          programPath.traverse({
+            VariableDeclarator (path: NodePath<VariableDeclarator>) {
+              const { id, init } = path.node
+              // const a = React.lazy
+              if (types.isIdentifier(id)) {
+                if (!types.isMemberExpression(init)) return
+                if (!types.isIdentifier(init.object)) return
+                if (!types.isIdentifier(init.property, { name: 'lazy' })) return
+                if (!state.reactNamespaces.has(init.object.name)) return
+                state.reactLazyBindings.add(id.name)
+              }
+              // const { lazy: a } = React;
+              if (types.isObjectPattern(id) && types.isIdentifier(init)) {
+                const { properties } = id
+                if (!state.reactNamespaces.has(init.name)) return
+                properties.forEach((prop) => {
+                  if (!types.isObjectProperty(prop)) return
+                  if (!types.isIdentifier(prop.key, { name: 'lazy' })) return
+                  if (!types.isIdentifier(prop.value)) return
+                  state.reactLazyBindings.add(prop.value.name)
+                })
+              }
+            }
+          })
+        },
+        exit (programPath: NodePath<Program>, state: State) {
+          const { filename = '' } = state
+          if (new RegExp(customLazySource).test(filename)) return
+          let needInject = false
+          const customLazyId = programPath.scope.generateUidIdentifier('customLazy')
+          programPath.traverse({
+            CallExpression (path: NodePath<CallExpression>) {
+              const { callee } = path.node
+              if (types.isMemberExpression(callee)) {
+                if (!types.isIdentifier(callee.object)) return
+                if (!state.reactNamespaces.has(callee.object.name)) return
+                if (!types.isIdentifier(callee.property, { name: 'lazy' })) return
+                path.node.callee = customLazyId
+                needInject = true
+              }
+              if (types.isIdentifier(callee) && state.reactLazyBindings.has(callee.name)) {
+                path.node.callee = customLazyId
+                needInject = true
+              }
+            }
+          })
+          const hasImport = programPath.node.body.some((node) => {
+            return types.isImportDeclaration(node) && node.source.value === customLazySource
+          })
+          if (hasImport || !needInject) return
+          const specifier = types.importSpecifier(customLazyId, types.identifier('lazy'))
+          const nodes = types.importDeclaration([specifier], types.stringLiteral(customLazySource))
+          programPath.unshiftContainer('body', nodes)
+        }
+      }
+    }
+  }
+}

package/src/transform-webpack-runtime.ts CHANGED Viewed

@@ -1,9 +1,16 @@
 import { NodePath, template } from '@babel/core'
 import generator from '@babel/generator'
 import * as parser from '@babel/parser'
-import traverse, { Node } from '@babel/traverse'
+import traverse from '@babel/traverse'
 import * as types from '@babel/types'
-import type { AssignmentExpression, VariableDeclarator } from '@babel/types'
+import type {
+  AssignmentExpression,
+  ObjectMethod,
+  ObjectProperty,
+  SpreadElement,
+  Statement,
+  VariableDeclarator
+} from '@babel/types'
 import type { CompilationAssets, AsyncPackOpts } from './types'
 import { isDynamicPackageJsAsset, isDynamicPackageWXssAsset } from './utils'
@@ -37,28 +44,17 @@ const webpackLoadDynamicModuleTemplate = `
       return;
     }
-    const dynamicPackageNameRegex = DYNAMIC_PACKAGE_NAME_REGEX;
-    const [,dynamicPackageName] = dynamicModulePath.match(dynamicPackageNameRegex) || [];
     const target = { src: dynamicModulePath };
     if (loadedDynamicModules[dynamicModulePath]) return done({ type: 'loaded', target });
-    const { SingletonPromise } = require('~/singleton-promise.js');
-    const waitStyle = hasStyleDynamicModuleList.includes(dynamicModulePath)?SingletonPromise.wait(dynamicPackageName):Promise.resolve();
-    waitStyle.then(()=>{
-      promiseRetry(function () {
-        return loadDynamicModule(dynamicModulePath)
-      })
-      .then(function () {
-        return done({ type: 'loaded', target })
-      }).catch(function () {
-        return done({ type:'error', target })
-      });
-    })
+    promiseRetry(function () {
+      return loadDynamicModule(dynamicModulePath)
+    }).then(function () {
+      return done({ type: 'loaded', target })
+    }).catch(function () {
+      return done({ type:'error', target })
+    });
   };
 `
@@ -91,7 +87,7 @@ const replaceWebpackLoadScriptFn = (assignmentExpressionNodePath: NodePath<Assig
   const loadDynamicModuleFnMapCode = (() => {
     const dynamicAssetsRequireTempCode = dynamicJsAssets.map((dynamicJsAsset) => {
-      return `'/${dynamicJsAsset}':function (){ return require.async('/${dynamicJsAsset}'); }`
+      return `'/${dynamicJsAsset}':function (){ return require.async('~/${dynamicJsAsset}'); }`
     })
     return `var loadDynamicModuleFnMap = {${dynamicAssetsRequireTempCode.join(',')}}`
@@ -105,9 +101,7 @@ const replaceWebpackLoadScriptFn = (assignmentExpressionNodePath: NodePath<Assig
     return `var hasStyleDynamicModuleList = [${hasStyleDynamicAssetsList.map(item => `'/${item}'`).join(',')}]`
   })()
-  const DYNAMIC_PACKAGE_NAME_REGEX = types.regExpLiteral(`(${dynamicPackageNamePrefix}(?:-[a-z]{2})?)\\/`)
-  const templateCodeAst = template.statement(webpackLoadDynamicModuleTemplate)({ DYNAMIC_PACKAGE_NAME_REGEX })
+  const templateCodeAst = template.ast(webpackLoadDynamicModuleTemplate) as Statement
   const loadDynamicModuleFnMapAst = template.ast(loadDynamicModuleFnMapCode)
@@ -124,19 +118,76 @@ const replaceWebpackLoadScriptFn = (assignmentExpressionNodePath: NodePath<Assig
   assignmentExpressionNodePath.insertBefore(templateCodeDepAst)
 }
-const webpackLoadDynamicModuleStylesheetTemplate = `
-loadStylesheet = function () {
-  return Promise.resolve()
+const webpackLoadDynamicStylesheetTemplate = `
+  __webpack_require__.f.miniCss = function (dynamicStylesheetChunkId, promises) {
+    var cssChunks = CSS_CHUNKS;
+    if(installedCssChunks[dynamicStylesheetChunkId] !== 0 && cssChunks[dynamicStylesheetChunkId]){
+      promises.push(loadStylesheet(dynamicStylesheetChunkId))
+    }
+  }
+`
+const replaceWebpackLoadDynamicModuleStylesheetFn = (
+  assignmentExpressionNodePath: NodePath<AssignmentExpression>
+) => {
+  const { left, right } = assignmentExpressionNodePath.node || {}
+  if (!types.isMemberExpression(left)) return
+  if (!types.isFunctionExpression(right)) return
+  if (!types.isMemberExpression(left.object)) return
+  if (!types.isIdentifier(left.object.object, { name: '__webpack_require__' })) return
+  if (!types.isIdentifier(left.object.property, { name: 'f' })) return
+  if (!types.isIdentifier(left.property, { name: 'miniCss' })) return
+  const isProcessed = right.params.some((item) => {
+    return types.isIdentifier(item, { name: 'dynamicStylesheetChunkId' })
+  })
+  if (isProcessed) return
+  const cssChunksValueAst: Array<ObjectMethod | ObjectProperty | SpreadElement> = []
+  assignmentExpressionNodePath.traverse({
+    VariableDeclarator: (nodePath: NodePath<VariableDeclarator>) => {
+      const { id, init } = nodePath.node || {}
+      if (!types.isIdentifier(id, { name: 'cssChunks' })) return
+      if (!types.isObjectExpression(init)) return
+      cssChunksValueAst.push(...init.properties)
+    }
+  })
+  const CSS_CHUNKS = types.objectExpression(cssChunksValueAst)
+  const templateCodeAst = template.statement(webpackLoadDynamicStylesheetTemplate)({ CSS_CHUNKS })
+  assignmentExpressionNodePath.replaceWith(templateCodeAst)
+}
+const webpackLoadStylesheetTemplate = `
+loadStylesheet = function (chunkId) {
+  const href = __webpack_require__.miniCssF(chunkId);
+  const fullHref = __webpack_require__.p + href;
+  const dynamicPackageNameRegex = DYNAMIC_PACKAGE_NAME_REGEX;
+  const [,dynamicPackageName] = fullHref.match(dynamicPackageNameRegex) || [];
+  const { SingletonPromise } = require('~/singleton-promise.js');
+  return SingletonPromise.wait(dynamicPackageName)
 }
 `
-const replaceLoadStylesheetFn = (nodePath: NodePath<VariableDeclarator>) => {
+const replaceLoadStylesheetFn = (nodePath: NodePath<VariableDeclarator>, opts: Opts) => {
   const { id, init } = nodePath.node || {}
   if (!types.isIdentifier(id, { name: 'loadStylesheet' })) return
   if (!types.isFunctionExpression(init)) return
   const isProcessed = !init.params.length
   if (isProcessed) return
-  const templateCodeAst = template.expression(webpackLoadDynamicModuleStylesheetTemplate)()
+  const { dynamicPackageNamePrefix } = opts
+  const DYNAMIC_PACKAGE_NAME_REGEX = types.regExpLiteral(`(${dynamicPackageNamePrefix}(?:-[a-z]{2})?)\\/`)
+  const templateCodeAst = template.expression(webpackLoadStylesheetTemplate)({ DYNAMIC_PACKAGE_NAME_REGEX })
   nodePath.replaceWith(templateCodeAst)
 }
@@ -157,9 +208,10 @@ export const transformWebpackRuntime = (code: string, opts: Opts) => {
   traverse(ast, {
     AssignmentExpression: (nodePath: NodePath<AssignmentExpression>) => {
       replaceWebpackLoadScriptFn(nodePath, opts)
+      replaceWebpackLoadDynamicModuleStylesheetFn(nodePath)
     },
     VariableDeclarator (nodePath: NodePath<VariableDeclarator>) {
-      replaceLoadStylesheetFn(nodePath)
+      replaceLoadStylesheetFn(nodePath, opts)
       removeCreateStylesheetFn(nodePath)
       removeFindStylesheetFn(nodePath)
     }