Clean up configs

colinhacks · Jun 23, 2023 · 9eb2508 · 9eb2508
1 parent 8d8e1a2
commit 9eb2508
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 331 deletions.
diff --git a/configs/babel-jest.config.json b/configs/babel-jest.config.json
@@ -0,0 +1,10 @@
+{
+  "rootDir": "..",
+  "testRegex": "src/.*\\.test\\.ts$",
+  "transform": {
+    "^.+\\.tsx?$": ["babel-jest", { "configFile": "./configs/babel.config.js" }]
+  },
+  "modulePathIgnorePatterns": ["language-server", "__vitest__"],
+  "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"],
+  "coverageReporters": ["json-summary", "text", "lcov"]
+}
diff --git a/babel.config.js → configs/babel.config.js b/babel.config.js → configs/babel.config.js
diff --git a/jest.config.json → configs/jest.config.json b/jest.config.json → configs/jest.config.json
@@ -1,5 +1,8 @@
 {
-  "rootDir": ".",
+  "rootDir": "..",
+  "transform": {
+    "^.+\\.tsx?$": "ts-jest"
+  },
   "testRegex": "src/.*\\.test\\.ts$",
   "modulePathIgnorePatterns": ["language-server", "__vitest__"],
   "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"],

diff --git a/rollup.config.js → configs/rollup.config.js b/rollup.config.js → configs/rollup.config.js
@@ -21,7 +21,7 @@ export default [
     ],
     plugins: [
       typescript({
-        tsconfig: "tsconfig.esm.json",
+        tsconfig: "./configs/tsconfig.esm.json",
         sourceMap: false,
       }),
     ],

diff --git a/swc-jest.config.json → configs/swc-jest.config.json b/swc-jest.config.json → configs/swc-jest.config.json
@@ -1,5 +1,5 @@
 {
-  "rootDir": ".",
+  "rootDir": "..",
   "transform": {
     "^.+\\.(t|j)sx?$": "@swc/jest"
   },

diff --git a/ts-jest.config.json → configs/ts-jest.config.json b/ts-jest.config.json → configs/ts-jest.config.json
@@ -1,5 +1,5 @@
 {
-  "rootDir": ".",
+  "rootDir": "..",
   "transform": {
     "^.+\\.tsx?$": "ts-jest"
   },

diff --git a/tsconfig.base.json → configs/tsconfig.base.json b/tsconfig.base.json → configs/tsconfig.base.json
@@ -1,12 +1,6 @@
 {
   "compilerOptions": {
-    "lib": [
-      "es5",
-      "es6",
-      "es7",
-      "esnext",
-      "dom"
-    ],
+    "lib": ["es5", "es6", "es7", "esnext", "dom"],
     "target": "es2018",
     "removeComments": false,
     "esModuleInterop": true,
@@ -22,9 +16,5 @@
     "downlevelIteration": true,
     "isolatedModules": true
   },
-  "include": [
-    "./src/**/*",
-    "playground.ts",
-    "./.eslintrc.js"
-  ]
-}
+  "include": ["../src/**/*", "../playground.ts", "../.eslintrc.js"]
+}
diff --git a/tsconfig.cjs.json → configs/tsconfig.cjs.json b/tsconfig.cjs.json → configs/tsconfig.cjs.json
@@ -2,14 +2,11 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "lib",
+    "outDir": "../lib",
     "declaration": true,
     "declarationMap": false,
     "sourceMap": false,
     "removeComments": true
   },
-  "exclude": [
-    "./src/**/__tests__",
-    "playground.ts"
-  ]
-}
+  "exclude": ["../src/**/__tests__", "../playground.ts"]
+}
diff --git a/tsconfig.esm.json → configs/tsconfig.esm.json b/tsconfig.esm.json → configs/tsconfig.esm.json
@@ -7,8 +7,5 @@
     "declarationMap": false,
     "sourceMap": false
   },
-  "exclude": [
-    "./src/**/__tests__",
-    "./src/playground.ts"
-  ]
+  "exclude": ["../src/**/__tests__", "../src/playground.ts"]
 }
diff --git a/tsconfig.test.json → configs/tsconfig.test.json b/tsconfig.test.json → configs/tsconfig.test.json
@@ -6,7 +6,8 @@
     "target": "es5",
     "declaration": true,
     "declarationMap": false,
-    "sourceMap": false
+    "sourceMap": false,
+    "noEmit": true
   },
   "exclude": []
 }
diff --git a/tsconfig.types.json → configs/tsconfig.types.json b/tsconfig.types.json → configs/tsconfig.types.json
@@ -1,13 +1,10 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "./lib/types",
+    "outDir": "../lib/types",
     "declaration": true,
     "declarationMap": true,
     "emitDeclarationOnly": true
   },
-  "exclude": [
-    "./src/**/__tests__",
-    "./src/playground.ts"
-  ]
+  "exclude": ["../src/**/__tests__", "../src/playground.ts"]
 }
diff --git a/vitest.config.ts → configs/vitest.config.ts b/vitest.config.ts → configs/vitest.config.ts
@@ -5,7 +5,7 @@ export default defineConfig({
     alias: {
       "@jest/globals": "vitest",
     },
-    include: ["**/*.test.ts"],
+    include: ["src/**/*.test.ts"],
     isolate: false,
     watch: false,
   },

diff --git a/deno/lib/__tests__/language-server.source.ts b/deno/lib/__tests__/language-server.source.ts