Skip to content

Commit

Permalink
node 22 som nå er LTS, nye versjoner
Browse files Browse the repository at this point in the history
  • Loading branch information
di0nys1us committed Nov 4, 2024
1 parent aba2ff5 commit 2de6a68
Show file tree
Hide file tree
Showing 9 changed files with 783 additions and 876 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.14.0-alpine as node
FROM node:lts-alpine as node

Check warning on line 1 in Dockerfile

View workflow job for this annotation

GitHub Actions / Bygg

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
RUN --mount=type=secret,id=NODE_AUTH_TOKEN \
npm config set //npm.pkg.github.com/:_authToken=$(cat /run/secrets/NODE_AUTH_TOKEN)
RUN npm config set @navikt:registry=https://npm.pkg.github.com
Expand Down Expand Up @@ -29,7 +29,7 @@ COPY server/package.json server/package-lock.json ./
RUN npm ci --omit dev

# runtime
FROM gcr.io/distroless/nodejs20-debian12 as runtime
FROM gcr.io/distroless/nodejs22-debian12 as runtime

Check warning on line 32 in Dockerfile

View workflow job for this annotation

GitHub Actions / Bygg

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
WORKDIR /app

ARG NODE_ENV=production
Expand Down
837 changes: 352 additions & 485 deletions client/package-lock.json

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
"@amplitude/analytics-browser": "2.11.8",
"@grafana/faro-web-sdk": "1.11.0",
"@grafana/faro-web-tracing": "1.11.0",
"@navikt/aksel-icons": "7.3.1",
"@navikt/ds-css": "7.3.1",
"@navikt/ds-react": "7.3.1",
"@navikt/aksel-icons": "7.4.3",
"@navikt/ds-css": "7.4.3",
"@navikt/ds-react": "7.4.3",
"@navikt/helse-frontend-varsel": "3.0.1",
"date-fns": "4.1.0",
"debug": "4.3.7",
"dexie": "4.0.9",
"fetch-intercept": "2.4.0",
"graphql-request": "7.1.0",
"graphql-request": "7.1.2",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-error-boundary": "4.1.2",
Expand All @@ -29,43 +29,43 @@
"stacktrace-js": "^2.0.2",
"styled-components": "6.1.13",
"swr": "2.2.5",
"uuid": "10.0.0",
"uuid": "11.0.2",
"whatwg-fetch": "3.6.20"
},
"devDependencies": {
"@eslint/js": "^9.13.0",
"@eslint/js": "^9.14.0",
"@graphql-codegen/cli": "^5.0.3",
"@graphql-codegen/typescript": "^4.1.0",
"@graphql-codegen/typescript-operations": "^4.3.0",
"@graphql-codegen/typescript": "^4.1.1",
"@graphql-codegen/typescript-operations": "^4.3.1",
"@testing-library/cypress": "10.0.2",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@this-dot/cypress-indexeddb": "2.0.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/debug": "^4.1.12",
"@types/node": "^20.16.10",
"@types/node": "^22.8.7",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-router": "^5.1.20",
"@types/react-router-dom": "^5.3.3",
"@types/uuid": "^10.0.0",
"@vitejs/plugin-react-swc": "^3.7.1",
"cross-env": "^7.0.3",
"cypress": "^13.15.0",
"eslint": "^9.13.0",
"cypress": "^13.15.1",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.13",
"globals": "^15.11.0",
"eslint-plugin-react-refresh": "^0.4.14",
"globals": "^15.12.0",
"jsdom": "^25.0.1",
"msw": "^2.5.0",
"msw": "^2.6.0",
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"typescript": "^5.6.3",
"typescript-eslint": "^8.11.0",
"typescript-eslint": "^8.12.2",
"vite": "^5.4.10",
"vitest": "^2.1.3"
"vitest": "^2.1.4"
},
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion client/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.5.0'
const PACKAGE_VERSION = '2.6.0'
const INTEGRITY_CHECKSUM = '07a8241b182f8a246a7cd39894799a9e'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()
Expand Down
5 changes: 4 additions & 1 deletion client/src/mocks/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { RequestHandler } from 'msw'
import { logDebug } from '../utvikling/logDebug'

export async function initMsw(): Promise<unknown> {
Expand Down Expand Up @@ -56,7 +57,9 @@ export async function initMsw(): Promise<unknown> {

const worker = setupWorker(...setupHandlers(store))
worker.listHandlers().forEach((handler) => {
logDebug(handler.info.header)
if ((handler as RequestHandler).info) {
logDebug((handler as RequestHandler).info.header)
}
})
return worker.start({
onUnhandledRequest: 'bypass',
Expand Down
102 changes: 58 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"cross-env": "^7.0.3",
"eslint": "^9.13.0",
"eslint": "^9.14.0",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"npm-run-all": "^4.1.5",
Expand Down
Loading

0 comments on commit 2de6a68

Please sign in to comment.