From f9a4ecdfbece96db318839e2b8ca7a397a050be0 Mon Sep 17 00:00:00 2001 From: theseanl Date: Sun, 28 Jan 2024 15:52:37 +0900 Subject: [PATCH] Revert "build: use import instead of _bundle" This reverts commit af5e25db23af938d4126b205870299692e4972da. --- packages/structured-clone/build.js | 1 + packages/structured-clone/package.json | 8 +-- packages/support-tables/build.js | 1 + packages/unified-latex-builder/build.js | 1 + packages/unified-latex-builder/package.json | 8 +-- packages/unified-latex-cli/package.json | 8 +-- packages/unified-latex-cli/tests/cli.test.ts | 70 ++++++++----------- packages/unified-latex-ctan/build.js | 1 + packages/unified-latex-ctan/package.json | 12 ++-- packages/unified-latex-lint/build.js | 1 + packages/unified-latex-lint/package.json | 12 ++-- packages/unified-latex-prettier/build.js | 1 + packages/unified-latex-prettier/package.json | 8 +-- packages/unified-latex-to-hast/build.js | 1 + packages/unified-latex-to-hast/package.json | 8 +-- packages/unified-latex-to-mdast/build.js | 1 + packages/unified-latex-to-mdast/package.json | 8 +-- packages/unified-latex-types/package.json | 6 +- packages/unified-latex-util-align/build.js | 1 + .../unified-latex-util-align/package.json | 8 +-- packages/unified-latex-util-argspec/build.js | 1 + .../unified-latex-util-argspec/package.json | 8 +-- .../unified-latex-util-arguments/build.js | 1 + .../unified-latex-util-arguments/package.json | 8 +-- packages/unified-latex-util-catcode/build.js | 1 + .../unified-latex-util-catcode/package.json | 8 +-- packages/unified-latex-util-comments/build.js | 1 + .../unified-latex-util-comments/package.json | 8 +-- .../unified-latex-util-environments/build.js | 1 + .../package.json | 8 +-- packages/unified-latex-util-glue/build.js | 1 + packages/unified-latex-util-glue/package.json | 8 +-- .../unified-latex-util-html-like/build.js | 1 + .../unified-latex-util-html-like/package.json | 8 +-- .../unified-latex-util-ligatures/build.js | 1 + .../unified-latex-util-ligatures/package.json | 8 +-- packages/unified-latex-util-macros/build.js | 1 + .../unified-latex-util-macros/package.json | 8 +-- packages/unified-latex-util-match/build.js | 1 + .../unified-latex-util-match/package.json | 8 +-- packages/unified-latex-util-packages/build.js | 1 + .../unified-latex-util-packages/package.json | 8 +-- packages/unified-latex-util-parse/build.js | 1 + .../unified-latex-util-parse/package.json | 8 +-- packages/unified-latex-util-pegjs/build.js | 1 + packages/unified-latex-util-pgfkeys/build.js | 1 + .../unified-latex-util-pgfkeys/package.json | 8 +-- .../unified-latex-util-print-raw/build.js | 1 + .../unified-latex-util-print-raw/package.json | 8 +-- .../unified-latex-util-render-info/build.js | 1 + .../package.json | 8 +-- packages/unified-latex-util-replace/build.js | 1 + .../unified-latex-util-replace/package.json | 8 +-- packages/unified-latex-util-scan/build.js | 1 + packages/unified-latex-util-scan/package.json | 8 +-- packages/unified-latex-util-split/build.js | 1 + .../unified-latex-util-split/package.json | 8 +-- .../unified-latex-util-to-string/build.js | 1 + .../unified-latex-util-to-string/package.json | 8 +-- packages/unified-latex-util-trim/build.js | 1 + packages/unified-latex-util-trim/package.json | 8 +-- packages/unified-latex-util-visit/build.js | 1 + .../unified-latex-util-visit/package.json | 8 +-- packages/unified-latex/build.js | 1 + packages/unified-latex/package.json | 8 +-- tsconfig.build.json | 3 +- 66 files changed, 194 insertions(+), 173 deletions(-) diff --git a/packages/structured-clone/build.js b/packages/structured-clone/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/structured-clone/build.js +++ b/packages/structured-clone/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/structured-clone/package.json b/packages/structured-clone/package.json index 5e83cab5..0d84597e 100644 --- a/packages/structured-clone/package.json +++ b/packages/structured-clone/package.json @@ -12,14 +12,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/support-tables/build.js b/packages/support-tables/build.js index 242eb96d..64a3746b 100644 --- a/packages/support-tables/build.js +++ b/packages/support-tables/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-builder/build.js b/packages/unified-latex-builder/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-builder/build.js +++ b/packages/unified-latex-builder/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-builder/package.json b/packages/unified-latex-builder/package.json index f9cb1edd..56d3207a 100644 --- a/packages/unified-latex-builder/package.json +++ b/packages/unified-latex-builder/package.json @@ -15,14 +15,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-cli/package.json b/packages/unified-latex-cli/package.json index 15a83553..8f4a56a2 100644 --- a/packages/unified-latex-cli/package.json +++ b/packages/unified-latex-cli/package.json @@ -41,14 +41,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-cli/tests/cli.test.ts b/packages/unified-latex-cli/tests/cli.test.ts index 71ac10d8..61011117 100644 --- a/packages/unified-latex-cli/tests/cli.test.ts +++ b/packages/unified-latex-cli/tests/cli.test.ts @@ -19,35 +19,27 @@ console.log = (...args) => { const exePath = path.resolve(__dirname, "../dist/unified-latex-cli.mjs"); const examplesPath = path.resolve(__dirname, "examples"); -async function execCLI(args: string[]) { - return await executeCommand(`node`, [ - // package.json points to typescript sources and it is replaced with the build output - // before publishing by scripts/make-package.mjs. In testing, we need to point to the - // build output explicitly by passing the conditions flag. - `-C`, - `prebuilt`, - exePath, - ...args, - ]); -} - describe( "unified-latex-cli", () => { + let stdout: string, stderr: string; it("executable exists", async () => { expect(fsLegacy.existsSync(exePath)).toBeTruthy(); }); it("can execute without error", async () => { - const stdout = await execCLI(["-h"]); + let { stdout, stderr } = await exec(`node ${exePath} -h`); expect(stdout).toBeTruthy(); }); it("can format document", async () => { - const stdout = await execCLI([`${examplesPath}/needs-fixing.tex`]); + let { stdout, stderr } = await exec( + `node ${exePath} ${examplesPath}/needs-fixing.tex` + ); expect(stdout).toMatchSnapshot(); }); it("can expand macro", async () => { { - const stdout = await execCLI([ + let stdout = await executeCommand(`node`, [ + exePath, `${examplesPath}/needs-expanding.tex`, `-e`, "\\newcommand{foo}[1]{FOO(#1)}", @@ -58,7 +50,8 @@ describe( } { // Make sure we don't lose spaces in math mode - const stdout = await execCLI([ + let stdout = await executeCommand(`node`, [ + exePath, `${examplesPath}/needs-expanding.tex`, `-e`, "\\newcommand{foo}[1]{$\\x #1$}", @@ -69,10 +62,9 @@ describe( } }); it("can expand macros defined in document", async () => { - const stdout = await execCLI([ - `${examplesPath}/has-definition.tex`, - `--stats-json`, - ]); + let { stdout, stderr } = await exec( + `node ${exePath} ${examplesPath}/has-definition.tex --stats-json` + ); const { newcommands } = JSON.parse(stdout) as { newcommands: { name: string }[]; }; @@ -80,25 +72,23 @@ describe( expect(newcommandNames).toEqual(["foo", "baz"]); { - const stdout = await execCLI([ - `${examplesPath}/has-definition.tex`, - `--expand-document-macro`, - `foo`, - `--expand-document-macro`, - `baz`, - ]); + let { stdout, stderr } = await exec( + `node ${exePath} ${examplesPath}/has-definition.tex --expand-document-macro foo --expand-document-macro baz` + ); expect(stdout).toMatchSnapshot(); } }); it("can override default macros", async () => { { - const stdout = await execCLI([ + let stdout = await executeCommand(`node`, [ + exePath, `${examplesPath}/has-existing-definition.tex`, ]); expect(stdout).toMatchSnapshot(); } { - const stdout = await execCLI([ + let stdout = await executeCommand(`node`, [ + exePath, `${examplesPath}/has-existing-definition.tex`, `-e`, "\\newcommand{mathbb}{\\mathbb}", @@ -106,7 +96,8 @@ describe( expect(stdout).toMatchSnapshot(); } { - const stdout = await execCLI([ + let stdout = await executeCommand(`node`, [ + exePath, `${examplesPath}/has-existing-definition.tex`, `-e`, "\\newcommand{mathbb}[2]{\\mathbb{#1}{#2}}", @@ -116,19 +107,17 @@ describe( }); it("can convert to html", async () => { { - const stdout = await execCLI([ - `${examplesPath}/simple.tex`, - `--html`, - ]); + let { stdout, stderr } = await exec( + `node ${exePath} ${examplesPath}/simple.tex --html` + ); expect(stdout).toMatchSnapshot(); } }); it("can convert to markdown", async () => { { - const stdout = await execCLI([ - `${examplesPath}/simple.tex`, - `--markdown`, - ]); + let { stdout, stderr } = await exec( + `node ${exePath} ${examplesPath}/simple.tex --markdown` + ); expect(stdout).toMatchSnapshot(); } }); @@ -142,10 +131,7 @@ describe( * Run commands with arguments using "cross-spawn", which correctly escapes arguments * so that end results are the same across different shells. */ -function executeCommand( - executablePath: string, - args: string[] -): Promise { +async function executeCommand(executablePath: string, args: string[]) { return new Promise((resolve, reject) => { const childProcess = spawn(executablePath, args, { stdio: "pipe" }); diff --git a/packages/unified-latex-ctan/build.js b/packages/unified-latex-ctan/build.js index 2238ffd2..95892b67 100644 --- a/packages/unified-latex-ctan/build.js +++ b/packages/unified-latex-ctan/build.js @@ -23,6 +23,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-ctan/package.json b/packages/unified-latex-ctan/package.json index 85adff87..c29296d1 100644 --- a/packages/unified-latex-ctan/package.json +++ b/packages/unified-latex-ctan/package.json @@ -29,19 +29,19 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*/index": { - "prebuilt": "./dist/dist/*/index.js", - "import": "./dist/*/index.ts", + "_bundle": "./dist/*/index.ts", + "import": "./dist/*/index.js", "require": "./dist/*/index.cjs" }, "./*": { - "prebuilt": "./dist/*/index.js", - "import": "./*/index.ts", + "_bundle": "./*/index.ts", + "import": "./dist/*/index.js", "require": "./dist/*/index.cjs" } }, diff --git a/packages/unified-latex-lint/build.js b/packages/unified-latex-lint/build.js index 2213cd1e..ec823e72 100644 --- a/packages/unified-latex-lint/build.js +++ b/packages/unified-latex-lint/build.js @@ -23,6 +23,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-lint/package.json b/packages/unified-latex-lint/package.json index f39bfe41..e73ce2ee 100644 --- a/packages/unified-latex-lint/package.json +++ b/packages/unified-latex-lint/package.json @@ -27,19 +27,19 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*/index": { - "prebuilt": "./dist/dist/*/index.js", - "import": "./dist/*/index.ts", + "_bundle": "./dist/*/index.ts", + "import": "./dist/*/index.js", "require": "./dist/*/index.cjs" }, "./*": { - "prebuilt": "./dist/*/index.js", - "import": "./*/index.ts", + "_bundle": "./*/index.ts", + "import": "./dist/*/index.js", "require": "./dist/*/index.cjs" } }, diff --git a/packages/unified-latex-prettier/build.js b/packages/unified-latex-prettier/build.js index dbe6486f..ecaee053 100644 --- a/packages/unified-latex-prettier/build.js +++ b/packages/unified-latex-prettier/build.js @@ -23,6 +23,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-prettier/package.json b/packages/unified-latex-prettier/package.json index 93320789..a925cf77 100644 --- a/packages/unified-latex-prettier/package.json +++ b/packages/unified-latex-prettier/package.json @@ -24,14 +24,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-to-hast/build.js b/packages/unified-latex-to-hast/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-to-hast/build.js +++ b/packages/unified-latex-to-hast/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-to-hast/package.json b/packages/unified-latex-to-hast/package.json index 01957006..49460b92 100644 --- a/packages/unified-latex-to-hast/package.json +++ b/packages/unified-latex-to-hast/package.json @@ -40,14 +40,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-to-mdast/build.js b/packages/unified-latex-to-mdast/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-to-mdast/build.js +++ b/packages/unified-latex-to-mdast/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-to-mdast/package.json b/packages/unified-latex-to-mdast/package.json index b5835062..c1f02e3c 100644 --- a/packages/unified-latex-to-mdast/package.json +++ b/packages/unified-latex-to-mdast/package.json @@ -27,14 +27,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-types/package.json b/packages/unified-latex-types/package.json index d124fbe0..c21833d8 100644 --- a/packages/unified-latex-types/package.json +++ b/packages/unified-latex-types/package.json @@ -12,11 +12,13 @@ ], "exports": { ".": { - "default": "./index.ts" + "_bundle": "./index.ts", + "default": "./dist/index.js" }, "./*js": "./dist/*js", "./*": { - "default": "./dist/*.ts" + "_bundle": "./dist/*.ts", + "default": "./dist/*.js" } }, "scripts": { diff --git a/packages/unified-latex-util-align/build.js b/packages/unified-latex-util-align/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-align/build.js +++ b/packages/unified-latex-util-align/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-align/package.json b/packages/unified-latex-util-align/package.json index 438d7ec4..ca4dc36c 100644 --- a/packages/unified-latex-util-align/package.json +++ b/packages/unified-latex-util-align/package.json @@ -17,14 +17,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-argspec/build.js b/packages/unified-latex-util-argspec/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-argspec/build.js +++ b/packages/unified-latex-util-argspec/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-argspec/package.json b/packages/unified-latex-util-argspec/package.json index 515ba995..35c9bfc8 100644 --- a/packages/unified-latex-util-argspec/package.json +++ b/packages/unified-latex-util-argspec/package.json @@ -15,14 +15,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-arguments/build.js b/packages/unified-latex-util-arguments/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-arguments/build.js +++ b/packages/unified-latex-util-arguments/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-arguments/package.json b/packages/unified-latex-util-arguments/package.json index 47eb02db..4a2cf617 100644 --- a/packages/unified-latex-util-arguments/package.json +++ b/packages/unified-latex-util-arguments/package.json @@ -22,14 +22,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-catcode/build.js b/packages/unified-latex-util-catcode/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-catcode/build.js +++ b/packages/unified-latex-util-catcode/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-catcode/package.json b/packages/unified-latex-util-catcode/package.json index 6d92417f..6a9d018b 100644 --- a/packages/unified-latex-util-catcode/package.json +++ b/packages/unified-latex-util-catcode/package.json @@ -17,14 +17,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-comments/build.js b/packages/unified-latex-util-comments/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-comments/build.js +++ b/packages/unified-latex-util-comments/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-comments/package.json b/packages/unified-latex-util-comments/package.json index 4dbb804b..704dcd5f 100644 --- a/packages/unified-latex-util-comments/package.json +++ b/packages/unified-latex-util-comments/package.json @@ -17,14 +17,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-environments/build.js b/packages/unified-latex-util-environments/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-environments/build.js +++ b/packages/unified-latex-util-environments/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-environments/package.json b/packages/unified-latex-util-environments/package.json index abd93065..0c2f26dc 100644 --- a/packages/unified-latex-util-environments/package.json +++ b/packages/unified-latex-util-environments/package.json @@ -21,14 +21,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-glue/build.js b/packages/unified-latex-util-glue/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-glue/build.js +++ b/packages/unified-latex-util-glue/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-glue/package.json b/packages/unified-latex-util-glue/package.json index 28c28565..8cf98a79 100644 --- a/packages/unified-latex-util-glue/package.json +++ b/packages/unified-latex-util-glue/package.json @@ -17,14 +17,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-html-like/build.js b/packages/unified-latex-util-html-like/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-html-like/build.js +++ b/packages/unified-latex-util-html-like/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-html-like/package.json b/packages/unified-latex-util-html-like/package.json index d1293dc9..65873eba 100644 --- a/packages/unified-latex-util-html-like/package.json +++ b/packages/unified-latex-util-html-like/package.json @@ -18,14 +18,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-ligatures/build.js b/packages/unified-latex-util-ligatures/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-ligatures/build.js +++ b/packages/unified-latex-util-ligatures/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-ligatures/package.json b/packages/unified-latex-util-ligatures/package.json index e7fb470f..2d878710 100644 --- a/packages/unified-latex-util-ligatures/package.json +++ b/packages/unified-latex-util-ligatures/package.json @@ -18,14 +18,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-macros/build.js b/packages/unified-latex-util-macros/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-macros/build.js +++ b/packages/unified-latex-util-macros/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-macros/package.json b/packages/unified-latex-util-macros/package.json index 25db84d2..0295dae4 100644 --- a/packages/unified-latex-util-macros/package.json +++ b/packages/unified-latex-util-macros/package.json @@ -21,14 +21,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-match/build.js b/packages/unified-latex-util-match/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-match/build.js +++ b/packages/unified-latex-util-match/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-match/package.json b/packages/unified-latex-util-match/package.json index b348a015..586d75f5 100644 --- a/packages/unified-latex-util-match/package.json +++ b/packages/unified-latex-util-match/package.json @@ -16,14 +16,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-packages/build.js b/packages/unified-latex-util-packages/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-packages/build.js +++ b/packages/unified-latex-util-packages/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-packages/package.json b/packages/unified-latex-util-packages/package.json index 674c17cf..d93d0ec9 100644 --- a/packages/unified-latex-util-packages/package.json +++ b/packages/unified-latex-util-packages/package.json @@ -19,14 +19,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-parse/build.js b/packages/unified-latex-util-parse/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-parse/build.js +++ b/packages/unified-latex-util-parse/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-parse/package.json b/packages/unified-latex-util-parse/package.json index 799a1205..7298d640 100644 --- a/packages/unified-latex-util-parse/package.json +++ b/packages/unified-latex-util-parse/package.json @@ -25,14 +25,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-pegjs/build.js b/packages/unified-latex-util-pegjs/build.js index 295f5cce..ddb473b7 100644 --- a/packages/unified-latex-util-pegjs/build.js +++ b/packages/unified-latex-util-pegjs/build.js @@ -21,6 +21,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; target: "node14", plugins: [pegjsLoader()], external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-pgfkeys/build.js b/packages/unified-latex-util-pgfkeys/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-pgfkeys/build.js +++ b/packages/unified-latex-util-pgfkeys/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-pgfkeys/package.json b/packages/unified-latex-util-pgfkeys/package.json index a672e56b..21ed57a9 100644 --- a/packages/unified-latex-util-pgfkeys/package.json +++ b/packages/unified-latex-util-pgfkeys/package.json @@ -18,14 +18,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-print-raw/build.js b/packages/unified-latex-util-print-raw/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-print-raw/build.js +++ b/packages/unified-latex-util-print-raw/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-print-raw/package.json b/packages/unified-latex-util-print-raw/package.json index 7cbe9e84..5938c2f4 100644 --- a/packages/unified-latex-util-print-raw/package.json +++ b/packages/unified-latex-util-print-raw/package.json @@ -15,14 +15,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-render-info/build.js b/packages/unified-latex-util-render-info/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-render-info/build.js +++ b/packages/unified-latex-util-render-info/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-render-info/package.json b/packages/unified-latex-util-render-info/package.json index 2e525f31..d5e10139 100644 --- a/packages/unified-latex-util-render-info/package.json +++ b/packages/unified-latex-util-render-info/package.json @@ -16,14 +16,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-replace/build.js b/packages/unified-latex-util-replace/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-replace/build.js +++ b/packages/unified-latex-util-replace/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-replace/package.json b/packages/unified-latex-util-replace/package.json index 595a652a..625c7f40 100644 --- a/packages/unified-latex-util-replace/package.json +++ b/packages/unified-latex-util-replace/package.json @@ -20,14 +20,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-scan/build.js b/packages/unified-latex-util-scan/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-scan/build.js +++ b/packages/unified-latex-util-scan/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-scan/package.json b/packages/unified-latex-util-scan/package.json index 7e098706..55b61000 100644 --- a/packages/unified-latex-util-scan/package.json +++ b/packages/unified-latex-util-scan/package.json @@ -18,14 +18,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-split/build.js b/packages/unified-latex-util-split/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-split/build.js +++ b/packages/unified-latex-util-split/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-split/package.json b/packages/unified-latex-util-split/package.json index d5452245..59d76015 100644 --- a/packages/unified-latex-util-split/package.json +++ b/packages/unified-latex-util-split/package.json @@ -16,14 +16,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-to-string/build.js b/packages/unified-latex-util-to-string/build.js index 94571744..3b83d536 100644 --- a/packages/unified-latex-util-to-string/build.js +++ b/packages/unified-latex-util-to-string/build.js @@ -22,6 +22,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-to-string/package.json b/packages/unified-latex-util-to-string/package.json index 2565c109..6d9b8ada 100644 --- a/packages/unified-latex-util-to-string/package.json +++ b/packages/unified-latex-util-to-string/package.json @@ -19,14 +19,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-trim/build.js b/packages/unified-latex-util-trim/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-trim/build.js +++ b/packages/unified-latex-util-trim/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-trim/package.json b/packages/unified-latex-util-trim/package.json index 51713996..68165988 100644 --- a/packages/unified-latex-util-trim/package.json +++ b/packages/unified-latex-util-trim/package.json @@ -19,14 +19,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex-util-visit/build.js b/packages/unified-latex-util-visit/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex-util-visit/build.js +++ b/packages/unified-latex-util-visit/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex-util-visit/package.json b/packages/unified-latex-util-visit/package.json index 3af8edde..85eeb276 100644 --- a/packages/unified-latex-util-visit/package.json +++ b/packages/unified-latex-util-visit/package.json @@ -16,14 +16,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/packages/unified-latex/build.js b/packages/unified-latex/build.js index 9de2a35c..b6709d9b 100644 --- a/packages/unified-latex/build.js +++ b/packages/unified-latex/build.js @@ -19,6 +19,7 @@ import { isCjsPackage } from "../../scripts/esbuild-module-check.mjs"; format: "esm", target: "node14", external: [...explicitDeps], + conditions: ["_bundle"], }; // Build the ESM diff --git a/packages/unified-latex/package.json b/packages/unified-latex/package.json index 3be93dfa..c2465c87 100644 --- a/packages/unified-latex/package.json +++ b/packages/unified-latex/package.json @@ -18,14 +18,14 @@ ], "exports": { ".": { - "prebuilt": "./dist/index.js", - "import": "./index.ts", + "_bundle": "./index.ts", + "import": "./dist/index.js", "require": "./dist/index.cjs" }, "./*js": "./dist/*js", "./*": { - "prebuilt": "./dist/*.js", - "import": "./*.ts", + "_bundle": "./*.ts", + "import": "./dist/*.js", "require": "./dist/*.cjs" } }, diff --git a/tsconfig.build.json b/tsconfig.build.json index 6336a1f1..0d6c1110 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -29,6 +29,7 @@ "declarationMap": true, "moduleResolution": "Bundler", "resolveJsonModule": true, - "forceConsistentCasingInFileNames": true + "customConditions": ["_bundle"], + "forceConsistentCasingInFileNames": true, } }