From 9b93ec4b28e16b795926900158c200957fd41ffa Mon Sep 17 00:00:00 2001 From: David Alsh Date: Thu, 19 Dec 2024 07:45:05 +0000 Subject: [PATCH] cli exports --- packages/core/cli/{src => }/.eslintrc.json | 0 packages/core/cli/.npmignore | 1 - packages/core/cli/bin/atlaspack-lib.cjs | 2 ++ packages/core/cli/bin/atlaspack-src.cjs | 2 ++ packages/core/cli/bin/atlaspack.cjs | 13 +++++++++++++ packages/core/cli/bin/atlaspack.js | 2 -- packages/core/cli/bin/dev-bin.js | 8 -------- packages/core/cli/ensure-no-dev-lib.sh | 1 - packages/core/cli/package.json | 12 +++++++++--- packages/core/cli/src/bin.js | 12 ------------ 10 files changed, 26 insertions(+), 27 deletions(-) rename packages/core/cli/{src => }/.eslintrc.json (100%) delete mode 100644 packages/core/cli/.npmignore create mode 100755 packages/core/cli/bin/atlaspack-lib.cjs create mode 100644 packages/core/cli/bin/atlaspack-src.cjs create mode 100755 packages/core/cli/bin/atlaspack.cjs delete mode 100755 packages/core/cli/bin/atlaspack.js delete mode 100644 packages/core/cli/bin/dev-bin.js delete mode 120000 packages/core/cli/ensure-no-dev-lib.sh delete mode 100755 packages/core/cli/src/bin.js diff --git a/packages/core/cli/src/.eslintrc.json b/packages/core/cli/.eslintrc.json similarity index 100% rename from packages/core/cli/src/.eslintrc.json rename to packages/core/cli/.eslintrc.json diff --git a/packages/core/cli/.npmignore b/packages/core/cli/.npmignore deleted file mode 100644 index e0da44dd4..000000000 --- a/packages/core/cli/.npmignore +++ /dev/null @@ -1 +0,0 @@ -/bin/dev-bin.js diff --git a/packages/core/cli/bin/atlaspack-lib.cjs b/packages/core/cli/bin/atlaspack-lib.cjs new file mode 100755 index 000000000..59778c0fc --- /dev/null +++ b/packages/core/cli/bin/atlaspack-lib.cjs @@ -0,0 +1,2 @@ +#!/usr/bin/env node +require('../lib/cli.js'); diff --git a/packages/core/cli/bin/atlaspack-src.cjs b/packages/core/cli/bin/atlaspack-src.cjs new file mode 100644 index 000000000..984f10b7b --- /dev/null +++ b/packages/core/cli/bin/atlaspack-src.cjs @@ -0,0 +1,2 @@ +require('@atlaspack/babel-register'); +require('../src/cli.js'); diff --git a/packages/core/cli/bin/atlaspack.cjs b/packages/core/cli/bin/atlaspack.cjs new file mode 100755 index 000000000..35f1d0dc8 --- /dev/null +++ b/packages/core/cli/bin/atlaspack.cjs @@ -0,0 +1,13 @@ +#!/usr/bin/env node + +/* + This will conditionally require the source or dist files + based on the condition supplied when initializing Atlaspack + + # Will use dist + npx atlaspack build + + # Will use sources + env NODE_OPTIONS="conditions=@atlaspack::sources" npx atlaspack build +*/ +require("#bin") diff --git a/packages/core/cli/bin/atlaspack.js b/packages/core/cli/bin/atlaspack.js deleted file mode 100755 index aacb05696..000000000 --- a/packages/core/cli/bin/atlaspack.js +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env node -require('../lib/bin'); diff --git a/packages/core/cli/bin/dev-bin.js b/packages/core/cli/bin/dev-bin.js deleted file mode 100644 index 05eef79da..000000000 --- a/packages/core/cli/bin/dev-bin.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * DEV BIN - DO NOT PUBLISH - * - * This file is copied into /lib/ by `yarn run dev:prepare` - * - * When babel build runs it is overwritten by another asset. - */ -require('../src/bin'); diff --git a/packages/core/cli/ensure-no-dev-lib.sh b/packages/core/cli/ensure-no-dev-lib.sh deleted file mode 120000 index 4fcc6cbb5..000000000 --- a/packages/core/cli/ensure-no-dev-lib.sh +++ /dev/null @@ -1 +0,0 @@ -../../../scripts/ensure-no-dev-lib.sh \ No newline at end of file diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 9046b885b..0648f1c85 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -11,10 +11,16 @@ "url": "https://github.com/atlassian-labs/atlaspack.git" }, "bin": { - "atlaspack": "bin/atlaspack.js" + "atlaspack": "./bin/atlaspack.cjs" + }, + "main": "./bin/atlaspack-lib.cjs", + "source": "./bin/atlaspack-src.cjs", + "imports": { + "#bin": { + "@atlaspack::sources": "./bin/atlaspack-src.cjs", + "default": "./bin/atlaspack-lib.cjs" + } }, - "main": "lib/bin.js", - "source": "src/bin.js", "scripts": { "prepack": "./ensure-no-dev-lib.sh", "dev:prepare": "rimraf ./lib/ && mkdir -p lib && cp ./bin/dev-bin.js ./lib/bin.js" diff --git a/packages/core/cli/src/bin.js b/packages/core/cli/src/bin.js deleted file mode 100755 index 51f9a8616..000000000 --- a/packages/core/cli/src/bin.js +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env node - -'use strict'; - -if ( - process.env.ATLASPACK_BUILD_ENV !== 'production' || - process.env.ATLASPACK_SELF_BUILD -) { - require('@atlaspack/babel-register'); -} - -require('./cli');