Skip to content

Commit 9f8b983

Browse files
Temp fix
1 parent 11976ad commit 9f8b983

File tree

4 files changed

+181
-72
lines changed

4 files changed

+181
-72
lines changed

.babelrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ module.exports = {
1818
],
1919
plugins: [
2020
require('@babel/plugin-proposal-class-properties').default,
21+
require('@babel/plugin-proposal-nullish-coalescing-operator').default,
22+
require('@babel/plugin-transform-optional-chaining').default,
2123
],
2224
};

app/stylesheet/carbon.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ $css--body: false;
1212
$css--reset: false;
1313
$css--default-type: false;
1414

15+
@use '@carbon/react';
16+
1517
// Use the white theme
1618
@import '~@carbon/themes/scss/themes';
1719
$carbon--theme: $carbon--theme--white;
1820

1921
@include carbon--theme();
2022

2123
@import '~@carbon/charts/styles.css';
22-
@use '@carbon/react';
2324

2425
// ignored by patternfly, but sets the right base for carbon rem units
2526
html {

package.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
"bootstrap-filestyle": "~1.2.1",
6161
"bootstrap-select": "^1.13.18",
6262
"bootstrap-switch": "3.3.4",
63+
"carbon-components-react": "~7.59.24",
64+
"carbon-icons": "~7.0.7",
6365
"classnames": "~2.2.6",
6466
"codemirror": "~5.58.2",
6567
"connected-react-router": "~6.7.0",
@@ -83,11 +85,11 @@
8385
"patternfly": "~3.59.5",
8486
"prop-types": "^15.6.0",
8587
"proxy-polyfill": "^0.1.7",
86-
"react": "~16.13.1",
88+
"react": "~17.0.0",
8789
"react-accessible-treeview": "^2.10.0",
8890
"react-bootstrap": "~0.33.0",
8991
"react-codemirror2": "^8.0.0",
90-
"react-dom": "~16.13.1",
92+
"react-dom": "~17.0.0",
9193
"react-markdown": "~6.0.3",
9294
"react-query": "^3.39.3",
9395
"react-redux": "^7.1.1",
@@ -113,8 +115,10 @@
113115
"@babel/plugin-proposal-class-properties": "~7.8.3",
114116
"@babel/plugin-proposal-export-default-from": "~7.8.3",
115117
"@babel/plugin-proposal-export-namespace-from": "~7.8.3",
118+
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
116119
"@babel/plugin-proposal-object-rest-spread": "~7.9.0",
117120
"@babel/plugin-transform-object-assign": "~7.8.3",
121+
"@babel/plugin-transform-optional-chaining": "^7.27.1",
118122
"@babel/preset-env": "~7.9.0",
119123
"@babel/preset-react": "~7.9.1",
120124
"@babel/register": "~7.9.0",
@@ -178,6 +182,7 @@
178182
},
179183
"packageManager": "[email protected]",
180184
"resolutions": {
185+
"acorn": "7.3.0",
181186
"angular": "~1.8.3",
182187
"angular-animate": "~1.8.3",
183188
"angular-sanitize": "~1.8.3",
@@ -196,6 +201,7 @@
196201
"path-to-regexp": "~8.0.0",
197202
"patternfly": "~3.59.5",
198203
"request": "npm:@cypress/request@^3.0.9",
204+
"react": "~17.0.0",
199205
"terser": "~4.8.1"
200206
}
201207
}

0 commit comments

Comments
 (0)