@taro-minify-pack/plugin-remote-assets 0.0.4 → 0.0.5-alpha.1

package/README.md

@@ -1,7 +1,7 @@
 ## @taro-minify-pack/plugin-remote-assets
 > 自动上传资源文件并替换路径
 > 
-> 注：由于 `@tarojs/webpack5-runner` 不支持绝对路径注册 `postcss` 插件注册注册,已向`Taro`官方提交[pullRequest](https://github.com/NervJS/taro/pull/18683),有需要的可以参考[pullRequest](https://github.com/NervJS/taro/pull/18683/files)自行 patch
+> 注：`Taro`版本低于`4.0.10`由于`@tarojs/webpack5-runner`不支持绝对路径注册`postcss`插件注册注册,需要参考[pullRequest](https://github.com/NervJS/taro/pull/18683/files)自行 patch
 
 
 ### 安装

package/dist/index.js

@@ -31,34 +31,29 @@ const upload_assets_1 = require("./upload-assets");
 const utils_1 = require("./utils");
 const path_transform_1 = require("./path-transform/path-transform");
 __exportStar(require("./upload-adapter"), exports);
-const cacheFilePath = path_1.default.resolve(__dirname, 'remote-assets-cache.json');
+const cacheFilePath = path_1.default.resolve(process.cwd(), 'node_modules', '.cache/remote-assets-cache.json');
 exports.default = (ctx, pluginOpts) => {
     const transform = (0, path_transform_1.pathTransform)({ cacheFilePath, pathAlias: pluginOpts.pathAlias || {} });
     ctx.onBuildStart(() => __awaiter(void 0, void 0, void 0, function* () {
         const { assetsDirPath, uploader } = pluginOpts;
-        const remoteAssetInfoList = yield (0, upload_assets_1.uploadAssets)({ assetsDirPath, upload: uploader });
+        const cacheData = (0, utils_1.getCacheData)(cacheFilePath);
+        const remoteAssetInfoList = yield (0, upload_assets_1.uploadAssets)({ assetsDirPath, cacheData, upload: uploader });
         const remoteAssetInfoMap = remoteAssetInfoList.reduce((result, item) => {
             return Object.assign(Object.assign({}, result), { [item.localPath]: item.remoteUrl });
-        }, {});
+        }, cacheData);
         (0, utils_1.saveCacheData)(cacheFilePath, remoteAssetInfoMap);
     }));
     ctx.modifyRunnerOpts((curRunnerOpts) => {
         const { postcss: curPostcssOpts } = curRunnerOpts.opts;
-        curRunnerOpts.opts.postcss = Object.assign(Object.assign({}, curPostcssOpts), { [path_1.default.resolve(__dirname, './path-transform/path-transform-postcss')]: {
-                enabled: true,
-                config: { transform }
-            } });
+        const postCssPluginPathTransformPath = path_1.default.resolve(__dirname, './path-transform/path-transform-postcss');
+        curRunnerOpts.opts.postcss = Object.assign(Object.assign({}, curPostcssOpts), { [postCssPluginPathTransformPath]: { enabled: true, config: { transform } } });
     });
     ctx.modifyWebpackChain(({ chain }) => {
         const babelPluginPathTransformPath = path_1.default.resolve(__dirname, './path-transform/path-transform-babel');
         chain.module
             .rule('script')
             .use('babelLoader')
-            .options({
-            plugins: [
-                [babelPluginPathTransformPath, { transform }]
-            ]
-        });
+            .options({ plugins: [[babelPluginPathTransformPath, { transform }]] });
     });
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AAGvB,mDAA8C;AAC9C,mCAAuC;AACvC,oEAA+D;AAI/D,mDAAgC;AAEhC,MAAM,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAA;AAEzE,kBAAe,CAAC,GAAmB,EAAE,UAAgC,EAAE,EAAE;IACvE,MAAM,SAAS,GAAG,IAAA,8BAAa,EAAC,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,CAAA;IAEzF,GAAG,CAAC,YAAY,CAAC,GAAS,EAAE;QAC1B,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAA;QAC9C,MAAM,mBAAmB,GAAG,MAAM,IAAA,4BAAY,EAAC,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QACnF,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACrE,uCAAY,MAAM,KAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,SAAS,IAAE;QACxD,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,IAAA,qBAAa,EAAC,aAAa,EAAE,kBAAkB,CAAC,CAAA;IAClD,CAAC,CAAA,CAAC,CAAA;IAEF,GAAG,CAAC,gBAAgB,CAAC,CAAC,aAAa,EAAE,EAAE;QACrC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,IAAI,CAAA;QACtD,aAAa,CAAC,IAAI,CAAC,OAAO,mCACrB,cAAc,KACjB,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yCAAyC,CAAC,CAAC,EAAE;gBACpE,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,EAAE,SAAS,EAAE;aACtB,GACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;QACnC,MAAM,4BAA4B,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,uCAAuC,CAAC,CAAA;QAErG,KAAK,CAAC,MAAM;aACT,IAAI,CAAC,QAAQ,CAAC;aACd,GAAG,CAAC,aAAa,CAAC;aAClB,OAAO,CAAC;YACP,OAAO,EAAE;gBACP,CAAC,4BAA4B,EAAE,EAAE,SAAS,EAAE,CAAC;aAC9C;SACF,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AAGvB,mDAA8C;AAC9C,mCAAqD;AACrD,oEAA+D;AAI/D,mDAAgC;AAEhC,MAAM,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,iCAAiC,CAAC,CAAA;AAEpG,kBAAe,CAAC,GAAmB,EAAE,UAAgC,EAAE,EAAE;IACvE,MAAM,SAAS,GAAG,IAAA,8BAAa,EAAC,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,CAAA;IAEzF,GAAG,CAAC,YAAY,CAAC,GAAS,EAAE;QAC1B,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAA;QAC9C,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,CAAA;QAC7C,MAAM,mBAAmB,GAAG,MAAM,IAAA,4BAAY,EAAC,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC9F,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACrE,uCAAY,MAAM,KAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,SAAS,IAAE;QACxD,CAAC,EAAE,SAAS,CAAC,CAAA;QACb,IAAA,qBAAa,EAAC,aAAa,EAAE,kBAAkB,CAAC,CAAA;IAClD,CAAC,CAAA,CAAC,CAAA;IAEF,GAAG,CAAC,gBAAgB,CAAC,CAAC,aAAa,EAAE,EAAE;QACrC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,IAAI,CAAA;QACtD,MAAM,8BAA8B,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yCAAyC,CAAC,CAAA;QACzG,aAAa,CAAC,IAAI,CAAC,OAAO,mCACrB,cAAc,KACjB,CAAC,8BAA8B,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,GAC3E,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;QACnC,MAAM,4BAA4B,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,uCAAuC,CAAC,CAAA;QAErG,KAAK,CAAC,MAAM;aACT,IAAI,CAAC,QAAQ,CAAC;aACd,GAAG,CAAC,aAAa,CAAC;aAClB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,4BAA4B,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/path-transform/path-transform.js

@@ -4,7 +4,7 @@ exports.pathTransform = void 0;
 const utils_1 = require("../utils");
 const pathTransform = (opt) => {
     return (path) => {
-        const remoteAssetInfoMap = (0, utils_1.getCacheData)(opt.cacheFilePath) || {};
+        const remoteAssetInfoMap = (0, utils_1.getCacheData)(opt.cacheFilePath);
         const pathAliasRegMap = Object.keys(opt.pathAlias).reduce((result, key) => {
             return Object.assign(Object.assign({}, result), { [key]: new RegExp(`^${key}`) });
         }, {});
@@ -15,7 +15,7 @@ const pathTransform = (opt) => {
             return path;
         })();
         if (!remoteAssetInfoMap[localPath])
-            return localPath;
+            return path;
         return remoteAssetInfoMap[localPath];
     };
 };

package/dist/path-transform/path-transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"path-transform.js","sourceRoot":"","sources":["../../src/path-transform/path-transform.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAO/B,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAE,EAAE;IACxC,OAAO,CAAC,IAAY,EAAE,EAAE;QACtB,MAAM,kBAAkB,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;QAEhE,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAyB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAChG,uCAAY,MAAM,KAAE,CAAC,GAAG,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,IAAE;QACpD,CAAC,EAAE,EAAE,CAAC,CAAA;QAEN,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;YACtB,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAChG,IAAI,cAAc;gBAAE,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;YACvG,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,EAAE,CAAA;QACJ,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAA;QACpD,OAAO,kBAAkB,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,aAAa,iBAgBzB"}
+{"version":3,"file":"path-transform.js","sourceRoot":"","sources":["../../src/path-transform/path-transform.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAO/B,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAE,EAAE;IACxC,OAAO,CAAC,IAAY,EAAE,EAAE;QACtB,MAAM,kBAAkB,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAE1D,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAyB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAChG,uCAAY,MAAM,KAAE,CAAC,GAAG,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC,IAAE;QACpD,CAAC,EAAE,EAAE,CAAC,CAAA;QAEN,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;YACtB,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAChG,IAAI,cAAc;gBAAE,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;YACvG,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,EAAE,CAAA;QACJ,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;YAAE,OAAO,IAAI,CAAA;QAC/C,OAAO,kBAAkB,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC,CAAA;AACH,CAAC,CAAA;AAhBY,QAAA,aAAa,iBAgBzB"}

package/dist/upload-assets/index.d.ts

@@ -1,6 +1,7 @@
 import { Uploader } from '../types';
 interface UploaderOpt {
     assetsDirPath?: string;
+    cacheData?: Record<string, any>;
     upload?: Uploader;
 }
 export declare const uploadAssets: (opt: UploaderOpt) => Promise<import("../types").RemoteAssetInfo[]>;

package/dist/upload-assets/index.js

@@ -17,18 +17,23 @@ const promise_pool_1 = require("@supercharge/promise-pool");
 const utils_1 = require("../utils");
 const path_1 = __importDefault(require("path"));
 const uploadAssets = (opt) => __awaiter(void 0, void 0, void 0, function* () {
-    const { assetsDirPath, upload } = opt;
+    const { assetsDirPath, cacheData, upload } = opt;
     if (!assetsDirPath || !upload)
         return [];
+    const uploadedAssetFileNames = Object.values(cacheData || {}).map(item => path_1.default.basename(new URL(item).pathname));
     const assetsPaths = (0, utils_1.travelFiles)(assetsDirPath);
-    const { results: remoteAssetInfoList } = yield promise_pool_1.PromisePool.withConcurrency(2)
-        .for(assetsPaths)
-        .process((localPath) => __awaiter(void 0, void 0, void 0, function* () {
+    const assetsInfos = assetsPaths.reduce((result, localPath) => {
         const uniqueKey = (0, utils_1.generateFileUniqueKey)(localPath);
         const { ext } = path_1.default.parse(localPath);
-        return upload({ localPath, uniqueKey, ext });
-    }));
-    return remoteAssetInfoList;
+        const isUploaded = uploadedAssetFileNames.includes(`${uniqueKey}${ext}`);
+        if (isUploaded)
+            return result;
+        return [...result, { localPath, ext, uniqueKey }];
+    }, []);
+    const { results: remoteAssetInfoList } = yield promise_pool_1.PromisePool.withConcurrency(2)
+        .for(assetsInfos)
+        .process((localAssetInfo) => __awaiter(void 0, void 0, void 0, function* () { return upload(localAssetInfo); }));
+    return remoteAssetInfoList.filter(Boolean);
 });
 exports.uploadAssets = uploadAssets;
 //# sourceMappingURL=index.js.map

package/dist/upload-assets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/upload-assets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAAuD;AAEvD,mCAA4D;AAC5D,gDAAuB;AAOhB,MAAM,YAAY,GAAG,CAAO,GAAgB,EAAE,EAAE;IACrD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;IAErC,IAAI,CAAC,aAAa,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAA;IAExC,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,aAAa,CAAC,CAAA;IAE9C,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,0BAAW,CAAC,eAAe,CAAC,CAAC,CAAC;SAC1E,GAAG,CAAC,WAAW,CAAC;SAChB,OAAO,CAAC,CAAO,SAAS,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,IAAA,6BAAqB,EAAC,SAAS,CAAC,CAAA;QAClD,MAAM,EAAE,GAAG,EAAE,GAAG,cAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACrC,OAAO,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAA;IAC9C,CAAC,CAAA,CAAC,CAAA;IAEJ,OAAO,mBAAmB,CAAA;AAC5B,CAAC,CAAA,CAAA;AAhBY,QAAA,YAAY,gBAgBxB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/upload-assets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAAuD;AAEvD,mCAA4D;AAC5D,gDAAuB;AAQhB,MAAM,YAAY,GAAG,CAAO,GAAgB,EAAE,EAAE;IACrD,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;IAEhD,IAAI,CAAC,aAAa,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAA;IAExC,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEhH,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,aAAa,CAAC,CAAA;IAE9C,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE;QAC7E,MAAM,SAAS,GAAG,IAAA,6BAAqB,EAAC,SAAS,CAAC,CAAA;QAClD,MAAM,EAAE,GAAG,EAAE,GAAG,cAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACrC,MAAM,UAAU,GAAG,sBAAsB,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,CAAC,CAAA;QACxE,IAAI,UAAU;YAAE,OAAO,MAAM,CAAA;QAC7B,OAAO,CAAC,GAAG,MAAM,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAA;IACnD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,0BAAW,CAAC,eAAe,CAAC,CAAC,CAAC;SAC1E,GAAG,CAAC,WAAW,CAAC;SAChB,OAAO,CAAC,CAAO,cAAc,EAAE,EAAE,kDAAC,OAAA,MAAM,CAAC,cAAc,CAAC,CAAA,GAAA,CAAC,CAAA;IAE5D,OAAO,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAC5C,CAAC,CAAA,CAAA;AAtBY,QAAA,YAAY,gBAsBxB"}

package/dist/utils.js

@@ -35,11 +35,14 @@ const getCacheData = (cacheFilePath) => {
         return JSON.parse(fs_1.default.readFileSync(cacheFilePath).toString());
     }
     catch (error) {
-        return null;
+        return {};
     }
 };
 exports.getCacheData = getCacheData;
 const saveCacheData = (cacheFilePath, cacheData) => {
+    const cacheDirPath = path_1.default.dirname(cacheFilePath);
+    if (!fs_1.default.existsSync(cacheDirPath))
+        fs_1.default.mkdirSync(cacheDirPath, { recursive: true });
     fs_1.default.writeFileSync(cacheFilePath, JSON.stringify(cacheData));
 };
 exports.saveCacheData = saveCacheData;

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,8CAAqB;AAErB;;GAEG;AACI,MAAM,WAAW,GAAG,CAAC,GAAW,EAAY,EAAE;IACnD,MAAM,KAAK,GAAG,YAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACjC,OAAO,KAAK,CAAC,MAAM,CAAW,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QAC7C,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACrC,IAAI,CAAC,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE;YAAE,OAAO,CAAC,GAAG,MAAM,EAAE,QAAQ,CAAC,CAAA;QACtE,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC,CAAA;IAC9C,CAAC,EAAE,EAAE,CAAC,CAAA;AACR,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAED;;GAEG;AACI,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAE,EAAE;IACxD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC1C,MAAM,MAAM,GAAG,YAAE,CAAC,YAAY,CAAC,GAAG,GAAG,GAAG,cAAI,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,CAAA;IAC1D,OAAO,IAAA,aAAG,EAAC,MAAM,CAAC,CAAA;AACpB,CAAC,CAAA;AAJY,QAAA,qBAAqB,yBAIjC;AAEM,MAAM,YAAY,GAAG,CAAC,aAAoB,EAAO,EAAE;IACxD,IAAI,CAAC;QACH,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB;AAEM,MAAM,aAAa,GAAG,CAAC,aAAoB,EAAE,SAAa,EAAE,EAAE;IACnE,YAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;AAC5D,CAAC,CAAA;AAFY,QAAA,aAAa,iBAEzB;AAEM,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;AAAf,QAAA,IAAI,QAAW"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,8CAAqB;AAErB;;GAEG;AACI,MAAM,WAAW,GAAG,CAAC,GAAW,EAAY,EAAE;IACnD,MAAM,KAAK,GAAG,YAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACjC,OAAO,KAAK,CAAC,MAAM,CAAW,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QAC7C,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACrC,IAAI,CAAC,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE;YAAE,OAAO,CAAC,GAAG,MAAM,EAAE,QAAQ,CAAC,CAAA;QACtE,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC,CAAA;IAC9C,CAAC,EAAE,EAAE,CAAC,CAAA;AACR,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAED;;GAEG;AACI,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAE,EAAE;IACxD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC1C,MAAM,MAAM,GAAG,YAAE,CAAC,YAAY,CAAC,GAAG,GAAG,GAAG,cAAI,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,CAAA;IAC1D,OAAO,IAAA,aAAG,EAAC,MAAM,CAAC,CAAA;AACpB,CAAC,CAAA;AAJY,QAAA,qBAAqB,yBAIjC;AAEM,MAAM,YAAY,GAAG,CAAC,aAAoB,EAAO,EAAE;IACxD,IAAI,CAAC;QACH,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAPY,QAAA,YAAY,gBAOxB;AAEM,MAAM,aAAa,GAAG,CAAC,aAAoB,EAAE,SAAa,EAAE,EAAE;IACnE,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;IAChD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,YAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACjF,YAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;AAC5D,CAAC,CAAA;AAJY,QAAA,aAAa,iBAIzB;AAEM,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;AAAf,QAAA,IAAI,QAAW"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taro-minify-pack/plugin-remote-assets",
-  "version": "0.0.4",
+  "version": "0.0.5-alpha.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -2,35 +2,34 @@ import path from 'path'
 import { RemoteAssetPluginOpt } from '@/types'
 import { IPluginContext } from '@tarojs/service'
 import { uploadAssets } from './upload-assets'
-import { saveCacheData } from './utils'
+import { getCacheData, saveCacheData } from './utils'
 import { pathTransform } from '@/path-transform/path-transform'
 
 export { RemoteAssetPluginOpt } from '@/types'
 
 export * from './upload-adapter'
 
-const cacheFilePath = path.resolve(__dirname, 'remote-assets-cache.json')
+const cacheFilePath = path.resolve(process.cwd(), 'node_modules', '.cache/remote-assets-cache.json')
 
 export default (ctx: IPluginContext, pluginOpts: RemoteAssetPluginOpt) => {
   const transform = pathTransform({ cacheFilePath, pathAlias: pluginOpts.pathAlias || {} })
 
   ctx.onBuildStart(async () => {
     const { assetsDirPath, uploader } = pluginOpts
-    const remoteAssetInfoList = await uploadAssets({ assetsDirPath, upload: uploader })
+    const cacheData = getCacheData(cacheFilePath)
+    const remoteAssetInfoList = await uploadAssets({ assetsDirPath, cacheData, upload: uploader })
     const remoteAssetInfoMap = remoteAssetInfoList.reduce((result, item) => {
       return { ...result, [item.localPath]: item.remoteUrl }
-    }, {})
+    }, cacheData)
     saveCacheData(cacheFilePath, remoteAssetInfoMap)
   })
 
   ctx.modifyRunnerOpts((curRunnerOpts) => {
     const { postcss: curPostcssOpts } = curRunnerOpts.opts
+    const postCssPluginPathTransformPath = path.resolve(__dirname, './path-transform/path-transform-postcss')
     curRunnerOpts.opts.postcss = {
       ...curPostcssOpts,
-      [path.resolve(__dirname, './path-transform/path-transform-postcss')]: {
-        enabled: true,
-        config: { transform }
-      }
+      [postCssPluginPathTransformPath]: { enabled: true, config: { transform } }
     }
   })
 
@@ -40,10 +39,6 @@ export default (ctx: IPluginContext, pluginOpts: RemoteAssetPluginOpt) => {
     chain.module
       .rule('script')
       .use('babelLoader')
-      .options({
-        plugins: [
-          [babelPluginPathTransformPath, { transform }]
-        ]
-      })
+      .options({ plugins: [[babelPluginPathTransformPath, { transform }]] })
   })
 }

package/src/path-transform/path-transform.ts

@@ -7,7 +7,7 @@ interface Opt{
 
 export const pathTransform = (opt: Opt) => {
   return (path: string) => {
-    const remoteAssetInfoMap = getCacheData(opt.cacheFilePath) || {}
+    const remoteAssetInfoMap = getCacheData(opt.cacheFilePath)
 
     const pathAliasRegMap = Object.keys(opt.pathAlias).reduce<Record<string, RegExp>>((result, key) => {
       return { ...result, [key]: new RegExp(`^${key}`) }
@@ -18,7 +18,7 @@ export const pathTransform = (opt: Opt) => {
       if (matchPathAlias) return path.replace(pathAliasRegMap[matchPathAlias], opt.pathAlias[matchPathAlias])
       return path
     })()
-    if (!remoteAssetInfoMap[localPath]) return localPath
+    if (!remoteAssetInfoMap[localPath]) return path
     return remoteAssetInfoMap[localPath]
   }
 }

package/src/upload-assets/index.ts

@@ -1,27 +1,34 @@
 import { PromisePool } from '@supercharge/promise-pool'
-import { Uploader } from '@/types'
+import { LocalAssetInfo, Uploader } from '@/types'
 import { generateFileUniqueKey, travelFiles } from '@/utils'
 import path from 'path'
 
 interface UploaderOpt {
     assetsDirPath?: string,
+    cacheData?:Record<string, any>
     upload?: Uploader
 }
 
 export const uploadAssets = async (opt: UploaderOpt) => {
-  const { assetsDirPath, upload } = opt
+  const { assetsDirPath, cacheData, upload } = opt
 
   if (!assetsDirPath || !upload) return []
 
+  const uploadedAssetFileNames = Object.values(cacheData || {}).map(item => path.basename(new URL(item).pathname))
+
   const assetsPaths = travelFiles(assetsDirPath)
 
+  const assetsInfos = assetsPaths.reduce<LocalAssetInfo[]>((result, localPath) => {
+    const uniqueKey = generateFileUniqueKey(localPath)
+    const { ext } = path.parse(localPath)
+    const isUploaded = uploadedAssetFileNames.includes(`${uniqueKey}${ext}`)
+    if (isUploaded) return result
+    return [...result, { localPath, ext, uniqueKey }]
+  }, [])
+
   const { results: remoteAssetInfoList } = await PromisePool.withConcurrency(2)
-    .for(assetsPaths)
-    .process(async (localPath) => {
-      const uniqueKey = generateFileUniqueKey(localPath)
-      const { ext } = path.parse(localPath)
-      return upload({ localPath, uniqueKey, ext })
-    })
-
-  return remoteAssetInfoList
+    .for(assetsInfos)
+    .process(async (localAssetInfo) => upload(localAssetInfo))
+
+  return remoteAssetInfoList.filter(Boolean)
 }

package/src/utils.ts

@@ -28,11 +28,13 @@ export const getCacheData = (cacheFilePath:string): any => {
     fs.accessSync(cacheFilePath)
     return JSON.parse(fs.readFileSync(cacheFilePath).toString())
   } catch (error) {
-    return null
+    return {}
   }
 }
 
 export const saveCacheData = (cacheFilePath:string, cacheData:any) => {
+  const cacheDirPath = path.dirname(cacheFilePath)
+  if (!fs.existsSync(cacheDirPath)) fs.mkdirSync(cacheDirPath, { recursive: true })
   fs.writeFileSync(cacheFilePath, JSON.stringify(cacheData))
 }