@gjsify/cli 0.16.0 → 0.16.1

package/lib/commands/pack.js

@@ -172,8 +172,18 @@ export async function packWorkspace(wsDir, opts = {}) {
  * Walk the workspace and return the list of files to include in the tarball,
  * relative to `wsDir`. Mirrors npm pack's selection rules:
  *
- *   - If pkg.files exists: use it as an allowlist (with .npmignore as a
- *     blacklist within those globs)
+ *   - If pkg.files exists: the array is an ALLOWLIST that overrides
+ *     .gitignore / .npmignore entirely. Every file under an allowlisted
+ *     path/dir ships from disk; only the hardcoded implicit-exclusion set
+ *     (node_modules, .git, lockfiles, … — applied by `walkAll` /
+ *     `expandFilesPatterns`) and npm's always-ignore names are dropped.
+ *     This matches `npm pack`: a `files` entry re-includes a path even when
+ *     .gitignore/.npmignore would drop it (verified against `npm pack
+ *     --dry-run`). Trimming `files`-allowlisted content by .gitignore
+ *     silently dropped build-generated-but-allowlisted files like
+ *     adwaita-web's `src/styles.generated.ts` (gitignored, allowlisted via
+ *     `files: ["src"]`) — shipping a broken tarball whose `src/index.ts`
+ *     imported a file the tarball didn't contain.
  *   - Otherwise: walk everything, apply .npmignore + .gitignore, drop the
  *     implicit-exclusion set (node_modules, .git, …)
  *
@@ -185,18 +195,22 @@ function collectFiles(wsDir, pkg) {
     const filesField = Array.isArray(pkg.files)
         ? pkg.files.filter((f) => typeof f === 'string')
         : null;
-    let candidates;
+    const out = new Set();
     if (filesField) {
-        candidates = expandFilesPatterns(wsDir, filesField);
+        // A `files` allowlist overrides .gitignore/.npmignore — ship every
+        // allowlisted path from disk. `expandFilesPatterns` already excludes
+        // the NEVER_INCLUDED_BASENAMES set (node_modules, .git, lockfiles, …)
+        // via `walkAll`, so junk is still kept out.
+        for (const f of expandFilesPatterns(wsDir, filesField))
+            out.add(f);
     }
     else {
-        candidates = walkAll(wsDir);
-    }
-    const ignore = loadIgnore(wsDir);
-    const out = new Set();
-    for (const f of candidates) {
-        if (!ignore(f))
-            out.add(f);
+        // No `files` field — walk everything and apply .npmignore/.gitignore.
+        const ignore = loadIgnore(wsDir);
+        for (const f of walkAll(wsDir)) {
+            if (!ignore(f))
+                out.add(f);
+        }
     }
     for (const f of always) {
         if (existsSync(join(wsDir, f)))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.16.0",
+    "version": "0.16.1",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -122,33 +122,33 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/buffer": "^0.16.0",
-        "@gjsify/create-app": "^0.16.0",
-        "@gjsify/node-globals": "^0.16.0",
-        "@gjsify/node-polyfills": "^0.16.0",
-        "@gjsify/npm-registry": "^0.16.0",
-        "@gjsify/resolve-npm": "^0.16.0",
-        "@gjsify/rolldown-plugin-gjsify": "^0.16.0",
-        "@gjsify/rolldown-plugin-pnp": "^0.16.0",
-        "@gjsify/semver": "^0.16.0",
-        "@gjsify/tar": "^0.16.0",
-        "@gjsify/tsc": "^0.16.0",
-        "@gjsify/web-polyfills": "^0.16.0",
-        "@gjsify/workspace": "^0.16.0",
+        "@gjsify/buffer": "^0.16.1",
+        "@gjsify/create-app": "^0.16.1",
+        "@gjsify/node-globals": "^0.16.1",
+        "@gjsify/node-polyfills": "^0.16.1",
+        "@gjsify/npm-registry": "^0.16.1",
+        "@gjsify/resolve-npm": "^0.16.1",
+        "@gjsify/rolldown-plugin-gjsify": "^0.16.1",
+        "@gjsify/rolldown-plugin-pnp": "^0.16.1",
+        "@gjsify/semver": "^0.16.1",
+        "@gjsify/tar": "^0.16.1",
+        "@gjsify/tsc": "^0.16.1",
+        "@gjsify/web-polyfills": "^0.16.1",
+        "@gjsify/workspace": "^0.16.1",
         "cosmiconfig": "^9.0.2",
         "get-tsconfig": "^4.14.0",
         "pkg-types": "^2.3.1",
-        "rolldown": "^1.1.0",
+        "rolldown": "^1.1.4",
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.16.0",
+        "@gjsify/unit": "^0.16.1",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/oxfmt-native": "^0.16.0",
-        "@gjsify/rolldown-native": "^0.16.0"
+        "@gjsify/oxfmt-native": "^0.16.1",
+        "@gjsify/rolldown-native": "^0.16.1"
     },
     "peerDependenciesMeta": {
         "@gjsify/oxfmt-native": {