Skip to content

Commit c00dc58

Browse files
yimingjfeyimingjfe
authored
refactor: migrate to rslib (#7899)
1 parent 17bec99 commit c00dc58

File tree

97 files changed

+1147
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1147
-552
lines changed

‎nx.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"{projectRoot}/tsconfig.json",
88
"{projectRoot}/package.json",
99
"{projectRoot}/modern.config.*",
10+
"{projectRoot}/rslib.config.*",
1011
"{projectRoot}/scripts/**/*"
1112
]
1213
},

‎packages/cli/plugin-bff/modern.config.js‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎packages/cli/plugin-bff/package.json‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,61 @@
1919
"jsnext:source": "./src/cli.ts",
2020
"types": "./src/cli.ts",
2121
"main": "./dist/cjs/cli.js",
22-
"module": "./dist/esm/cli.js",
22+
"module": "./dist/esm-node/cli.mjs",
2323
"exports": {
2424
"./types": "./types.d.ts",
2525
".": {
2626
"types": "./dist/types/cli.d.ts",
2727
"jsnext:source": "./src/cli.ts",
28+
"node": {
29+
"import": "./dist/esm-node/cli.mjs",
30+
"require": "./dist/cjs/cli.js"
31+
},
2832
"default": "./dist/cjs/cli.js"
2933
},
3034
"./cli": {
3135
"types": "./dist/types/cli.d.ts",
3236
"jsnext:source": "./src/cli.ts",
37+
"node": {
38+
"import": "./dist/esm-node/cli.mjs",
39+
"require": "./dist/cjs/cli.js"
40+
},
3341
"default": "./dist/cjs/cli.js"
3442
},
3543
"./server-plugin": {
3644
"types": "./dist/types/server.d.ts",
3745
"jsnext:source": "./src/server.ts",
46+
"node": {
47+
"import": "./dist/esm-node/server.mjs",
48+
"require": "./dist/cjs/server.js"
49+
},
3850
"default": "./dist/cjs/server.js"
3951
},
4052
"./loader": {
4153
"types": "./dist/types/loader.d.ts",
4254
"jsnext:source": "./src/loader.ts",
55+
"node": {
56+
"import": "./dist/esm-node/loader.mjs",
57+
"require": "./dist/cjs/loader.js"
58+
},
4359
"default": "./dist/cjs/loader.js"
4460
},
4561
"./server": {
4662
"types": "./dist/types/runtime/hono/index.d.ts",
4763
"jsnext:source": "./src/runtime/hono/index.ts",
64+
"node": {
65+
"import": "./dist/esm-node/runtime/hono/index.mjs",
66+
"require": "./dist/cjs/runtime/hono/index.js"
67+
},
4868
"default": "./dist/cjs/runtime/hono/index.js"
4969
},
5070
"./client": {
5171
"types": "./dist/types/create-request/index.d.ts",
5272
"jsnext:source": "./src/runtime/create-request/index.ts",
73+
"node": {
74+
"import": "./dist/esm-node/runtime/create-request/index.mjs",
75+
"require": "./dist/cjs/runtime/create-request/index.js"
76+
},
5377
"default": "./dist/cjs/runtime/create-request/index.js"
5478
}
5579
},
@@ -75,8 +99,8 @@
7599
"scripts": {
76100
"prepublishOnly": "only-allow-pnpm",
77101
"new": "modern-lib new",
78-
"build": "modern-lib build",
79-
"dev": "modern-lib build --watch",
102+
"build": "rslib build",
103+
"dev": "rslib build --watch",
80104
"test": "jest --passWithNoTests"
81105
},
82106
"dependencies": {
@@ -96,9 +120,10 @@
96120
"@modern-js/plugin": "workspace:*",
97121
"@modern-js/runtime": "workspace:*",
98122
"@modern-js/types": "workspace:*",
99-
"@scripts/build": "workspace:*",
100123
"@rsbuild/core": "1.6.8",
101124
"@scripts/jest-config": "workspace:*",
125+
"@rslib/core": "0.18.0",
126+
"@modern-js/rslib": "workspace:*",
102127
"@types/babel__core": "^7.20.5",
103128
"@types/jest": "^29.5.14",
104129
"@types/node": "^20",

‎packages/cli/plugin-bff/rslib.config.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { rslibConfig } from '@modern-js/rslib';
2+
import { defineConfig } from '@rslib/core';
3+
4+
export default defineConfig(rslibConfig);

‎packages/cli/plugin-bff/src/cli.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,13 @@ export const bffPlugin = (): CliPlugin<AppTools> => ({
212212
);
213213

214214
const name = isServer ? 'server' : 'client';
215+
const loaderPath = require.resolve('./loader');
215216
chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(apiRegexp);
216217
chain.module
217218
.rule('js-bff-api')
218219
.test(apiRegexp)
219220
.use('custom-loader')
220-
.loader(require.resolve('./loader').replace(/\\/g, '/'))
221+
.loader(loaderPath.replace(/\\/g, '/'))
221222
.options({
222223
prefix,
223224
appDir: appDirectory,

‎packages/cli/plugin-data-loader/modern.config.js‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎packages/cli/plugin-data-loader/package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"jsnext:source": "./src/runtime/index.ts",
2323
"types": "./src/runtime/index.ts",
2424
"main": "./dist/cjs/runtime/index.js",
25-
"module": "./dist/esm/runtime/index.js",
25+
"module": "./dist/esm/runtime/index.mjs",
2626
"exports": {
2727
"./loader": {
2828
"types": "./dist/types/cli/loader.d.ts",
@@ -32,7 +32,7 @@
3232
"./runtime": {
3333
"types": "./dist/types/runtime/index.d.ts",
3434
"jsnext:source": "./src/runtime/index.ts",
35-
"default": "./dist/esm/runtime/index.js"
35+
"default": "./dist/esm/runtime/index.mjs"
3636
}
3737
},
3838
"typesVersions": {
@@ -48,8 +48,8 @@
4848
"scripts": {
4949
"prepublishOnly": "only-allow-pnpm",
5050
"new": "modern-lib new",
51-
"build": "modern-lib build",
52-
"dev": "modern-lib build --watch",
51+
"build": "rslib build",
52+
"dev": "rslib build --watch",
5353
"test": "jest --passWithNoTests"
5454
},
5555
"dependencies": {
@@ -62,8 +62,9 @@
6262
"devDependencies": {
6363
"@modern-js/server-core": "workspace:*",
6464
"@modern-js/types": "workspace:*",
65-
"@scripts/build": "workspace:*",
6665
"@scripts/jest-config": "workspace:*",
66+
"@rslib/core": "0.18.0",
67+
"@modern-js/rslib": "workspace:*",
6768
"@types/babel__core": "^7.20.5",
6869
"@types/jest": "^29.5.14",
6970
"@types/node": "^20",

‎packages/cli/plugin-data-loader/rslib.config.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { rslibConfig } from '@modern-js/rslib';
2+
import { defineConfig } from '@rslib/core';
3+
4+
export default defineConfig(rslibConfig);

‎packages/cli/plugin-ssg/modern.config.js‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎packages/cli/plugin-ssg/package.json‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"jsnext:source": "./src/index.ts",
2020
"types": "./src/index.ts",
2121
"main": "./dist/cjs/index.js",
22-
"module": "./dist/esm/index.js",
22+
"module": "./dist/esm/index.mjs",
2323
"typesVersions": {
2424
"*": {
2525
".": [
@@ -33,36 +33,37 @@
3333
"exports": {
3434
".": {
3535
"types": "./dist/types/index.d.ts",
36+
"jsnext:source": "./src/index.ts",
3637
"node": {
37-
"jsnext:source": "./src/index.ts",
38-
"import": "./dist/esm-node/index.js",
38+
"import": "./dist/esm-node/index.mjs",
3939
"require": "./dist/cjs/index.js"
4040
},
41-
"default": "./dist/esm/index.js"
41+
"default": "./dist/esm/index.mjs"
4242
},
4343
"./cli": {
44+
"types": "./dist/types/index.d.ts",
4445
"jsnext:source": "./src/index.ts",
4546
"node": {
46-
"import": "./dist/esm-node/index.js",
47+
"import": "./dist/esm-node/index.mjs",
4748
"require": "./dist/cjs/index.js"
4849
},
49-
"default": "./dist/esm/index.js"
50+
"default": "./dist/esm/index.mjs"
5051
},
5152
"./types": {
5253
"types": "./dist/types/types.d.ts",
54+
"jsnext:source": "./src/types.ts",
5355
"node": {
54-
"types": "./dist/types/types.d.ts",
55-
"import": "./dist/esm-node/types.js",
56+
"import": "./dist/esm-node/types.mjs",
5657
"require": "./dist/cjs/types.js"
5758
},
58-
"default": "./dist/esm/types.js"
59+
"default": "./dist/esm/types.mjs"
5960
}
6061
},
6162
"scripts": {
6263
"prepublishOnly": "only-allow-pnpm",
6364
"new": "modern-lib new",
64-
"build": "modern-lib build",
65-
"dev": "modern-lib build --watch",
65+
"build": "rslib build",
66+
"dev": "rslib build --watch",
6667
"test": "jest --passWithNoTests"
6768
},
6869
"dependencies": {
@@ -83,8 +84,9 @@
8384
"devDependencies": {
8485
"@modern-js/app-tools": "workspace:*",
8586
"@modern-js/types": "workspace:*",
86-
"@scripts/build": "workspace:*",
8787
"@scripts/jest-config": "workspace:*",
88+
"@rslib/core": "0.18.0",
89+
"@modern-js/rslib": "workspace:*",
8890
"@types/jest": "^29.5.14",
8991
"@types/node": "^20",
9092
"jest": "^29.7.0",

0 commit comments

Comments
 (0)