paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 31 Packages Projects Releases Wiki Activity

revert version of react and fix merge conflicts

Browse Source 
Signed-off-by: aramissennyeydd <aramis.sennyey@doordash.com>
This commit is contained in:
aramissennyeydd
2024-09-24 21:08:37 -04:00
parent 7d9580643a
commit 4958c01d14
53 changed files with 126 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app-defaults/package.json
+2 -2
View File
@@ -50,8 +50,8 @@
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/app-next-example-plugin/package.json
+2 -2
View File
@@ -50,8 +50,8 @@
"@types/react": "^18.0.0",
"cross-fetch": "^4.0.0",
"msw": "^1.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/app-next/package.json
+2 -2
View File
@@ -78,8 +78,8 @@
"@material-ui/lab": "4.0.0-alpha.61",
"@octokit/rest": "^19.0.3",
"history": "^5.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4",
packages/app/package.json
+2 -2
View File
@@ -76,8 +76,8 @@
"@octokit/rest": "^19.0.3",
"@vitejs/plugin-react": "^4.3.1",
"history": "^5.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4",
packages/core-app-api/package.json
+2 -2
View File
@@ -70,8 +70,8 @@
"@types/react": "^18.0.0",
"@types/zen-observable": "^0.8.0",
"msw": "^1.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-beta": "npm:react-router@6.0.0-beta.0",
"react-router-dom": "^6.3.0",
"react-router-dom-beta": "npm:react-router-dom@6.0.0-beta.0",
packages/core-components/package.json
+2 -2
View File
@@ -116,8 +116,8 @@
"cross-fetch": "^4.0.0",
"history": "^5.0.0",
"msw": "^1.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/core-plugin-api/package.json
+2 -2
View File
@@ -64,8 +64,8 @@
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/create-app/templates/default-app/packages/app/package.json.hbs
+2 -2
View File
@@ -41,8 +41,8 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"history": "^5.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
packages/dev-utils/package.json
+2 -2
View File
@@ -56,8 +56,8 @@
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0",
"zen-observable": "^0.10.0"
},
packages/frontend-app-api/package.json
+2 -2
View File
@@ -52,8 +52,8 @@
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^15.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/frontend-defaults/package.json
+14 -2
View File
@@ -44,9 +44,21 @@
"@backstage/core-plugin-api": "workspace:^",
"@backstage/test-utils": "workspace:^",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.0.0"
"@testing-library/react": "^16.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
"@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
"react": "^16.13.1 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
"react-router-dom": "6.0.0-beta.0 || ^6.3.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
}
packages/frontend-plugin-api/package.json
+2 -2
View File
@@ -49,8 +49,8 @@
"@testing-library/react": "^16.0.0",
"@types/react": "^18.0.0",
"history": "^5.3.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/frontend-test-utils/package.json
+2 -2
View File
@@ -44,8 +44,8 @@
"@backstage/cli": "workspace:^",
"@testing-library/jest-dom": "^6.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/integration-react/package.json
+2 -2
View File
@@ -48,8 +48,8 @@
"@testing-library/jest-dom": "^6.0.0",
"@types/react": "^18.0.0",
"msw": "^1.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/repo-tools/src/commands/peer-deps/peer-deps.ts
+1 -1
View File
@@ -191,7 +191,7 @@ export default async ({ fix }: { fix: boolean }) => {
if (fix) {
writeFileSync(
resolvePath(pkg.dir, 'package.json'),
JSON.stringify(packageJson, null, 4),
`${JSON.stringify(packageJson, null, 2)}\n`,
);
}
}
packages/techdocs-cli-embedded-app/package.json
+2 -2
View File
@@ -48,8 +48,8 @@
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"history": "^5.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
},
packages/test-utils/package.json
+2 -2
View File
@@ -67,8 +67,8 @@
"@testing-library/jest-dom": "^6.0.0",
"@types/react": "^18.0.0",
"msw": "^1.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/theme/package.json
+2 -2
View File
@@ -46,8 +46,8 @@
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {
packages/version-bridge/package.json
+2 -2
View File
@@ -40,8 +40,8 @@
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^16.0.0",
"@types/react": "^18.0.0",
"react": "^18.0.2",
"react-dom": "^18.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.3.0"
},
"peerDependencies": {