From 2754cd3040d872b0049151ae3444d89c777f642c Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Fri, 1 Mar 2024 19:57:41 -0500 Subject: [PATCH 1/2] Update USWDS typings to incorporate corrections --- index.d.ts | 91 +++++++++++---------------------------- package-lock.json | 14 +++--- package.json | 2 +- tsconfig.json | 5 +-- typings/uswds__uswds.d.ts | 2 - 5 files changed, 33 insertions(+), 81 deletions(-) delete mode 100644 typings/uswds__uswds.d.ts diff --git a/index.d.ts b/index.d.ts index 21235a5a..5ad3617b 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,67 +1,24 @@ -import { - accordion as baseAccordion, - banner as baseBanner, - characterCount as baseCharacterCount, - comboBox as baseComboBox, - datePicker as baseDatePicker, - dateRangePicker as baseDateRangePicker, - fileInput as baseFileInput, - footer as baseFooter, - inPageNavigation as baseInPageNavigation, - inputMask as baseInputMask, - languageSelector as baseLanguageSelector, - modal as baseModal, - navigation as baseNavigation, - password as basePassword, - search as baseSearch, - skipnav as baseSkipnav, - timePicker as baseTimePicker, - table as baseTable, - tooltip as baseTooltip, - validator as baseValidator, -} from '@uswds/uswds'; - -type ComponentLifecycle = (target?: HTMLElement) => any; - -interface BaseComponent { - on: ComponentLifecycle; - off: ComponentLifecycle; -} - -interface Button extends BaseComponent {} - -interface Range extends BaseComponent { - updateCallout(targetRange: HTMLInputElement): void; -} - -type Tooltip = typeof baseTooltip & - BaseComponent & { - show( - tooltipBody: HTMLElement, - tooltipTrigger: Element, - position: 'top' | 'right' | 'left' | 'bottom', - ): void; - }; - -export const accordion: typeof baseAccordion & BaseComponent; -export const banner: typeof baseBanner & BaseComponent; -export const button: Button; -export const characterCount: typeof baseCharacterCount & BaseComponent; -export const comboBox: typeof baseComboBox & BaseComponent; -export const datePicker: typeof baseDatePicker & BaseComponent; -export const dateRangePicker: typeof baseDateRangePicker & BaseComponent; -export const fileInput: typeof baseFileInput & BaseComponent; -export const footer: typeof baseFooter & BaseComponent; -export const inPageNavigation: typeof baseInPageNavigation & BaseComponent; -export const inputMask: typeof baseInputMask & BaseComponent; -export const languageSelector: typeof baseLanguageSelector & BaseComponent; -export const modal: typeof baseModal & BaseComponent; -export const navigation: typeof baseNavigation & BaseComponent; -export const password: typeof basePassword & BaseComponent; -export const range: Range; -export const search: typeof baseSearch & BaseComponent; -export const skipnav: typeof baseSkipnav & BaseComponent; -export const timePicker: typeof baseTimePicker & BaseComponent; -export const table: typeof baseTable & BaseComponent; -export const tooltip: Tooltip; -export const validator: typeof baseValidator & BaseComponent; +export { + accordion, + banner, + button, + characterCount, + comboBox, + datePicker, + dateRangePicker, + fileInput, + footer, + inPageNavigation, + inputMask, + languageSelector, + modal, + navigation, + password, + range, + search, + skipnav, + timePicker, + table, + tooltip, + validator, +} from '@uswds/uswds/js'; diff --git a/package-lock.json b/package-lock.json index 89587276..415c029a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "8.1.0", "license": "CC0-1.0", "dependencies": { - "@types/uswds__uswds": "^3.3.3", + "@types/uswds__uswds": "^3.7.0", "@uswds/uswds": "^3.7.1" }, "devDependencies": { @@ -1007,9 +1007,9 @@ } }, "node_modules/@types/uswds__uswds": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@types/uswds__uswds/-/uswds__uswds-3.3.3.tgz", - "integrity": "sha512-lg5rcWgVvFFoJ+CY+HH6IReBJVT4R/5JXABfDz8NDoS1KDKa86z/XUmaDNK6Frb90n12fPRUF95qegL8tY6pPw==" + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@types/uswds__uswds/-/uswds__uswds-3.7.0.tgz", + "integrity": "sha512-HlOhwJPLpmv3rC8IN81DmvnRvi9Qzsf7MdxlE1XCB+fsPqTakkrpLdDoQOL+9lcCOurt7VhBXClSi6ZCKskZHw==" }, "node_modules/@types/yauzl": { "version": "2.10.3", @@ -7769,9 +7769,9 @@ } }, "@types/uswds__uswds": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@types/uswds__uswds/-/uswds__uswds-3.3.3.tgz", - "integrity": "sha512-lg5rcWgVvFFoJ+CY+HH6IReBJVT4R/5JXABfDz8NDoS1KDKa86z/XUmaDNK6Frb90n12fPRUF95qegL8tY6pPw==" + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@types/uswds__uswds/-/uswds__uswds-3.7.0.tgz", + "integrity": "sha512-HlOhwJPLpmv3rC8IN81DmvnRvi9Qzsf7MdxlE1XCB+fsPqTakkrpLdDoQOL+9lcCOurt7VhBXClSi6ZCKskZHw==" }, "@types/yauzl": { "version": "2.10.3", diff --git a/package.json b/package.json index 3ba41e73..4de6bf54 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ }, "homepage": "https://github.com/18F/identity-design-system#readme", "dependencies": { - "@types/uswds__uswds": "^3.3.3", + "@types/uswds__uswds": "^3.7.0", "@uswds/uswds": "^3.7.1" }, "devDependencies": { diff --git a/tsconfig.json b/tsconfig.json index 69f6c8fc..58a832bf 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,10 +8,7 @@ "moduleResolution": "node", "module": "ESNext", "target": "ESNext", - "baseUrl": ".", - "paths": { - "*": ["typings/*"] - } + "baseUrl": "." }, "exclude": ["build", "dist", "packages"] } diff --git a/typings/uswds__uswds.d.ts b/typings/uswds__uswds.d.ts deleted file mode 100644 index 63e270e1..00000000 --- a/typings/uswds__uswds.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -declare module '@uswds/uswds/js/usa-button'; -declare module '@uswds/uswds/js/usa-range'; From 3e1e5e78d25be00aafb846996b88763b3fa20357 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Mon, 4 Mar 2024 07:58:02 -0500 Subject: [PATCH 2/2] Use export all syntax --- index.d.ts | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/index.d.ts b/index.d.ts index 5ad3617b..3af20d71 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,24 +1 @@ -export { - accordion, - banner, - button, - characterCount, - comboBox, - datePicker, - dateRangePicker, - fileInput, - footer, - inPageNavigation, - inputMask, - languageSelector, - modal, - navigation, - password, - range, - search, - skipnav, - timePicker, - table, - tooltip, - validator, -} from '@uswds/uswds/js'; +export * from '@uswds/uswds/js';