Skip to content

Commit

Permalink
feat: initial changes to allow components to build with react 18
Browse files Browse the repository at this point in the history
  • Loading branch information
noah-eigenfeld committed Mar 20, 2024
1 parent 7262693 commit 5ba1ca7
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 13 deletions.
7 changes: 6 additions & 1 deletion examples/discovery-search-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"ibm-watson": "^8.0.0",
"node-polyfill-webpack-plugin": "^3.0.0",
"proper-url-join": "^2.1.1",
"react": "^17.0.2",
"react": "^18.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
Expand All @@ -51,5 +51,10 @@
"moduleNameMapper": {
"^axios$": "axios/dist/node/axios.cjs"
}
},
"overrides": {
"carbon-components-react": {
"react": "^18.0.0"
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"prettier": "^2.4.1",
"proper-url-join": "^2.1.1",
"raw-loader": "^4.0.2",
"react": "^17.0.2",
"react": "^18.0.2",
"react-dom": "^17.0.2",
"seedrandom": "^3.0.5",
"source-map-explorer": "2.5.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/discovery-react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
"css-loader": "^6.9.1",
"madge": "^6.1.0",
"marked": "^11.1.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-scripts": "^5.0.1",
"sass-embedded": "^1.70.0",
"sass-loader": "^14.0.0",
Expand Down
38 changes: 29 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2813,8 +2813,8 @@ __metadata:
marked: "npm:^11.1.1"
mustache: "npm:^4.2.0"
pdfjs-dist: "npm:2.6.347"
react: "npm:^17.0.2"
react-dom: "npm:^17.0.2"
react: "npm:^18.0.0"
react-dom: "npm:^18.0.0"
react-error-boundary: "npm:^1.2.5"
react-resize-detector: "npm:^4.2.3"
react-scripts: "npm:^5.0.1"
Expand Down Expand Up @@ -11483,7 +11483,7 @@ __metadata:
ibm-watson: "npm:^8.0.0"
node-polyfill-webpack-plugin: "npm:^3.0.0"
proper-url-join: "npm:^2.1.1"
react: "npm:^17.0.2"
react: "npm:^18.0.2"
react-dom: "npm:^17.0.2"
react-scripts: "npm:^5.0.1"
start-server-and-test: "npm:^2.0.3"
Expand Down Expand Up @@ -21774,6 +21774,18 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^18.0.0":
version: 18.2.0
resolution: "react-dom@npm:18.2.0"
dependencies:
loose-envify: "npm:^1.1.0"
scheduler: "npm:^0.23.0"
peerDependencies:
react: ^18.2.0
checksum: 66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
languageName: node
linkType: hard

"react-element-to-jsx-string@npm:^15.0.0":
version: 15.0.0
resolution: "react-element-to-jsx-string@npm:15.0.0"
Expand Down Expand Up @@ -22111,13 +22123,12 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^17.0.2":
version: 17.0.2
resolution: "react@npm:17.0.2"
"react@npm:^18.0.0, react@npm:^18.0.2":
version: 18.2.0
resolution: "react@npm:18.2.0"
dependencies:
loose-envify: "npm:^1.1.0"
object-assign: "npm:^4.1.1"
checksum: 07ae8959acf1596f0550685102fd6097d461a54a4fd46a50f88a0cd7daaa97fdd6415de1dcb4bfe0da6aa43221a6746ce380410fa848acc60f8ac41f6649c148
checksum: b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
languageName: node
linkType: hard

Expand Down Expand Up @@ -22963,7 +22974,7 @@ __metadata:
prettier: "npm:^2.4.1"
proper-url-join: "npm:^2.1.1"
raw-loader: "npm:^4.0.2"
react: "npm:^17.0.2"
react: "npm:^18.0.2"
react-dom: "npm:^17.0.2"
seedrandom: "npm:^3.0.5"
source-map-explorer: "npm:2.5.3"
Expand Down Expand Up @@ -23347,6 +23358,15 @@ __metadata:
languageName: node
linkType: hard

"scheduler@npm:^0.23.0":
version: 0.23.0
resolution: "scheduler@npm:0.23.0"
dependencies:
loose-envify: "npm:^1.1.0"
checksum: b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd
languageName: node
linkType: hard

"schema-utils@npm:2.7.0":
version: 2.7.0
resolution: "schema-utils@npm:2.7.0"
Expand Down

0 comments on commit 5ba1ca7

Please sign in to comment.