feat(pack): support .gitignore match

Signed-off-by: Kevin Cui <[email protected]>

package.json

@@ -61,7 +61,7 @@
   "dependencies": {
     "commander": "^12.1.0",
     "execa": "^9.5.0",
-    "fast-glob": "^3.3.2",
+    "globby": "^14.0.2",
     "tar": "^7.4.3",
     "yaml": "^2.6.0"
   }

src/cmd/install.test.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import fg from "fast-glob";
+import { globby } from "globby";
 import { beforeEach, describe, expect, it } from "vitest";
 import { fixture } from "../../tests/helper/fs";
 import { Registry } from "../../tests/helper/registry";
@@ -39,7 +39,7 @@ describe.sequential("install file", () => {
 
         expect(await exists(path.join(ctx.workdir, folderName, ooPackageName))).toBe(true);
 
-        const fileList = await fg.glob("**/*", {
+        const fileList = await globby("**", {
             cwd: path.join(ctx.workdir, folderName),
             onlyFiles: true,
             absolute: false,
@@ -89,7 +89,7 @@ describe.sequential("install file", () => {
 
         expect(await exists(path.join(ctx.workdir, folderName, ooPackageName))).toBe(true);
 
-        const fileList = await fg.glob("**/*", {
+        const fileList = await globby("**", {
             cwd: path.join(ctx.workdir, folderName),
             onlyFiles: true,
             absolute: false,
@@ -202,7 +202,7 @@ describe.sequential("install all", () => {
             },
         });
 
-        const fileList = await fg.glob(`**/${ooPackageName}`, {
+        const fileList = await globby(`**/${ooPackageName}`, {
             cwd: distDir,
             onlyFiles: true,
             absolute: false,
@@ -303,7 +303,7 @@ describe.sequential("install deps", () => {
             d: "0.0.1",
         });
 
-        const fileList = await fg.glob(`**/${ooPackageName}`, {
+        const fileList = await globby(`**/${ooPackageName}`, {
             cwd: distDir,
             onlyFiles: true,
             absolute: false,
@@ -383,7 +383,7 @@ describe.sequential("install deps", () => {
             b: "0.0.1",
         });
 
-        const fileList = await fg.glob(`**/${ooPackageName}`, {
+        const fileList = await globby(`**/${ooPackageName}`, {
             cwd: distDir,
             onlyFiles: true,
             absolute: false,
@@ -445,7 +445,7 @@ describe.sequential("install deps", () => {
             },
         });
 
-        const fileList = await fg.glob(`**/${ooPackageName}`, {
+        const fileList = await globby(`**/${ooPackageName}`, {
             cwd: distDir,
             onlyFiles: true,
             absolute: false,

src/cmd/pack.ts

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { execa } from "execa";
+import { globby } from "globby";
 import { copyDir, remove, tempDir, writeFile } from "../utils/fs";
 import { env } from "../utils/misc";
 import { generatePackageJson } from "../utils/npm";
@@ -16,10 +17,22 @@ export async function prePack(p: string, ignore: string[]) {
 
     const workdir = await tempDir();
 
+    const files = await globby("**", {
+        cwd: p,
+        dot: true,
+        onlyFiles: false,
+        gitignore: true,
+        ignore,
+        absolute: true,
+    });
+
     await Promise.all([
         copyDir(p, path.join(workdir, "package"), (source, _) => {
-            const relative = path.relative(p, source).split(path.sep);
-            return !ignore.some(i => relative.includes(i));
+            if (source === p) {
+                return true;
+            }
+
+            return files.includes(source);
         }),
         writeFile(path.join(workdir, "package.json"), packageJson),
     ]);

src/utils/npm.ts

@@ -1,6 +1,6 @@
 import type { Deps, OOPackageSchema } from "../types";
 import path from "node:path";
-import fg from "fast-glob";
+import { globby } from "globby";
 import YAML from "yaml";
 import { ooPackageName } from "../const";
 import { exists, readFile, writeFile } from "./fs";
@@ -120,7 +120,7 @@ export async function createNpmrc(dir: string, registry: string, token: string)
 }
 
 export async function transformNodeModules(dir: string) {
-    const result = await fg("node_modules/**/package/package.oo.yaml", {
+    const result = await globby("node_modules/**/package/package.oo.yaml", {
         onlyFiles: true,
         cwd: dir,
         dot: false,