Skip to content

Commit 062ff87

Browse files
authored
Merge branch 'main' into sid/actionmenu-in-focuszone
2 parents 9cd871d + a348400 commit 062ff87

File tree

115 files changed

+37501
-30667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+37501
-30667
lines changed

.eslintrc.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
"lib-*/**/*",
2525
"types/**/*",
2626
"consumer-test/**/*",
27-
"contributor-docs/adrs/*"
27+
"contributor-docs/adrs/*",
28+
// Note: this file is inlined from an external dependency
29+
"src/utils/polymorphic.ts"
2830
],
2931
"globals": {
3032
"__DEV__": "readonly"

consumer-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
},
55
"dependencies": {
66
"@primer/react": "*",
7-
"typescript": "^4.4.4"
7+
"typescript": "~4.7.2"
88
}
99
}

jest.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ module.exports = {
1111
testMatch: ['<rootDir>/(src|codemods)/**/*.test.[jt]s?(x)', '!**/*.types.test.[jt]s?(x)'],
1212
transformIgnorePatterns: [
1313
'node_modules/(?!@github/combobox-nav|@koddsson/textarea-caret|@github/markdown-toolbar-element)'
14-
]
14+
],
15+
watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname']
1516
}

0 commit comments

Comments
 (0)