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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"playwright": "1.61.1",
"react": "18.3.1",
"read-package-up": "^12.0.0",
"typescript": "6.0.3",
"typescript": "7.0.2",
"vitest": "^4.1.9",
"vitest-browser-react": "2.2.0",
"webpack": "^5.107.2"
Expand Down
7 changes: 5 additions & 2 deletions packages/__docs__/buildScripts/utils/getJSDoc.mts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
* SOFTWARE.
*/

import * as ts from 'typescript'
// TypeScript 7 dropped the programmatic Compiler API, so this imports
// Microsoft's TypeScript 6.0 compatibility shim instead.
// TODO revisit once TypeScript 7.1 adds a Compiler API (see https://devblogs.microsoft.com/typescript/announcing-typescript-7-0/)
import * as ts from 'typescript-compiler-api'
import type { JsDocResult } from '../DataTypes.mjs'
import {
ArrowFunction,
Expand All @@ -31,7 +34,7 @@ import {
JSDocTag, NamedDeclaration,
TypeChecker,
VariableDeclaration
} from 'typescript'
} from 'typescript-compiler-api'
import fs from 'fs'

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/__docs__/globals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import ReactDOM from 'react-dom'

import { LoremIpsum } from 'lorem-ipsum'
import moment from 'moment'
// @ts-expect-error no type declarations for moment locales side-effect import
// @ts-ignore no type declarations for moment locales side-effect import
import 'moment/min/locales'
import { mirrorHorizontalPlacement } from '@instructure/ui-position'
import { getComponentsForVersion } from './versioned-components'
Expand Down
1 change: 1 addition & 0 deletions packages/__docs__/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
"react-docgen": "8.0.3",
"style-loader": "4.0.0",
"thread-loader": "^4.0.4",
"typescript-compiler-api": "npm:@typescript/typescript6@^6.0.2",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

TS7 has no compiler API (that is used in getJSDoc). They promise a new API in 7.1 and recommends adding in this compatibility packages until it is released.

"webpack-bundle-analyzer": "5.3.0"
},
"//dependency-comments": {
Expand Down
3 changes: 2 additions & 1 deletion packages/ui-table/src/Table/__tests__/Table.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,11 @@ describe('<Table />', async () => {
<Table.Body>
test
<span>test</span>
{/* @ts-expect-error error is normal here */}
{/* @ts-ignore error is normal here */}
<Table.Row>
test
<span>test</span>
{/* @ts-ignore error is normal here */}
<Table.Cell>Foo</Table.Cell>
test
<span>test</span>
Expand Down
Loading
Loading