Merge 0b687da into 67821c3

streetsidesoftware · Jun 27, 2023 · 5a1251e · 5a1251e
2 parents 67821c3 + 0b687da
commit 5a1251e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 55 deletions.
diff --git a/packages/cspell-gitignore/bin.mjs b/packages/cspell-gitignore/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-gitignore/package.json b/packages/cspell-gitignore/package.json
@@ -13,21 +13,17 @@
   "bin": {
     "cspell-gitignore": "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"
     }
   },
   "files": [
     "bin.mjs",
     "dist",
-    "!dist/esm/**/*.js",
-    "!dist/esm/**/*.ts",
     "!**/*.tsbuildInfo",
     "!**/__mocks__",
     "!**/test/**",
@@ -37,8 +33,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-gitignore/tsconfig.cjs.json b/packages/cspell-gitignore/tsconfig.cjs.json
diff --git a/packages/cspell-gitignore/tsconfig.esm.json b/packages/cspell-gitignore/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-gitignore/tsconfig.json b/packages/cspell-gitignore/tsconfig.json
@@ -1,4 +1,4 @@
 {
     "files": [],
-    "references": [{ "path": "./tsconfig.cjs.json" }, { "path": "./tsconfig.esm.json" }]
+    "references": [{ "path": "./tsconfig.esm.json" }]
 }
diff --git a/test-packages/cspell-gitignore/test-cspell-gitignore/bin.cjs b/test-packages/cspell-gitignore/test-cspell-gitignore/bin.cjs
diff --git a/test-packages/cspell-gitignore/test-cspell-gitignore/package.json b/test-packages/cspell-gitignore/test-cspell-gitignore/package.json
@@ -4,12 +4,11 @@
   "description": "Pure testing package for cspell-gitignore. Its purpose is to verify cspell-gitignore dependencies.",
   "private": true,
   "bin": {
-    "test-cjs": "./bin.cjs",
     "test-mjs": "./bin.mjs",
     "test-rollup-cjs": "./bin.rollup.cjs",
     "test-rollup-mjs": "./bin.rollup.mjs"
   },
-  "type": "commonjs",
+  "type": "module",
   "scripts": {
     "clean": "shx rm -rf dist .rollup.cache",
     "build": "pnpm build:ts && pnpm build:rollup",
@@ -18,7 +17,7 @@
     "clean-build": "pnpm run clean && pnpm run build",
     "compile": "tsc -b .",
     "test": "pnpm test:unit && pnpm test:smoke",
-    "test:smoke": "node ./bin.mjs && node ./bin.cjs && node ./bin.rollup.mjs && node ./bin.rollup.cjs",
+    "test:smoke": "node ./bin.mjs && node ./bin.rollup.mjs && node ./bin.rollup.cjs",
     "test:unit": "vitest run"
   },
   "author": "",

diff --git a/.../test-cspell-gitignore/src/index.test.cts → ...e/test-cspell-gitignore/src/index.test.ts b/.../test-cspell-gitignore/src/index.test.cts → ...e/test-cspell-gitignore/src/index.test.ts
diff --git a/test-packages/cspell-gitignore/test-cspell-gitignore/tsconfig.cjs.json b/test-packages/cspell-gitignore/test-cspell-gitignore/tsconfig.cjs.json
diff --git a/test-packages/cspell-gitignore/test-cspell-gitignore/tsconfig.json b/test-packages/cspell-gitignore/test-cspell-gitignore/tsconfig.json
@@ -1,4 +1,4 @@
 {
     "files": [],
-    "references": [{ "path": "./tsconfig.cjs.json" }, { "path": "./tsconfig.esm.json" }]
+    "references": [{ "path": "./tsconfig.esm.json" }]
 }