From 38e557a1effdde3308eb3b3050c6a9231c3a44a6 Mon Sep 17 00:00:00 2001 From: ianwremmel <1182361+ianwremmel@users.noreply.github.com> Date: Sun, 9 Jun 2024 10:14:58 -0700 Subject: [PATCH] feat: remove carpentry condition --- .env | 1 - README.md | 23 ------------------- .../nx/executors/package-json/executor.mjs | 2 -- packages/@clc/nx/src/helpers.mjs | 7 ++---- .../aws-env-loader/package.json | 2 -- .../cli-plugin-example/package.json | 2 -- .../@code-like-a-carpenter/cli/package.json | 2 -- .../contract-tests/package.json | 2 -- .../dotenv/package.json | 2 -- .../errors/package.json | 2 -- .../exception/package.json | 2 -- .../package.json | 2 -- .../foundation-parser/package.json | 2 -- .../package.json | 2 -- .../foundation-plugin-typescript/package.json | 2 -- .../foundation-runtime/package.json | 2 -- .../package.json | 2 -- .../graphql-codegen-helpers/package.json | 2 -- .../interact/package.json | 2 -- .../lambda-handlers/package.json | 2 -- .../logger/package.json | 2 -- .../parallel/package.json | 2 -- .../sentry/package.json | 2 -- .../telemetry/package.json | 2 -- .../tool-foundation/package.json | 2 -- .../wait-for/package.json | 2 -- 26 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 1023d5da..00000000 --- a/.env +++ /dev/null @@ -1 +0,0 @@ -NODE_OPTIONS='--conditions=carpentry' diff --git a/README.md b/README.md index f25143fc..611443d4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ - [Contribute](#contribute) - [nx](#nx) - [`@clc` vs `@code-like-a-carpenter`](#clc-vs-code-like-a-carpenter) - - [Local development without building first](#local-development-without-building-first) - [License](#license) @@ -92,28 +91,6 @@ only does this plugin need to a different package.json layout (it's `main` entry needs to point to a typescript file, not a built file), it just wouldn't make sense outside the context of this particular repository. -### Local development without building first - -In addition to `cjs`/`esm` entries in each package's export map, there's also a -`carpentry` entry which exports the typescript source code. By setting -`NODE_OPTIONS='--conditions=carpentry`, `nx` _should_ be able to use project -code without building it first. - -If you're debugging a cli, you can also `--import tsx` during development to run -without building everything first: - -```sh -NODE_OPTIONS='--conditions=carpentry --import tsx' npx @code-like-a-carpenter/cli -``` - -This approach isn't fully compatible with `nx` yet. By setting `--import tsx`, -`nx` ends up with libraries vying to import typescript files and errors. Since -`--import` cannot be set on the environment when using `nx`, `nx` cannot call -local clis that need to be transpiled on the fly. Either they need to be build -before they get invoked as an `nx` target or (prefferably), they would also -export an `nx` executor that can be called directly. If we don't need to shell -out to a subprocess, we can rely on `nx`'s automatically registered swc/node - ## License MIT © [Ian Remmel](https://github.com/ianwremmel) 2019 until at least now diff --git a/packages/@clc/nx/executors/package-json/executor.mjs b/packages/@clc/nx/executors/package-json/executor.mjs index 6b08a57b..9d885201 100644 --- a/packages/@clc/nx/executors/package-json/executor.mjs +++ b/packages/@clc/nx/executors/package-json/executor.mjs @@ -78,7 +78,6 @@ async function config(pkg, mjs, mts, type, context) { import: { types: mjs || mts ? './dist/types/index.d.mts' : './dist/types/index.d.ts', - ...(mjs ? {} : {carpentry: mts ? './src/index.mts' : './src/index.ts'}), default: mjs ? './src/index.mjs' : './dist/esm/index.mjs', }, require: { @@ -86,7 +85,6 @@ async function config(pkg, mjs, mts, type, context) { mjs || mts ? './dist/cjs-types/index.d.ts' : './dist/types/index.d.ts', - ...(mjs ? {} : {carpentry: mts ? './src/index.mts' : './src/index.ts'}), default: './dist/cjs/index.cjs', }, /* eslint-enable sort-keys */ diff --git a/packages/@clc/nx/src/helpers.mjs b/packages/@clc/nx/src/helpers.mjs index d3fd37e6..5aabccda 100644 --- a/packages/@clc/nx/src/helpers.mjs +++ b/packages/@clc/nx/src/helpers.mjs @@ -1,5 +1,7 @@ import assert from 'node:assert'; +import {writePrettierFile} from '@code-like-a-carpenter/tooling-common'; + /** @typedef {import('@nx/devkit').ExecutorContext} ExecutorContext */ /** @typedef {import('@schemastore/package')} JSONSchemaForNPMPackageJsonFiles */ @@ -31,10 +33,5 @@ export function extractProjectRoot(context) { * @param {JSONSchemaForNPMPackageJsonFiles} pkg */ export async function writePackageJson(filename, pkg) { - // This needs to be late-imported because nx doesn't do its dotenv loading - // early enough, so --conditions=carpentry isn't yet set. - const {writePrettierFile} = await import( - '@code-like-a-carpenter/tooling-common' - ); await writePrettierFile(filename, JSON.stringify(pkg, null, 2)); } diff --git a/packages/@code-like-a-carpenter/aws-env-loader/package.json b/packages/@code-like-a-carpenter/aws-env-loader/package.json index 853145a5..54a273e7 100644 --- a/packages/@code-like-a-carpenter/aws-env-loader/package.json +++ b/packages/@code-like-a-carpenter/aws-env-loader/package.json @@ -5,12 +5,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/cli-plugin-example/package.json b/packages/@code-like-a-carpenter/cli-plugin-example/package.json index e7ad8970..80049b51 100644 --- a/packages/@code-like-a-carpenter/cli-plugin-example/package.json +++ b/packages/@code-like-a-carpenter/cli-plugin-example/package.json @@ -14,12 +14,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/cli/package.json b/packages/@code-like-a-carpenter/cli/package.json index 37e9908d..2f04c75d 100644 --- a/packages/@code-like-a-carpenter/cli/package.json +++ b/packages/@code-like-a-carpenter/cli/package.json @@ -39,12 +39,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/contract-tests/package.json b/packages/@code-like-a-carpenter/contract-tests/package.json index c950a248..5b734fa8 100644 --- a/packages/@code-like-a-carpenter/contract-tests/package.json +++ b/packages/@code-like-a-carpenter/contract-tests/package.json @@ -16,12 +16,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/dotenv/package.json b/packages/@code-like-a-carpenter/dotenv/package.json index 58fa7199..7ced3fff 100644 --- a/packages/@code-like-a-carpenter/dotenv/package.json +++ b/packages/@code-like-a-carpenter/dotenv/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/errors/package.json b/packages/@code-like-a-carpenter/errors/package.json index f3ba64bb..582ca642 100644 --- a/packages/@code-like-a-carpenter/errors/package.json +++ b/packages/@code-like-a-carpenter/errors/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/exception/package.json b/packages/@code-like-a-carpenter/exception/package.json index 985d41fe..4e266643 100644 --- a/packages/@code-like-a-carpenter/exception/package.json +++ b/packages/@code-like-a-carpenter/exception/package.json @@ -5,12 +5,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/foundation-intermediate-representation/package.json b/packages/@code-like-a-carpenter/foundation-intermediate-representation/package.json index 36954224..3d88f0b8 100644 --- a/packages/@code-like-a-carpenter/foundation-intermediate-representation/package.json +++ b/packages/@code-like-a-carpenter/foundation-intermediate-representation/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/foundation-parser/package.json b/packages/@code-like-a-carpenter/foundation-parser/package.json index 6ce31740..c8542e2a 100644 --- a/packages/@code-like-a-carpenter/foundation-parser/package.json +++ b/packages/@code-like-a-carpenter/foundation-parser/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/foundation-plugin-cloudformation/package.json b/packages/@code-like-a-carpenter/foundation-plugin-cloudformation/package.json index b42642c2..6bb1b077 100644 --- a/packages/@code-like-a-carpenter/foundation-plugin-cloudformation/package.json +++ b/packages/@code-like-a-carpenter/foundation-plugin-cloudformation/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/foundation-plugin-typescript/package.json b/packages/@code-like-a-carpenter/foundation-plugin-typescript/package.json index af89ef52..67796ce3 100644 --- a/packages/@code-like-a-carpenter/foundation-plugin-typescript/package.json +++ b/packages/@code-like-a-carpenter/foundation-plugin-typescript/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/foundation-runtime/package.json b/packages/@code-like-a-carpenter/foundation-runtime/package.json index 6d08a72d..7a27d273 100644 --- a/packages/@code-like-a-carpenter/foundation-runtime/package.json +++ b/packages/@code-like-a-carpenter/foundation-runtime/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/foundation-transform-environment/package.json b/packages/@code-like-a-carpenter/foundation-transform-environment/package.json index 7a82578e..05bf04bb 100644 --- a/packages/@code-like-a-carpenter/foundation-transform-environment/package.json +++ b/packages/@code-like-a-carpenter/foundation-transform-environment/package.json @@ -15,12 +15,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/graphql-codegen-helpers/package.json b/packages/@code-like-a-carpenter/graphql-codegen-helpers/package.json index cc1bb64d..f067be23 100644 --- a/packages/@code-like-a-carpenter/graphql-codegen-helpers/package.json +++ b/packages/@code-like-a-carpenter/graphql-codegen-helpers/package.json @@ -14,12 +14,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/interact/package.json b/packages/@code-like-a-carpenter/interact/package.json index 714f9596..d9ccc3ae 100644 --- a/packages/@code-like-a-carpenter/interact/package.json +++ b/packages/@code-like-a-carpenter/interact/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/lambda-handlers/package.json b/packages/@code-like-a-carpenter/lambda-handlers/package.json index da318d3c..656e1ab6 100644 --- a/packages/@code-like-a-carpenter/lambda-handlers/package.json +++ b/packages/@code-like-a-carpenter/lambda-handlers/package.json @@ -20,12 +20,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/logger/package.json b/packages/@code-like-a-carpenter/logger/package.json index bff4341b..473f796f 100644 --- a/packages/@code-like-a-carpenter/logger/package.json +++ b/packages/@code-like-a-carpenter/logger/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/parallel/package.json b/packages/@code-like-a-carpenter/parallel/package.json index 66189256..7522f660 100644 --- a/packages/@code-like-a-carpenter/parallel/package.json +++ b/packages/@code-like-a-carpenter/parallel/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/sentry/package.json b/packages/@code-like-a-carpenter/sentry/package.json index 7966c13e..151c202a 100644 --- a/packages/@code-like-a-carpenter/sentry/package.json +++ b/packages/@code-like-a-carpenter/sentry/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/telemetry/package.json b/packages/@code-like-a-carpenter/telemetry/package.json index 3e9d705f..21527d2e 100644 --- a/packages/@code-like-a-carpenter/telemetry/package.json +++ b/packages/@code-like-a-carpenter/telemetry/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/tool-foundation/package.json b/packages/@code-like-a-carpenter/tool-foundation/package.json index bb1c1f1b..74ba334e 100644 --- a/packages/@code-like-a-carpenter/tool-foundation/package.json +++ b/packages/@code-like-a-carpenter/tool-foundation/package.json @@ -11,12 +11,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } }, diff --git a/packages/@code-like-a-carpenter/wait-for/package.json b/packages/@code-like-a-carpenter/wait-for/package.json index bc9436bb..9118f835 100644 --- a/packages/@code-like-a-carpenter/wait-for/package.json +++ b/packages/@code-like-a-carpenter/wait-for/package.json @@ -10,12 +10,10 @@ ".": { "import": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/esm/index.mjs" }, "require": { "types": "./dist/types/index.d.ts", - "carpentry": "./src/index.ts", "default": "./dist/cjs/index.cjs" } },