Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions cypress/component/Tooltip.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ describe('<Tooltip/>', () => {
})
})

it('should close when Esc key is pressed', async () => {

@matyasf matyasf Jul 6, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was randomly failing because its async and does not have an await.

This seems to be a systematic issue with Cypress tests, I'll fix them in a later PR

it('should close when Esc key is pressed', () => {
cy.mount(
<Tooltip renderTip={<h2>Hello</h2>}>
<a data-testid="trigger" href="example.html">
Expand All @@ -173,15 +173,17 @@ describe('<Tooltip/>', () => {

cy.get(tooltip).should('not.be.visible')

cy.contains('Hover me!').realHover()
cy.get('[data-testid="trigger"]').focus()

cy.get(tooltip).should('be.visible')

cy.get(tooltip).should('be.visible').realPress('Escape')
cy.get('[data-testid="trigger"]').realPress('Escape')

cy.get(tooltip).should('not.be.visible')
})
})

it('should close when Esc key is pressed and Tooltip is hovered over', async () => {
it('should close when Esc key is pressed and Tooltip is hovered over', () => {
cy.mount(
<Tooltip renderTip={<h2>Hello</h2>}>
<a data-testid="trigger" href="example.html">
Expand Down Expand Up @@ -256,7 +258,6 @@ describe('<Tooltip/>', () => {
.realPress('Escape')
.then(() => {
cy.get(tooltip).should('not.be.visible')
cy.wait(300)
cy.get('[role="dialog"]').should('be.visible')
})

Expand Down
3 changes: 1 addition & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ const NODE_PACKAGES = [
'ui-webpack-config',
'command-utils',
'instui-cli',
'babel-plugin-transform-imports',
'pkg-utils'
'babel-plugin-transform-imports'
].join("|")

const finalConfig = tseslint.config(
Expand Down
59 changes: 29 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
"lint:changes": "pnpm run lint -- --since HEAD^",
"lint:fix": "pnpm -r --stream lint:fix",
"lint:commits": "commitlint --from=HEAD^1",
"bootstrap": "node scripts/bootstrap.js",
"bootstrap": "node scripts/bootstrap.mjs",
"build": "pnpm -r --stream build",
"build:watch": "pnpm -r --stream build:watch",
"build:docs": "pnpm --filter docs-app bundle",
"build:themes": "ui-scripts build-themes",
"build:tokens": "ui-scripts generate-all-tokens",
"build:types": "tsc -b tsconfig.references.json",
"build:ts": "pnpm --filter @instructure/ui-icons prepare-build && pnpm run build:types",
"clean": "node scripts/clean.js",
"clean-node": "node scripts/clean.js --nuke_node",
"clean": "node scripts/clean.mjs",
"clean-node": "node scripts/clean.mjs --nuke_node",
"export:icons": "pnpm --filter @instructure/ui-icons export",
"create-component-version": "ui-scripts create-component-version",
"bump": "ui-scripts bump",
Expand All @@ -47,68 +47,67 @@
"release": "ui-scripts publish",
"publish-private": "ui-scripts publish-private",
"commit": "cz",
"husky:pre-commit": "lint-staged && node scripts/checkTSReferences.js",
"husky:pre-commit": "lint-staged && node scripts/checkTSReferences.mjs",
"postinstall": "husky",
"ts:check": "pnpm -r --stream ts:check"
},
"license": "MIT",
"devDependencies": {
"@babel/cli": "^7.27.2",
"babel-loader": "^10.1.1",
"@babel/runtime": "^7.29.2",
"@babel/runtime": "^7.29.7",
"moment-timezone": "^0.6.2",
"@commitlint/cli": "^20.5.3",
"@commitlint/config-conventional": "^20.5.3",
"@commitlint/cli": "^21.2.0",
"@commitlint/config-conventional": "^21.2.0",
"@emotion/cache": "^11.14.0",
"@emotion/react": "^11.14.0",
"@eslint/js": "^9.39.4",
"@instructure/browserslist-config-instui": "workspace:*",
"@instructure/pkg-utils": "workspace:*",
"@instructure/ui-babel-preset": "workspace:*",
"@instructure/ui-scripts": "workspace:*",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "15.0.7",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/jest": "^29.5.14",
"@types/node": "^22",
"@types/jest": "^30.0.0",
"@types/node": "^24",
"@types/react": "18.3.26",
"@types/react-dom": "18.3.1",
"@vitejs/plugin-react": "^4.5.1",
"@vitest/eslint-plugin": "^1.6.14",
"@vitejs/plugin-react": "^5.2.0",
"@vitest/eslint-plugin": "^1.6.20",
"babel-plugin-add-import-extension": "^1.6.0",
"chai": "^4.4.1",
"chalk": "^4.1.2",
"commitizen": "^4.3.1",
"concurrently": "^9.2.1",
"chalk": "^5.6.2",
"commitizen": "^4.3.2",
"concurrently": "^9.2.3",
"cross-spawn": "^7.0.6",
"cypress": "^15.13.0",
"cypress": "^15.18.0",
"cypress-real-events": "^1.15.0",
"cz-git": "^1.13.0",
"esbuild": "^0.28.0",
"cz-git": "^1.13.1",
"esbuild": "^0.28.1",
"eslint": "^9.39.4",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-node": "^0.3.10",
"eslint-module-utils": "^2.12.1",
"eslint-import-resolver-node": "^0.4.0",
"eslint-module-utils": "2.13.0",
"eslint-plugin-compat": "^7.0.2",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-notice": "^1.0.0",
"eslint-plugin-react": "^7.37.5",
"globals": "^17.6.0",
"read-package-up": "^12.0.0",
"globals": "^17.7.0",
"husky": "^9.1.7",
"jsdom": "^26.1.0",
"jsdom": "^29.1.1",
"lerna": "9.0.7",
"lint-staged": "^16.4.0",
"lint-staged": "^17.0.8",
"react": "18.3.1",
"typescript": "6.0.3",
"typescript-eslint": "^8.59.1",
"vitest": "^3.2.2",
"webpack": "^5.106.2"
"typescript-eslint": "^8.62.1",
"vitest": "^4.1.9",
"webpack": "^5.107.2"
},
"//dependency-comments": {
"scripts": "The '--' at the end of commands is needed so user parameters are passed forward",
"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",
Expand Down
6 changes: 3 additions & 3 deletions packages/__docs__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@
"@instructure/ui-utils": "workspace:*",
"@instructure/ui-view": "workspace:*",
"babel-loader": "^10.1.1",
"@babel/runtime": "^7.29.2",
"@babel/runtime": "^7.29.7",
"@babel/standalone": "^7.29.3",
"codesandbox": "^2.2.3",
"codesandbox-import-utils": "^2.2.3",

@matyasf matyasf Jul 6, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This package has wayyy less transitive dependencies

"lorem-ipsum": "^3.0.0",
"marked-react": "^4.0.0",
"moment": "^2.30.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"uuid": "^14.0.0",
"uuid": "14.0.1",
"webpack-merge": "^6.0.1",
"hoist-non-react-statics": "^3.3.2",
"buffer": "^6.0.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/__docs__/src/CodeSandboxButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

import { Component } from 'react'
import { getParameters } from 'codesandbox/lib/api/define'
import { getParameters } from 'codesandbox-import-utils/lib/api/define'

import { Tooltip } from '@instructure/ui-tooltip'
import { SVGIcon } from '@instructure/ui-svg-images'
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 @@ -22,7 +22,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.29.2",
"@babel/runtime": "^7.29.7",
"@instructure/shared-types": "workspace:*",
"@instructure/ui-themes": "workspace:*"
},
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 @@ -22,7 +22,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.29.2",
"@babel/runtime": "^7.29.7",
"@instructure/shared-types": "workspace:*",
"@instructure/ui-themes": "workspace:*"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/command-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
},
"license": "MIT",
"dependencies": {
"chalk": "^5.4.1",
"chalk": "^5.6.2",
"cross-spawn": "^7.0.6",
"which": "^4.0.0"
"which": "^7.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.29.2"
"@babel/runtime": "^7.29.7"
},
"devDependencies": {
"@instructure/ui-babel-preset": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/debounce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.29.2"
"@babel/runtime": "^7.29.7"
},
"devDependencies": {
"@instructure/ui-babel-preset": "workspace:*"
Expand Down
8 changes: 4 additions & 4 deletions 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.29.2",
"@babel/runtime": "^7.29.7",
"@emotion/react": "^11",
"@instructure/console": "workspace:*",
"@instructure/shared-types": "workspace:*",
Expand All @@ -37,12 +37,12 @@
},
"devDependencies": {
"@instructure/ui-babel-preset": "workspace:*",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "15.0.7",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/hoist-non-react-statics": "^3.3.7",
"react-dom": "18.3.1",
"vitest": "^3.2.2"
"vitest": "^4.1.9"
},
"peerDependencies": {
"react": ">=18 <=19"
Expand Down
1 change: 0 additions & 1 deletion packages/pkg-utils/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions packages/pkg-utils/.npmignore

This file was deleted.

Loading
Loading