diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac89ffc9dd..a88b2e080c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,5 +39,7 @@ jobs: echo "Error: Uncommitted changes detected after build." echo "Changed files:" git status --porcelain + echo "Diff of changes:" + git diff exit 1 fi diff --git a/common/shared/vite/data.ts b/common/shared/vite/data.ts index 9b61db7cc8..5251fc36b3 100644 --- a/common/shared/vite/data.ts +++ b/common/shared/vite/data.ts @@ -18,7 +18,7 @@ export const peerDepsMap = { react: { global: 'React', name: 'react', - version: '>=16.9.0', + version: '^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc', }, 'react/jsx-runtime': { global: 'React', @@ -28,7 +28,7 @@ export const peerDepsMap = { 'react-dom': { global: 'ReactDOM', name: 'react-dom', - version: '>=16.9.0', + version: '^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc', }, 'react-dom/client': { global: 'ReactDOM', diff --git a/packages-experimental/action-recorder/package.json b/packages-experimental/action-recorder/package.json index 7d90584ad2..059a27eaf1 100644 --- a/packages-experimental/action-recorder/package.json +++ b/packages-experimental/action-recorder/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages-experimental/debugger/package.json b/packages-experimental/debugger/package.json index 1e985fc28a..d372489dd5 100644 --- a/packages-experimental/debugger/package.json +++ b/packages-experimental/debugger/package.json @@ -59,7 +59,7 @@ "build": "univer-cli build --skipUMD" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages-experimental/uni-formula-ui/package.json b/packages-experimental/uni-formula-ui/package.json index cf50b8127b..b7eb9f7669 100644 --- a/packages-experimental/uni-formula-ui/package.json +++ b/packages-experimental/uni-formula-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages-experimental/uni-sheets-ui/package.json b/packages-experimental/uni-sheets-ui/package.json index 28f0781e4f..ce103fca2c 100644 --- a/packages-experimental/uni-sheets-ui/package.json +++ b/packages-experimental/uni-sheets-ui/package.json @@ -56,7 +56,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages-experimental/uni-slides-ui/package.json b/packages-experimental/uni-slides-ui/package.json index eb7a6cbfb3..a719dd1630 100644 --- a/packages-experimental/uni-slides-ui/package.json +++ b/packages-experimental/uni-slides-ui/package.json @@ -56,7 +56,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0" + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "dependencies": { "@univerjs/core": "workspace:*", diff --git a/packages-experimental/uniui/package.json b/packages-experimental/uniui/package.json index 31d96b0643..d545ed11c2 100644 --- a/packages-experimental/uniui/package.json +++ b/packages-experimental/uniui/package.json @@ -56,8 +56,8 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", + "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/design/package.json b/packages/design/package.json index 7006b2ff35..e5192af84c 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -64,8 +64,8 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", + "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "dependencies": { "@radix-ui/react-dropdown-menu": "^2.1.6", diff --git a/packages/docs-drawing-ui/package.json b/packages/docs-drawing-ui/package.json index f0f3bbbd17..2c7c2be9b6 100644 --- a/packages/docs-drawing-ui/package.json +++ b/packages/docs-drawing-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/docs-hyper-link-ui/package.json b/packages/docs-hyper-link-ui/package.json index e9b73c8922..e108be11e4 100644 --- a/packages/docs-hyper-link-ui/package.json +++ b/packages/docs-hyper-link-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/docs-mention-ui/package.json b/packages/docs-mention-ui/package.json index 4547e280ba..b97047582a 100644 --- a/packages/docs-mention-ui/package.json +++ b/packages/docs-mention-ui/package.json @@ -58,7 +58,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/docs-quick-insert-ui/package.json b/packages/docs-quick-insert-ui/package.json index 9fec467375..4081be8be9 100644 --- a/packages/docs-quick-insert-ui/package.json +++ b/packages/docs-quick-insert-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { @@ -73,12 +73,12 @@ "@univerjs/docs-ui": "workspace:*", "@univerjs/drawing": "workspace:*", "@univerjs/drawing-ui": "workspace:*", + "@univerjs/engine-render": "workspace:*", "@univerjs/icons": "^0.2.30", "@univerjs/ui": "workspace:*" }, "devDependencies": { "@univerjs-infra/shared": "workspace:*", - "@univerjs/engine-render": "workspace:*", "postcss": "^8.5.3", "react": "18.3.1", "rxjs": "^7.8.1", diff --git a/packages/docs-thread-comment-ui/package.json b/packages/docs-thread-comment-ui/package.json index 6400e811bc..4f0461f79d 100644 --- a/packages/docs-thread-comment-ui/package.json +++ b/packages/docs-thread-comment-ui/package.json @@ -56,7 +56,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json index f693af50a5..f5ac259ec4 100644 --- a/packages/docs-ui/package.json +++ b/packages/docs-ui/package.json @@ -70,7 +70,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json index 0e46b49dae..937e1875ad 100644 --- a/packages/drawing-ui/package.json +++ b/packages/drawing-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json index 3359959391..38ae36a35f 100644 --- a/packages/find-replace/package.json +++ b/packages/find-replace/package.json @@ -64,7 +64,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json index 6f5547abeb..06de3b4c15 100644 --- a/packages/sheets-conditional-formatting-ui/package.json +++ b/packages/sheets-conditional-formatting-ui/package.json @@ -64,8 +64,8 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", + "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-crosshair-highlight/package.json b/packages/sheets-crosshair-highlight/package.json index 1cf9515838..8ea02d5953 100644 --- a/packages/sheets-crosshair-highlight/package.json +++ b/packages/sheets-crosshair-highlight/package.json @@ -68,7 +68,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-data-validation-ui/package.json b/packages/sheets-data-validation-ui/package.json index 8923cea0f0..fcd499663a 100644 --- a/packages/sheets-data-validation-ui/package.json +++ b/packages/sheets-data-validation-ui/package.json @@ -65,7 +65,7 @@ "lint:types": "tsc --noEmit" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-drawing-ui/package.json b/packages/sheets-drawing-ui/package.json index 7913799099..d79aa473e2 100644 --- a/packages/sheets-drawing-ui/package.json +++ b/packages/sheets-drawing-ui/package.json @@ -68,7 +68,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json index cb135ff4a9..fdd51962e0 100644 --- a/packages/sheets-filter-ui/package.json +++ b/packages/sheets-filter-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-formula-ui/package.json b/packages/sheets-formula-ui/package.json index 7870e78616..3547e97632 100644 --- a/packages/sheets-formula-ui/package.json +++ b/packages/sheets-formula-ui/package.json @@ -69,7 +69,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json index e568de80b3..2c9973b4a0 100644 --- a/packages/sheets-hyper-link-ui/package.json +++ b/packages/sheets-hyper-link-ui/package.json @@ -70,7 +70,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-numfmt-ui/package.json b/packages/sheets-numfmt-ui/package.json index 39082ba676..d52b1d3f6c 100644 --- a/packages/sheets-numfmt-ui/package.json +++ b/packages/sheets-numfmt-ui/package.json @@ -64,7 +64,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-sort-ui/package.json b/packages/sheets-sort-ui/package.json index 5a11cfe352..32b4908cad 100644 --- a/packages/sheets-sort-ui/package.json +++ b/packages/sheets-sort-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-thread-comment-ui/package.json b/packages/sheets-thread-comment-ui/package.json index 5ee107c310..3efa323a38 100644 --- a/packages/sheets-thread-comment-ui/package.json +++ b/packages/sheets-thread-comment-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json index 5ff5b1725f..194df74405 100644 --- a/packages/sheets-ui/package.json +++ b/packages/sheets-ui/package.json @@ -70,7 +70,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json index 81d307b05f..d58048e658 100644 --- a/packages/sheets-zen-editor/package.json +++ b/packages/sheets-zen-editor/package.json @@ -70,7 +70,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json index 6b081bf02a..9f7e1befbe 100644 --- a/packages/slides-ui/package.json +++ b/packages/slides-ui/package.json @@ -64,7 +64,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json index 59658c0a91..357e021cad 100644 --- a/packages/thread-comment-ui/package.json +++ b/packages/thread-comment-ui/package.json @@ -62,7 +62,7 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/ui/package.json b/packages/ui/package.json index c64c4b3b30..f2654065e2 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -70,8 +70,8 @@ "build": "univer-cli build" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", + "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/packages/uniscript/package.json b/packages/uniscript/package.json index 418c74f0dd..fb0ce26b6f 100644 --- a/packages/uniscript/package.json +++ b/packages/uniscript/package.json @@ -65,7 +65,7 @@ }, "peerDependencies": { "monaco-editor": ">=0.50.0", - "react": ">=16.9.0", + "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "rxjs": ">=7.0.0" }, "dependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 124247e3e7..fe95661b33 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1462,6 +1462,9 @@ importers: '@univerjs/drawing-ui': specifier: workspace:* version: link:../drawing-ui + '@univerjs/engine-render': + specifier: workspace:* + version: link:../engine-render '@univerjs/icons': specifier: ^0.2.30 version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) @@ -1472,9 +1475,6 @@ importers: '@univerjs-infra/shared': specifier: workspace:* version: link:../../common/shared - '@univerjs/engine-render': - specifier: workspace:* - version: link:../engine-render postcss: specifier: ^8.5.3 version: 8.5.3