Skip to content

Commit

Permalink
refactor(many): update dependecies, fix flaky test
Browse files Browse the repository at this point in the history
Closes: INSTUI-4218

The test was failing because it relied on a random probability which was happening too often
  • Loading branch information
matyasf committed Dec 11, 2024
1 parent a0fff9d commit c6cae87
Show file tree
Hide file tree
Showing 107 changed files with 2,295 additions and 4,309 deletions.
13 changes: 1 addition & 12 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const finalConfig = tseslint.config(
},
settings: {
react: {
version: process.env.REACT_VERSION || '18.2.0'
version: process.env.REACT_VERSION || '18.3.1'
}
}
},
Expand Down Expand Up @@ -206,17 +206,6 @@ const finalConfig = tseslint.config(
}
}
},
{// parts of the docs app that are not converted to TS
// TODO convert docs app fully to TS to remove this part
files: [
'packages/__docs__/**/*.js',
],
languageOptions: {
globals: {
...globals.browser
}
}
},
{// ui-codemods in Vitest TODO convert fully to TS to remove this part
files: [
'packages/ui-codemods/**/*.js',
Expand Down
6,012 changes: 2,016 additions & 3,996 deletions package-lock.json

Large diffs are not rendered by default.

47 changes: 24 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,55 +60,56 @@
"@storybook/react/webpack": "^5"
},
"devDependencies": {
"@babel/cli": "^7.25.6",
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@emotion/cache": "^11.13.1",
"@emotion/react": "^11.13.3",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.11.1",
"@babel/cli": "^7.26.4",
"@commitlint/cli": "^19.6.0",
"@commitlint/config-conventional": "^19.6.0",
"@emotion/cache": "^11.14.0",
"@emotion/react": "^11.14.0",
"@eslint/js": "^9.16.0",
"@instructure/browserslist-config-instui": "workspace:*",
"@instructure/pkg-utils": "workspace:*",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/eslint__js": "^8.42.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.2",
"@vitest/eslint-plugin": "^1.1.4",
"@types/jest": "^29.5.14",
"@vitejs/plugin-react": "^4.3.4",
"@vitest/eslint-plugin": "^1.1.14",
"chai": "^4.4.1",
"chalk": "^4.1.2",
"commitizen": "^4.3.1",
"cross-spawn": "^7.0.3",
"cypress": "^13.15.0",
"cross-spawn": "^7.0.6",
"cypress": "^13.16.1",
"cypress-real-events": "^1.13.0",
"esbuild": "^0.24.0",
"eslint": "^9.11.1",
"eslint": "^9.16.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-module-utils": "^2.12.0",
"eslint-plugin-compat": "^6.0.1",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-notice": "^1.0.0",
"eslint-plugin-react": "^7.37.0",
"globals": "^15.9.0",
"husky": "^9.1.6",
"lerna": "^8.1.8",
"eslint-plugin-react": "^7.37.2",
"globals": "^15.13.0",
"husky": "^9.1.7",
"lerna": "^8.1.9",
"lint-staged": "^15.2.10",
"react": "^18.3.1",
"tar": "^7.4.3",
"typescript": "5.6.2",
"typescript-eslint": "^8.8.0",
"vitest": "^2.1.1",
"webpack": "^5.95.0"
"typescript": "5.7.2",
"typescript-eslint": "^8.18.0",
"vitest": "^2.1.8",
"webpack": "^5.97.1"
},
"//dependency-comments": {
"danger": "^11.3.1 -- add this back if we use it in pr-validation.yml",
"chalk": "Chalk 5 is ESM. (used here by the scripts/ folder)",
"tar": "Lerna 8 needs tar for this fixed(?) bug: https://github.com/lerna/lerna/issues/4005",
"eslint-import-resolver-typescript": "^3.6.1 not supported by ESLint 9",
"eslint-plugin-import-x": "^3.1.0 not supported by ESLint 9"
"eslint-plugin-import-x": "^3.1.0 not supported by ESLint 9",
"@types/jest": "needed because https://github.com/testing-library/jest-dom/issues/544 recheck if fixed"
},
"engines": {
"node": ">=18",
Expand Down
10 changes: 5 additions & 5 deletions packages/__docs__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/standalone": "^7.25.6",
"@babel/standalone": "^7.26.4",
"@instructure/canvas-high-contrast-theme": "10.8.0",
"@instructure/canvas-theme": "10.8.0",
"@instructure/console": "10.8.0",
Expand Down Expand Up @@ -116,8 +116,8 @@
"buffer": "^6.0.3",
"codesandbox": "^2.2.3",
"lorem-ipsum": "^2.0.8",
"marked": "^14.1.2",
"marked-react": "^2.0.0",
"marked": "^15.0.3",
"marked-react": "^3.0.0",
"moment": "^2.30.1",
"prop-types": "^15.8.1",
"react": "^18.3.1",
Expand All @@ -133,11 +133,11 @@
"chokidar": "^3.6.0",
"globby": "^14.0.2",
"gray-matter": "^4.0.3",
"html-webpack-plugin": "^5.6.0",
"html-webpack-plugin": "^5.6.3",
"jsdoc-api": "^8.1.1",
"mkdirp": "^3.0.1",
"raw-loader": "^4.0.2",
"react-docgen": "^7.0.3",
"react-docgen": "^7.1.0",
"svg-inline-loader": "^0.8.2",
"webpack-bundle-analyzer": "^4.10.2"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/__examples__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/ui-babel-preset": "10.8.0",
"@instructure/ui-buttons": "10.8.0",
"@instructure/ui-i18n": "10.8.0",
Expand All @@ -46,9 +46,9 @@
"@types/webpack-env": "^1.18.5",
"globby": "^13.2.2",
"prop-types": "^15.8.1",
"react-docgen": "7.0.3",
"react-docgen": "7.1.0",
"storybook": "^7.6.19",
"webpack": "^5.95.0"
"webpack": "^5.97.1"
},
"resolutions": {
"@storybook/react/webpack": "^5"
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas-high-contrast-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@instructure/ui-babel-preset": "10.8.0"
},
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/shared-types": "10.8.0",
"@instructure/theme-registry": "10.8.0",
"@instructure/ui-themes": "10.8.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@instructure/ui-babel-preset": "10.8.0"
},
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/shared-types": "10.8.0",
"@instructure/theme-registry": "10.8.0",
"@instructure/ui-themes": "10.8.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/command-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"license": "MIT",
"dependencies": {
"chalk": "^5.3.0",
"cross-spawn": "^7.0.3",
"cross-spawn": "^7.0.6",
"which": "^4.0.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cz-lerna-changelog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@instructure/pkg-utils": "10.8.0",
"@semantic-release/commit-analyzer": "^9.0.2",
"chalk": "^4.1.2",
"cz-customizable": "^6.9.2",
"cz-customizable": "^7.3.0",
"inquirer": "^8.2.6"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/debounce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@instructure/ui-babel-preset": "10.8.0"
},
"dependencies": {
"@babel/runtime": "^7.25.6"
"@babel/runtime": "^7.26.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@emotion/react": "^11",
"@instructure/console": "10.8.0",
"@instructure/shared-types": "10.8.0",
Expand Down
5 changes: 5 additions & 0 deletions packages/pkg-utils/lib/get-package.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ exports.getPackage = function getPackage(options) {
return new Package(result.packageJson, path.dirname(result.path))
}

/**
* Reads a package.json
* @param options {readPkgUp.NormalizeOptions}
* @returns {readPkgUp.NormalizedPackageJson}
*/
exports.getPackageJSON = function getPackageJSON(options) {
return readPackage(options).packageJson
}
Expand Down
3 changes: 2 additions & 1 deletion packages/pkg-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"bugs": "https://github.com/instructure/instructure-ui/issues",
"scripts": {
"lint": "ui-scripts lint",
"lint:fix": "ui-scripts lint --fix"
"lint:fix": "ui-scripts lint --fix",
"ts:check": "tsc -p tsconfig.build.json --noEmit --emitDeclarationOnly false"
},
"license": "MIT",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-registry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"access": "public"
},
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/console": "10.8.0",
"@instructure/shared-types": "10.8.0",
"@instructure/ui-utils": "10.8.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-a11y-content/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/emotion": "10.8.0",
"@instructure/shared-types": "10.8.0",
"@instructure/ui-react-utils": "10.8.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-a11y-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/console": "10.8.0",
"@instructure/shared-types": "10.8.0",
"@instructure/ui-a11y-content": "10.8.0",
Expand All @@ -34,9 +34,9 @@
"devDependencies": {
"@instructure/ui-babel-preset": "10.8.0",
"@instructure/ui-color-utils": "10.8.0",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"vitest": "^2.1.1"
"vitest": "^2.1.8"
},
"peerDependencies": {
"react": ">=16.14 <=18"
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-alerts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"@instructure/ui-color-utils": "10.8.0",
"@instructure/ui-scripts": "10.8.0",
"@instructure/ui-test-utils": "10.8.0",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"vitest": "^2.1.1"
"vitest": "^2.1.8"
},
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/console": "10.8.0",
"@instructure/emotion": "10.8.0",
"@instructure/shared-types": "10.8.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-avatar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/emotion": "10.8.0",
"@instructure/shared-types": "10.8.0",
"@instructure/ui-icons": "10.8.0",
Expand All @@ -39,9 +39,9 @@
"@instructure/ui-test-locator": "10.8.0",
"@instructure/ui-test-utils": "10.8.0",
"@instructure/ui-themes": "10.8.0",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"vitest": "^2.1.1"
"vitest": "^2.1.8"
},
"peerDependencies": {
"react": ">=16.14 <=18"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-axe-check/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"@instructure/ui-babel-preset": "10.8.0"
},
"dependencies": {
"@babel/runtime": "^7.25.6",
"axe-core": "^4.10.0"
"@babel/runtime": "^7.26.0",
"axe-core": "^4.10.2"
},
"publishConfig": {
"access": "public"
Expand Down
26 changes: 13 additions & 13 deletions packages/ui-babel-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
},
"license": "MIT",
"dependencies": {
"@babel/core": "^7.25.2",
"@babel/core": "^7.26.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@babel/plugin-proposal-export-default-from": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.25.9",
"@babel/plugin-proposal-export-default-from": "^7.25.9",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-classes": "^7.25.4",
"@babel/plugin-transform-destructuring": "^7.24.8",
"@babel/plugin-transform-react-constant-elements": "^7.25.1",
"@babel/plugin-transform-react-display-name": "^7.24.7",
"@babel/plugin-transform-runtime": "^7.25.4",
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@babel/runtime": "^7.25.6",
"@babel/plugin-transform-classes": "^7.25.9",
"@babel/plugin-transform-destructuring": "^7.25.9",
"@babel/plugin-transform-react-constant-elements": "^7.25.9",
"@babel/plugin-transform-react-display-name": "^7.25.9",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.26.3",
"@babel/preset-typescript": "^7.26.0",
"@babel/runtime": "^7.26.0",
"@instructure/babel-plugin-transform-imports": "10.8.0",
"@instructure/browserslist-config-instui": "10.8.0",
"babel-loader": "^9.2.1",
Expand All @@ -41,7 +41,7 @@
"babel-plugin-transform-ensure-ignore": "^0.1.0",
"babel-plugin-transform-remove-console": "^6.9.4",
"babel-plugin-transform-undefined-to-void": "^6.9.4",
"core-js": "3.38.1"
"core-js": "3.39.0"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-badge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.26.0",
"@instructure/emotion": "10.8.0",
"@instructure/shared-types": "10.8.0",
"@instructure/ui-color-utils": "10.8.0",
Expand All @@ -38,9 +38,9 @@
"@instructure/ui-babel-preset": "10.8.0",
"@instructure/ui-test-utils": "10.8.0",
"@instructure/ui-themes": "10.8.0",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"vitest": "^2.1.1"
"vitest": "^2.1.8"
},
"peerDependencies": {
"react": ">=16.14 <=18"
Expand Down
Loading

0 comments on commit c6cae87

Please sign in to comment.