Merge pull request #141 from palantir/ea/improve-tsconfigs

Improves tsconfig
palantir · Mar 22, 2024 · fb1a46f · fb1a46f
2 parents 56ce464 + 51eaa03
commit fb1a46f
Show file tree

Hide file tree

Showing 51 changed files with 193 additions and 124 deletions.
diff --git a/.monorepolint.config.mjs b/.monorepolint.config.mjs
@@ -72,38 +72,18 @@ function getTsconfigOptions(baseTsconfigPath, opts) {
       extends: baseTsconfigPath,
 
       compilerOptions: {
-        rootDir: "src",
+        rootDir: ".",
         outDir: "build/types",
         composite: true,
       },
-      include: ["./src/**/*", ".eslintrc.cjs"],
+      include: ["./src/**/*", ".eslintrc.cjs", "package.json"],
       ...(opts.customTsconfigExcludes
         ? { exclude: opts.customTsconfigExcludes ?? [] }
         : {}),
     },
   };
 }
 
-function getTsconfigOptionsE2E(baseTsconfigPath) {
-  return {
-    file: "tsconfig.json",
-    template: {
-      extends: baseTsconfigPath,
-
-      compilerOptions: {
-        rootDir: "src",
-        outDir: "build/types",
-        composite: true,
-      },
-      include: ["./src/**/*", ".eslintrc.cjs"],
-      exclude: [
-        "./src/__e2e_tests__/**/**.test.ts",
-        "./src/generatedNoCheck/**/*",
-      ],
-    },
-  };
-}
-
 /**
  * @param {Omit<import("@monorepolint/config").RuleEntry<>,"options" | "id">} shared
  * @param {{
@@ -157,12 +137,12 @@ function standardPackageRules(shared, options) {
         entries: {
           exports: {
             ".": {
-              types: "./build/types/index.d.ts",
+              types: "./build/types/src/index.d.ts",
               import: "./build/js/index.mjs",
               require: `./build/js/index.${options.legacy ? "" : "c"}js`,
             },
             "./*": {
-              types: "./build/types/public/*.d.ts",
+              types: "./build/types/src/public/*.d.ts",
               import: "./build/js/public/*.mjs",
               require: `./build/js/public/*.${options.legacy ? "" : "c"}js`,
             },
@@ -184,7 +164,7 @@ function standardPackageRules(shared, options) {
 
           main: `./build/js/index.${options.legacy ? "" : "c"}js`,
           module: "./build/js/index.mjs",
-          types: "./build/types/index.d.ts",
+          types: "./build/types/src/index.d.ts",
         },
       },
     }),

diff --git a/examples-extra/basic/cli/package.json b/examples-extra/basic/cli/package.json
@@ -9,12 +9,12 @@
   },
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
+      "types": "./build/types/src/index.d.ts",
       "import": "./build/js/index.mjs",
       "require": "./build/js/index.cjs"
     },
     "./*": {
-      "types": "./build/types/public/*.d.ts",
+      "types": "./build/types/src/public/*.d.ts",
       "import": "./build/js/public/*.mjs",
       "require": "./build/js/public/*.cjs"
     }
@@ -53,6 +53,6 @@
   ],
   "main": "./build/js/index.cjs",
   "module": "./build/js/index.mjs",
-  "types": "./build/types/index.d.ts",
+  "types": "./build/types/src/index.d.ts",
   "type": "module"
 }
diff --git a/examples-extra/basic/cli/tsconfig.json b/examples-extra/basic/cli/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "extends": "../../../monorepo/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
+    "rootDir": ".",
     "outDir": "build/types",
     "composite": true
   },
   "include": [
     "./src/**/*",
-    ".eslintrc.cjs"
+    ".eslintrc.cjs",
+    "package.json"
   ],
   "references": [
     {

diff --git a/examples-extra/basic/sdk/package.json b/examples-extra/basic/sdk/package.json
@@ -10,12 +10,12 @@
   },
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
+      "types": "./build/types/src/index.d.ts",
       "import": "./build/js/index.mjs",
       "require": "./build/js/index.cjs"
     },
     "./*": {
-      "types": "./build/types/public/*.d.ts",
+      "types": "./build/types/src/public/*.d.ts",
       "import": "./build/js/public/*.mjs",
       "require": "./build/js/public/*.cjs"
     }
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "keywords": [ ],
+  "keywords": [],
   "files": [
     "build/types",
     "build/js",
@@ -53,6 +53,6 @@
   ],
   "main": "./build/js/index.cjs",
   "module": "./build/js/index.mjs",
-  "types": "./build/types/index.d.ts",
+  "types": "./build/types/src/index.d.ts",
   "type": "module"
 }
diff --git a/examples-extra/basic/sdk/tsconfig.json b/examples-extra/basic/sdk/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "extends": "../../../monorepo/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
+    "rootDir": ".",
     "outDir": "build/types",
     "composite": true
   },
   "include": [
     "./src/**/*",
-    ".eslintrc.cjs"
+    ".eslintrc.cjs",
+    "package.json"
   ],
   "references": [
     {

diff --git a/examples-extra/one_dot_one/package.json b/examples-extra/one_dot_one/package.json
@@ -10,12 +10,12 @@
   },
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
+      "types": "./build/types/src/index.d.ts",
       "import": "./build/js/index.mjs",
       "require": "./build/js/index.cjs"
     },
     "./*": {
-      "types": "./build/types/public/*.d.ts",
+      "types": "./build/types/src/public/*.d.ts",
       "import": "./build/js/public/*.mjs",
       "require": "./build/js/public/*.cjs"
     }
@@ -44,7 +44,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "keywords": [ ],
+  "keywords": [],
   "files": [
     "build/types",
     "build/js",
@@ -56,5 +56,5 @@
   ],
   "main": "./build/js/index.cjs",
   "module": "./build/js/index.mjs",
-  "types": "./build/types/index.d.ts"
+  "types": "./build/types/src/index.d.ts"
 }
diff --git a/examples-extra/one_dot_one/tsconfig.json b/examples-extra/one_dot_one/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "extends": "../../monorepo/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
+    "rootDir": ".",
     "outDir": "build/types",
     "composite": true
   },
   "include": [
     "./src/**/*",
-    ".eslintrc.cjs"
+    ".eslintrc.cjs",
+    "package.json"
   ],
   "references": []
 }
diff --git a/packages/api/changelog/@unreleased/pr-141.v2.yml b/packages/api/changelog/@unreleased/pr-141.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Improves tsconfig
+  links:
+  - https://github.com/palantir/osdk-ts/pull/141
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -10,12 +10,12 @@
   },
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
+      "types": "./build/types/src/index.d.ts",
       "import": "./build/js/index.mjs",
       "require": "./build/js/index.js"
     },
     "./*": {
-      "types": "./build/types/public/*.d.ts",
+      "types": "./build/types/src/public/*.d.ts",
       "import": "./build/js/public/*.mjs",
       "require": "./build/js/public/*.js"
     }
@@ -45,7 +45,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "keywords": [ ],
+  "keywords": [],
   "files": [
     "build/types",
     "build/js",
@@ -57,5 +57,5 @@
   ],
   "main": "./build/js/index.js",
   "module": "./build/js/index.mjs",
-  "types": "./build/types/index.d.ts"
+  "types": "./build/types/src/index.d.ts"
 }
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "extends": "../../monorepo/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
+    "rootDir": ".",
     "outDir": "build/types",
     "composite": true
   },
   "include": [
     "./src/**/*",
-    ".eslintrc.cjs"
+    ".eslintrc.cjs",
+    "package.json"
   ],
   "references": [
     {

diff --git a/packages/cli/changelog/@unreleased/pr-141.v2.yml b/packages/cli/changelog/@unreleased/pr-141.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Improves tsconfig
+  links:
+  - https://github.com/palantir/osdk-ts/pull/141
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -10,12 +10,12 @@
   },
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
+      "types": "./build/types/src/index.d.ts",
       "import": "./build/js/index.mjs",
       "require": "./build/js/index.cjs"
     },
     "./*": {
-      "types": "./build/types/public/*.d.ts",
+      "types": "./build/types/src/public/*.d.ts",
       "import": "./build/js/public/*.mjs",
       "require": "./build/js/public/*.cjs"
     }
@@ -60,7 +60,7 @@
   "imports": {
     "#net": "./src/net/index.mts"
   },
-  "keywords": [ ],
+  "keywords": [],
   "bin": {
     "osdk": "./bin/osdk.mjs"
   },
@@ -75,6 +75,6 @@
   ],
   "main": "./build/js/index.cjs",
   "module": "./build/js/index.mjs",
-  "types": "./build/types/index.d.ts",
+  "types": "./build/types/src/index.d.ts",
   "type": "module"
 }
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "extends": "../../monorepo/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
+    "rootDir": ".",
     "outDir": "build/types",
     "composite": true
   },
   "include": [
     "./src/**/*",
-    ".eslintrc.cjs"
+    ".eslintrc.cjs",
+    "package.json"
   ],
   "references": [
     {

diff --git a/packages/client/changelog/@unreleased/pr-141.v2.yml b/packages/client/changelog/@unreleased/pr-141.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Improves tsconfig
+  links:
+  - https://github.com/palantir/osdk-ts/pull/141
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -10,12 +10,12 @@
   },
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
+      "types": "./build/types/src/index.d.ts",
       "import": "./build/js/index.mjs",
       "require": "./build/js/index.cjs"
     },
     "./*": {
-      "types": "./build/types/public/*.d.ts",
+      "types": "./build/types/src/public/*.d.ts",
       "import": "./build/js/public/*.mjs",
       "require": "./build/js/public/*.cjs"
     }
@@ -58,7 +58,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "keywords": [ ],
+  "keywords": [],
   "files": [
     "build/types",
     "build/js",
@@ -70,6 +70,6 @@
   ],
   "main": "./build/js/index.cjs",
   "module": "./build/js/index.mjs",
-  "types": "./build/types/index.d.ts",
+  "types": "./build/types/src/index.d.ts",
   "type": "module"
 }
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "extends": "../../monorepo/tsconfig/tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "src",
+    "rootDir": ".",
     "outDir": "build/types",
     "composite": true
   },
   "include": [
     "./src/**/*",
-    ".eslintrc.cjs"
+    ".eslintrc.cjs",
+    "package.json"
   ],
   "references": [
     {

diff --git a/packages/create-app/changelog/@unreleased/pr-141.v2.yml b/packages/create-app/changelog/@unreleased/pr-141.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Improves tsconfig
+  links:
+  - https://github.com/palantir/osdk-ts/pull/141
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -10,12 +10,12 @@
   },
   "exports": {
     ".": {
-      "types": "./build/types/index.d.ts",
+      "types": "./build/types/src/index.d.ts",
       "import": "./build/js/index.mjs",
       "require": "./build/js/index.cjs"
     },
     "./*": {
-      "types": "./build/types/public/*.d.ts",
+      "types": "./build/types/src/public/*.d.ts",
       "import": "./build/js/public/*.mjs",
       "require": "./build/js/public/*.cjs"
     }
@@ -61,6 +61,6 @@
   ],
   "main": "./build/js/index.cjs",
   "module": "./build/js/index.mjs",
-  "types": "./build/types/index.d.ts",
+  "types": "./build/types/src/index.d.ts",
   "type": "module"
 }