fix: zip

Author: sylingd

.github/workflows/dev.yml

@@ -82,7 +82,7 @@ jobs:
       run: |
         npx puppeteer browsers install
         php -S 0.0.0.0:8899 -t $GITHUB_WORKSPACE/tests/simple-server &
-        sleep 5
+        sleep 3
         npm run test:e2e
     - name: Publish snapshot
       env:

package.json

@@ -57,7 +57,6 @@
     "axios": "^1.7.2",
     "cpr": "^3.0.1",
     "cross-env": "^7.0.3",
-    "cross-zip": "^4.0.1",
     "crx": "^5.0.1",
     "fs-extra": "^11.1.1",
     "get-port": "^7.1.0",

pnpm-lock.yaml

@@ -29,6 +29,7 @@ import crx from './pack-utils/crx.mjs';
 import cws from './pack-utils/cws.mjs';
 import edge from './pack-utils/edge.mjs';
 import xpi from './pack-utils/xpi.mjs';
+import { createZip } from './zip.mjs';
 
 const packUtils = {
   amo,
@@ -59,19 +60,6 @@ function copyDir(source, target) {
   });
 }
 
-function createZip(source, target) {
-  return new Promise((resolve, reject) => {
-    zip(source, target, err => {
-      console.log(`zip ${source} -> ${target}`, err);
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
 async function packOnePlatform(name, browserConfig, itemConfig) {
   if (typeof packUtils[name] === 'undefined') {
     console.error(`pack-utils for ${name} not found`);
@@ -95,6 +83,7 @@ async function packOnePlatform(name, browserConfig, itemConfig) {
       }),
     );
     // 打包成zip
+    console.log(`zip ${source} -> ${target}`);
     await createZip(thisPack, zipPath);
     // 执行上传等操作
     console.log(`running ${name} pack...`);

scripts/pack.mjs

@@ -0,0 +1,47 @@
+import { execFile } from 'child_process';
+import fs from 'fs/promises';
+import os from 'os';
+import path from 'path';
+
+function quotePath(p) {
+  return '"' + p + '"';
+}
+
+function exec(command, args, options) {
+  return new Promise((resolve, reject) => {
+    execFile(command, args, options, err => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+
+export async function createZip(inPath, outPath) {
+  if (process.platform === 'win32') {
+    await fs.rm(outPath, { recursive: true, maxRetries: 3 });
+    return exec(
+      'powershell.exe',
+      [
+        '-nologo',
+        '-noprofile',
+        '-command',
+        '& { param([String]$myInPath, [String]$myOutPath); Add-Type -A "System.IO.Compression.FileSystem"; [IO.Compression.ZipFile]::CreateFromDirectory($myInPath, $myOutPath); exit !$? }',
+        '-myInPath',
+        quotePath(inPath),
+        '-myOutPath',
+        quotePath(outPath),
+      ],
+      {
+        cwd: path.dirname(inPath),
+        maxBuffer: Infinity,
+      },
+    );
+  }
+  return exec('zip', ['-r', '-y', outPath, '.'], {
+    cwd: inPath,
+    maxBuffer: Infinity,
+  });
+}