fix: clean up commonjs builds (#605)

* clean up commonjs builds * fix cjs
saber-hq · Jun 1, 2022 · 1cb51ef · 1cb51ef
1 parent be3514d
commit 1cb51ef
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 32 deletions.
diff --git a/packages/anchor-contrib/tsconfig.cjs.json b/packages/anchor-contrib/tsconfig.cjs.json
@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "@saberhq/tsconfig/tsconfig.cjs.json",
   "compilerOptions": {
-    "module": "CommonJS",
     "outDir": "dist/cjs/"
-  }
+  },
+  "include": ["src/"]
 }
diff --git a/packages/anchor-contrib/tsconfig.json b/packages/anchor-contrib/tsconfig.json
@@ -1,9 +1,7 @@
 {
-  "extends": "@saberhq/tsconfig/tsconfig.lib.json",
+  "extends": "@saberhq/tsconfig/tsconfig.module.json",
   "compilerOptions": {
-    "moduleResolution": "nodenext",
-    "outDir": "dist/esm/",
-    "noEmit": false
+    "outDir": "dist/esm/"
   },
   "include": ["src/"]
 }
diff --git a/packages/chai-solana/tsconfig.cjs.json b/packages/chai-solana/tsconfig.cjs.json
@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "@saberhq/tsconfig/tsconfig.cjs.json",
   "compilerOptions": {
-    "module": "CommonJS",
     "outDir": "dist/cjs/"
-  }
+  },
+  "include": ["src/"]
 }
diff --git a/packages/chai-solana/tsconfig.json b/packages/chai-solana/tsconfig.json
@@ -1,9 +1,7 @@
 {
-  "extends": "@saberhq/tsconfig/tsconfig.lib.json",
+  "extends": "@saberhq/tsconfig/tsconfig.module.json",
   "compilerOptions": {
-    "moduleResolution": "nodenext",
-    "outDir": "dist/esm/",
-    "noEmit": false
+    "outDir": "dist/esm/"
   },
   "include": ["src/"]
 }
diff --git a/packages/option-utils/tsconfig.cjs.json b/packages/option-utils/tsconfig.cjs.json
@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "@saberhq/tsconfig/tsconfig.cjs.json",
   "compilerOptions": {
-    "module": "CommonJS",
     "outDir": "dist/cjs/"
-  }
+  },
+  "include": ["src/"]
 }
diff --git a/packages/option-utils/tsconfig.json b/packages/option-utils/tsconfig.json
@@ -1,8 +1,7 @@
 {
-  "extends": "@saberhq/tsconfig/tsconfig.lib.json",
+  "extends": "@saberhq/tsconfig/tsconfig.module.json",
   "compilerOptions": {
-    "outDir": "dist/esm/",
-    "noEmit": false
+    "outDir": "dist/esm/"
   },
   "include": ["src/"]
 }
diff --git a/packages/solana-contrib/package.json b/packages/solana-contrib/package.json
@@ -26,7 +26,7 @@
     "src/"
   ],
   "dependencies": {
-    "@saberhq/option-utils": "workspace:*",
+    "@saberhq/option-utils": "workspace:^",
     "@solana/buffer-layout": "^4.0.0",
     "@types/promise-retry": "^1.1.3",
     "@types/retry": "^0.12.2",
@@ -36,7 +36,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@saberhq/tsconfig": "workspace:*",
+    "@saberhq/tsconfig": "workspace:^",
     "@solana/web3.js": "^1.43.2",
     "@types/bn.js": "^5.1.0",
     "@types/jest": "^27.5.1",

diff --git a/packages/solana-contrib/tsconfig.cjs.json b/packages/solana-contrib/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "CommonJS",
+    "moduleResolution": "node",
     "outDir": "dist/cjs/"
   }
 }
diff --git a/packages/solana-contrib/tsconfig.json b/packages/solana-contrib/tsconfig.json
@@ -1,10 +1,8 @@
 {
-  "extends": "@saberhq/tsconfig/tsconfig.lib.json",
+  "extends": "@saberhq/tsconfig/tsconfig.module.json",
   "compilerOptions": {
     "outDir": "dist/esm/",
-    "moduleResolution": "nodenext",
-    "lib": ["ES2021.Promise", "ES2019"],
-    "noEmit": false
+    "lib": ["ES2021.Promise", "ES2019"]
   },
   "include": ["src/"]
 }
diff --git a/packages/stableswap-sdk/tsconfig.cjs.json b/packages/stableswap-sdk/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "CommonJS",
+    "moduleResolution": "node",
     "outDir": "dist/cjs/"
   }
 }
diff --git a/packages/stableswap-sdk/tsconfig.json b/packages/stableswap-sdk/tsconfig.json
@@ -1,8 +1,7 @@
 {
-  "extends": "@saberhq/tsconfig/tsconfig.lib.json",
+  "extends": "@saberhq/tsconfig/tsconfig.module.json",
   "compilerOptions": {
-    "outDir": "dist/esm/",
-    "noEmit": false
+    "outDir": "dist/esm/"
   },
   "include": ["src/"],
   "exclude": ["**/*.test.ts"]

diff --git a/packages/tsconfig/tsconfig.cjs.json b/packages/tsconfig/tsconfig.cjs.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "display": "Saber CommonJS TSConfig",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "moduleResolution": "node"
+  }
+}
diff --git a/packages/tsconfig/tsconfig.module.json b/packages/tsconfig/tsconfig.module.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "display": "Saber NodeNext TSConfig (recommended)",
+  "compilerOptions": {
+    "moduleResolution": "node16"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
@@ -2244,7 +2244,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@saberhq/option-utils@workspace:*, @saberhq/option-utils@workspace:packages/option-utils":
+"@saberhq/option-utils@workspace:^, @saberhq/option-utils@workspace:packages/option-utils":
   version: 0.0.0-use.local
   resolution: "@saberhq/option-utils@workspace:packages/option-utils"
   dependencies:
@@ -2300,8 +2300,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@saberhq/solana-contrib@workspace:packages/solana-contrib"
   dependencies:
-    "@saberhq/option-utils": "workspace:*"
-    "@saberhq/tsconfig": "workspace:*"
+    "@saberhq/option-utils": "workspace:^"
+    "@saberhq/tsconfig": "workspace:^"
     "@solana/buffer-layout": ^4.0.0
     "@solana/web3.js": ^1.43.2
     "@types/bn.js": ^5.1.0