Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/frontend-react/bundl…
Browse files Browse the repository at this point in the history
…er-8aabc1763d
  • Loading branch information
jpandersen87 authored Jan 3, 2025
2 parents 7fb3442 + ae07924 commit 017119a
Show file tree
Hide file tree
Showing 30 changed files with 6,819 additions and 1,412 deletions.
5 changes: 1 addition & 4 deletions frontend-react/.storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { initialize, mswLoader } from "msw-storybook-addon";
import { CacheProvider } from "rest-hooks";
import { HelmetProvider } from "react-helmet-async";
import MockDate from "mockdate";
Expand All @@ -25,8 +24,6 @@ export const parameters = {
},
};

initialize();

function withRestHooksCacheProvider(Story) {
return (
<CacheProvider>
Expand All @@ -45,4 +42,4 @@ function withHelmet(Story) {

export const decorators = [withHelmet, withRestHooksCacheProvider];

export const loaders = [mswLoader];
export const loaders = [];
11 changes: 5 additions & 6 deletions frontend-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"@okta/okta-react": "^6.9.0",
"@okta/okta-signin-widget": "^7.26.1",
"@rest-hooks/rest": "^3.0.3",
"@tanstack/react-query": "^5.62.2",
"@tanstack/react-query-devtools": "^5.62.2",
"@tanstack/react-query": "^5.62.11",
"@tanstack/react-query-devtools": "^5.62.11",
"@trussworks/react-uswds": "^9.1.0",
"@uswds/uswds": "3.7.1",
"axios": "^1.7.8",
"axios": "^1.7.9",
"classnames": "^2.5.1",
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
Expand Down Expand Up @@ -170,10 +170,9 @@
"globals": "^15.13.0",
"husky": "^9.1.7",
"jsdom": "^25.0.1",
"lint-staged": "^15.2.11",
"lint-staged": "^15.3.0",
"mockdate": "^3.0.5",
"msw": "^2.6.8",
"msw-storybook-addon": "^2.0.4",
"msw": "^2.7.0",
"npm-run-all": "^4.1.5",
"otpauth": "^9.3.6",
"patch-package": "^8.0.0",
Expand Down
Loading

0 comments on commit 017119a

Please sign in to comment.