@dbx-tools/cli 0.6.14 → 0.6.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/src/bootstrap.js +30 -4
- package/lib/src/pnpm.d.ts +11 -1
- package/lib/src/pnpm.js +105 -7
- package/package.json +3 -3
- package/src/bootstrap.ts +29 -3
- package/src/pnpm.ts +110 -6
package/lib/src/bootstrap.js
CHANGED
|
@@ -7,9 +7,9 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
|
7
7
|
import { join } from "node:path";
|
|
8
8
|
import { fileURLToPath } from "node:url";
|
|
9
9
|
import { intro, outro } from "@clack/prompts";
|
|
10
|
-
import { exec } from "@dbx-tools/core";
|
|
10
|
+
import { exec, project } from "@dbx-tools/core";
|
|
11
11
|
import { json } from "@dbx-tools/shared-core";
|
|
12
|
-
import { resolvePnpmArgv, runPnpm } from "./pnpm.js";
|
|
12
|
+
import { childEnv, resolvePnpmArgv, runPnpm } from "./pnpm.js";
|
|
13
13
|
import { rootLabel } from "./root.js";
|
|
14
14
|
/** Fallback when this CLI's own version isn't a real release (an in-repo `0.0.0`). */
|
|
15
15
|
const FALLBACK_PROJEN_SPECIFIER = "@dbx-tools/projen@latest";
|
|
@@ -139,8 +139,31 @@ export function seedToolchain(root, projenSpecifier = defaultProjenSpecifier())
|
|
|
139
139
|
if (!existsSync(workspaceFile)) {
|
|
140
140
|
writeFileSync(workspaceFile, WORKSPACE_SEED);
|
|
141
141
|
}
|
|
142
|
+
seedRegistry(root);
|
|
142
143
|
runPnpm(["add", "-D", "projen", "typescript@^5.9.3", "tsx@^4.23.0", projenSpecifier], root);
|
|
143
144
|
}
|
|
145
|
+
/**
|
|
146
|
+
* Pin a non-default registry into the new root's `.npmrc`.
|
|
147
|
+
*
|
|
148
|
+
* The CLI already forces `--registry` onto the pnpm invocations it makes itself,
|
|
149
|
+
* but a bootstrapped workspace outlives this process: every later `pnpm install`
|
|
150
|
+
* the developer (or projen's post-synth step) runs is on its own. pnpm ignores
|
|
151
|
+
* `npm_config_registry` from the environment, so without a file on disk those
|
|
152
|
+
* runs revert to `https://registry.npmjs.org/` - which is a hard failure where
|
|
153
|
+
* the custom registry was the only reachable one.
|
|
154
|
+
*
|
|
155
|
+
* Only writes for an actual override, never creates a file just to name npmjs,
|
|
156
|
+
* and never overwrites an existing `.npmrc` (the developer's own wins).
|
|
157
|
+
*/
|
|
158
|
+
function seedRegistry(root) {
|
|
159
|
+
const registry = project.npmRegistry(null, { overrideOnly: true, envVars: true })?.toString();
|
|
160
|
+
if (!registry)
|
|
161
|
+
return;
|
|
162
|
+
const npmrc = join(root, ".npmrc");
|
|
163
|
+
if (existsSync(npmrc))
|
|
164
|
+
return;
|
|
165
|
+
writeFileSync(npmrc, `registry=${registry}\n`);
|
|
166
|
+
}
|
|
144
167
|
/**
|
|
145
168
|
* Make what `pnpm init` produced safe to synth against. Two corrections, both
|
|
146
169
|
* because that output varies by pnpm version:
|
|
@@ -177,10 +200,13 @@ function normalizeSeedManifest(manifestPath) {
|
|
|
177
200
|
*/
|
|
178
201
|
export function runInitialSynth(root) {
|
|
179
202
|
const [command, ...prefix] = resolvePnpmArgv();
|
|
203
|
+
// No `--registry` here: this is `pnpm exec`, whose trailing arguments belong to
|
|
204
|
+
// tsx. The registry reaches anything nested through `childEnv` and the seeded
|
|
205
|
+
// `.npmrc` instead.
|
|
180
206
|
exec.spawnSync(command, [...prefix, "exec", "tsx", ".projenrc.ts"], {
|
|
181
207
|
cwd: root,
|
|
182
|
-
env: {
|
|
208
|
+
env: childEnv({ PROJEN_DISABLE_POST: "true" }),
|
|
183
209
|
check: true,
|
|
184
210
|
});
|
|
185
211
|
}
|
|
186
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,sFAAsF;AACtF,MAAM,yBAAyB,GAAG,0BAA0B,CAAC;AAE7D;;;;;;;;;;;;;;GAcG;AACH,SAAS,sBAAsB;IAC7B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,CAAC,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC;AAC/E,CAAC;AAED,oFAAoF;AACpF,SAAS,UAAU;IACjB,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC;QAC9E,OAAO,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,SAAS,eAAe,CAAC,CAAS,EAAE,CAAS;IAC3C,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,mEAAmE;AACnE,SAAS,sBAAsB,CAAC,IAAY;IAC1C,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC;QAC1E,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC;IAC9B,IAAI,CAAC,QAAQ;QAAE,OAAO;IACtB,MAAM,SAAS,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,SAAS,IAAI,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO;IACnE,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;AACzD,CAAC;AAED,8EAA8E;AAC9E,iFAAiF;AACjF,0EAA0E;AAC1E,4DAA4D;AAC5D,MAAM,iBAAiB,GAAG;;;;CAIzB,CAAC;AAEF,gGAAgG;AAChG,MAAM,cAAc,GAAG;;;CAGtB,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,kBAA0B,sBAAsB,EAAE;IAElD,KAAK,CAAC,wCAAwC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEjE,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAErC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,aAAa,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAC7C,CAAC;IAED,eAAe,CAAC,IAAI,CAAC,CAAC;IAEtB,OAAO,CAAC,CAAC,SAAS,EAAE,sBAAsB,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9D,KAAK,CAAC,oEAAoE,CAAC,CAAC;AAC9E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,kBAA0B,sBAAsB,EAAE;IAElD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAChD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QACxB,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IACxD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,aAAa,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,CAAC;AAC9F,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAS,qBAAqB,CAAC,YAAoB;IACjD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,OAAO,QAAQ,CAAC,UAAU,CAAC;QAC3B,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;QACzB,aAAa,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACxE,CAAC;IAAC,MAAM,CAAC;QACP,iFAAiF;IACnF,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,eAAe,EAAE,CAAC;IAC/C,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,EAAE;QAClE,GAAG,EAAE,IAAI;QACT,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,MAAM,EAAE;QACpD,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;AACL,CAAC","sourcesContent":["/**\n * Bootstrap a brand-new folder into a working dbx-tools workspace before projen runs.\n *\n * @module\n */\nimport { existsSync, readFileSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { intro, outro } from \"@clack/prompts\";\nimport { exec } from \"@dbx-tools/core\";\nimport { json } from \"@dbx-tools/shared-core\";\nimport { resolvePnpmArgv, runPnpm } from \"./pnpm.ts\";\nimport { rootLabel } from \"./root.ts\";\n\n/** Fallback when this CLI's own version isn't a real release (an in-repo `0.0.0`). */\nconst FALLBACK_PROJEN_SPECIFIER = \"@dbx-tools/projen@latest\";\n\n/**\n * Install the engine at THIS CLI's own version. The two are released together by\n * the root `bump`, so the matching engine always exists on the registry.\n *\n * Not `@latest`, and not a bare `@dbx-tools/projen`. A bare specifier can land on\n * a stray `0.0.0`, whose `^0.0.0` caret then reaches no real release. `@latest`\n * has a subtler failure: pnpm 11 applies a `minimumReleaseAge` delay, so for the\n * first day after a release it deliberately resolves a dist-tag to the newest\n * version OLDER than the threshold and merely notes the newer one\n * (`+ @dbx-tools/projen 0.1.24 (0.3.42 is available)`). A bootstrap run right\n * after a release therefore installed a months-old engine against a current CLI,\n * which is how `sync --watch` died on an engine predating its `concurrently`\n * dependency. An explicit range admits only the version we want, so the age\n * heuristic has nothing older to fall back to.\n */\nfunction defaultProjenSpecifier(): string {\n  const version = ownVersion();\n  return version ? `@dbx-tools/projen@^${version}` : FALLBACK_PROJEN_SPECIFIER;\n}\n\n/** This CLI's own released version, or `undefined` for an in-repo `0.0.0` build. */\nfunction ownVersion(): string | undefined {\n  try {\n    const manifestPath = fileURLToPath(new URL(\"../package.json\", import.meta.url));\n    const version = json.parseRecord(readFileSync(manifestPath, \"utf8\"))?.version;\n    return typeof version === \"string\" && version !== \"0.0.0\" ? version : undefined;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Compare `x.y.z` triples; returns <0, 0, or >0. Missing parts count as 0. */\nfunction compareVersions(a: string, b: string): number {\n  const parts = (v: string) => v.split(\".\").map((p) => Number.parseInt(p, 10) || 0);\n  const [x, y] = [parts(a), parts(b)];\n  return x[0] - y[0] || x[1] - y[1] || x[2] - y[2];\n}\n\n/** Version of the engine currently installed at `root`, if any. */\nfunction installedEngineVersion(root: string): string | undefined {\n  try {\n    const manifest = join(root, \"node_modules\", \"@dbx-tools\", \"projen\", \"package.json\");\n    const version = json.parseRecord(readFileSync(manifest, \"utf8\"))?.version;\n    return typeof version === \"string\" ? version : undefined;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Upgrade an established workspace whose installed engine predates this CLI.\n *\n * Bootstrapping pins the engine once, and nothing afterwards revisits it - so a\n * workspace created months ago kept resolving its original engine no matter how\n * current the CLI invoking it was, and failed inside the OLD engine's code\n * (`sync --watch` dying on a `concurrently` that engine never declared). The two\n * are released in lockstep, so this CLI's version is exactly the engine it\n * expects.\n *\n * Only ever moves FORWARD: an engine at or ahead of this CLI is left alone, so\n * an older CLI cannot downgrade a workspace.\n */\nexport function ensureEngineCurrent(root: string): void {\n  const expected = ownVersion();\n  if (!expected) return;\n  const installed = installedEngineVersion(root);\n  if (installed && compareVersions(installed, expected) >= 0) return;\n  runPnpm([\"add\", \"-D\", defaultProjenSpecifier()], root);\n}\n\n// Reach the class through its module NAMESPACE. Current engines also hoist it\n// flat, but every engine ever published exports the namespace, and this template\n// is resolved against `@latest` - a flat import dies on an older one with\n// \"does not provide an export named 'DBXToolsNodeProject'\".\nconst PROJENRC_TEMPLATE = `import { project as projectApi } from \"@dbx-tools/projen\";\n\nconst project = new projectApi.DBXToolsNodeProject();\nproject.synth();\n`;\n\n/** Seed `pnpm-workspace.yaml` so the first \\`pnpm add\\` can allow esbuild non-interactively. */\nconst WORKSPACE_SEED = `packages: []\nallowBuilds:\n  esbuild: true\n`;\n\n/**\n * Turn a folder into a functioning dbx-tools workspace: `pnpm init`, seed\n * `pnpm-workspace.yaml`, add `projen`/`typescript`/`tsx` + the engine package,\n * write a minimal `.projenrc.ts`, synth once (with `PROJEN_DISABLE_POST`), then\n * install. Does not run barrels - run `pnpm run barrels` or a full projen synth\n * post-install to generate package barrels.\n *\n * Every step is idempotent and self-guarded, so this is safe to run against a\n * folder that ALREADY has a hand-authored `.projenrc.ts` (and even a committed\n * `package.json`) but is missing the installed toolchain - e.g. a freshly copied\n * project whose generated files (including manifests) are gitignored. In that\n * case `pnpm init` and the `.projenrc.ts` scaffold are skipped, but the engine +\n * projen + tsx are (re)installed so the subsequent synth can regenerate\n * everything. See {@link seedToolchain}.\n */\nexport function bootstrapWorkspace(\n  root: string,\n  projenSpecifier: string = defaultProjenSpecifier(),\n): void {\n  intro(`Bootstrapping dbx-tools workspace in ${rootLabel(root)}`);\n\n  seedToolchain(root, projenSpecifier);\n\n  const projenrc = join(root, \".projenrc.ts\");\n  if (!existsSync(projenrc)) {\n    writeFileSync(projenrc, PROJENRC_TEMPLATE);\n  }\n\n  runInitialSynth(root);\n\n  runPnpm([\"install\", \"--no-frozen-lockfile\", \"--force\"], root);\n  outro(\"Workspace ready - re-run dbx-tools or add packages under packages/\");\n}\n\n/**\n * Install the toolchain a synth needs (`projen`, `typescript`, `tsx`, and the\n * dbx-tools engine), seeding a `package.json` and `pnpm-workspace.yaml` first\n * when absent. Idempotent: run it whenever the engine is missing, so a copied\n * project with a `.projenrc.ts` but no `node_modules`/manifests can be brought\n * up to a synth-ready state without full bootstrapping.\n */\nexport function seedToolchain(\n  root: string,\n  projenSpecifier: string = defaultProjenSpecifier(),\n): void {\n  const manifestPath = join(root, \"package.json\");\n  if (!existsSync(manifestPath)) {\n    runPnpm([\"init\"], root);\n    normalizeSeedManifest(manifestPath);\n  }\n\n  const workspaceFile = join(root, \"pnpm-workspace.yaml\");\n  if (!existsSync(workspaceFile)) {\n    writeFileSync(workspaceFile, WORKSPACE_SEED);\n  }\n\n  runPnpm([\"add\", \"-D\", \"projen\", \"typescript@^5.9.3\", \"tsx@^4.23.0\", projenSpecifier], root);\n}\n\n/**\n * Make what `pnpm init` produced safe to synth against. Two corrections, both\n * because that output varies by pnpm version:\n *\n *   - drop `devEngines`, which pnpm 11 seeds as `packageManager: { name: \"pnpm\",\n *     onFail: \"download\" }`. Any npm-based tool later in the chain (an\n *     `npx`/dlx fallback) then refuses with EBADDEVENGINES, its runner being npm;\n *   - force `type: \"module\"`, which pnpm 11 writes and pnpm 10 does not. tsx\n *     picks the entry's format from the nearest manifest, so without it\n *     `.projenrc.ts` loads as CJS and the first dependency using top-level await\n *     dies on \"not supported with the cjs output format\".\n *\n * projen regenerates the whole manifest at synth, so this only has to hold the\n * seed together long enough to get there.\n */\nfunction normalizeSeedManifest(manifestPath: string): void {\n  try {\n    const manifest = json.parseRecord(readFileSync(manifestPath, \"utf8\"));\n    if (!manifest) return;\n    delete manifest.devEngines;\n    manifest.type = \"module\";\n    writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\\n`);\n  } catch {\n    // A malformed/absent manifest here just means the later `pnpm add` recreates it.\n  }\n}\n\n/**\n * Run the initial synth by executing `.projenrc.ts` directly with tsx (with\n * `PROJEN_DISABLE_POST` set), NOT `projen <task>`. Use right after seeding a\n * fresh workspace: the projen TASKS (`sync`, `barrels`, ...) only exist once\n * `.projenrc.ts` has run once, so `projen sync` can't be the bootstrapping step.\n */\nexport function runInitialSynth(root: string): void {\n  const [command, ...prefix] = resolvePnpmArgv();\n  exec.spawnSync(command, [...prefix, \"exec\", \"tsx\", \".projenrc.ts\"], {\n    cwd: root,\n    env: { ...process.env, PROJEN_DISABLE_POST: \"true\" },\n    check: true,\n  });\n}\n"]}
|
|
212
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Bootstrap a brand-new folder into a working dbx-tools workspace before projen runs.\n *\n * @module\n */\nimport { existsSync, readFileSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { intro, outro } from \"@clack/prompts\";\nimport { exec, project } from \"@dbx-tools/core\";\nimport { json } from \"@dbx-tools/shared-core\";\nimport { childEnv, resolvePnpmArgv, runPnpm } from \"./pnpm.ts\";\nimport { rootLabel } from \"./root.ts\";\n\n/** Fallback when this CLI's own version isn't a real release (an in-repo `0.0.0`). */\nconst FALLBACK_PROJEN_SPECIFIER = \"@dbx-tools/projen@latest\";\n\n/**\n * Install the engine at THIS CLI's own version. The two are released together by\n * the root `bump`, so the matching engine always exists on the registry.\n *\n * Not `@latest`, and not a bare `@dbx-tools/projen`. A bare specifier can land on\n * a stray `0.0.0`, whose `^0.0.0` caret then reaches no real release. `@latest`\n * has a subtler failure: pnpm 11 applies a `minimumReleaseAge` delay, so for the\n * first day after a release it deliberately resolves a dist-tag to the newest\n * version OLDER than the threshold and merely notes the newer one\n * (`+ @dbx-tools/projen 0.1.24 (0.3.42 is available)`). A bootstrap run right\n * after a release therefore installed a months-old engine against a current CLI,\n * which is how `sync --watch` died on an engine predating its `concurrently`\n * dependency. An explicit range admits only the version we want, so the age\n * heuristic has nothing older to fall back to.\n */\nfunction defaultProjenSpecifier(): string {\n  const version = ownVersion();\n  return version ? `@dbx-tools/projen@^${version}` : FALLBACK_PROJEN_SPECIFIER;\n}\n\n/** This CLI's own released version, or `undefined` for an in-repo `0.0.0` build. */\nfunction ownVersion(): string | undefined {\n  try {\n    const manifestPath = fileURLToPath(new URL(\"../package.json\", import.meta.url));\n    const version = json.parseRecord(readFileSync(manifestPath, \"utf8\"))?.version;\n    return typeof version === \"string\" && version !== \"0.0.0\" ? version : undefined;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Compare `x.y.z` triples; returns <0, 0, or >0. Missing parts count as 0. */\nfunction compareVersions(a: string, b: string): number {\n  const parts = (v: string) => v.split(\".\").map((p) => Number.parseInt(p, 10) || 0);\n  const [x, y] = [parts(a), parts(b)];\n  return x[0] - y[0] || x[1] - y[1] || x[2] - y[2];\n}\n\n/** Version of the engine currently installed at `root`, if any. */\nfunction installedEngineVersion(root: string): string | undefined {\n  try {\n    const manifest = join(root, \"node_modules\", \"@dbx-tools\", \"projen\", \"package.json\");\n    const version = json.parseRecord(readFileSync(manifest, \"utf8\"))?.version;\n    return typeof version === \"string\" ? version : undefined;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Upgrade an established workspace whose installed engine predates this CLI.\n *\n * Bootstrapping pins the engine once, and nothing afterwards revisits it - so a\n * workspace created months ago kept resolving its original engine no matter how\n * current the CLI invoking it was, and failed inside the OLD engine's code\n * (`sync --watch` dying on a `concurrently` that engine never declared). The two\n * are released in lockstep, so this CLI's version is exactly the engine it\n * expects.\n *\n * Only ever moves FORWARD: an engine at or ahead of this CLI is left alone, so\n * an older CLI cannot downgrade a workspace.\n */\nexport function ensureEngineCurrent(root: string): void {\n  const expected = ownVersion();\n  if (!expected) return;\n  const installed = installedEngineVersion(root);\n  if (installed && compareVersions(installed, expected) >= 0) return;\n  runPnpm([\"add\", \"-D\", defaultProjenSpecifier()], root);\n}\n\n// Reach the class through its module NAMESPACE. Current engines also hoist it\n// flat, but every engine ever published exports the namespace, and this template\n// is resolved against `@latest` - a flat import dies on an older one with\n// \"does not provide an export named 'DBXToolsNodeProject'\".\nconst PROJENRC_TEMPLATE = `import { project as projectApi } from \"@dbx-tools/projen\";\n\nconst project = new projectApi.DBXToolsNodeProject();\nproject.synth();\n`;\n\n/** Seed `pnpm-workspace.yaml` so the first \\`pnpm add\\` can allow esbuild non-interactively. */\nconst WORKSPACE_SEED = `packages: []\nallowBuilds:\n  esbuild: true\n`;\n\n/**\n * Turn a folder into a functioning dbx-tools workspace: `pnpm init`, seed\n * `pnpm-workspace.yaml`, add `projen`/`typescript`/`tsx` + the engine package,\n * write a minimal `.projenrc.ts`, synth once (with `PROJEN_DISABLE_POST`), then\n * install. Does not run barrels - run `pnpm run barrels` or a full projen synth\n * post-install to generate package barrels.\n *\n * Every step is idempotent and self-guarded, so this is safe to run against a\n * folder that ALREADY has a hand-authored `.projenrc.ts` (and even a committed\n * `package.json`) but is missing the installed toolchain - e.g. a freshly copied\n * project whose generated files (including manifests) are gitignored. In that\n * case `pnpm init` and the `.projenrc.ts` scaffold are skipped, but the engine +\n * projen + tsx are (re)installed so the subsequent synth can regenerate\n * everything. See {@link seedToolchain}.\n */\nexport function bootstrapWorkspace(\n  root: string,\n  projenSpecifier: string = defaultProjenSpecifier(),\n): void {\n  intro(`Bootstrapping dbx-tools workspace in ${rootLabel(root)}`);\n\n  seedToolchain(root, projenSpecifier);\n\n  const projenrc = join(root, \".projenrc.ts\");\n  if (!existsSync(projenrc)) {\n    writeFileSync(projenrc, PROJENRC_TEMPLATE);\n  }\n\n  runInitialSynth(root);\n\n  runPnpm([\"install\", \"--no-frozen-lockfile\", \"--force\"], root);\n  outro(\"Workspace ready - re-run dbx-tools or add packages under packages/\");\n}\n\n/**\n * Install the toolchain a synth needs (`projen`, `typescript`, `tsx`, and the\n * dbx-tools engine), seeding a `package.json` and `pnpm-workspace.yaml` first\n * when absent. Idempotent: run it whenever the engine is missing, so a copied\n * project with a `.projenrc.ts` but no `node_modules`/manifests can be brought\n * up to a synth-ready state without full bootstrapping.\n */\nexport function seedToolchain(\n  root: string,\n  projenSpecifier: string = defaultProjenSpecifier(),\n): void {\n  const manifestPath = join(root, \"package.json\");\n  if (!existsSync(manifestPath)) {\n    runPnpm([\"init\"], root);\n    normalizeSeedManifest(manifestPath);\n  }\n\n  const workspaceFile = join(root, \"pnpm-workspace.yaml\");\n  if (!existsSync(workspaceFile)) {\n    writeFileSync(workspaceFile, WORKSPACE_SEED);\n  }\n\n  seedRegistry(root);\n\n  runPnpm([\"add\", \"-D\", \"projen\", \"typescript@^5.9.3\", \"tsx@^4.23.0\", projenSpecifier], root);\n}\n\n/**\n * Pin a non-default registry into the new root's `.npmrc`.\n *\n * The CLI already forces `--registry` onto the pnpm invocations it makes itself,\n * but a bootstrapped workspace outlives this process: every later `pnpm install`\n * the developer (or projen's post-synth step) runs is on its own. pnpm ignores\n * `npm_config_registry` from the environment, so without a file on disk those\n * runs revert to `https://registry.npmjs.org/` - which is a hard failure where\n * the custom registry was the only reachable one.\n *\n * Only writes for an actual override, never creates a file just to name npmjs,\n * and never overwrites an existing `.npmrc` (the developer's own wins).\n */\nfunction seedRegistry(root: string): void {\n  const registry = project.npmRegistry(null, { overrideOnly: true, envVars: true })?.toString();\n  if (!registry) return;\n  const npmrc = join(root, \".npmrc\");\n  if (existsSync(npmrc)) return;\n  writeFileSync(npmrc, `registry=${registry}\\n`);\n}\n\n/**\n * Make what `pnpm init` produced safe to synth against. Two corrections, both\n * because that output varies by pnpm version:\n *\n *   - drop `devEngines`, which pnpm 11 seeds as `packageManager: { name: \"pnpm\",\n *     onFail: \"download\" }`. Any npm-based tool later in the chain (an\n *     `npx`/dlx fallback) then refuses with EBADDEVENGINES, its runner being npm;\n *   - force `type: \"module\"`, which pnpm 11 writes and pnpm 10 does not. tsx\n *     picks the entry's format from the nearest manifest, so without it\n *     `.projenrc.ts` loads as CJS and the first dependency using top-level await\n *     dies on \"not supported with the cjs output format\".\n *\n * projen regenerates the whole manifest at synth, so this only has to hold the\n * seed together long enough to get there.\n */\nfunction normalizeSeedManifest(manifestPath: string): void {\n  try {\n    const manifest = json.parseRecord(readFileSync(manifestPath, \"utf8\"));\n    if (!manifest) return;\n    delete manifest.devEngines;\n    manifest.type = \"module\";\n    writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\\n`);\n  } catch {\n    // A malformed/absent manifest here just means the later `pnpm add` recreates it.\n  }\n}\n\n/**\n * Run the initial synth by executing `.projenrc.ts` directly with tsx (with\n * `PROJEN_DISABLE_POST` set), NOT `projen <task>`. Use right after seeding a\n * fresh workspace: the projen TASKS (`sync`, `barrels`, ...) only exist once\n * `.projenrc.ts` has run once, so `projen sync` can't be the bootstrapping step.\n */\nexport function runInitialSynth(root: string): void {\n  const [command, ...prefix] = resolvePnpmArgv();\n  // No `--registry` here: this is `pnpm exec`, whose trailing arguments belong to\n  // tsx. The registry reaches anything nested through `childEnv` and the seeded\n  // `.npmrc` instead.\n  exec.spawnSync(command, [...prefix, \"exec\", \"tsx\", \".projenrc.ts\"], {\n    cwd: root,\n    env: childEnv({ PROJEN_DISABLE_POST: \"true\" }),\n    check: true,\n  });\n}\n"]}
|
package/lib/src/pnpm.d.ts
CHANGED
|
@@ -1,6 +1,16 @@
|
|
|
1
|
+
/** `--registry <url>` for npx, or `[]`. Placed BEFORE the package name by callers. */
|
|
2
|
+
export declare function npxRegistryArgs(): string[];
|
|
3
|
+
/** `--registry <url>` for a pnpm invocation, or `[]` when the subcommand does not resolve. */
|
|
4
|
+
export declare function pnpmRegistryArgs(args: readonly string[]): string[];
|
|
5
|
+
/**
|
|
6
|
+
* `process.env` plus the registry under npm's env-var convention, for children
|
|
7
|
+
* that read it (npm, npx, and anything they spawn). pnpm ignores it, which is
|
|
8
|
+
* why the CLI flags above exist.
|
|
9
|
+
*/
|
|
10
|
+
export declare function childEnv(extra?: Record<string, string>): NodeJS.ProcessEnv;
|
|
1
11
|
/** Memoized `[command, ...prefix]` argv prefix to run pnpm (resolved install, else corepack, else npx). */
|
|
2
12
|
export declare const resolvePnpmArgv: () => string[];
|
|
3
|
-
/** Run pnpm with inherited stdio from `cwd
|
|
13
|
+
/** Run pnpm with inherited stdio from `cwd`, forcing the resolved registry. */
|
|
4
14
|
export declare function runPnpm(args: string[], cwd: string): void;
|
|
5
15
|
/** Install workspace dependencies when `node_modules` or projen is missing. */
|
|
6
16
|
export declare function ensureWorkspaceReady(root: string): void;
|
package/lib/src/pnpm.js
CHANGED
|
@@ -1,13 +1,99 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* pnpm discovery, workspace install, and projen forwarding for the `dbx-tools` CLI.
|
|
3
3
|
*
|
|
4
|
+
* ## Forcing a custom registry
|
|
5
|
+
*
|
|
6
|
+
* pnpm and npm do NOT agree on how a registry is configured, and getting this
|
|
7
|
+
* wrong is silent. Measured against pnpm 11.0.6 and npm 11:
|
|
8
|
+
*
|
|
9
|
+
* | mechanism | npm | pnpm |
|
|
10
|
+
* | ---------------------------------------- | --- | ---- |
|
|
11
|
+
* | `--registry <url>` CLI flag | yes | yes |
|
|
12
|
+
* | project `.npmrc` | yes | yes |
|
|
13
|
+
* | `npm_config_registry` env var | yes | NO |
|
|
14
|
+
*
|
|
15
|
+
* So an env var alone reads back correctly from `npm config get registry` while
|
|
16
|
+
* pnpm ignores it and silently falls through to its built-in
|
|
17
|
+
* `https://registry.npmjs.org/`. That produced a bootstrap which logged the
|
|
18
|
+
* local registry and then tried to fetch `typescript` / `projen` / `tsx` from
|
|
19
|
+
* npmjs, failing with ECONNREFUSED on a machine that had no route to it.
|
|
20
|
+
*
|
|
21
|
+
* Hence all three channels, each where it actually applies:
|
|
22
|
+
*
|
|
23
|
+
* - {@link pnpmRegistryArgs} passes `--registry` to pnpm, but only for the
|
|
24
|
+
* subcommands that resolve packages. It must NOT be appended to
|
|
25
|
+
* `pnpm exec <cmd>`, where trailing arguments belong to `<cmd>`, not pnpm.
|
|
26
|
+
* - {@link npxRegistryArgs} passes `--registry` to npx, before the package
|
|
27
|
+
* name, so the npx fallback can fetch pnpm itself from the same registry.
|
|
28
|
+
* - {@link childEnv} keeps `npm_config_registry` set for npm-based children
|
|
29
|
+
* (npx included), which is the only channel npm exposes to nested tools.
|
|
30
|
+
*
|
|
31
|
+
* `@dbx-tools/core`'s `npmRegistry({ overrideOnly: true })` returns nothing when
|
|
32
|
+
* the effective registry IS npmjs, so none of this touches a default install.
|
|
33
|
+
*
|
|
4
34
|
* @module
|
|
5
35
|
*/
|
|
6
36
|
import { createRequire } from "node:module";
|
|
7
37
|
import { dirname, join } from "node:path";
|
|
8
|
-
import { exec } from "@dbx-tools/core";
|
|
9
|
-
import { functionModule } from "@dbx-tools/shared-core";
|
|
38
|
+
import { exec, project } from "@dbx-tools/core";
|
|
39
|
+
import { functionModule, log } from "@dbx-tools/shared-core";
|
|
10
40
|
import { needsInstall } from "./root.js";
|
|
41
|
+
const logger = log.logger("dbx-tools:pnpm");
|
|
42
|
+
/**
|
|
43
|
+
* pnpm subcommands that resolve packages from a registry, and therefore accept a
|
|
44
|
+
* meaningful `--registry`. Everything else (`exec`, `run`, `config`, ...) is left
|
|
45
|
+
* alone: `exec` in particular forwards trailing arguments to the command it runs,
|
|
46
|
+
* so a `--registry` appended there would land on projen or tsx instead.
|
|
47
|
+
*/
|
|
48
|
+
const REGISTRY_SUBCOMMANDS = new Set([
|
|
49
|
+
"add",
|
|
50
|
+
"create",
|
|
51
|
+
"dlx",
|
|
52
|
+
"i",
|
|
53
|
+
"import",
|
|
54
|
+
"init",
|
|
55
|
+
"install",
|
|
56
|
+
"link",
|
|
57
|
+
"up",
|
|
58
|
+
"update",
|
|
59
|
+
]);
|
|
60
|
+
/**
|
|
61
|
+
* The registry to force onto child package managers, or `undefined` when the
|
|
62
|
+
* effective one is already the public default.
|
|
63
|
+
*
|
|
64
|
+
* `envVars: true` also consults `npm_config_registry` directly, because a
|
|
65
|
+
* container may export it without any `.npmrc` for `npm config get` to read.
|
|
66
|
+
* Memoized: resolution shells out to npm.
|
|
67
|
+
*/
|
|
68
|
+
const registryOverride = functionModule.memoize(() => project.npmRegistry(null, { overrideOnly: true, envVars: true })?.toString());
|
|
69
|
+
/** `--registry <url>` for npx, or `[]`. Placed BEFORE the package name by callers. */
|
|
70
|
+
export function npxRegistryArgs() {
|
|
71
|
+
const url = registryOverride();
|
|
72
|
+
return url ? ["--registry", url] : [];
|
|
73
|
+
}
|
|
74
|
+
/** `--registry <url>` for a pnpm invocation, or `[]` when the subcommand does not resolve. */
|
|
75
|
+
export function pnpmRegistryArgs(args) {
|
|
76
|
+
const url = registryOverride();
|
|
77
|
+
if (!url)
|
|
78
|
+
return [];
|
|
79
|
+
const subcommand = args.find((arg) => !arg.startsWith("-"));
|
|
80
|
+
return subcommand && REGISTRY_SUBCOMMANDS.has(subcommand) ? ["--registry", url] : [];
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* `process.env` plus the registry under npm's env-var convention, for children
|
|
84
|
+
* that read it (npm, npx, and anything they spawn). pnpm ignores it, which is
|
|
85
|
+
* why the CLI flags above exist.
|
|
86
|
+
*/
|
|
87
|
+
export function childEnv(extra) {
|
|
88
|
+
const env = { ...process.env, ...extra };
|
|
89
|
+
const url = registryOverride();
|
|
90
|
+
if (url) {
|
|
91
|
+
// Both cases: env is case-sensitive on POSIX, and npm lowercases when reading.
|
|
92
|
+
env.npm_config_registry = url;
|
|
93
|
+
env.NPM_CONFIG_REGISTRY = url;
|
|
94
|
+
}
|
|
95
|
+
return env;
|
|
96
|
+
}
|
|
11
97
|
/** True when `pnpm --version` runs, i.e. pnpm is already on PATH. */
|
|
12
98
|
function pnpmOnPath() {
|
|
13
99
|
try {
|
|
@@ -26,12 +112,14 @@ function pnpmOnPath() {
|
|
|
26
112
|
function resolvePnpmArgvImpl() {
|
|
27
113
|
// 1. A resolvable `pnpm` dependency (the normal in-workspace case): run its
|
|
28
114
|
// bin directly with the current node - no PATH or package-manager shim.
|
|
115
|
+
// pnpm's own `--registry` rides in with the ARGS, after this entry point.
|
|
29
116
|
try {
|
|
30
117
|
const require = createRequire(import.meta.url);
|
|
31
118
|
const pkgJsonPath = require.resolve("pnpm/package.json");
|
|
32
119
|
const pkg = require(pkgJsonPath);
|
|
33
120
|
const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin.pnpm;
|
|
34
|
-
|
|
121
|
+
if (bin)
|
|
122
|
+
return [process.execPath, join(dirname(pkgJsonPath), bin)];
|
|
35
123
|
}
|
|
36
124
|
catch {
|
|
37
125
|
// fall through
|
|
@@ -59,14 +147,24 @@ function resolvePnpmArgvImpl() {
|
|
|
59
147
|
// 4. Last resort: fetch pnpm on demand via npx. Pass `--engine-strict=false`
|
|
60
148
|
// (and skip npm's devEngines gate) so npm doesn't refuse to run just
|
|
61
149
|
// because the target manifest declares `devEngines.packageManager: pnpm`.
|
|
62
|
-
|
|
150
|
+
// npm-level flags, `--registry` among them, must precede the package name,
|
|
151
|
+
// or npx forwards them to pnpm instead of acting on them itself.
|
|
152
|
+
return ["npx", ...npxRegistryArgs(), "-y", "--engine-strict=false", "pnpm"];
|
|
63
153
|
}
|
|
64
154
|
/** Memoized `[command, ...prefix]` argv prefix to run pnpm (resolved install, else corepack, else npx). */
|
|
65
155
|
export const resolvePnpmArgv = functionModule.memoize(resolvePnpmArgvImpl);
|
|
66
|
-
/** Run pnpm with inherited stdio from `cwd
|
|
156
|
+
/** Run pnpm with inherited stdio from `cwd`, forcing the resolved registry. */
|
|
67
157
|
export function runPnpm(args, cwd) {
|
|
68
158
|
const [command, ...prefix] = resolvePnpmArgv();
|
|
69
|
-
|
|
159
|
+
const registryArgs = pnpmRegistryArgs(args);
|
|
160
|
+
if (registryArgs.length > 0) {
|
|
161
|
+
logger.info(`running pnpm with registry: ${registryArgs[1]}`);
|
|
162
|
+
}
|
|
163
|
+
exec.spawnSync(command, [...prefix, ...args, ...registryArgs], {
|
|
164
|
+
cwd,
|
|
165
|
+
check: true,
|
|
166
|
+
env: childEnv(),
|
|
167
|
+
});
|
|
70
168
|
}
|
|
71
169
|
/** Install workspace dependencies when `node_modules` or projen is missing. */
|
|
72
170
|
export function ensureWorkspaceReady(root) {
|
|
@@ -78,4 +176,4 @@ export function ensureWorkspaceReady(root) {
|
|
|
78
176
|
export function runProjen(args, root) {
|
|
79
177
|
runPnpm(["exec", "projen", ...args], root);
|
|
80
178
|
}
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG5wbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wbnBtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFDSCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQzVDLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQzFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN2QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUt6QyxxRUFBcUU7QUFDckUsU0FBUyxVQUFVO0lBQ2pCLElBQUksQ0FBQztRQUNILElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUU7WUFDcEMsTUFBTSxFQUFFLFFBQVE7WUFDaEIsS0FBSyxFQUFFLFFBQVE7WUFDZixNQUFNLEVBQUUsUUFBUTtZQUNoQixLQUFLLEVBQUUsSUFBSTtTQUNaLENBQUMsQ0FBQztRQUNILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztBQUNILENBQUM7QUFFRCxTQUFTLG1CQUFtQjtJQUMxQiw0RUFBNEU7SUFDNUUsMkVBQTJFO0lBQzNFLElBQUksQ0FBQztRQUNILE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUN6RCxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFzQixDQUFDO1FBQ3RELE1BQU0sR0FBRyxHQUFHLE9BQU8sR0FBRyxDQUFDLEdBQUcsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDO1FBQ2pFLE9BQU8sQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsZUFBZTtJQUNqQixDQUFDO0lBRUQsMkVBQTJFO0lBQzNFLDBFQUEwRTtJQUMxRSxnRUFBZ0U7SUFDaEUscUVBQXFFO0lBQ3JFLElBQUksVUFBVSxFQUFFO1FBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRWxDLG1EQUFtRDtJQUNuRCxJQUFJLENBQUM7UUFDSCxJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBRSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsRUFBRTtZQUM3QyxNQUFNLEVBQUUsUUFBUTtZQUNoQixLQUFLLEVBQUUsUUFBUTtZQUNmLE1BQU0sRUFBRSxRQUFRO1lBQ2hCLEtBQUssRUFBRSxJQUFJO1NBQ1osQ0FBQyxDQUFDO1FBQ0gsSUFBSSxVQUFVLEVBQUU7WUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLGVBQWU7SUFDakIsQ0FBQztJQUVELDZFQUE2RTtJQUM3RSx3RUFBd0U7SUFDeEUsNkVBQTZFO0lBQzdFLE9BQU8sQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLHVCQUF1QixFQUFFLE1BQU0sQ0FBQyxDQUFDO0FBQ3hELENBQUM7QUFFRCwyR0FBMkc7QUFDM0csTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLGNBQWMsQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBQztBQUUzRSxnREFBZ0Q7QUFDaEQsTUFBTSxVQUFVLE9BQU8sQ0FBQyxJQUFjLEVBQUUsR0FBVztJQUNqRCxNQUFNLENBQUMsT0FBTyxFQUFFLEdBQUcsTUFBTSxDQUFDLEdBQUcsZUFBZSxFQUFFLENBQUM7SUFDL0MsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxFQUFFLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0FBQ3RFLENBQUM7QUFFRCwrRUFBK0U7QUFDL0UsTUFBTSxVQUFVLG9CQUFvQixDQUFDLElBQVk7SUFDL0MsSUFBSSxZQUFZLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztRQUN2QixPQUFPLENBQUMsQ0FBQyxTQUFTLEVBQUUsc0JBQXNCLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNyRCxDQUFDO0FBQ0gsQ0FBQztBQUVELDhEQUE4RDtBQUM5RCxNQUFNLFVBQVUsU0FBUyxDQUFDLElBQWMsRUFBRSxJQUFZO0lBQ3BELE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztBQUM3QyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBwbnBtIGRpc2NvdmVyeSwgd29ya3NwYWNlIGluc3RhbGwsIGFuZCBwcm9qZW4gZm9yd2FyZGluZyBmb3IgdGhlIGBkYngtdG9vbHNgIENMSS5cbiAqXG4gKiBAbW9kdWxlXG4gKi9cbmltcG9ydCB7IGNyZWF0ZVJlcXVpcmUgfSBmcm9tIFwibm9kZTptb2R1bGVcIjtcbmltcG9ydCB7IGRpcm5hbWUsIGpvaW4gfSBmcm9tIFwibm9kZTpwYXRoXCI7XG5pbXBvcnQgeyBleGVjIH0gZnJvbSBcIkBkYngtdG9vbHMvY29yZVwiO1xuaW1wb3J0IHsgZnVuY3Rpb25Nb2R1bGUgfSBmcm9tIFwiQGRieC10b29scy9zaGFyZWQtY29yZVwiO1xuaW1wb3J0IHsgbmVlZHNJbnN0YWxsIH0gZnJvbSBcIi4vcm9vdC50c1wiO1xuXG4vKiogQSBwYWNrYWdlLmpzb24gYGJpbmAgZmllbGQ6IGVpdGhlciBhIHNpbmdsZSBjb21tYW5kIHN0cmluZywgb3IgYSBuYW1lIC0+IHBhdGggbWFwLiAqL1xudHlwZSBCaW5GaWVsZCA9IHN0cmluZyB8IFJlY29yZDxzdHJpbmcsIHN0cmluZz47XG5cbi8qKiBUcnVlIHdoZW4gYHBucG0gLS12ZXJzaW9uYCBydW5zLCBpLmUuIHBucG0gaXMgYWxyZWFkeSBvbiBQQVRILiAqL1xuZnVuY3Rpb24gcG5wbU9uUGF0aCgpOiBib29sZWFuIHtcbiAgdHJ5IHtcbiAgICBleGVjLnNwYXduU3luYyhcInBucG1cIiwgW1wiLS12ZXJzaW9uXCJdLCB7XG4gICAgICBzdGRlcnI6IFwiaWdub3JlXCIsXG4gICAgICBzdGRpbjogXCJpZ25vcmVcIixcbiAgICAgIHN0ZG91dDogXCJpZ25vcmVcIixcbiAgICAgIGNoZWNrOiB0cnVlLFxuICAgIH0pO1xuICAgIHJldHVybiB0cnVlO1xuICB9IGNhdGNoIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cbn1cblxuZnVuY3Rpb24gcmVzb2x2ZVBucG1Bcmd2SW1wbCgpOiBzdHJpbmdbXSB7XG4gIC8vIDEuIEEgcmVzb2x2YWJsZSBgcG5wbWAgZGVwZW5kZW5jeSAodGhlIG5vcm1hbCBpbi13b3Jrc3BhY2UgY2FzZSk6IHJ1biBpdHNcbiAgLy8gICAgYmluIGRpcmVjdGx5IHdpdGggdGhlIGN1cnJlbnQgbm9kZSAtIG5vIFBBVEggb3IgcGFja2FnZS1tYW5hZ2VyIHNoaW0uXG4gIHRyeSB7XG4gICAgY29uc3QgcmVxdWlyZSA9IGNyZWF0ZVJlcXVpcmUoaW1wb3J0Lm1ldGEudXJsKTtcbiAgICBjb25zdCBwa2dKc29uUGF0aCA9IHJlcXVpcmUucmVzb2x2ZShcInBucG0vcGFja2FnZS5qc29uXCIpO1xuICAgIGNvbnN0IHBrZyA9IHJlcXVpcmUocGtnSnNvblBhdGgpIGFzIHsgYmluOiBCaW5GaWVsZCB9O1xuICAgIGNvbnN0IGJpbiA9IHR5cGVvZiBwa2cuYmluID09PSBcInN0cmluZ1wiID8gcGtnLmJpbiA6IHBrZy5iaW4ucG5wbTtcbiAgICByZXR1cm4gW3Byb2Nlc3MuZXhlY1BhdGgsIGpvaW4oZGlybmFtZShwa2dKc29uUGF0aCksIGJpbildO1xuICB9IGNhdGNoIHtcbiAgICAvLyBmYWxsIHRocm91Z2hcbiAgfVxuXG4gIC8vIDIuIEEgYmFyZSBgcG5wbWAgYWxyZWFkeSBvbiBQQVRIIChlLmcuIHJ1bm5pbmcgdW5kZXIgYHBucG0gZGx4YCkuIFByZWZlclxuICAvLyAgICB0aGlzIG92ZXIgdGhlIGNvcmVwYWNrL25weCBmYWxsYmFja3Mgc28gd2UgbmV2ZXIgc2hlbGwgdGhyb3VnaCBucG0gLVxuICAvLyAgICBgbnB4IC15IHBucG1gIHJ1bnMgdW5kZXIgbnBtLCB3aGljaCByZWplY3RzIGEgYm9vdHN0cmFwcGVkXG4gIC8vICAgIGBkZXZFbmdpbmVzLnBhY2thZ2VNYW5hZ2VyOiBwbnBtYCBtYW5pZmVzdCB3aXRoIEVCQURERVZFTkdJTkVTLlxuICBpZiAocG5wbU9uUGF0aCgpKSByZXR1cm4gW1wicG5wbVwiXTtcblxuICAvLyAzLiBUcnkgdG8gZW5hYmxlIHBucG0gdmlhIGNvcmVwYWNrLCB0aGVuIHVzZSBpdC5cbiAgdHJ5IHtcbiAgICBleGVjLnNwYXduU3luYyhcImNvcmVwYWNrXCIsIFtcImVuYWJsZVwiLCBcInBucG1cIl0sIHtcbiAgICAgIHN0ZGVycjogXCJpZ25vcmVcIixcbiAgICAgIHN0ZGluOiBcImlnbm9yZVwiLFxuICAgICAgc3Rkb3V0OiBcImlnbm9yZVwiLFxuICAgICAgY2hlY2s6IHRydWUsXG4gICAgfSk7XG4gICAgaWYgKHBucG1PblBhdGgoKSkgcmV0dXJuIFtcInBucG1cIl07XG4gIH0gY2F0Y2gge1xuICAgIC8vIGZhbGwgdGhyb3VnaFxuICB9XG5cbiAgLy8gNC4gTGFzdCByZXNvcnQ6IGZldGNoIHBucG0gb24gZGVtYW5kIHZpYSBucHguIFBhc3MgYC0tZW5naW5lLXN0cmljdD1mYWxzZWBcbiAgLy8gICAgKGFuZCBza2lwIG5wbSdzIGRldkVuZ2luZXMgZ2F0ZSkgc28gbnBtIGRvZXNuJ3QgcmVmdXNlIHRvIHJ1biBqdXN0XG4gIC8vICAgIGJlY2F1c2UgdGhlIHRhcmdldCBtYW5pZmVzdCBkZWNsYXJlcyBgZGV2RW5naW5lcy5wYWNrYWdlTWFuYWdlcjogcG5wbWAuXG4gIHJldHVybiBbXCJucHhcIiwgXCIteVwiLCBcIi0tZW5naW5lLXN0cmljdD1mYWxzZVwiLCBcInBucG1cIl07XG59XG5cbi8qKiBNZW1vaXplZCBgW2NvbW1hbmQsIC4uLnByZWZpeF1gIGFyZ3YgcHJlZml4IHRvIHJ1biBwbnBtIChyZXNvbHZlZCBpbnN0YWxsLCBlbHNlIGNvcmVwYWNrLCBlbHNlIG5weCkuICovXG5leHBvcnQgY29uc3QgcmVzb2x2ZVBucG1Bcmd2ID0gZnVuY3Rpb25Nb2R1bGUubWVtb2l6ZShyZXNvbHZlUG5wbUFyZ3ZJbXBsKTtcblxuLyoqIFJ1biBwbnBtIHdpdGggaW5oZXJpdGVkIHN0ZGlvIGZyb20gYGN3ZGAuICovXG5leHBvcnQgZnVuY3Rpb24gcnVuUG5wbShhcmdzOiBzdHJpbmdbXSwgY3dkOiBzdHJpbmcpOiB2b2lkIHtcbiAgY29uc3QgW2NvbW1hbmQsIC4uLnByZWZpeF0gPSByZXNvbHZlUG5wbUFyZ3YoKTtcbiAgZXhlYy5zcGF3blN5bmMoY29tbWFuZCwgWy4uLnByZWZpeCwgLi4uYXJnc10sIHsgY3dkLCBjaGVjazogdHJ1ZSB9KTtcbn1cblxuLyoqIEluc3RhbGwgd29ya3NwYWNlIGRlcGVuZGVuY2llcyB3aGVuIGBub2RlX21vZHVsZXNgIG9yIHByb2plbiBpcyBtaXNzaW5nLiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGVuc3VyZVdvcmtzcGFjZVJlYWR5KHJvb3Q6IHN0cmluZyk6IHZvaWQge1xuICBpZiAobmVlZHNJbnN0YWxsKHJvb3QpKSB7XG4gICAgcnVuUG5wbShbXCJpbnN0YWxsXCIsIFwiLS1uby1mcm96ZW4tbG9ja2ZpbGVcIl0sIHJvb3QpO1xuICB9XG59XG5cbi8qKiBSdW4gYHBucG0gZXhlYyBwcm9qZW5gIHdpdGggdGhlIGdpdmVuIGFyZ3MgZnJvbSBgcm9vdGAuICovXG5leHBvcnQgZnVuY3Rpb24gcnVuUHJvamVuKGFyZ3M6IHN0cmluZ1tdLCByb290OiBzdHJpbmcpOiB2b2lkIHtcbiAgcnVuUG5wbShbXCJleGVjXCIsIFwicHJvamVuXCIsIC4uLmFyZ3NdLCByb290KTtcbn1cbiJdfQ==
|
|
179
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../src/pnpm.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * pnpm discovery, workspace install, and projen forwarding for the `dbx-tools` CLI.\n *\n * ## Forcing a custom registry\n *\n * pnpm and npm do NOT agree on how a registry is configured, and getting this\n * wrong is silent. Measured against pnpm 11.0.6 and npm 11:\n *\n * | mechanism                                | npm | pnpm |\n * | ---------------------------------------- | --- | ---- |\n * | `--registry <url>` CLI flag              | yes | yes  |\n * | project `.npmrc`                         | yes | yes  |\n * | `npm_config_registry` env var            | yes | NO   |\n *\n * So an env var alone reads back correctly from `npm config get registry` while\n * pnpm ignores it and silently falls through to its built-in\n * `https://registry.npmjs.org/`. That produced a bootstrap which logged the\n * local registry and then tried to fetch `typescript` / `projen` / `tsx` from\n * npmjs, failing with ECONNREFUSED on a machine that had no route to it.\n *\n * Hence all three channels, each where it actually applies:\n *\n *  - {@link pnpmRegistryArgs} passes `--registry` to pnpm, but only for the\n *    subcommands that resolve packages. It must NOT be appended to\n *    `pnpm exec <cmd>`, where trailing arguments belong to `<cmd>`, not pnpm.\n *  - {@link npxRegistryArgs} passes `--registry` to npx, before the package\n *    name, so the npx fallback can fetch pnpm itself from the same registry.\n *  - {@link childEnv} keeps `npm_config_registry` set for npm-based children\n *    (npx included), which is the only channel npm exposes to nested tools.\n *\n * `@dbx-tools/core`'s `npmRegistry({ overrideOnly: true })` returns nothing when\n * the effective registry IS npmjs, so none of this touches a default install.\n *\n * @module\n */\nimport { createRequire } from \"node:module\";\nimport { dirname, join } from \"node:path\";\nimport { exec, project } from \"@dbx-tools/core\";\nimport { functionModule, log } from \"@dbx-tools/shared-core\";\nimport { needsInstall } from \"./root.ts\";\n\nconst logger = log.logger(\"dbx-tools:pnpm\");\n\n/** A package.json `bin` field: either a single command string, or a name -> path map. */\ntype BinField = string | Record<string, string>;\n\n/**\n * pnpm subcommands that resolve packages from a registry, and therefore accept a\n * meaningful `--registry`. Everything else (`exec`, `run`, `config`, ...) is left\n * alone: `exec` in particular forwards trailing arguments to the command it runs,\n * so a `--registry` appended there would land on projen or tsx instead.\n */\nconst REGISTRY_SUBCOMMANDS = new Set([\n  \"add\",\n  \"create\",\n  \"dlx\",\n  \"i\",\n  \"import\",\n  \"init\",\n  \"install\",\n  \"link\",\n  \"up\",\n  \"update\",\n]);\n\n/**\n * The registry to force onto child package managers, or `undefined` when the\n * effective one is already the public default.\n *\n * `envVars: true` also consults `npm_config_registry` directly, because a\n * container may export it without any `.npmrc` for `npm config get` to read.\n * Memoized: resolution shells out to npm.\n */\nconst registryOverride = functionModule.memoize((): string | undefined =>\n  project.npmRegistry(null, { overrideOnly: true, envVars: true })?.toString(),\n);\n\n/** `--registry <url>` for npx, or `[]`. Placed BEFORE the package name by callers. */\nexport function npxRegistryArgs(): string[] {\n  const url = registryOverride();\n  return url ? [\"--registry\", url] : [];\n}\n\n/** `--registry <url>` for a pnpm invocation, or `[]` when the subcommand does not resolve. */\nexport function pnpmRegistryArgs(args: readonly string[]): string[] {\n  const url = registryOverride();\n  if (!url) return [];\n  const subcommand = args.find((arg) => !arg.startsWith(\"-\"));\n  return subcommand && REGISTRY_SUBCOMMANDS.has(subcommand) ? [\"--registry\", url] : [];\n}\n\n/**\n * `process.env` plus the registry under npm's env-var convention, for children\n * that read it (npm, npx, and anything they spawn). pnpm ignores it, which is\n * why the CLI flags above exist.\n */\nexport function childEnv(extra?: Record<string, string>): NodeJS.ProcessEnv {\n  const env: NodeJS.ProcessEnv = { ...process.env, ...extra };\n  const url = registryOverride();\n  if (url) {\n    // Both cases: env is case-sensitive on POSIX, and npm lowercases when reading.\n    env.npm_config_registry = url;\n    env.NPM_CONFIG_REGISTRY = url;\n  }\n  return env;\n}\n\n/** True when `pnpm --version` runs, i.e. pnpm is already on PATH. */\nfunction pnpmOnPath(): boolean {\n  try {\n    exec.spawnSync(\"pnpm\", [\"--version\"], {\n      stderr: \"ignore\",\n      stdin: \"ignore\",\n      stdout: \"ignore\",\n      check: true,\n    });\n    return true;\n  } catch {\n    return false;\n  }\n}\n\nfunction resolvePnpmArgvImpl(): string[] {\n  // 1. A resolvable `pnpm` dependency (the normal in-workspace case): run its\n  //    bin directly with the current node - no PATH or package-manager shim.\n  //    pnpm's own `--registry` rides in with the ARGS, after this entry point.\n  try {\n    const require = createRequire(import.meta.url);\n    const pkgJsonPath = require.resolve(\"pnpm/package.json\");\n    const pkg = require(pkgJsonPath) as { bin: BinField };\n    const bin = typeof pkg.bin === \"string\" ? pkg.bin : pkg.bin.pnpm;\n    if (bin) return [process.execPath, join(dirname(pkgJsonPath), bin)];\n  } catch {\n    // fall through\n  }\n\n  // 2. A bare `pnpm` already on PATH (e.g. running under `pnpm dlx`). Prefer\n  //    this over the corepack/npx fallbacks so we never shell through npm -\n  //    `npx -y pnpm` runs under npm, which rejects a bootstrapped\n  //    `devEngines.packageManager: pnpm` manifest with EBADDEVENGINES.\n  if (pnpmOnPath()) return [\"pnpm\"];\n\n  // 3. Try to enable pnpm via corepack, then use it.\n  try {\n    exec.spawnSync(\"corepack\", [\"enable\", \"pnpm\"], {\n      stderr: \"ignore\",\n      stdin: \"ignore\",\n      stdout: \"ignore\",\n      check: true,\n    });\n    if (pnpmOnPath()) return [\"pnpm\"];\n  } catch {\n    // fall through\n  }\n\n  // 4. Last resort: fetch pnpm on demand via npx. Pass `--engine-strict=false`\n  //    (and skip npm's devEngines gate) so npm doesn't refuse to run just\n  //    because the target manifest declares `devEngines.packageManager: pnpm`.\n  //    npm-level flags, `--registry` among them, must precede the package name,\n  //    or npx forwards them to pnpm instead of acting on them itself.\n  return [\"npx\", ...npxRegistryArgs(), \"-y\", \"--engine-strict=false\", \"pnpm\"];\n}\n\n/** Memoized `[command, ...prefix]` argv prefix to run pnpm (resolved install, else corepack, else npx). */\nexport const resolvePnpmArgv = functionModule.memoize(resolvePnpmArgvImpl);\n\n/** Run pnpm with inherited stdio from `cwd`, forcing the resolved registry. */\nexport function runPnpm(args: string[], cwd: string): void {\n  const [command, ...prefix] = resolvePnpmArgv();\n  const registryArgs = pnpmRegistryArgs(args);\n  if (registryArgs.length > 0) {\n    logger.info(`running pnpm with registry: ${registryArgs[1]}`);\n  }\n  exec.spawnSync(command, [...prefix, ...args, ...registryArgs], {\n    cwd,\n    check: true,\n    env: childEnv(),\n  });\n}\n\n/** Install workspace dependencies when `node_modules` or projen is missing. */\nexport function ensureWorkspaceReady(root: string): void {\n  if (needsInstall(root)) {\n    runPnpm([\"install\", \"--no-frozen-lockfile\"], root);\n  }\n}\n\n/** Run `pnpm exec projen` with the given args from `root`. */\nexport function runProjen(args: string[], root: string): void {\n  runPnpm([\"exec\", \"projen\", ...args], root);\n}\n"]}
|
package/package.json
CHANGED
|
@@ -18,15 +18,15 @@
|
|
|
18
18
|
"@clack/prompts": "^1.7.0",
|
|
19
19
|
"commander": "^15.0.0",
|
|
20
20
|
"pnpm": "^11.0.6",
|
|
21
|
-
"@dbx-tools/core": "0.6.
|
|
22
|
-
"@dbx-tools/shared-core": "0.6.
|
|
21
|
+
"@dbx-tools/core": "0.6.27",
|
|
22
|
+
"@dbx-tools/shared-core": "0.6.27"
|
|
23
23
|
},
|
|
24
24
|
"main": "./lib/index.js",
|
|
25
25
|
"license": "UNLICENSED",
|
|
26
26
|
"publishConfig": {
|
|
27
27
|
"access": "public"
|
|
28
28
|
},
|
|
29
|
-
"version": "0.6.
|
|
29
|
+
"version": "0.6.27",
|
|
30
30
|
"types": "./lib/index.d.ts",
|
|
31
31
|
"type": "module",
|
|
32
32
|
"exports": {
|
package/src/bootstrap.ts
CHANGED
|
@@ -7,9 +7,9 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
|
7
7
|
import { join } from "node:path";
|
|
8
8
|
import { fileURLToPath } from "node:url";
|
|
9
9
|
import { intro, outro } from "@clack/prompts";
|
|
10
|
-
import { exec } from "@dbx-tools/core";
|
|
10
|
+
import { exec, project } from "@dbx-tools/core";
|
|
11
11
|
import { json } from "@dbx-tools/shared-core";
|
|
12
|
-
import { resolvePnpmArgv, runPnpm } from "./pnpm.ts";
|
|
12
|
+
import { childEnv, resolvePnpmArgv, runPnpm } from "./pnpm.ts";
|
|
13
13
|
import { rootLabel } from "./root.ts";
|
|
14
14
|
|
|
15
15
|
/** Fallback when this CLI's own version isn't a real release (an in-repo `0.0.0`). */
|
|
@@ -157,9 +157,32 @@ export function seedToolchain(
|
|
|
157
157
|
writeFileSync(workspaceFile, WORKSPACE_SEED);
|
|
158
158
|
}
|
|
159
159
|
|
|
160
|
+
seedRegistry(root);
|
|
161
|
+
|
|
160
162
|
runPnpm(["add", "-D", "projen", "typescript@^5.9.3", "tsx@^4.23.0", projenSpecifier], root);
|
|
161
163
|
}
|
|
162
164
|
|
|
165
|
+
/**
|
|
166
|
+
* Pin a non-default registry into the new root's `.npmrc`.
|
|
167
|
+
*
|
|
168
|
+
* The CLI already forces `--registry` onto the pnpm invocations it makes itself,
|
|
169
|
+
* but a bootstrapped workspace outlives this process: every later `pnpm install`
|
|
170
|
+
* the developer (or projen's post-synth step) runs is on its own. pnpm ignores
|
|
171
|
+
* `npm_config_registry` from the environment, so without a file on disk those
|
|
172
|
+
* runs revert to `https://registry.npmjs.org/` - which is a hard failure where
|
|
173
|
+
* the custom registry was the only reachable one.
|
|
174
|
+
*
|
|
175
|
+
* Only writes for an actual override, never creates a file just to name npmjs,
|
|
176
|
+
* and never overwrites an existing `.npmrc` (the developer's own wins).
|
|
177
|
+
*/
|
|
178
|
+
function seedRegistry(root: string): void {
|
|
179
|
+
const registry = project.npmRegistry(null, { overrideOnly: true, envVars: true })?.toString();
|
|
180
|
+
if (!registry) return;
|
|
181
|
+
const npmrc = join(root, ".npmrc");
|
|
182
|
+
if (existsSync(npmrc)) return;
|
|
183
|
+
writeFileSync(npmrc, `registry=${registry}\n`);
|
|
184
|
+
}
|
|
185
|
+
|
|
163
186
|
/**
|
|
164
187
|
* Make what `pnpm init` produced safe to synth against. Two corrections, both
|
|
165
188
|
* because that output varies by pnpm version:
|
|
@@ -195,9 +218,12 @@ function normalizeSeedManifest(manifestPath: string): void {
|
|
|
195
218
|
*/
|
|
196
219
|
export function runInitialSynth(root: string): void {
|
|
197
220
|
const [command, ...prefix] = resolvePnpmArgv();
|
|
221
|
+
// No `--registry` here: this is `pnpm exec`, whose trailing arguments belong to
|
|
222
|
+
// tsx. The registry reaches anything nested through `childEnv` and the seeded
|
|
223
|
+
// `.npmrc` instead.
|
|
198
224
|
exec.spawnSync(command, [...prefix, "exec", "tsx", ".projenrc.ts"], {
|
|
199
225
|
cwd: root,
|
|
200
|
-
env: {
|
|
226
|
+
env: childEnv({ PROJEN_DISABLE_POST: "true" }),
|
|
201
227
|
check: true,
|
|
202
228
|
});
|
|
203
229
|
}
|
package/src/pnpm.ts
CHANGED
|
@@ -1,17 +1,110 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* pnpm discovery, workspace install, and projen forwarding for the `dbx-tools` CLI.
|
|
3
3
|
*
|
|
4
|
+
* ## Forcing a custom registry
|
|
5
|
+
*
|
|
6
|
+
* pnpm and npm do NOT agree on how a registry is configured, and getting this
|
|
7
|
+
* wrong is silent. Measured against pnpm 11.0.6 and npm 11:
|
|
8
|
+
*
|
|
9
|
+
* | mechanism | npm | pnpm |
|
|
10
|
+
* | ---------------------------------------- | --- | ---- |
|
|
11
|
+
* | `--registry <url>` CLI flag | yes | yes |
|
|
12
|
+
* | project `.npmrc` | yes | yes |
|
|
13
|
+
* | `npm_config_registry` env var | yes | NO |
|
|
14
|
+
*
|
|
15
|
+
* So an env var alone reads back correctly from `npm config get registry` while
|
|
16
|
+
* pnpm ignores it and silently falls through to its built-in
|
|
17
|
+
* `https://registry.npmjs.org/`. That produced a bootstrap which logged the
|
|
18
|
+
* local registry and then tried to fetch `typescript` / `projen` / `tsx` from
|
|
19
|
+
* npmjs, failing with ECONNREFUSED on a machine that had no route to it.
|
|
20
|
+
*
|
|
21
|
+
* Hence all three channels, each where it actually applies:
|
|
22
|
+
*
|
|
23
|
+
* - {@link pnpmRegistryArgs} passes `--registry` to pnpm, but only for the
|
|
24
|
+
* subcommands that resolve packages. It must NOT be appended to
|
|
25
|
+
* `pnpm exec <cmd>`, where trailing arguments belong to `<cmd>`, not pnpm.
|
|
26
|
+
* - {@link npxRegistryArgs} passes `--registry` to npx, before the package
|
|
27
|
+
* name, so the npx fallback can fetch pnpm itself from the same registry.
|
|
28
|
+
* - {@link childEnv} keeps `npm_config_registry` set for npm-based children
|
|
29
|
+
* (npx included), which is the only channel npm exposes to nested tools.
|
|
30
|
+
*
|
|
31
|
+
* `@dbx-tools/core`'s `npmRegistry({ overrideOnly: true })` returns nothing when
|
|
32
|
+
* the effective registry IS npmjs, so none of this touches a default install.
|
|
33
|
+
*
|
|
4
34
|
* @module
|
|
5
35
|
*/
|
|
6
36
|
import { createRequire } from "node:module";
|
|
7
37
|
import { dirname, join } from "node:path";
|
|
8
|
-
import { exec } from "@dbx-tools/core";
|
|
9
|
-
import { functionModule } from "@dbx-tools/shared-core";
|
|
38
|
+
import { exec, project } from "@dbx-tools/core";
|
|
39
|
+
import { functionModule, log } from "@dbx-tools/shared-core";
|
|
10
40
|
import { needsInstall } from "./root.ts";
|
|
11
41
|
|
|
42
|
+
const logger = log.logger("dbx-tools:pnpm");
|
|
43
|
+
|
|
12
44
|
/** A package.json `bin` field: either a single command string, or a name -> path map. */
|
|
13
45
|
type BinField = string | Record<string, string>;
|
|
14
46
|
|
|
47
|
+
/**
|
|
48
|
+
* pnpm subcommands that resolve packages from a registry, and therefore accept a
|
|
49
|
+
* meaningful `--registry`. Everything else (`exec`, `run`, `config`, ...) is left
|
|
50
|
+
* alone: `exec` in particular forwards trailing arguments to the command it runs,
|
|
51
|
+
* so a `--registry` appended there would land on projen or tsx instead.
|
|
52
|
+
*/
|
|
53
|
+
const REGISTRY_SUBCOMMANDS = new Set([
|
|
54
|
+
"add",
|
|
55
|
+
"create",
|
|
56
|
+
"dlx",
|
|
57
|
+
"i",
|
|
58
|
+
"import",
|
|
59
|
+
"init",
|
|
60
|
+
"install",
|
|
61
|
+
"link",
|
|
62
|
+
"up",
|
|
63
|
+
"update",
|
|
64
|
+
]);
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* The registry to force onto child package managers, or `undefined` when the
|
|
68
|
+
* effective one is already the public default.
|
|
69
|
+
*
|
|
70
|
+
* `envVars: true` also consults `npm_config_registry` directly, because a
|
|
71
|
+
* container may export it without any `.npmrc` for `npm config get` to read.
|
|
72
|
+
* Memoized: resolution shells out to npm.
|
|
73
|
+
*/
|
|
74
|
+
const registryOverride = functionModule.memoize((): string | undefined =>
|
|
75
|
+
project.npmRegistry(null, { overrideOnly: true, envVars: true })?.toString(),
|
|
76
|
+
);
|
|
77
|
+
|
|
78
|
+
/** `--registry <url>` for npx, or `[]`. Placed BEFORE the package name by callers. */
|
|
79
|
+
export function npxRegistryArgs(): string[] {
|
|
80
|
+
const url = registryOverride();
|
|
81
|
+
return url ? ["--registry", url] : [];
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/** `--registry <url>` for a pnpm invocation, or `[]` when the subcommand does not resolve. */
|
|
85
|
+
export function pnpmRegistryArgs(args: readonly string[]): string[] {
|
|
86
|
+
const url = registryOverride();
|
|
87
|
+
if (!url) return [];
|
|
88
|
+
const subcommand = args.find((arg) => !arg.startsWith("-"));
|
|
89
|
+
return subcommand && REGISTRY_SUBCOMMANDS.has(subcommand) ? ["--registry", url] : [];
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* `process.env` plus the registry under npm's env-var convention, for children
|
|
94
|
+
* that read it (npm, npx, and anything they spawn). pnpm ignores it, which is
|
|
95
|
+
* why the CLI flags above exist.
|
|
96
|
+
*/
|
|
97
|
+
export function childEnv(extra?: Record<string, string>): NodeJS.ProcessEnv {
|
|
98
|
+
const env: NodeJS.ProcessEnv = { ...process.env, ...extra };
|
|
99
|
+
const url = registryOverride();
|
|
100
|
+
if (url) {
|
|
101
|
+
// Both cases: env is case-sensitive on POSIX, and npm lowercases when reading.
|
|
102
|
+
env.npm_config_registry = url;
|
|
103
|
+
env.NPM_CONFIG_REGISTRY = url;
|
|
104
|
+
}
|
|
105
|
+
return env;
|
|
106
|
+
}
|
|
107
|
+
|
|
15
108
|
/** True when `pnpm --version` runs, i.e. pnpm is already on PATH. */
|
|
16
109
|
function pnpmOnPath(): boolean {
|
|
17
110
|
try {
|
|
@@ -30,12 +123,13 @@ function pnpmOnPath(): boolean {
|
|
|
30
123
|
function resolvePnpmArgvImpl(): string[] {
|
|
31
124
|
// 1. A resolvable `pnpm` dependency (the normal in-workspace case): run its
|
|
32
125
|
// bin directly with the current node - no PATH or package-manager shim.
|
|
126
|
+
// pnpm's own `--registry` rides in with the ARGS, after this entry point.
|
|
33
127
|
try {
|
|
34
128
|
const require = createRequire(import.meta.url);
|
|
35
129
|
const pkgJsonPath = require.resolve("pnpm/package.json");
|
|
36
130
|
const pkg = require(pkgJsonPath) as { bin: BinField };
|
|
37
131
|
const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin.pnpm;
|
|
38
|
-
return [process.execPath, join(dirname(pkgJsonPath), bin)];
|
|
132
|
+
if (bin) return [process.execPath, join(dirname(pkgJsonPath), bin)];
|
|
39
133
|
} catch {
|
|
40
134
|
// fall through
|
|
41
135
|
}
|
|
@@ -62,16 +156,26 @@ function resolvePnpmArgvImpl(): string[] {
|
|
|
62
156
|
// 4. Last resort: fetch pnpm on demand via npx. Pass `--engine-strict=false`
|
|
63
157
|
// (and skip npm's devEngines gate) so npm doesn't refuse to run just
|
|
64
158
|
// because the target manifest declares `devEngines.packageManager: pnpm`.
|
|
65
|
-
|
|
159
|
+
// npm-level flags, `--registry` among them, must precede the package name,
|
|
160
|
+
// or npx forwards them to pnpm instead of acting on them itself.
|
|
161
|
+
return ["npx", ...npxRegistryArgs(), "-y", "--engine-strict=false", "pnpm"];
|
|
66
162
|
}
|
|
67
163
|
|
|
68
164
|
/** Memoized `[command, ...prefix]` argv prefix to run pnpm (resolved install, else corepack, else npx). */
|
|
69
165
|
export const resolvePnpmArgv = functionModule.memoize(resolvePnpmArgvImpl);
|
|
70
166
|
|
|
71
|
-
/** Run pnpm with inherited stdio from `cwd
|
|
167
|
+
/** Run pnpm with inherited stdio from `cwd`, forcing the resolved registry. */
|
|
72
168
|
export function runPnpm(args: string[], cwd: string): void {
|
|
73
169
|
const [command, ...prefix] = resolvePnpmArgv();
|
|
74
|
-
|
|
170
|
+
const registryArgs = pnpmRegistryArgs(args);
|
|
171
|
+
if (registryArgs.length > 0) {
|
|
172
|
+
logger.info(`running pnpm with registry: ${registryArgs[1]}`);
|
|
173
|
+
}
|
|
174
|
+
exec.spawnSync(command, [...prefix, ...args, ...registryArgs], {
|
|
175
|
+
cwd,
|
|
176
|
+
check: true,
|
|
177
|
+
env: childEnv(),
|
|
178
|
+
});
|
|
75
179
|
}
|
|
76
180
|
|
|
77
181
|
/** Install workspace dependencies when `node_modules` or projen is missing. */
|