Skip to content

Commit 0e9a47d

Browse files
committed
refactor(many): fix deleted packages that were left in as dependency; fix some components throwing ref warnings under React 18
1 parent b9067f3 commit 0e9a47d

File tree

84 files changed

+225
-269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+225
-269
lines changed

package-lock.json

Lines changed: 128 additions & 167 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
},
4444
"license": "MIT",
4545
"resolutions": {
46-
"react": "^19.1",
47-
"react-dom": "^19.1",
48-
"@types/react": "^19.1"
46+
"react": "18.3.1",
47+
"react-dom": "18.3.1"
4948
},
5049
"devDependencies": {
5150
"@babel/cli": "^7.27.2",
@@ -58,11 +57,11 @@
5857
"@instructure/pkg-utils": "workspace:*",
5958
"@testing-library/dom": "^10.4.0",
6059
"@testing-library/jest-dom": "^6.6.3",
61-
"@testing-library/react": "^16.3.0",
60+
"@testing-library/react": "15.0.7",
6261
"@testing-library/user-event": "^14.6.1",
6362
"@types/jest": "^29.5.14",
6463
"@types/node": "^22",
65-
"@types/react-dom": "^19.1",
64+
"@types/react-dom": "18.3.1",
6665
"@vitejs/plugin-react": "^4.5.1",
6766
"@vitest/eslint-plugin": "^1.2.1",
6867
"chai": "^4.4.1",
@@ -86,7 +85,7 @@
8685
"jsdom": "^26.1.0",
8786
"lerna": "^8.2.4",
8887
"lint-staged": "^15.2.10",
89-
"react": "^19.1",
88+
"react": "18.3.1",
9089
"tar": "^7.4.3",
9190
"typescript": "5.8.3",
9291
"typescript-eslint": "^8.33.1",

packages/__docs__/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
"marked": "^15.0.12",
119119
"marked-react": "^3.0.0",
120120
"moment": "^2.30.1",
121-
"react": "19.1",
122-
"react-dom": "19.1",
121+
"react": "18.3.1",
122+
"react-dom": "18.3.1",
123123
"semver": "^7.7.2",
124124
"uuid": "^11.1.0",
125125
"webpack-merge": "^6.0.1"

packages/__docs__/resolve.mjs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,7 @@ const alias = {
219219
'../ui-file-drop/src/'
220220
),
221221
'@instructure/ui-heading$': path.resolve(import.meta.dirname, '../ui-heading/src/'),
222-
'@instructure/emotion$': path.resolve(import.meta.dirname, '../emotion/src/'),
223-
'@instructure/theme-registry$': path.resolve(
224-
import.meta.dirname,
225-
'../theme-registry/src/'
226-
)
222+
'@instructure/emotion$': path.resolve(import.meta.dirname, '../emotion/src/')
227223
}
228224

229225
export default { alias }

packages/__docs__/src/App/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ class App extends Component<AppProps, AppState> {
105105
_mediaQueryListener?: ReturnType<typeof addMediaQueryMatchListener>
106106
_defaultDocumentTitle?: string
107107
_controller?: AbortController
108-
_heroRef: React.RefObject<Hero | null>
109-
_navRef: React.RefObject<Nav | null>
108+
_heroRef: React.RefObject<any>
109+
_navRef: React.RefObject<any>
110110
_skipToMainButtonRef?: HTMLElement
111111
_mainContentRef?: HTMLElement
112112

packages/canvas-high-contrast-theme/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"dependencies": {
2828
"@babel/runtime": "^7.27.6",
2929
"@instructure/shared-types": "10.25.0",
30-
"@instructure/theme-registry": "10.25.0",
3130
"@instructure/ui-themes": "10.25.0"
3231
},
3332
"publishConfig": {

packages/canvas-theme/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"dependencies": {
2828
"@babel/runtime": "^7.27.6",
2929
"@instructure/shared-types": "10.25.0",
30-
"@instructure/theme-registry": "10.25.0",
3130
"@instructure/ui-themes": "10.25.0"
3231
},
3332
"publishConfig": {

packages/emotion/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@emotion/react": "^11",
2828
"@instructure/console": "10.25.0",
2929
"@instructure/shared-types": "10.25.0",
30-
"@instructure/theme-registry": "10.25.0",
3130
"@instructure/ui-decorator": "10.25.0",
3231
"@instructure/ui-i18n": "10.25.0",
3332
"@instructure/ui-react-utils": "10.25.0",
@@ -38,9 +37,9 @@
3837
"devDependencies": {
3938
"@instructure/ui-babel-preset": "10.25.0",
4039
"@testing-library/jest-dom": "^6.6.3",
41-
"@testing-library/react": "^16.0.1",
40+
"@testing-library/react": "15.0.7",
4241
"@testing-library/user-event": "^14.6.1",
43-
"react-dom": "^19.1",
42+
"react-dom": "18.3.1",
4443
"vitest": "^3.2.2"
4544
},
4645
"peerDependencies": {

packages/ui-a11y-content/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@instructure/ui-axe-check": "10.25.0",
3333
"@instructure/ui-babel-preset": "10.25.0",
3434
"@testing-library/jest-dom": "^6.6.3",
35-
"@testing-library/react": "^16.0.1",
35+
"@testing-library/react": "15.0.7",
3636
"vitest": "^3.2.2"
3737
},
3838
"peerDependencies": {

packages/ui-a11y-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@instructure/ui-babel-preset": "10.25.0",
3636
"@instructure/ui-color-utils": "10.25.0",
3737
"@testing-library/jest-dom": "^6.6.3",
38-
"@testing-library/react": "^16.3.0",
38+
"@testing-library/react": "15.0.7",
3939
"vitest": "^3.2.2"
4040
},
4141
"peerDependencies": {

0 commit comments

Comments
 (0)