Skip to content

Commit a41e7ab

Browse files
fix(modern-js-plugin-v3): harden RSC bridge runtime merge (#4484)
Co-authored-by: zhouxiao.shaw <zhouxiao.shaw@bytedance.com>
1 parent 0068d40 commit a41e7ab

37 files changed

+4366
-428
lines changed

packages/bridge/bridge-react/package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
".": {
2020
"types": "./dist/index.d.ts",
2121
"import": "./dist/index.es.js",
22-
"require": "./dist/index.cjs.js"
22+
"require": "./dist/index.cjs.js",
23+
"default": "./dist/index.es.js"
2324
},
2425
"./base": {
2526
"types": "./dist/base.d.ts",
@@ -64,17 +65,20 @@
6465
"./lazy-utils": {
6566
"types": "./dist/lazy-utils.d.ts",
6667
"import": "./dist/lazy-utils.es.js",
67-
"require": "./dist/lazy-utils.cjs.js"
68+
"require": "./dist/lazy-utils.cjs.js",
69+
"default": "./dist/lazy-utils.es.js"
6870
},
6971
"./data-fetch-utils": {
7072
"types": "./dist/data-fetch-utils.d.ts",
7173
"import": "./dist/data-fetch-utils.es.js",
72-
"require": "./dist/data-fetch-utils.cjs.js"
74+
"require": "./dist/data-fetch-utils.cjs.js",
75+
"default": "./dist/data-fetch-utils.es.js"
7376
},
7477
"./data-fetch-server-middleware": {
7578
"types": "./dist/data-fetch-server-middleware.d.ts",
7679
"import": "./dist/data-fetch-server-middleware.es.js",
77-
"require": "./dist/data-fetch-server-middleware.cjs.js"
80+
"require": "./dist/data-fetch-server-middleware.cjs.js",
81+
"default": "./dist/data-fetch-server-middleware.es.js"
7882
},
7983
"./lazy-load-component-plugin": {
8084
"types": "./dist/lazy-load-component-plugin.d.ts",

packages/dts-plugin/src/core/lib/typeScriptCompiler.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ensureDirSync, writeFileSync, existsSync } from 'fs-extra';
1+
import fsExtra from 'fs-extra';
22
import crypto from 'crypto';
33
import { stat, readdir, writeFile, rm, readFile } from 'fs/promises';
44
import {
@@ -26,6 +26,7 @@ import { TsConfigJson } from '../interfaces/TsConfigJson';
2626
import { logger } from '../../server';
2727

2828
const STARTS_WITH_SLASH = /^\//;
29+
const { ensureDirSync, writeFileSync, existsSync } = fsExtra;
2930

3031
const DEFINITION_FILE_EXTENSION = '.d.ts';
3132

0 commit comments

Comments
 (0)