Try to finalize the ESM & CJS experiment

tylerlong · tylerlong · commit 82ba5e0ce85f · 2025-02-04T10:56:21.000-08:00
diff --git a/package.json b/package.json
@@ -14,16 +14,11 @@
     "reset": "lerna exec 'rm -rf dist'",
     "prepublishOnly": "yarn reset && yarn compile && yarn test",
     "test": "yarn workspace @rc-ex/test run vitest",
-    "upgrade-all": "yarn-upgrade-all -W && yarn workspaces run yarn-upgrade-all && yarn install",
-    "reinstall": "lerna exec 'rm -rf node_modules' && yarn install && lerna exec 'yarn install'"
+    "upgrade-all": "yarn-upgrade-all -W && yarn workspaces run yarn-upgrade-all && yarn install"
   },
   "devDependencies": {
-    "@types/node": "^22.13.0",
+    "@types/node": "^22.13.1",
     "lerna": "^8.1.9",
-    "prettier": "^3.4.2",
-    "sort-package-json": "^2.14.0",
-    "tsup": "^8.3.6",
-    "ttpt": "^0.13.0",
     "typescript": "^5.7.3",
     "yarn-upgrade-all": "^0.7.4"
   }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
diff --git a/packages/core/tsconfig.cjs.json b/packages/core/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true
diff --git a/packages/extensions/authorize-uri/package.json b/packages/extensions/authorize-uri/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
diff --git a/packages/extensions/authorize-uri/src/index.ts b/packages/extensions/authorize-uri/src/index.ts
@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import SdkExtension from "@rc-ex/core/SdkExtension";
 import type AuthorizeRequest from "@rc-ex/core/definitions/AuthorizeRequest";
 import type { QueryDataMap } from "urijs";
diff --git a/packages/extensions/authorize-uri/tsconfig.cjs.json b/packages/extensions/authorize-uri/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/packages/extensions/auto-refresh/package.json b/packages/extensions/auto-refresh/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
diff --git a/packages/extensions/auto-refresh/src/index.ts b/packages/extensions/auto-refresh/src/index.ts
@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import SdkExtension from "@rc-ex/core/SdkExtension";
 
 export interface AutoRefreshOptions {
diff --git a/packages/extensions/auto-refresh/tsconfig.cjs.json b/packages/extensions/auto-refresh/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/packages/extensions/debug/package.json b/packages/extensions/debug/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
diff --git a/packages/extensions/debug/src/index.ts b/packages/extensions/debug/src/index.ts
@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import type {
   RestMethod,
   RestRequestConfig,
diff --git a/packages/extensions/debug/tsconfig.cjs.json b/packages/extensions/debug/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/packages/extensions/events/package.json b/packages/extensions/events/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
diff --git a/packages/extensions/events/src/index.ts b/packages/extensions/events/src/index.ts
@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import type {
   RestMethod,
   RestRequestConfig,
diff --git a/packages/extensions/events/tsconfig.cjs.json b/packages/extensions/events/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/packages/extensions/rate-limit/package.json b/packages/extensions/rate-limit/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
diff --git a/packages/extensions/rate-limit/tsconfig.cjs.json b/packages/extensions/rate-limit/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/packages/extensions/rcsdk/package.json b/packages/extensions/rcsdk/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
diff --git a/packages/extensions/rcsdk/src/index.ts b/packages/extensions/rcsdk/src/index.ts
@@ -1,12 +1,12 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import type {
   RestMethod,
   RestRequestConfig,
   RestResponse,
 } from "@rc-ex/core/types";
 import SdkExtension from "@rc-ex/core/SdkExtension";
 import RestException from "@rc-ex/core/RestException";
-import { SDK } from "@ringcentral/sdk/lib/index";
+import { SDK } from "@ringcentral/sdk";
 
 export interface RcSdkOptions {
   rcSdk: SDK;
diff --git a/packages/extensions/rcsdk/tsconfig.cjs.json b/packages/extensions/rcsdk/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/packages/extensions/retry/package.json b/packages/extensions/retry/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "wait-for-async": "^0.7.10"
+    "wait-for-async": "^0.7.11"
   },
   "scripts": {
     "build": "tsc -p tsconfig.esm.json && tsc -p tsconfig.cjs.json"
diff --git a/packages/extensions/retry/src/index.ts b/packages/extensions/retry/src/index.ts
@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import type {
   RestMethod,
   RestRequestConfig,
diff --git a/packages/extensions/retry/tsconfig.cjs.json b/packages/extensions/retry/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/packages/extensions/ws/package.json b/packages/extensions/ws/package.json
@@ -8,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
@@ -43,7 +43,7 @@
     "http-status-codes": "^2.3.0",
     "hyperid": "^3.3.0",
     "isomorphic-ws": "^5.0.0",
-    "wait-for-async": "^0.7.10",
+    "wait-for-async": "^0.7.11",
     "ws": "^8.18.0"
   },
   "scripts": {
diff --git a/packages/extensions/ws/src/index.ts b/packages/extensions/ws/src/index.ts
@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import type {
   RestMethod,
   RestRequestConfig,
diff --git a/packages/extensions/ws/src/types.ts b/packages/extensions/ws/src/types.ts
@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import type {
   RestMethod,
   RestRequestConfig,
diff --git a/packages/extensions/ws/tsconfig.cjs.json b/packages/extensions/ws/tsconfig.cjs.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "module": "commonjs",
+    "target": "ES2022",
     "declaration": true,
     "outDir": "./dist/cjs",
     "skipLibCheck": true,
diff --git a/test/package.json b/test/package.json
@@ -13,8 +13,8 @@
     "@rc-ex/ws": "file:../packages/extensions/ws",
     "@ringcentral/sdk": "^5.0.3",
     "dotenv-override-true": "^6.2.2",
-    "vitest": "^3.0.4",
-    "wait-for-async": "^0.7.10",
+    "vitest": "^3.0.5",
+    "wait-for-async": "^0.7.11",
     "winston": "^3.17.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type RingCentral from "@rc-ex/core/index";`
	`1`	`+import type RingCentral from "@rc-ex/core";`
`2`	`2`	`import SdkExtension from "@rc-ex/core/SdkExtension";`
`3`	`3`	`import type AuthorizeRequest from "@rc-ex/core/definitions/AuthorizeRequest";`
`4`	`4`	`import type { QueryDataMap } from "urijs";`