Skip to content
Open
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
6 changes: 3 additions & 3 deletions .github/workflows/_manual-release-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
runs-on: ubuntu-latest
name: Release to npm
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v6
- name: Install Node 24
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/_pr-release-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
name: Release to npm
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_release-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
name: Release to npm
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
name: Tag release commit
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Set up git identity
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
language: [ 'javascript' ]
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v6
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
if: startsWith(github.event.head_commit.message, 'chore(release)')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v6
- name: Install Node 24
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand Down Expand Up @@ -72,10 +72,10 @@ jobs:
env:
PUBLIC_PATH: '/latest/'
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v6
- name: Install Node 24
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ jobs:
name: Lint commit msg + code
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand All @@ -25,9 +25,9 @@ jobs:
name: Vitest unit tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand All @@ -41,9 +41,9 @@ jobs:
name: Cypress component tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
GITHUB_PULL_REQUEST_PREVIEW: 'true'
PUBLIC_PATH: /pr-preview/pr-${{ github.event.pull_request.number }}/
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/checkout@v6
- uses: pnpm/action-setup@v6
- name: Install Node 24
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/visual-baselines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0

- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'

- name: Cache Cypress binary
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress-${{ hashFiles('regression-test/package-lock.json') }}
Expand All @@ -43,7 +43,7 @@ jobs:
working-directory: regression-test

- name: Run Cypress
uses: cypress-io/github-action@v6
uses: cypress-io/github-action@v7
env:
ELECTRON_EXTRA_LAUNCH_ARGS: "--remote-debugging-port=9222"
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/visual-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0

- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: '24'
cache: 'pnpm'

- name: Cache Cypress binary
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.cache/Cypress
key: ${{ runner.os }}-cypress-${{ hashFiles('regression-test/package-lock.json') }}
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Run Cypress
id: cypress
uses: cypress-io/github-action@v6
uses: cypress-io/github-action@v7
continue-on-error: true
env:
ELECTRON_EXTRA_LAUNCH_ARGS: "--remote-debugging-port=9222"
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
"

- name: Post PR comment
uses: marocchino/sticky-pull-request-comment@v2
uses: marocchino/sticky-pull-request-comment@v3
with:
header: visual-regression
message: |
Expand Down
1 change: 1 addition & 0 deletions cypress.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const { defineConfig } = require('cypress')
const webpackConfig = require('./cypress/webpack.config.cjs')

module.exports = defineConfig({
allowCypressEnv: false,
numTestsKeptInMemory: 1,
defaultCommandTimeout: 10000,
pageLoadTimeout: 120000,
Expand Down
13 changes: 4 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,11 @@
"ts:check": "pnpm -r --stream ts:check"
},
"license": "MIT",
"pnpm": {
"overrides": {
"react": "18.3.1",
"react-dom": "18.3.1",
"@types/react": "18.3.26",
"git-raw-commits>dargs": "7.0.0"
}
},
Comment on lines -53 to -60

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 is now in [pnpm-workspace.yaml

"devDependencies": {
"@babel/cli": "^7.27.2",
"babel-loader": "^10.1.1",
"@babel/runtime": "^7.29.2",
"moment-timezone": "^0.6.2",
"@commitlint/cli": "^20.5.3",
"@commitlint/config-conventional": "^20.5.3",
"@emotion/cache": "^11.14.0",
Expand Down Expand Up @@ -140,5 +135,5 @@
"browserslist": [
"extends @instructure/browserslist-config-instui"
],
"packageManager": "pnpm@10.23.0+sha512.21c4e5698002ade97e4efe8b8b4a89a8de3c85a37919f957e7a0f30f38fbc5bbdd05980ffe29179b2fb6e6e691242e098d945d1601772cad0fef5fb6411e2a4b"
"packageManager": "pnpm@11.5.3+sha512.7ac1c919341c213a34dc0d02afb7143c5c26ac26ee8c4782deea821b8ac64d2134a081fd8941dae6e29bbb48f58dfc2b7fbceeccc07cb2f09d219d342a4969ed"
}
11 changes: 8 additions & 3 deletions packages/__docs__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
},
"license": "MIT",
"dependencies": {
"@babel/standalone": "^7.29.3",
"@instructure/canvas-high-contrast-theme": "workspace:*",
"@instructure/canvas-theme": "workspace:*",
"@instructure/console": "workspace:*",
Expand Down Expand Up @@ -114,14 +113,18 @@
"@instructure/ui-utils": "workspace:*",
"@instructure/ui-view": "workspace:*",
"babel-loader": "^10.1.1",
"@babel/runtime": "^7.29.2",
"@babel/standalone": "^7.29.3",
"codesandbox": "^2.2.3",
"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",
"webpack-merge": "^6.0.1"
"webpack-merge": "^6.0.1",
"hoist-non-react-statics": "^3.3.2",
"buffer": "^6.0.3"
Comment on lines +116 to +127

@matyasf matyasf Jun 11, 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.

I needed to add lots of dependencies because in earlier versions pnpm read these if they were in the root node_modules folder, now it needs to be added explicitly. This also uncovered some bugs, e.g. babel runtime not added everywhere

},
"devDependencies": {
"@instructure/ui-babel-preset": "workspace:*",
Expand All @@ -135,7 +138,9 @@
"mkdirp": "3.0.1",
"react-docgen": "8.0.3",
"style-loader": "4.0.0",
"webpack-bundle-analyzer": "5.3.0"
"thread-loader": "^4.0.4",
"webpack-bundle-analyzer": "5.3.0",
"@types/hoist-non-react-statics": "^3.3.7"
},
"//dependency-comments": {
"chokidar": "4.0.1 seems to have issues watching an array of paths. Check later if fixed..."
Expand Down
3 changes: 3 additions & 0 deletions packages/console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"ts:check": "tsc -p tsconfig.build.json --noEmit --emitDeclarationOnly false"
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.29.2"
},
"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.27.6"
"@babel/runtime": "^7.29.2"
},
"devDependencies": {
"@instructure/ui-babel-preset": "workspace:*"
Expand Down
1 change: 1 addition & 0 deletions packages/emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "^14.6.1",
"@types/hoist-non-react-statics": "^3.3.7",
"react-dom": "18.3.1",
"vitest": "^3.2.2"
},
Expand Down
6 changes: 4 additions & 2 deletions packages/ui-codemods/lib/utils/codemodHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ function findAttribute(
* again a `JSXText` with `" \n"`. This function removes the empty text nodes.
* This does not modify the input array.
*/
function getVisibleChildren(nodes?: JSXElement['children']) {
const result: JSXElement['children'] = []
function getVisibleChildren(
nodes?: JSXElement['children']
): NonNullable<JSXElement['children']> {
const result: NonNullable<JSXElement['children']> = []
if (!nodes) {
return result
}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-codemods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@instructure/ui-babel-preset": "workspace:*",
"@types/jscodeshift": "^17.3.0",
"@types/prettier": "^2.7.3",
"esbuild": "^0.25.5",
"esbuild": "^0.28.0",
"vitest": "^3.2.2"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-decorator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.6"
"@babel/runtime": "^7.29.2"
},
"devDependencies": {
"@instructure/ui-babel-preset": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@instructure/ui-babel-preset": "workspace:*",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "15.0.7",
"@types/hoist-non-react-statics": "^3.3.6",
"@types/hoist-non-react-statics": "^3.3.7",
"react-dom": "18.3.1",
"vitest": "^3.2.2"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/ui-react-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"@instructure/ui-babel-preset": "workspace:*",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "15.0.7",
"vitest": "^3.2.2"
"vitest": "^3.2.2",
"@types/hoist-non-react-statics": "^3.3.7"
},
"peerDependencies": {
"react": ">=18 <=19",
Expand Down
12 changes: 6 additions & 6 deletions packages/ui-scripts/lib/build/buildThemes/setupThemes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ import generateSemantics, {
import generateComponent, {
generateComponentType
} from './generateComponents.js'
import { exec } from 'child_process'
import { promisify } from 'node:util'
import { resolveBin, runCommandAsync } from '@instructure/command-utils'

// transform to an object for easier handling
export const transformThemes = (themes: any, input: any) =>
Expand Down Expand Up @@ -369,11 +368,12 @@ const setupThemes = async (targetPath: string, input: any): Promise<void> => {
}
`
await createFile(`${targetPath}/index.ts`, exportIndexFileContent)
const execAsync = promisify(exec)
try {
const { stdout, stderr } = await execAsync(
"dprint fmt '" + targetPath + "/**/*.*'"
)
const dprintBin = resolveBin('dprint')
const { stdout, stderr } = await runCommandAsync(dprintBin, [
'fmt',
`${targetPath}/**/*.*`
])
console.log('[dprint]', stdout)
if (stderr) {
console.error('[dprint error]:', stderr)
Expand Down
Loading
Loading