Skip to content

Commit 5f13893

Browse files
tylerlongtylerlong
committed
Use tsup to publish
1 parent ecc1f9a commit 5f13893

30 files changed

Lines changed: 723 additions & 137 deletions

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ project.
130130
### Test
131131

132132
```
133-
yarn reset && yarn compile && yarn test
133+
yarn clean && yarn build && yarn test
134134
```
135135

136136
### Test one test case
@@ -144,7 +144,7 @@ t=auto-recover yarn test
144144
Update version number in `packages/core/src/Rest.ts`
145145

146146
```
147-
yarn compile
147+
yarn build
148148
yarn lerna publish from-package
149149
```
150150

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"test"
1111
],
1212
"scripts": {
13-
"compile": "lerna exec 'yarn build' --scope=@rc-ex/core && lerna exec 'yarn build' --no-private --ignore=@rc-ex/core",
14-
"reset": "lerna exec 'rm -rf dist'",
13+
"build": "lerna exec 'yarn build' --scope=@rc-ex/core && lerna exec 'yarn build' --no-private --ignore=@rc-ex/core",
14+
"clean": "lerna exec 'rm -rf dist'",
1515
"reinstall": "lerna exec 'rm -rf node_modules' && yarn install",
16-
"prepublishOnly": "yarn reset && yarn compile && yarn test",
16+
"prepack": "yarn clean && yarn build && yarn test",
1717
"test": "yarn workspace @rc-ex/test run vitest",
1818
"upgrade-all": "yarn-upgrade-all -W && yarn workspaces run yarn-upgrade-all && yarn install",
1919
"format-lint": "biome check --write --unsafe ."
@@ -22,6 +22,7 @@
2222
"@biomejs/biome": "^2.4.10",
2323
"@types/node": "^25.0.3",
2424
"lerna": "^9.0.3",
25+
"tsup": "^8.5.1",
2526
"typescript": "^5.9.3",
2627
"yarn-upgrade-all": "^0.7.5"
2728
},

‎packages/core/package.json‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,24 @@
88
"files": [
99
"dist"
1010
],
11-
"types": "./dist/esm/index.d.ts",
12-
"main": "./dist/esm/index.js",
13-
"module": "./dist/esm/index.js",
11+
"types": "./dist/index.d.ts",
12+
"main": "./dist/index.cjs",
13+
"module": "./dist/index.js",
1414
"exports": {
1515
".": {
16-
"types": "./dist/esm/index.d.ts",
17-
"import": "./dist/esm/index.js"
16+
"types": "./dist/index.d.ts",
17+
"import": "./dist/index.js",
18+
"require": "./dist/index.cjs"
1819
},
1920
"./lib/*": {
20-
"types": "./dist/esm/*.d.ts",
21-
"import": "./dist/esm/*.js"
21+
"types": "./dist/*.d.ts",
22+
"import": "./dist/*.js",
23+
"require": "./dist/*.cjs"
2224
},
2325
"./*": {
24-
"types": "./dist/esm/*.d.ts",
25-
"import": "./dist/esm/*.js"
26+
"types": "./dist/*.d.ts",
27+
"import": "./dist/*.js",
28+
"require": "./dist/*.cjs"
2629
}
2730
},
2831
"repository": {
@@ -45,7 +48,7 @@
4548
"ringcentral-code-generator": "^0.7.6"
4649
},
4750
"scripts": {
48-
"build": "tsc -p tsconfig.esm.json"
51+
"build": "tsup --config tsup.config.ts && tsc -p tsconfig.esm.json --declaration --emitDeclarationOnly --outDir dist"
4952
},
5053
"type": "module"
5154
}

‎packages/core/tsconfig.esm.json‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
"compilerOptions": {
33
"esModuleInterop": true,
44
"module": "ESNext",
5-
"target": "ESNext",
6-
"declaration": true,
7-
"outDir": "./dist/esm",
8-
"skipLibCheck": true,
9-
"paths": {
10-
"axios": ["../../node_modules/axios/dist/esm/axios.js"]
11-
}
5+
"moduleResolution": "Bundler",
6+
"target": "ES2022",
7+
"skipLibCheck": true
128
},
13-
"include": ["src/**/*.ts"]
9+
"include": [
10+
"src/**/*.ts"
11+
]
1412
}

‎packages/core/tsup.config.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { defineConfig } from "tsup";
2+
3+
export default defineConfig({
4+
entry: ["src/**/*.ts"],
5+
format: ["esm", "cjs"],
6+
dts: false,
7+
bundle: false,
8+
splitting: false,
9+
sourcemap: true,
10+
clean: true,
11+
target: "es2022",
12+
outDir: "dist",
13+
tsconfig: "tsconfig.esm.json",
14+
outExtension({ format }) {
15+
return {
16+
js: format === "cjs" ? ".cjs" : ".js",
17+
};
18+
},
19+
});

‎packages/extensions/authorize-uri/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
"files": [
99
"dist"
1010
],
11-
"types": "./dist/esm/index.d.ts",
12-
"main": "./dist/esm/index.js",
13-
"module": "./dist/esm/index.js",
11+
"types": "./dist/index.d.ts",
12+
"main": "./dist/index.cjs",
13+
"module": "./dist/index.js",
1414
"exports": {
1515
".": {
16-
"types": "./dist/esm/index.d.ts",
17-
"import": "./dist/esm/index.js"
16+
"types": "./dist/index.d.ts",
17+
"import": "./dist/index.js",
18+
"require": "./dist/index.cjs"
1819
}
1920
},
2021
"repository": {
@@ -32,7 +33,7 @@
3233
"urijs": "^1.19.11"
3334
},
3435
"scripts": {
35-
"build": "tsc -p tsconfig.esm.json"
36+
"build": "tsup --config tsup.config.ts && tsc -p tsconfig.esm.json --declaration --emitDeclarationOnly --outDir dist"
3637
},
3738
"type": "module"
3839
}

‎packages/extensions/authorize-uri/tsconfig.esm.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22
"compilerOptions": {
33
"esModuleInterop": true,
44
"module": "ESNext",
5-
"target": "ESNext",
6-
"declaration": true,
7-
"outDir": "./dist/esm",
5+
"moduleResolution": "Bundler",
6+
"target": "ES2022",
87
"skipLibCheck": true,
8+
"baseUrl": ".",
99
"paths": {
10-
"@rc-ex/core": ["../../core/dist/esm/index"],
11-
"@rc-ex/core/*": ["../../core/dist/esm/*"]
10+
"@rc-ex/core": [
11+
"../../core/src/index.ts"
12+
],
13+
"@rc-ex/core/*": [
14+
"../../core/src/*"
15+
]
1216
}
1317
},
14-
"include": ["src/**/*.ts"]
18+
"include": [
19+
"src/**/*.ts"
20+
]
1521
}

‎packages/extensions/authorize-uri/tsup.config.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { defineConfig } from "tsup";
2+
3+
export default defineConfig({
4+
entry: ["src/**/*.ts"],
5+
format: ["esm", "cjs"],
6+
dts: false,
7+
bundle: false,
8+
splitting: false,
9+
sourcemap: true,
10+
clean: true,
11+
target: "es2022",
12+
outDir: "dist",
13+
tsconfig: "tsconfig.esm.json",
14+
outExtension({ format }) {
15+
return {
16+
js: format === "cjs" ? ".cjs" : ".js",
17+
};
18+
},
19+
});

‎packages/extensions/auto-refresh/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
"files": [
99
"dist"
1010
],
11-
"types": "./dist/esm/index.d.ts",
12-
"main": "./dist/esm/index.js",
13-
"module": "./dist/esm/index.js",
11+
"types": "./dist/index.d.ts",
12+
"main": "./dist/index.cjs",
13+
"module": "./dist/index.js",
1414
"exports": {
1515
".": {
16-
"types": "./dist/esm/index.d.ts",
17-
"import": "./dist/esm/index.js"
16+
"types": "./dist/index.d.ts",
17+
"import": "./dist/index.js",
18+
"require": "./dist/index.cjs"
1819
}
1920
},
2021
"repository": {
@@ -28,7 +29,7 @@
2829
"access": "public"
2930
},
3031
"scripts": {
31-
"build": "tsc -p tsconfig.esm.json"
32+
"build": "tsup --config tsup.config.ts && tsc -p tsconfig.esm.json --declaration --emitDeclarationOnly --outDir dist"
3233
},
3334
"type": "module"
3435
}

‎packages/extensions/auto-refresh/tsconfig.esm.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22
"compilerOptions": {
33
"esModuleInterop": true,
44
"module": "ESNext",
5-
"target": "ESNext",
6-
"declaration": true,
7-
"outDir": "./dist/esm",
5+
"moduleResolution": "Bundler",
6+
"target": "ES2022",
87
"skipLibCheck": true,
8+
"baseUrl": ".",
99
"paths": {
10-
"@rc-ex/core": ["../../core/dist/esm/index"],
11-
"@rc-ex/core/*": ["../../core/dist/esm/*"]
10+
"@rc-ex/core": [
11+
"../../core/src/index.ts"
12+
],
13+
"@rc-ex/core/*": [
14+
"../../core/src/*"
15+
]
1216
}
1317
},
14-
"include": ["src/**/*.ts"]
18+
"include": [
19+
"src/**/*.ts"
20+
]
1521
}

0 commit comments

Comments
 (0)