BREAKING CHANGE: drop CommonJS support

tradingview · Jun 13, 2024 · 18bd57c · 18bd57c
1 parent 7ece760
commit 18bd57c
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 478 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,10 +20,7 @@
     "editorconfig-checker": "^4.0.2",
     "eslint": "^8.26.0",
     "globals": "^13.17.0",
-    "replace-ext": "^2.0.0",
     "rollup": "^3.2.3",
-    "ts-transform-import-path-rewrite": "^0.3.0",
-    "ttypescript": "^1.5.13",
     "typescript": "4.8.4"
   },
   "private": true,

diff --git a/src/package.json b/src/package.json
@@ -3,9 +3,7 @@
   "version": "0.0.0",
   "description": "Functionality on top of HTML canvas element, including support for HiDPI and pixel-perfect rendering",
   "scripts": {
-    "build": "npm run build:esmodule && npm run build:commonjs && node ../tools/build-package-json package.json ../dist/fancy-canvas/package.json",
-    "build:commonjs": "tsc --project tsconfig.cjs.json",
-    "build:esmodule": "ttsc --project tsconfig.esm.json && node ../tools/replace-extension ../dist/fancy-canvas .js .mjs && node ../tools/replace-extension ../dist/fancy-canvas .ts .mts"
+    "build": "tsc --project tsconfig.json && node ../tools/build-package-json package.json ../dist/fancy-canvas/package.json"
   },
   "keywords": [
     "html",
@@ -17,10 +15,9 @@
   "author": "[email protected]",
   "license": "MIT",
   "private": true,
-  "type": "commonjs",
-  "module": "./index.mjs",
+  "type": "module",
+  "module": "./index.js",
   "exports": {
-    "import": "./index.mjs",
-    "require": "./index.js"
+    "import": "./index.js"
   }
 }
diff --git a/src/tsconfig.cjs.json b/src/tsconfig.cjs.json
diff --git a/src/tsconfig.esm.json b/src/tsconfig.esm.json
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -3,5 +3,7 @@
 	"compilerOptions": {
 		"declaration": true,
 		"outDir": "../dist/fancy-canvas",
+		"module": "node16",
+		"moduleResolution": "node16"
 	}
 }
diff --git a/tests/node-esmodules/index.mts → tests/index.mts b/tests/node-esmodules/index.mts → tests/index.mts
diff --git a/tests/node-commonjs/index.cts b/tests/node-commonjs/index.cts
diff --git a/tests/node-commonjs/package.json b/tests/node-commonjs/package.json
diff --git a/tests/node-commonjs/tsconfig.json b/tests/node-commonjs/tsconfig.json
diff --git a/tests/node-esmodules/package.json b/tests/node-esmodules/package.json
diff --git a/tests/node-esmodules/tsconfig.json b/tests/node-esmodules/tsconfig.json
diff --git a/tests/package.json b/tests/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "start": "npm start --prefix node-commonjs && npm start --prefix node-esmodules"
+    "start": "ts-node-esm index.mts"
   },
   "dependencies": {
     "fancy-canvas": "file:../dist/fancy-canvas",

diff --git a/tests/tsconfig.json b/tests/tsconfig.json
@@ -1,6 +1,8 @@
 {
 	"extends": "../tsconfig.json",
 	"compilerOptions": {
-		"lib": ["dom", "es2015"]
+		"lib": ["dom", "es2015"],
+		"module": "node16",
+		"moduleResolution": "node16"
 	}
 }
diff --git a/tools/build-package-json.js b/tools/build-package-json.js
@@ -39,6 +39,6 @@ const output = {
 	type: input.type,
 
 	// contents
-	files: ['**/*.mjs', '**/*.d.mts', '**/*.js', '**/*.d.ts'],
+	files: ['**/*.js', '**/*.d.ts'],
 };
 fs.writeFileSync(outputPath, JSON.stringify(output, null, 2));
diff --git a/tools/replace-extension.js b/tools/replace-extension.js