@10stars/config 17.0.5 → 17.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10stars/config",
-  "version": "17.0.5",
+  "version": "17.0.7",
   "private": false,
   "bin": {
     "config": "./src/index.ts"

package/src/index.ts

@@ -3,11 +3,11 @@ import { execSync } from "node:child_process"
 import fs from "node:fs/promises"
 import path from "node:path"
 
-import { resetColorIndex } from "./colors"
-import { checkIsMonorepo, dedupeSingletons, linkPackages, linkSelf } from "./link-packages"
-import { dedupeRemote, linkRemote } from "./link-remote"
+import { checkIsMonorepo, dedupeSingletons, linkPackages, linkSelf } from "./linking/link-packages"
+import { dedupeRemote, linkRemote } from "./linking/link-remote"
 import { setupOverrides } from "./manage-overrides"
-import { runConcurrently, type CommandConfig } from "./runner"
+import { resetColorIndex } from "./run/colors"
+import { runConcurrently, type CommandConfig } from "./run/runner"
 import { setupSideEffects } from "./vanilla-extract/manage-side-effects"
 import { patchVanillaExtract } from "./vanilla-extract/patch-vanilla-extract"
 import { setupVSCode } from "./vscode-config"

package/src/{link-remote.ts → linking/link-remote.ts}

@@ -37,8 +37,14 @@ interface LinkRemoteOptions {
 type Sibling = { abs: string; ref: string | null }
 
 // execFile (not a shell) so branch names / refs / SHAs can't inject shell syntax.
-const git = (args: string[], cwd?: string): string =>
-  execFileSync(`git`, args, { cwd, encoding: `utf8` }).trim()
+// quiet: ignore the child's stderr (used by tryGit, whose callers tolerate failure — otherwise
+// git's "fatal: …" for an expected miss, e.g. `describe` on a tagless shallow clone, spams the log).
+const git = (args: string[], cwd?: string, quiet = false): string =>
+  execFileSync(`git`, args, {
+    cwd,
+    encoding: `utf8`,
+    ...(quiet && { stdio: [`ignore`, `pipe`, `ignore`] }),
+  }).trim()
 
 const execFileAsync = promisify(execFile)
 
@@ -51,7 +57,7 @@ const gitAsync = (args: string[], cwd?: string): Promise<unknown> =>
 
 const tryGit = (args: string[], cwd?: string): string | null => {
   try {
-    return git(args, cwd)
+    return git(args, cwd, true) // quiet: failure is expected/tolerated, so don't leak git's stderr
   } catch {
     return null
   }

package/src/vanilla-extract/patch-vanilla-extract.ts

@@ -23,18 +23,32 @@ const PATCHED = String.raw`/(?:^|[/\\])css\.(js|cjs|mjs|jsx|ts|tsx)(\?used)?$/`
 export const patchVanillaExtract = async (cwd: string): Promise<boolean> => {
   const nodeModules = path.join(cwd, `node_modules`)
 
-  // Recursively collect `@vanilla-extract/integration/dist/*.js` WITHOUT following directory
-  // symlinks. A `file:` self-dep (e.g. frontend-toolkit's `frontend-toolkit: file:.` creates
-  // node_modules/frontend-toolkit -> .) makes symlink-following recurse forever — Bun.Glob does,
-  // even with `followSymlinks: false`. A linked sibling patches its own VE during its own install,
-  // and this repo's own copy is hoisted as a real dir, so real-dir-only recursion is sufficient.
-  const integrationDist = /[/\\]@vanilla-extract[/\\]integration[/\\]dist[/\\][^/\\]+\.js$/
+  // Collect every real `@vanilla-extract/integration/dist/*.js`. VE always sits directly under a
+  // `node_modules` dir, so we read each node_modules' own integration/dist and recurse ONLY into
+  // *nested* node_modules — never into package source trees. (A flat hoisted tree is hundreds of
+  // packages; recursing each one's dist/esm/cjs/… was the bulk of the old cost.) Symlinks are
+  // skipped: a `file:` self-dep links node_modules/<pkg> -> repo root, so following links recurses
+  // forever — also why Bun.Glob (which follows links even with `followSymlinks: false`) can't be
+  // used. A linked sibling patches its own VE during its own install; this repo's copy is hoisted
+  // as a real dir, so real-dir-only descent finds every copy that this install must patch.
   const findFiles = async (dir: string, out: string[] = []): Promise<string[]> => {
+    const distDir = path.join(dir, `@vanilla-extract`, `integration`, `dist`)
+    for (const entry of await fs.readdir(distDir, { withFileTypes: true }).catch(() => [])) {
+      if (entry.isFile() && entry.name.endsWith(`.js`)) out.push(path.join(distDir, entry.name))
+    }
+
     for (const entry of await fs.readdir(dir, { withFileTypes: true }).catch(() => [])) {
-      if (entry.isSymbolicLink()) continue
-      const full = path.join(dir, entry.name)
-      if (entry.isDirectory()) await findFiles(full, out)
-      else if (entry.isFile() && integrationDist.test(full)) out.push(full)
+      if (entry.isSymbolicLink() || !entry.isDirectory()) continue
+      const pkgDir = path.join(dir, entry.name)
+      if (entry.name.startsWith(`@`)) {
+        // scoped packages nest a level deeper: node_modules/@scope/<pkg>/node_modules
+        for (const scoped of await fs.readdir(pkgDir, { withFileTypes: true }).catch(() => [])) {
+          if (scoped.isSymbolicLink() || !scoped.isDirectory()) continue
+          await findFiles(path.join(pkgDir, scoped.name, `node_modules`), out)
+        }
+      } else {
+        await findFiles(path.join(pkgDir, `node_modules`), out)
+      }
     }
     return out
   }