From 4ac4c810120a21e96af1ff7989fbae63970044c9 Mon Sep 17 00:00:00 2001 From: Aman Karmani Date: Sat, 19 Oct 2024 01:44:50 -0700 Subject: [PATCH 1/4] add support for cjs --- package.json | 55 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 98e6990..6ad9e3e 100644 --- a/package.json +++ b/package.json @@ -43,44 +43,68 @@ "exports": { ".": { "types": "./dist/src/index.d.ts", - "import": "./dist/src/index.js" + "import": "./dist/src/index.js", + "require": "./dist/cjs/src/index.js" }, "./alloc": { "types": "./dist/src/alloc.d.ts", - "node": "./dist/src/alloc.node.js", - "import": "./dist/src/alloc.js" + "node": { + "import": "./dist/src/alloc.node.js", + "require": "./dist/cjs/src/alloc.node.js" + }, + "import": "./dist/src/alloc.js", + "require": "./dist/cjs/src/alloc.js" }, "./compare": { "types": "./dist/src/compare.d.ts", - "node": "./dist/src/compare.node.js", - "import": "./dist/src/compare.js" + "node": { + "import": "./dist/src/compare.node.js", + "require": "./dist/cjs/src/compare.node.js" + }, + "import": "./dist/src/compare.js", + "require": "./dist/cjs/src/compare.js" }, "./concat": { "types": "./dist/src/concat.d.ts", - "node": "./dist/src/concat.node.js", - "import": "./dist/src/concat.js" + "node": { + "import": "./dist/src/concat.node.js", + "require": "./dist/cjs/src/concat.node.js" + }, + "import": "./dist/src/concat.js", + "require": "./dist/cjs/src/concat.js" }, "./equals": { "types": "./dist/src/equals.d.ts", - "import": "./dist/src/equals.js" + "import": "./dist/src/equals.js", + "require": "./dist/cjs/src/equals.js" }, "./from-string": { "types": "./dist/src/from-string.d.ts", - "node": "./dist/src/from-string.node.js", - "import": "./dist/src/from-string.js" + "node": { + "import": "./dist/src/from-string.node.js", + "require": "./dist/cjs/src/from-string.node.js" + }, + "import": "./dist/src/from-string.js", + "require": "./dist/cjs/src/from-string.js" }, "./to-string": { "types": "./dist/src/to-string.d.ts", - "node": "./dist/src/to-string.node.js", - "import": "./dist/src/to-string.js" + "node": { + "import": "./dist/src/to-string.node.js", + "require": "./dist/cjs/src/to-string.node.js" + }, + "import": "./dist/src/to-string.js", + "require": "./dist/cjs/src/to-string.js" }, "./xor": { "types": "./dist/src/xor.d.ts", - "import": "./dist/src/xor.js" + "import": "./dist/src/xor.js", + "require": "./dist/cjs/src/xor.js" }, "./xor-compare": { "types": "./dist/src/xor-compare.d.ts", - "import": "./dist/src/xor-compare.js" + "import": "./dist/src/xor-compare.js", + "require": "./dist/cjs/src/xor-compare.js" } }, "imports": { @@ -217,7 +241,8 @@ "test:firefox-webworker": "aegir test -t webworker -- --browser firefox", "lint": "aegir lint", "release": "aegir release", - "build": "aegir build", + "build": "aegir build && npm run build:cjs", + "build:cjs": "tsc --project tsconfig.json --module commonjs --verbatimModuleSyntax false --moduleResolution node10 --outDir ./dist/cjs --declaration --declarationDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'", "dep-check": "aegir dep-check", "docs": "aegir docs" }, From 1abb480d979091a57dba6bb1ea0f50a274ff8abf Mon Sep 17 00:00:00 2001 From: Aman Karmani Date: Sat, 19 Oct 2024 01:50:22 -0700 Subject: [PATCH 2/4] fix these too --- package.json | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 6ad9e3e..cccbe57 100644 --- a/package.json +++ b/package.json @@ -110,33 +110,57 @@ "imports": { "#util/as-uint8array": { "types": "./dist/src/util/as-uint8array.d.ts", - "node": "./dist/src/util/as-uint8array.node.js", - "import": "./dist/src/util/as-uint8array.js" + "node": { + "import": "./dist/src/util/as-uint8array.node.js", + "require": "./dist/cjs/src/util/as-uint8array.node.js" + }, + "import": "./dist/src/util/as-uint8array.js", + "require": "./dist/cjs/src/util/as-uint8array.js" }, "#alloc": { "types": "./dist/src/alloc.d.ts", - "node": "./dist/src/alloc.node.js", - "import": "./dist/src/alloc.js" + "node": { + "import": "./dist/src/alloc.node.js", + "require": "./dist/cjs/src/alloc.node.js" + }, + "import": "./dist/src/alloc.js", + "require": "./dist/cjs/src/alloc.js" }, "#compare": { "types": "./dist/src/compare.d.ts", - "node": "./dist/src/compare.node.js", - "import": "./dist/src/compare.js" + "node": { + "import": "./dist/src/compare.node.js", + "require": "./dist/cjs/src/compare.node.js" + }, + "import": "./dist/src/compare.js", + "require": "./dist/cjs/src/compare.js" }, "#concat": { "types": "./dist/src/concat.d.ts", - "node": "./dist/src/concat.node.js", - "import": "./dist/src/concat.js" + "node": { + "import": "./dist/src/concat.node.js", + "require": "./dist/cjs/src/concat.node.js" + }, + "import": "./dist/src/concat.js", + "require": "./dist/cjs/src/concat.js" }, "#from-string": { "types": "./dist/src/from-string.d.ts", - "node": "./dist/src/from-string.node.js", - "import": "./dist/src/from-string.js" + "node": { + "import": "./dist/src/from-string.node.js", + "require": "./dist/cjs/src/from-string.node.js" + }, + "import": "./dist/src/from-string.js", + "require": "./dist/cjs/src/from-string.js" }, "#to-string": { "types": "./dist/src/to-string.d.ts", - "node": "./dist/src/to-string.node.js", - "import": "./dist/src/to-string.js" + "node": { + "import": "./dist/src/to-string.node.js", + "require": "./dist/cjs/src/to-string.node.js" + }, + "import": "./dist/src/to-string.js", + "require": "./dist/cjs/src/to-string.js" } }, "eslintConfig": { From dfa5917e2ee98d258ecd04b07b119a6127e9dfd1 Mon Sep 17 00:00:00 2001 From: Aman Karmani Date: Sat, 19 Oct 2024 02:46:39 -0700 Subject: [PATCH 3/4] fix cjs build --- package.json | 6 ++++-- tsconfig.cjs.json | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tsconfig.cjs.json diff --git a/package.json b/package.json index cccbe57..ba17598 100644 --- a/package.json +++ b/package.json @@ -266,7 +266,7 @@ "lint": "aegir lint", "release": "aegir release", "build": "aegir build && npm run build:cjs", - "build:cjs": "tsc --project tsconfig.json --module commonjs --verbatimModuleSyntax false --moduleResolution node10 --outDir ./dist/cjs --declaration --declarationDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'", + "build:cjs": "tsc --project tsconfig.cjs.json --verbatimModuleSyntax false && resolve-tspaths -p tsconfig.cjs.json && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'", "dep-check": "aegir dep-check", "docs": "aegir docs" }, @@ -276,7 +276,9 @@ "devDependencies": { "@types/benchmark": "^2.1.1", "aegir": "^42.2.3", - "benchmark": "^2.1.4" + "benchmark": "^2.1.4", + "typescript": "^5.6.3", + "resolve-tspaths": "^0.8.22" }, "react-native": { "#util/as-uint8array": "./dist/src/util/as-uint8array.js", diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json new file mode 100644 index 0000000..6795b5a --- /dev/null +++ b/tsconfig.cjs.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "module": "CommonJS", + "outDir": "./dist/cjs", + "baseUrl": "." + } +} From f7048b775edd068afa11f2fb80c6560204178a1e Mon Sep 17 00:00:00 2001 From: Aman Karmani Date: Sat, 19 Oct 2024 02:54:24 -0700 Subject: [PATCH 4/4] works now --- package.json | 2 +- tsconfig.cjs.json | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ba17598..c27cf16 100644 --- a/package.json +++ b/package.json @@ -266,7 +266,7 @@ "lint": "aegir lint", "release": "aegir release", "build": "aegir build && npm run build:cjs", - "build:cjs": "tsc --project tsconfig.cjs.json --verbatimModuleSyntax false && resolve-tspaths -p tsconfig.cjs.json && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'", + "build:cjs": "tsc --project tsconfig.cjs.json --verbatimModuleSyntax false && resolve-tspaths -p tsconfig.cjs.json -s src -o dist/cjs/src && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'", "dep-check": "aegir dep-check", "docs": "aegir docs" }, diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json index 6795b5a..d3178ef 100644 --- a/tsconfig.cjs.json +++ b/tsconfig.cjs.json @@ -3,6 +3,14 @@ "compilerOptions": { "module": "CommonJS", "outDir": "./dist/cjs", - "baseUrl": "." + "baseUrl": ".", + "paths": { + "#util/as-uint8array": ["./src/util/as-uint8array.ts"], + "#alloc": ["./src/alloc.ts"], + "#compare": ["./src/compare.ts"], + "#concat": ["./src/concat.ts"], + "#from-string": ["./src/from-string.ts"], + "#to-string": ["./src/to-string.ts"] + } } }