fix!: remove commonjs support from cspell-grammar (#4588)

streetsidesoftware · Jun 27, 2023 · 67821c3 · 67821c3
1 parent 1d31c73
commit 67821c3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 36 deletions.
diff --git a/packages/cspell-grammar/bin.mjs b/packages/cspell-grammar/bin.mjs
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
-import * as app from './dist/esm/app.mjs';
+import * as app from './dist/app.js';
 
 app.run(process.argv);
diff --git a/packages/cspell-grammar/package.json b/packages/cspell-grammar/package.json
@@ -12,48 +12,46 @@
   "bin": {
     "cspell-grammar": "bin.mjs"
   },
-  "type": "commonjs",
-  "main": "dist/cjs/index.js",
-  "types": "dist/cjs/index.d.ts",
-  "module": "dist/esm/index.mjs",
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "module": "dist/index.js",
   "exports": {
     ".": {
-      "import": "./dist/esm/index.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": "./dist/index.js"
     },
     "./parsers/typescript": {
-      "import": "./dist/esm/parsers/typescript/index.mjs",
-      "require": "./dist/cjs/parsers/typescript/index.js"
+      "import": "./dist/parsers/typescript/index.js"
     }
   },
   "typesVersions": {
     "*": {
       "index.js": [
-        "dist/cjs/index.d.ts"
+        "dist/index.d.ts"
       ],
       "index.d.ts": [
-        "dist/cjs/index.d.ts"
+        "dist/index.d.ts"
       ],
-      "dist/cjs/*.d.ts": [
-        "dist/cjs/*.d.ts"
+      "dist/*.d.ts": [
+        "dist/*.d.ts"
+      ],
+      "parsers": [
+        "dist/parsers/index.d.ts"
       ],
       "parsers/typescript": [
-        "dist/cjs/parsers/typescript/index.d.ts"
+        "dist/parsers/typescript/index.d.ts"
       ],
       "parsers/typescript/*.d.ts": [
-        "dist/cjs/parsers/typescript/*.d.ts"
+        "dist/parsers/typescript/*.d.ts"
       ],
       "*": [
-        "dist/cjs/*.d.ts",
-        "dist/cjs/*/index.d.ts"
+        "dist/*.d.ts",
+        "dist/*/index.d.ts"
       ]
     }
   },
   "files": [
     "bin.mjs",
     "dist",
-    "!dist/esm/**/*.js",
-    "!dist/esm/**/*.ts",
     "!**/*.tsbuildInfo",
     "!**/__mocks__",
     "!**/test/**",
@@ -63,8 +61,7 @@
   ],
   "scripts": {
     "clean": "shx rm -rf dist temp coverage \"*.tsbuildInfo\"",
-    "build": "tsc -b . && ts2mjs dist/esm",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "build": "tsc -b .",
     "clean-build": "pnpm run clean && pnpm run build",
     "coverage": "pnpm coverage:vitest && pnpm coverage:fix",
     "coverage:vitest": "vitest run --coverage",

diff --git a/packages/cspell-grammar/tsconfig.cjs.json b/packages/cspell-grammar/tsconfig.cjs.json
diff --git a/packages/cspell-grammar/tsconfig.esm.json b/packages/cspell-grammar/tsconfig.esm.json
@@ -6,7 +6,7 @@
         "module": "ES2020",
         "moduleResolution": "node16",
         "rootDir": "src",
-        "outDir": "dist/esm",
+        "outDir": "dist",
         "sourceMap": false,
         "types": ["node"]
     },

diff --git a/packages/cspell-grammar/tsconfig.json b/packages/cspell-grammar/tsconfig.json
@@ -1,4 +1,4 @@
 {
     "files": [],
-    "references": [{ "path": "./tsconfig.cjs.json" }, { "path": "./tsconfig.esm.json" }]
+    "references": [{ "path": "./tsconfig.esm.json" }]
 }