Skip to content

Commit

Permalink
december updates (#506)
Browse files Browse the repository at this point in the history
  • Loading branch information
talepre authored Jan 7, 2025
1 parent 3c3963d commit ac03722
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 36 deletions.
Binary file modified bun.lockb
Binary file not shown.
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,28 @@
],
"dependencies": {
"clsx": "2.1.1",
"zod": "3.23.8"
"zod": "3.24.1"
},
"devDependencies": {
"@axe-core/playwright": "4.10.1",
"@playwright/test": "1.48.2",
"@storybook/addon-essentials": "8.4.4",
"@storybook/addon-viewport": "8.4.4",
"@storybook/blocks": "8.4.4",
"@storybook/html": "8.4.4",
"@storybook/html-vite": "8.4.4",
"@typescript-eslint/eslint-plugin": "8.14.0",
"@typescript-eslint/parser": "8.14.0",
"@playwright/test": "1.49.1",
"@storybook/addon-essentials": "8.4.7",
"@storybook/addon-viewport": "8.4.7",
"@storybook/blocks": "8.4.7",
"@storybook/html": "8.4.7",
"@storybook/html-vite": "8.4.7",
"@typescript-eslint/eslint-plugin": "8.18.1",
"@typescript-eslint/parser": "8.18.1",
"concurrently": "9.1.0",
"copyfiles": "2.4.1",
"esbuild-minify-templates": "0.11.0",
"eslint": "9.14.0",
"husky": "9.1.6",
"lint-staged": "15.2.10",
"prettier": "3.3.3",
"storybook": "8.4.4",
"eslint": "9.17.0",
"husky": "9.1.7",
"lint-staged": "15.2.11",
"prettier": "3.4.2",
"storybook": "8.4.7",
"typescript-plugin-css-modules": "5.1.0",
"vite": "5.1.8",
"vite": "6.0.5",
"postcss-import-sync2": "1.2.0"
},
"lint-staged": {
Expand Down
8 changes: 4 additions & 4 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"test:watch": "TZ=UTC vitest watch"
},
"dependencies": {
"@amplitude/analytics-browser": "2.11.9",
"@grafana/faro-web-sdk": "1.12.0",
"@navikt/ds-css": "7.5.1",
"@amplitude/analytics-browser": "2.11.10",
"@grafana/faro-web-sdk": "1.12.2",
"@navikt/ds-css": "7.9.0",
"decorator-icons": "workspace:*",
"decorator-shared": "workspace:*",
"js-cookie": "3.0.5",
Expand All @@ -27,6 +27,6 @@
"jsdom": "25.0.1",
"postcss": "8.4.49",
"rollup-plugin-minify-html-literals-v3": "1.3.4",
"vitest": "2.1.5"
"vitest": "2.1.8"
}
}
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"decorator-shared": "workspace:*"
},
"devDependencies": {
"@navikt/aksel-icons": "7.5.1",
"@navikt/aksel-icons": "7.9.0",
"svgo": "3.3.2"
}
}
4 changes: 2 additions & 2 deletions packages/next-pages-router-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"lint": "next lint"
},
"dependencies": {
"@navikt/nav-dekoratoren-moduler": "^2.1.6",
"@navikt/nav-dekoratoren-moduler": "^3.1.3",
"react": "^18",
"react-dom": "^18",
"next": "14.2.4"
"next": "14.2.21"
},
"devDependencies": {
"typescript": "^5",
Expand Down
22 changes: 11 additions & 11 deletions packages/next-pages-router-example/pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import Document, {
Head,
} from "next/document";
import {
DecoratorComponents,
fetchDecoratorReact,
DecoratorEnvProps,
DecoratorComponentsReact,
} from "@navikt/nav-dekoratoren-moduler/ssr";
import React from "react";

Expand All @@ -17,25 +17,25 @@ const decoratorParams: DecoratorEnvProps = {
localUrl: "http://localhost:8089",
};

class _Document extends Document<{ decorator: DecoratorComponents }> {
class _Document extends Document<{ Decorator: DecoratorComponentsReact }> {
static async getInitialProps(ctx: DocumentContext) {
const initialProps = await Document.getInitialProps(ctx);
const decorator = await fetchDecoratorReact(decoratorParams);
return { ...initialProps, decorator };
const Decorator = await fetchDecoratorReact(decoratorParams);
return { ...initialProps, Decorator };
}

render() {
const { Styles, Scripts, Header, Footer } = this.props.decorator;
const { Decorator } = this.props;
return (
<Html lang="no">
<Head />
<Styles />
<Scripts />

<Head>
<Decorator.HeadAssets />
</Head>
<body>
<Header />
<Decorator.Header />
<Main />
<Footer />
<Decorator.Footer />
<Decorator.Scripts />
<NextScript />
</body>
</Html>
Expand Down
9 changes: 6 additions & 3 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
"decorator-client": "workspace:*",
"decorator-icons": "workspace:*",
"decorator-shared": "workspace:*",
"hono": "4.6.10",
"ts-pattern": "5.5.0",
"hono": "4.6.14",
"ts-pattern": "5.6.0",
"unleash-client": "4.2.1"
},
"dependencyComments": {
"msw": "2.4.3: There's an issue with bun and any versions higher than 2.4.3 for now. Keeping the version, possibly removing bun in future."
},
"devDependencies": {
"@types/bun": "1.1.13",
"@types/bun": "1.1.14",
"msw": "2.4.3",
"postcss": "8.4.49",
"postcss-modules": "6.0.1",
Expand Down

0 comments on commit ac03722

Please sign in to comment.