Merge pull request #859 from patrickcate/feature/1.8.x

Feature/1.8.x
patrickcate · Mar 24, 2024 · 00d63c9 · 00d63c9
2 parents eb3cbb5 + 5a49f1f
commit 00d63c9
Show file tree

Hide file tree

Showing 162 changed files with 1,511 additions and 1,452 deletions.
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx --no-install commitlint --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
@@ -11,7 +11,7 @@ module.exports = {
   semi: false,
   singleQuote: true,
   tabWidth: 2,
-  trailingComma: 'es5',
+  trailingComma: 'all',
   useTabs: false,
   vueIndentScriptAndStyle: false,
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "pretest:component": "rm -rf .nyc_output coverage || true",
     "test:component": "cross-env TZ=America/New_York cypress run --component",
     "test:e2e": "cross-env TZ=America/New_York cypress run",
-    "prepare": "husky install",
+    "prepare": "husky",
     "prepublishOnly": "npm run build",
     "storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 6006",
     "build-storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider STORYBOOK_MODE=BUILD build-storybook",
@@ -69,7 +69,7 @@
     "@vueuse/components": "^10.7.0",
     "@vueuse/core": "^10.7.0",
     "@vueuse/integrations": "^10.7.0",
-    "date-fns": "^2.28.0",
+    "date-fns": "^3.6.0",
     "fast-sort": "^3.1.3",
     "focus-trap": "^7.0.0",
     "just-kebab-case": "^4.0.0",
@@ -99,15 +99,15 @@
     "cypress-real-events": "^1.11.0",
     "cz-customizable": "^6.3.0",
     "eslint": "^8.1.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-storybook": "^0.5.6",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-vue": "^9.1.1",
-    "husky": "^8.0.1",
+    "husky": "^9.0.11",
     "hygen-neo": "^6.3.0",
     "lint-staged": "^15.2.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.2.5",
     "semantic-release": "^19.0.5",
     "vite": "^4.0.0",
     "vite-plugin-istanbul": "^5.0.0",

diff --git a/src/components/BaseHeading/BaseHeading.test.js b/src/components/BaseHeading/BaseHeading.test.js
@@ -49,7 +49,7 @@ describe('BaseHeading', () => {
 
     cy.get('@consoleWarn').should(
       'be.calledWith',
-      `'notheading' is not a valid HTML heading element`
+      `'notheading' is not a valid HTML heading element`,
     )
   })
 })
diff --git a/src/components/BaseLink/BaseLink.test.js b/src/components/BaseLink/BaseLink.test.js
@@ -109,7 +109,7 @@ describe('BaseLink', () => {
 
     cy.get('test-global-router-component').should(
       'contain',
-      'Test Global Component Link'
+      'Test Global Component Link',
     )
     cy.get('test-global-router-component')
       .should('have.attr', 'to')

diff --git a/src/components/UsaAccordion/UsaAccordion.test.js b/src/components/UsaAccordion/UsaAccordion.test.js
@@ -9,16 +9,16 @@ describe('UsaAccordion', () => {
       slots: {
         default: () => [
           h(UsaAccordionItem, { label: 'Accordion 1' }, () =>
-            h('p', 'Accordion 1')
+            h('p', 'Accordion 1'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 2' }, () =>
-            h('p', 'Accordion 2')
+            h('p', 'Accordion 2'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 3' }, () =>
-            h('p', 'Accordion 3')
+            h('p', 'Accordion 3'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 4' }, () =>
-            h('p', 'Accordion 4')
+            h('p', 'Accordion 4'),
           ),
         ],
       },
@@ -35,14 +35,14 @@ describe('UsaAccordion', () => {
 
       cy.get(`h2.usa-accordion__heading:nth-of-type(${item})`).should('exist')
       cy.get(
-        `h2.usa-accordion__heading:nth-of-type(${item}) button.usa-accordion__button`
+        `h2.usa-accordion__heading:nth-of-type(${item}) button.usa-accordion__button`,
       )
         .should('contain', `Accordion ${item}`)
         .and('have.attr', 'aria-expanded')
         .and('contain', 'false')
 
       cy.get(
-        `h2.usa-accordion__heading:nth-of-type(${item}) button.usa-accordion__button`
+        `h2.usa-accordion__heading:nth-of-type(${item}) button.usa-accordion__button`,
       )
         .should('have.attr', 'aria-controls')
         .and('contain', id)
@@ -84,16 +84,16 @@ describe('UsaAccordion', () => {
       slots: {
         default: () => [
           h(UsaAccordionItem, { label: 'Accordion 1' }, () =>
-            h('p', 'Accordion 1')
+            h('p', 'Accordion 1'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 2' }, () =>
-            h('p', 'Accordion 2')
+            h('p', 'Accordion 2'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 3' }, () =>
-            h('p', 'Accordion 3')
+            h('p', 'Accordion 3'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 4' }, () =>
-            h('p', 'Accordion 4')
+            h('p', 'Accordion 4'),
           ),
         ],
       },
@@ -102,22 +102,22 @@ describe('UsaAccordion', () => {
     const items = ['first', 'second', 'third', 'fourth']
 
     cy.get('.usa-accordion__heading:nth-of-type(1) .usa-accordion__button').as(
-      'firstButton'
+      'firstButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(1)').as('firstContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(2) .usa-accordion__button').as(
-      'secondButton'
+      'secondButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(2)').as('secondContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(3) .usa-accordion__button').as(
-      'thirdButton'
+      'thirdButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(3)').as('thirdContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(4) .usa-accordion__button').as(
-      'fourthButton'
+      'fourthButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(4)').as('fourthContent')
 
@@ -141,16 +141,16 @@ describe('UsaAccordion', () => {
       slots: {
         default: () => [
           h(UsaAccordionItem, { label: 'Accordion 1' }, () =>
-            h('p', 'Accordion 1')
+            h('p', 'Accordion 1'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 2' }, () =>
-            h('p', 'Accordion 2')
+            h('p', 'Accordion 2'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 3' }, () =>
-            h('p', 'Accordion 3')
+            h('p', 'Accordion 3'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 4' }, () =>
-            h('p', 'Accordion 4')
+            h('p', 'Accordion 4'),
           ),
         ],
       },
@@ -159,22 +159,22 @@ describe('UsaAccordion', () => {
     const items = ['first', 'second', 'third', 'fourth']
 
     cy.get('.usa-accordion__heading:nth-of-type(1) .usa-accordion__button').as(
-      'firstButton'
+      'firstButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(1)').as('firstContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(2) .usa-accordion__button').as(
-      'secondButton'
+      'secondButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(2)').as('secondContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(3) .usa-accordion__button').as(
-      'thirdButton'
+      'thirdButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(3)').as('thirdContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(4) .usa-accordion__button').as(
-      'fourthButton'
+      'fourthButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(4)').as('fourthContent')
 
@@ -197,16 +197,16 @@ describe('UsaAccordion', () => {
       slots: {
         default: () => [
           h(UsaAccordionItem, { label: 'Accordion 1' }, () =>
-            h('p', 'Accordion 1')
+            h('p', 'Accordion 1'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 2', open: true }, () =>
-            h('p', 'Accordion 2')
+            h('p', 'Accordion 2'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 3' }, () =>
-            h('p', 'Accordion 3')
+            h('p', 'Accordion 3'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 4' }, () =>
-            h('p', 'Accordion 4')
+            h('p', 'Accordion 4'),
           ),
         ],
       },
@@ -235,13 +235,13 @@ describe('UsaAccordion', () => {
       slots: {
         default: () => [
           h(UsaAccordionItem, { label: 'Accordion 1', open: true }, () =>
-            h('p', 'Accordion 1')
+            h('p', 'Accordion 1'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 2', open: true }, () =>
-            h('p', 'Accordion 2')
+            h('p', 'Accordion 2'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 3', open: true }, () =>
-            h('p', 'Accordion 3')
+            h('p', 'Accordion 3'),
           ),
         ],
       },
@@ -250,17 +250,17 @@ describe('UsaAccordion', () => {
     const items = ['first', 'second', 'third']
 
     cy.get('.usa-accordion__heading:nth-of-type(1) .usa-accordion__button').as(
-      'firstButton'
+      'firstButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(1)').as('firstContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(2) .usa-accordion__button').as(
-      'secondButton'
+      'secondButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(2)').as('secondContent')
 
     cy.get('.usa-accordion__heading:nth-of-type(3) .usa-accordion__button').as(
-      'thirdButton'
+      'thirdButton',
     )
     cy.get('.usa-accordion__content:nth-of-type(3)').as('thirdContent')
 
@@ -289,13 +289,13 @@ describe('UsaAccordion', () => {
       slots: {
         default: () => [
           h(UsaAccordionItem, { label: 'Accordion 1' }, () =>
-            h('p', 'Accordion 1')
+            h('p', 'Accordion 1'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 2' }, () =>
-            h('p', 'Accordion 2')
+            h('p', 'Accordion 2'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 3' }, () =>
-            h('p', 'Accordion 3')
+            h('p', 'Accordion 3'),
           ),
         ],
       },
@@ -309,13 +309,13 @@ describe('UsaAccordion', () => {
       slots: {
         default: () => [
           h(UsaAccordionItem, { label: 'Accordion 1' }, () =>
-            h('p', 'Accordion 1')
+            h('p', 'Accordion 1'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 2', open: true }, () =>
-            h('p', 'Accordion 2')
+            h('p', 'Accordion 2'),
           ),
           h(UsaAccordionItem, { label: 'Accordion 3' }, () =>
-            h('p', 'Accordion 3')
+            h('p', 'Accordion 3'),
           ),
         ],
       },
@@ -341,7 +341,7 @@ describe('UsaAccordion', () => {
       })
 
     cy.get(
-      '.usa-accordion__heading:nth-of-type(1) .usa-accordion__button'
+      '.usa-accordion__heading:nth-of-type(1) .usa-accordion__button',
     ).click()
 
     cy.get('@wrapper')

diff --git a/src/components/UsaAccordion/UsaAccordion.vue b/src/components/UsaAccordion/UsaAccordion.vue
@@ -36,7 +36,7 @@ watch(accordionItems, () => {
 
 provide(
   'accordionHeadingTag',
-  computed(() => props.headingTag)
+  computed(() => props.headingTag),
 )
 provide('registerAccordionItem', registerAccordionItem)
 provide('unregisterAccordionItem', unregisterAccordionItem)

diff --git a/src/components/UsaAccordionItem/UsaAccordionItem.stories.js b/src/components/UsaAccordionItem/UsaAccordionItem.stories.js
@@ -57,8 +57,8 @@ const DefaultTemplate = (args, { argTypes }) => ({
   template: `<UsaAccordion>
     <UsaAccordionItem :id="id" :label="label" :open="open" :custom-classes="customClasses">
       <template v-if="${!!args['slot:label']}" #label>${
-    args['slot:label']
-  }</template>
+        args['slot:label']
+      }</template>
       <template v-if="${!!args.default}" #default>${args.default}</template>
     </UsaAccordionItem>
   </UsaAccordion>`,

diff --git a/src/components/UsaAccordionItem/UsaAccordionItem.test.js b/src/components/UsaAccordionItem/UsaAccordionItem.test.js
@@ -20,7 +20,7 @@ describe('UsaAccordionItem', () => {
     cy.get('.usa-accordion__button').should('contain', 'Test Accordion Label')
     cy.get('.usa-accordion__content').should(
       'contain',
-      'Test Accordion Content'
+      'Test Accordion Content',
     )
   })
 
@@ -43,7 +43,7 @@ describe('UsaAccordionItem', () => {
       .and('contain', 'test-accordion-item-id')
     cy.get('.usa-accordion__content').should(
       'have.id',
-      'test-accordion-item-id'
+      'test-accordion-item-id',
     )
   })
 
@@ -64,7 +64,7 @@ describe('UsaAccordionItem', () => {
 
     cy.get('.usa-accordion__button').should(
       'contain',
-      'Custom Accordion Slot Label'
+      'Custom Accordion Slot Label',
     )
   })
 

diff --git a/src/components/UsaAlert/UsaAlert.stories.js b/src/components/UsaAlert/UsaAlert.stories.js
@@ -100,8 +100,8 @@ const DefaultTemplate = (args, { argTypes }) => ({
       :custom-classes="customClasses"
     >
       <template v-if="${!!args['slot:heading']}" #heading>${
-    args['slot:heading']
-  }</template>
+        args['slot:heading']
+      }</template>
       <template v-if="${!!args.default}" #default>${args.default}</template>
       <template v-if="${!!args.message}" #message>${args.message}</template>
     </UsaAlert>`,

diff --git a/src/components/UsaAlert/UsaAlert.test.js b/src/components/UsaAlert/UsaAlert.test.js
@@ -207,7 +207,7 @@ describe('UsaAlert', () => {
 
     cy.get('@consoleWarn').should(
       'be.calledWith',
-      `'notvariant' is not a valid alert variant`
+      `'notvariant' is not a valid alert variant`,
     )
   })
 })