Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/server/graphql-16.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kenglxn authored Sep 25, 2023
2 parents 2c3274a + 9f19fcf commit 04f96b0
Show file tree
Hide file tree
Showing 20 changed files with 2,232 additions and 11,189 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
cache: 'npm'

- name: Installer avhengigheter (client)
run: npm ci
run: npm ci --omit=dev --omit=optional
env:
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}

- name: Installer avhengigheter (server)
run: npm ci --production --ignore-scripts --no-optional
run: npm ci --omit=dev --omit=optional
env:
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
working-directory: ./server
Expand Down
12,742 changes: 2,132 additions & 10,610 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 0 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,27 @@
"@navikt/ds-css": "^4.9.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "^4.9.0",
"@navikt/fnrvalidator": "^1.1.3",
"@navikt/nav-dekoratoren-moduler": "2.1.3",
"@sentry/react": "^6.7.0",
"@types/amplitude-js": "^8.9.0",
"@types/classnames": "^2.2.7",
"@types/express-serve-static-core": "^4.17.24",
"@types/jest": "26.0.24",
"@types/jest-axe": "^3.5.1",
"@types/raf": "^3.4.0",
"@types/react": "17.0.38",
"@types/react-collapse": "^5.0.0",
"@types/react-dom": "17.0.11",
"@types/react-modal": "3.13.1",
"@types/react-tooltip": "^4.2.4",
"@types/smoothscroll-polyfill": "^0.3.1",
"@types/uuid": "^9.0.2",
"@typescript-eslint/eslint-plugin": "^5.8.1",
"@typescript-eslint/parser": "^5.8.1",
"@vitejs/plugin-react-swc": "3.3.2",
"abortcontroller-polyfill": "^1.7.1",
"amplitude-js": "^7.4.1",
"core-js": "^3.20.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"fuzzysort": "^1.1.4",
"immutable": "^4.3.0",
"jest-axe": "^4.1.0",
"raf": "^3.4.1",
"react": "^17.0.1",
"react-collapse": "^5.1.0",
"react-dom": "^17.0.1",
"react-modal": "^3.12.1",
"react-router-dom": "^6.3.0",
"react-tooltip": "^4.2.13",
"regenerator-runtime": "^0.13.7",
"smoothscroll-polyfill": "^0.4.4",
"swr": "^2.2.2",
"typescript": "4.5.4",
"uuid": "^9.0.0",
"vite": "4.4.9",
"vite-plugin-svgr": "3.2.0",
"vite-tsconfig-paths": "4.2.0",
"whatwg-fetch": "^3.6.2",
"zod": "^3.12.0"
Expand Down
2 changes: 0 additions & 2 deletions server/mock/innloggetMock.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import fetch from 'node-fetch';

const sessions = {};
export const mock = function (app) {
app.get('/min-side-arbeidsgiver/api/innlogget', (req, res) => {
Expand Down
14 changes: 9 additions & 5 deletions server/mock/presenterteKandidaterMock.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ export const mock = (app) => {
app.use(
'/min-side-arbeidsgiver/presenterte-kandidater-api/ekstern/antallkandidater',
(req, res) => {
res.send({
antallKandidater: Math.floor(Math.random() * 10)
});
},
if (Math.random() < 0.1) {
res.sendStatus(502);
} else {
res.send({
antallKandidater: Math.floor(Math.random() * 10),
});
}
}
);
}
};
180 changes: 25 additions & 155 deletions server/package-lock.json

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

Loading

0 comments on commit 04f96b0

Please sign in to comment.