Skip to content

Commit 2c1af16

Browse files
authored
Merge pull request #470 from opf/code-maintenance/typescript-6.0
[DREAM-713] Support TypeScript 6.0
2 parents 3e667a3 + 4e925c1 commit 2c1af16

8 files changed

Lines changed: 246 additions & 190 deletions

File tree

.changeset/swift-deer-wave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@openproject/primer-view-components': patch
3+
---
4+
5+
Support TypeScript 6.0
-1 Bytes
Loading

app/components/primer/alpha/select_panel_element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {getAnchoredPosition} from '@primer/behaviors'
22
import {controller, target} from '@github/catalyst'
33
import {IncludeFragmentElement} from '@github/include-fragment-element'
4-
import type {PrimerTextFieldElement} from 'app/lib/primer/forms/primer_text_field'
4+
import type {PrimerTextFieldElement} from '../../../lib/primer/forms/primer_text_field'
55
import type {AnchorAlignment, AnchorSide} from '@primer/behaviors'
66
import type {LiveRegionElement} from '@primer/live-region-element'
77
import '@primer/live-region-element'

app/components/primer/alpha/tree_view/tree_view_icon_pair_element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class TreeViewIconPairElement extends HTMLElement {
1313
this,
1414
() => Boolean(this.collapsedIcon) && Boolean(this.expandedIcon),
1515
() => {
16-
this.expanded = this.collapsedIcon.hidden
16+
this.expanded = Boolean(this.collapsedIcon.hidden)
1717
},
1818
)
1919
}

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"@primer/primitives": "^11.9.0",
7373
"@primer/stylelint-config": "^13.6.0",
7474
"@rollup/plugin-node-resolve": "^16.0.1",
75-
"@rollup/plugin-typescript": "^8.3.3",
75+
"@rollup/plugin-typescript": "^12.3.0",
7676
"axe-core": "^4.7.1",
7777
"chokidar-cli": "^3.0.0",
7878
"cssnano": "^7.0.1",
@@ -92,7 +92,7 @@
9292
"rollup-plugin-terser": "^7.0.2",
9393
"stylelint-actions-formatters": "^16.3.1",
9494
"tslib": "^2.4.0",
95-
"typescript": "^5.2.2",
95+
"typescript": "^6.0.3",
9696
"vite": "^8.0.9",
9797
"vite-plugin-ruby": "^5.2.1"
9898
},

rollup.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ export default {
1212
},
1313
plugins: [
1414
resolve(),
15-
typescript(),
15+
// Declarations are emitted by the separate `tsc` step (see script/build-assets),
16+
// so disable them here. Avoids @rollup/plugin-typescript v12 requiring
17+
// declarationDir to sit alongside the bundle output.
18+
typescript({declaration: false, declarationDir: undefined}),
1619
terser({keep_classnames: /Element$/}) // comment out terser in dev if you want debugger statements
1720
],
1821
onwarn: (warning, warn) => {

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"dom",
99
"dom.iterable"
1010
],
11-
"moduleResolution": "node",
11+
"moduleResolution": "bundler",
1212
"allowSyntheticDefaultImports": true,
1313
"declaration": true,
1414
"declarationDir": "./app",
15+
"rootDir": "./app",
1516
"strictPropertyInitialization": false,
1617
"strict": true,
17-
"baseUrl": ".",
1818
"types": [],
1919
},
2020
"include": [

0 commit comments

Comments
 (0)