Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@ciandt-crodrigues
ciandt-crodrigues authored Oct 31, 2024
2 parents a2fcb1c + 0931fc5 commit 9a0d72f
Show file tree
Hide file tree
Showing 24 changed files with 799 additions and 1,034 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ packages/enhanced/test/js

# storybook cases
!apps/rslib-module/@mf-types/**

**/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/dynamic-nested-remote/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/dynamic-remote-new-version/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/dynamic-remote/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/host/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/nested-remote/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/remote-new-version/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs-ssr/remote/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/modernjs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4"
}
Expand Down
8 changes: 4 additions & 4 deletions apps/router-demo/router-host-2000/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"@ant-design/icons": "^5.3.6",
"@module-federation/bridge-react": "workspace:*",
"@module-federation/enhanced": "workspace:*",
"react-router-dom": "^6.24.1",
"@module-federation/retry-plugin": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react-dom": "^18.3.1",
"react-router-dom": "^6.24.1"
},
"devDependencies": {
"@module-federation/rsbuild-plugin": "workspace:*",
"@rsbuild/core": "^1.0.16",
"@rsbuild/plugin-react": "^1.0.5",
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-react": "^1.0.6",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.3.0",
"tailwindcss": "^3.4.3",
Expand Down
4 changes: 2 additions & 2 deletions apps/router-demo/router-host-v5-2200/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
},
"devDependencies": {
"@module-federation/rsbuild-plugin": "workspace:*",
"@rsbuild/core": "^1.0.16",
"@rsbuild/plugin-react": "^1.0.5",
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-react": "^1.0.6",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.3.0",
"tailwindcss": "^3.4.3",
Expand Down
4 changes: 2 additions & 2 deletions apps/router-demo/router-host-vue3-2100/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"devDependencies": {
"@module-federation/rsbuild-plugin": "workspace:*",
"@rsbuild/core": "^1.0.16",
"@rsbuild/plugin-vue": "^1.0.1",
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-vue": "^1.0.3",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.2"
}
Expand Down
4 changes: 2 additions & 2 deletions apps/router-demo/router-remote1-2001/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
},
"devDependencies": {
"@ant-design/cssinjs": "^1.20.0",
"@rsbuild/core": "^1.0.16",
"@rsbuild/plugin-react": "^1.0.5",
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-react": "^1.0.6",
"@rsbuild/shared": "^0.7.10",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.3.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/router-demo/router-remote2-2002/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"react-router-dom": "6.24.1"
},
"devDependencies": {
"@rsbuild/core": "^1.0.16",
"@rsbuild/plugin-react": "^1.0.5",
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-react": "^1.0.6",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.3.0",
"typescript": "^5.4.5"
Expand Down
6 changes: 3 additions & 3 deletions apps/router-demo/router-remote3-2003/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"preview": "rsbuild preview"
},
"dependencies": {
"@module-federation/rsbuild-plugin": "workspace:*",
"@module-federation/bridge-vue3": "workspace:*",
"@module-federation/rsbuild-plugin": "workspace:*",
"vue": "^3.4.19",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@rsbuild/core": "^1.0.16",
"@rsbuild/plugin-vue": "^1.0.1",
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-vue": "^1.0.3",
"@vue/tsconfig": "^0.5.1",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.2",
Expand Down
4 changes: 2 additions & 2 deletions apps/router-demo/router-remote4-2004/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"react-router-dom": "6.24.1"
},
"devDependencies": {
"@rsbuild/core": "^1.0.16",
"@rsbuild/plugin-react": "^1.0.5",
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-react": "^1.0.6",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.3.0",
"typescript": "^5.4.5"
Expand Down
8 changes: 4 additions & 4 deletions apps/rslib-module/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
"storybook": "storybook dev -p 6006"
},
"devDependencies": {
"storybook": "^8.3.6",
"storybook-react-rsbuild": "^0.1.1",
"@module-federation/enhanced": "workspace:*",
"@module-federation/rsbuild-plugin": "workspace:*",
"@module-federation/storybook-addon": "workspace:*",
"@rsbuild/plugin-react": "^1.0.5",
"@rsbuild/plugin-react": "^1.0.6",
"@rslib/core": "^0.0.14",
"@types/react": "^18.3.11",
"http-server": "^14.1.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react-dom": "^18.3.1",
"storybook": "^8.3.6",
"storybook-react-rsbuild": "^0.1.1"
},
"peerDependencies": {
"react": "*"
Expand Down
4 changes: 2 additions & 2 deletions apps/runtime-demo/3008-runtime-remote/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"react-dom": "^18.3.1"
},
"devDependencies": {
"@rsbuild/core": "^0.6.15",
"@rsbuild/plugin-react": "^1.0.5"
"@rsbuild/core": "^1.0.19",
"@rsbuild/plugin-react": "^1.0.6"
}
}
3 changes: 2 additions & 1 deletion nx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,6 @@
},
"useInferencePlugins": false,
"defaultBase": "main",
"nxCloudAccessToken": "NTVlZTRhOWItMGRjYy00YmJjLTllNzAtNDFkNzRhNzdjZDkwfHJlYWQtd3JpdGU="
"nxCloudAccessToken": "NTVlZTRhOWItMGRjYy00YmJjLTllNzAtNDFkNzRhNzdjZDkwfHJlYWQtd3JpdGU=",
"useLegacyCache": true
}
36 changes: 18 additions & 18 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,23 @@
"@commitlint/cz-commitlint": "19.5.0",
"@fontsource/roboto": "5.1.0",
"@fontsource/roboto-mono": "5.1.0",
"@nx/cypress": "20.0.0",
"@nx/devkit": "20.0.0",
"@nx/esbuild": "20.0.0",
"@nx/eslint": "20.0.0",
"@nx/eslint-plugin": "20.0.0",
"@nx/express": "20.0.0",
"@nx/jest": "20.0.0",
"@nx/js": "20.0.3",
"@nx/next": "20.0.0",
"@nx/node": "20.0.0",
"@nx/react": "20.0.0",
"@nx/rollup": "20.0.0",
"@nx/rspack": "20.0.0",
"@nx/storybook": "20.0.0",
"@nx/vite": "20.0.0",
"@nx/web": "20.0.0",
"@nx/webpack": "20.0.0",
"@nx/cypress": "20.0.6",
"@nx/devkit": "20.0.6",
"@nx/esbuild": "20.0.6",
"@nx/eslint": "20.0.6",
"@nx/eslint-plugin": "20.0.6",
"@nx/express": "20.0.6",
"@nx/jest": "20.0.6",
"@nx/js": "20.0.6",
"@nx/next": "20.0.6",
"@nx/node": "20.0.6",
"@nx/react": "20.0.6",
"@nx/rollup": "20.0.6",
"@nx/rspack": "20.0.6",
"@nx/storybook": "20.0.6",
"@nx/vite": "20.0.6",
"@nx/web": "20.0.6",
"@nx/webpack": "20.0.6",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@rollup/plugin-alias": "5.1.1",
"@rollup/plugin-replace": "6.0.1",
Expand Down Expand Up @@ -192,7 +192,7 @@
"mime-types": "2.1.35",
"msw": "^1.2.1",
"node-fetch": "~3.3.2",
"nx": "20.0.0",
"nx": "20.0.6",
"open": "^10.1.0",
"postcss-calc": "9.0.1",
"postcss-custom-properties": "13.3.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/chrome-devtools/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@types/react": "~18.2.0",
"@types/react-dom": "~18.3.0",
"lint-staged": "~13.1.0",
"prettier": "~2.8.1",
"prettier": "~3.3.3",
"rimraf": "~3.0.2",
"typescript": "~5.0.4",
"vitest": "1.2.2"
Expand Down
6 changes: 3 additions & 3 deletions packages/rsbuild-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"@module-federation/sdk": "workspace:*"
},
"devDependencies": {
"@rsbuild/core": "^1.0.16"
"@rsbuild/core": "^1.0.19"
},
"peerDependencies": {
"@rsbuild/core": "1.x",
"@module-federation/enhanced": "workspace:*"
"@module-federation/enhanced": "workspace:*",
"@rsbuild/core": "1.x"
},
"engines": {
"node": ">=16.0.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/storybook-addon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
}
},
"devDependencies": {
"@module-federation/enhanced": "workspace:*",
"@module-federation/sdk": "workspace:*",
"@module-federation/utilities": "workspace:*",
"@rsbuild/core": "^1.0.19",
"@storybook/core-common": "7.6.20",
"@storybook/node-logger": "7.6.20",
"webpack": "5.93.0",
"webpack-virtual-modules": "0.6.2",
"@module-federation/enhanced": "workspace:*",
"@module-federation/sdk": "workspace:*",
"@rsbuild/core": "^1.0.18"
"webpack-virtual-modules": "0.6.2"
},
"peerDependencies": {
"@module-federation/utilities": "^3.1.20",
Expand Down
Loading

0 comments on commit 9a0d72f

Please sign in to comment.