xshell 1.0.151 → 1.0.153

package/builder.js

@@ -527,20 +527,36 @@ export class Bundler {
     }
     async copy_files({ dependencies = this.dependencies, production = this.production, assets = this.assets, fpd_root = this.fpd_root, fpd_out = this.fpd_out, print = { info: true, files: false } } = {}) {
         if (print.info)
-            console.log(`复制 ${this.name} 项目文件及依赖 → ${this.fpd_out}`);
+            console.log(`复制 ${this.name} 项目文件及依赖 -> ${this.fpd_out}`);
         if (dependencies)
             await fmkdir(`${fpd_out}vendors/`, { print: false });
+        // 输出路径 -> 原路径，用来保证只复制一次且是同样的映射
+        let records = new Map();
+        const { name } = this;
         async function fcopy_asset(asset) {
             let src, out;
             if (typeof asset === 'string')
                 src = out = asset;
             else
                 ({ src, out } = asset);
-            await fcopy(path.resolve_with_slash(fpd_root, src), `${fpd_out}${out}`, { print: print.files });
+            await fcopy_record(path.resolve_with_slash(fpd_root, src), `${fpd_out}${out}`);
+        }
+        async function fcopy_record(fp_src, fp_out) {
+            // 保证同样的输出资源只被写入一次
+            const fp_src_old = records.get(fp_out);
+            if (fp_src_old) {
+                if (fp_src_old === fp_src) { }
+                else
+                    throw new Error(`${name} 复制项目资源冲突, ${fp_src_old} 和 ${fp_src} 均复制到 ${fp_out}`);
+            }
+            else {
+                records.set(fp_out, fp_src);
+                await fcopy(fp_src, fp_out, { print: print.files });
+            }
         }
         await Promise.all([
             ...this.resolve_dependency_files(dependencies, true, { production })
-                .map(async (fp) => fcopy(`${fpd_root}node_modules/${fp}`, `${fpd_out}vendors/${fp}`, { print: print.files })),
+                .map(async (fp) => fcopy_record(`${fpd_root}node_modules/${fp}`, `${fpd_out}vendors/${fp}`)),
             ...this.resolve_config(assets, production)
                 .map(fcopy_asset),
             ...this.htmls ? Object.entries(this.htmls).map(async ([fp_html, { icon, manifest, scripts, mscripts }]) => Promise.all([

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.151",
+    "version": "1.0.153",
     "type": "module",
     "main": "./index.js",
     "bin": {