Skip to content

Commit

Permalink
pakkeoppdateringer
Browse files Browse the repository at this point in the history
  • Loading branch information
@vebnor
vebnor committed Nov 11, 2024
1 parent 1b00e48 commit 43d0788
Show file tree
Hide file tree
Showing 5 changed files with 2,047 additions and 1,968 deletions.
4 changes: 2 additions & 2 deletions e2e/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@playwright/test": "1.47.2",
"@types/node": "22.7.4"
"@playwright/test": "1.48.2",
"@types/node": "22.9.0"
}
}
106 changes: 53 additions & 53 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
"repository": "https://github.com/navikt/k9-los-web",
"license": "MIT",
"dependencies": {
"@formatjs/intl-datetimeformat": "6.12.5",
"@formatjs/intl-numberformat": "8.10.3",
"@grafana/faro-web-sdk": "^1.10.2",
"@grafana/faro-web-tracing": "^1.10.2",
"@navikt/aksel-icons": "7.1.0",
"@navikt/ds-css": "7.1.0",
"@navikt/ds-react": "7.1.0",
"@navikt/ds-tailwind": "7.1.0",
"@navikt/ds-tokens": "7.1.0",
"@formatjs/intl-datetimeformat": "6.16.4",
"@formatjs/intl-numberformat": "8.14.4",
"@grafana/faro-web-sdk": "^1.11.0",
"@grafana/faro-web-tracing": "^1.11.0",
"@navikt/aksel-icons": "7.5.1",
"@navikt/ds-css": "7.5.1",
"@navikt/ds-react": "7.5.1",
"@navikt/ds-tailwind": "7.5.1",
"@navikt/ds-tokens": "7.5.1",
"@navikt/familie-endringslogg": "13.1.4",
"@navikt/fnrvalidator": "^2.1.2",
"@navikt/ft-form-hooks": "5.1.1",
"@navikt/ft-form-validators": "2.4.1",
"@navikt/ft-plattform-komponenter": "3.1.1",
"@navikt/ft-form-hooks": "5.2.3",
"@navikt/ft-form-validators": "2.5.3",
"@navikt/ft-plattform-komponenter": "5.1.0",
"@popperjs/core": "2.11.8",
"@reach/combobox": "0.18.0",
"@sentry/browser": "8.32.0",
"@sentry/cli": "^2.36.6",
"@sentry/react": "^8.32.0",
"@sentry/browser": "8.37.1",
"@sentry/cli": "^2.38.2",
"@sentry/react": "^8.37.1",
"axios": "1.7.7",
"classnames": "2.5.1",
"dayjs": "1.11.13",
Expand Down Expand Up @@ -79,55 +79,55 @@
"react-day-picker": "7.4.10",
"react-dom": "18.3.1",
"react-final-form": "6.5.9",
"react-hook-form": "7.53.0",
"react-hook-form": "7.53.2",
"react-idle-timer": "5.7.2",
"react-intl": "6.7.0",
"react-intl": "6.8.7",
"react-modal": "3.16.1",
"react-popper": "2.3.0",
"react-query": "3.39.3",
"react-router": "6.26.2",
"react-router-dom": "6.26.2",
"tailwindcss": "3.4.13",
"react-router": "6.28.0",
"react-router-dom": "6.28.0",
"tailwindcss": "3.4.14",
"uuid": "10.0.0"
},
"devDependencies": {
"@babel/core": "7.25.2",
"@babel/core": "7.26.0",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-transform-runtime": "7.25.4",
"@babel/preset-env": "7.25.4",
"@babel/preset-react": "7.24.7",
"@babel/preset-typescript": "7.24.7",
"@babel/register": "7.24.6",
"@babel/plugin-transform-runtime": "7.25.9",
"@babel/preset-env": "7.26.0",
"@babel/preset-react": "7.25.9",
"@babel/preset-typescript": "7.26.0",
"@babel/register": "7.25.9",
"@chromatic-com/storybook": "^2.0.2",
"@navikt/aksel-stylelint": "7.1.0",
"@playwright/test": "1.47.2",
"@storybook/addon-essentials": "^8.3.4",
"@storybook/addon-interactions": "^8.3.4",
"@storybook/addon-links": "^8.3.4",
"@storybook/addon-onboarding": "^8.3.4",
"@storybook/addon-styling-webpack": "^1.0.0",
"@navikt/aksel-stylelint": "7.5.1",
"@playwright/test": "1.48.2",
"@storybook/addon-essentials": "^8.4.2",
"@storybook/addon-interactions": "^8.4.2",
"@storybook/addon-links": "^8.4.2",
"@storybook/addon-onboarding": "^8.4.2",
"@storybook/addon-styling-webpack": "^1.0.1",
"@storybook/addon-webpack5-compiler-swc": "^1.0.5",
"@storybook/blocks": "^8.3.4",
"@storybook/react": "^8.3.4",
"@storybook/react-webpack5": "^8.3.4",
"@storybook/test": "^8.3.4",
"@storybook/blocks": "^8.4.2",
"@storybook/react": "^8.4.2",
"@storybook/react-webpack5": "^8.4.2",
"@storybook/test": "^8.4.2",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/jest-dom": "6.6.3",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@trivago/prettier-plugin-sort-imports": "4.3.0",
"@types/chai": "4.3.20",
"@types/history": "5.0.0",
"@types/jest": "29.5.13",
"@types/react": "18.3.10",
"@types/jest": "29.5.14",
"@types/react": "18.3.12",
"@types/react-collapse": "5.0.4",
"@types/react-dom": "18.3.0",
"@types/react-dom": "18.3.1",
"@types/react-intl": "3.0.0",
"@types/react-redux": "7.1.34",
"@types/react-router-dom": "5.3.3",
"@typescript-eslint/eslint-plugin": "8.8.0",
"@typescript-eslint/parser": "8.8.0",
"@typescript-eslint/eslint-plugin": "8.13.0",
"@typescript-eslint/parser": "8.13.0",
"autoprefixer": "10.4.20",
"babel-eslint": "10.1.0",
"babel-jest": "29.7.0",
Expand All @@ -146,38 +146,38 @@
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-typescript": "3.6.3",
"eslint-import-resolver-webpack": "0.13.9",
"eslint-plugin-import": "2.30.0",
"eslint-plugin-jest": "28.8.3",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jest": "28.9.0",
"eslint-plugin-jest-dom": "5.4.0",
"eslint-plugin-jsx-a11y": "6.10.0",
"eslint-plugin-react": "7.37.1",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react-hooks": "4.6.2",
"eslint-plugin-storybook": "^0.9.0",
"html-webpack-plugin": "5.6.0",
"html-webpack-plugin": "5.6.3",
"husky": "9.1.6",
"identity-obj-proxy": "3.0.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-fixed-jsdom": "^0.0.4",
"jest-fixed-jsdom": "^0.0.8",
"jest-transform-stub": "2.0.0",
"jsdom": "25.0.1",
"less": "4.2.0",
"less-loader": "12.2.0",
"lint-staged": "15.2.10",
"mini-css-extract-plugin": "2.9.1",
"msw": "2.4.9",
"msw": "2.6.4",
"postcss-less": "6.0.0",
"postcss-loader": "8.1.1",
"prettier": "^3.3.3",
"prop-types": "15.8.1",
"storybook": "^8.3.4",
"storybook": "^8.4.2",
"stylelint": "15.11.0",
"stylelint-config-prettier": "9.0.5",
"stylelint-order": "6.0.4",
"terser-webpack-plugin": "5.3.10",
"thread-loader": "4.0.4",
"typescript": "5.6.2",
"webpack": "5.95.0",
"typescript": "5.6.3",
"webpack": "5.96.1",
"webpack-cli": "5.1.4",
"webpack-dev-server": "5.1.0",
"webpack-merge": "6.0.1"
Expand Down
6 changes: 3 additions & 3 deletions server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"connect-timeout": "1.9.0",
"cors": "2.8.5",
"dotenv": "16.4.5",
"express": "4.21.0",
"express": "4.21.1",
"express-http-proxy": "2.1.1",
"express-rate-limit": "^7.4.0",
"express-rate-limit": "^7.4.1",
"helmet": "8.0.0",
"jose": "5.9.3",
"morgan": "1.10.0",
"node-cache": "5.1.2",
"winston": "3.14.2"
"winston": "3.17.0"
}
}
29 changes: 20 additions & 9 deletions src/client/mockServiceWorker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.4.9'
const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
const PACKAGE_VERSION = '2.6.4'
const INTEGRITY_CHECKSUM = 'ca7800994cc8bfb5eb961e037c877074'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()

Expand Down Expand Up @@ -62,7 +62,12 @@ self.addEventListener('message', async function (event) {

sendToClient(client, {
type: 'MOCKING_ENABLED',
payload: true,
payload: {
client: {
id: client.id,
frameType: client.frameType,
},
},
})
break
}
Expand Down Expand Up @@ -155,6 +160,10 @@ async function handleRequest(event, requestId) {
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId)

if (activeClientIds.has(event.clientId)) {
return client
}

if (client?.frameType === 'top-level') {
return client
}
Expand Down Expand Up @@ -183,12 +192,14 @@ async function getResponse(event, client, requestId) {
const requestClone = request.clone()

function passthrough() {
const headers = Object.fromEntries(requestClone.headers.entries())

// Remove internal MSW request header so the passthrough request
// complies with any potential CORS preflight checks on the server.
// Some servers forbid unknown request headers.
delete headers['x-msw-intention']
// Cast the request headers to a new Headers instance
// so the headers can be manipulated with.
const headers = new Headers(requestClone.headers)

// Remove the "accept" header value that marked this request as passthrough.
// This prevents request alteration and also keeps it compliant with the
// user-defined CORS policies.
headers.delete('accept', 'msw/passthrough')

return fetch(requestClone, { headers })
}
Expand Down
Loading

0 comments on commit 43d0788

Please sign in to comment.