Merge branch 'master' into dependabot/npm_and_yarn/graphql-16.8.1

navikt · Oct 12, 2023 · 495006e · 495006e
2 parents fa5ac37 + 5095c3a
commit 495006e
Show file tree

Hide file tree

Showing 735 changed files with 9,645 additions and 9,519 deletions.
diff --git a/.github/workflows/deploy-docker-image.yml b/.github/workflows/deploy-docker-image.yml
@@ -29,6 +29,8 @@ jobs:
       issues: write
       packages: write
     # needs: [test, lint-tscheck-build]
+    outputs:
+      image: ${{ steps.docker-push.outputs.image }}
     steps:
       - name: Hente kode
         uses: actions/checkout@v3
@@ -136,3 +138,18 @@ jobs:
                             repo: context.issue.repo,
                             issue_number: ${{ steps.createdeployissue.outputs.number }} }
             github.rest.issues.createComment({...issue, body: '/promote dev-fss'})
+
+      - name: Set image output
+        id: docker-push
+        run: echo "IMAGE=$IMAGE_BASE:$TAG" >> $GITHUB_OUTPUT
+
+  trivy:
+    needs: [ deploy-docker-image ]
+    uses: navikt/sif-gha-workflows/.github/workflows/trivy-ghcr.yml@main
+    permissions:
+      contents: write
+      security-events: write
+      actions: read
+    secrets: inherit
+    with:
+      image: ${{ needs.deploy-docker-image.outputs.image }}
diff --git a/.github/workflows/lint-tscheck-build.yml b/.github/workflows/lint-tscheck-build.yml
@@ -37,7 +37,7 @@ jobs:
         run: yarn ts-check
 
       - name: Linting
-        run: yarn less:lint
+        run: yarn css:lint
 
       - name: Sjekker at koden bygger
         if: ${{inputs.run-build}}

diff --git a/.storybook/main.js b/.storybook/main.js
@@ -60,14 +60,8 @@ module.exports = {
         include: PACKAGES_DIR,
       },
       {
-        test: /\.(le|c)ss$/,
+        test: /\\.css$/,
         use: [
-          {
-            loader: MiniCssExtractPlugin.loader,
-            options: {
-              publicPath: './',
-            },
-          },
           {
             loader: 'css-loader',
             options: {
@@ -77,19 +71,6 @@ module.exports = {
               },
             },
           },
-          {
-            loader: 'less-loader',
-            options: {
-              lessOptions: {
-                modules: true,
-                localIdentName: '[name]_[local]_[contenthash:base64:5]',
-                modifyVars: {
-                  nodeModulesPath: '~',
-                  coreModulePath: '~',
-                },
-              },
-            },
-          },
         ],
         include: [PACKAGES_DIR],
         exclude: [CSS_DIR],
@@ -163,7 +144,7 @@ module.exports = {
         ignoreOrder: true,
       }),
     );
-    config.resolve.extensions.push('.ts', '.tsx', '.less');
+    config.resolve.extensions.push('.ts', '.tsx', '.css');
 
     // Return the altered config
     return config;

diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -3,7 +3,7 @@ import '@formatjs/intl-datetimeformat/polyfill-force';
 import '@formatjs/intl-datetimeformat/locale-data/nb';
 import '@formatjs/intl-numberformat/polyfill-force';
 import '@formatjs/intl-numberformat/locale-data/nb';
-import '@fpsak-frontend/assets/styles/global.less';
+import '@fpsak-frontend/assets/styles/global.css';
 import '@navikt/ft-plattform-komponenter/dist/style.css';
 import '@navikt/ds-css';
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginxinc/nginx-unprivileged:1.23.1-alpine
+FROM nginxinc/nginx-unprivileged:stable-alpine-slim
 
 LABEL org.opencontainers.image.source=https://github.com/navikt/k9-sak-web
 

diff --git a/deploy/dev-fss-k9saksbehandling.yml b/deploy/dev-fss-k9saksbehandling.yml
@@ -57,8 +57,6 @@ spec:
       value: "http://k9-tilbake.default"
     - name: APP_URL_K9FORDEL
       value: "http://k9-fordel.k9saksbehandling"
-    - name: APP_DIAGNOSEKODER
-      value: "http://diagnosekode-api.k9saksbehandling/diagnosekoder"
     - name: MEDISINSK_VILKAR_FRONTEND_URL
       value: "https://medisinsk-vilkar-frontend.dev.adeo.no/"
     - name: OMSORGSDAGER_FRONTEND_URL

diff --git a/deploy/prod-fss-k9saksbehandling.yml b/deploy/prod-fss-k9saksbehandling.yml
@@ -57,8 +57,6 @@ spec:
       value: "http://k9-tilbake.k9saksbehandling"
     - name: APP_URL_K9FORDEL
       value: "http://k9-fordel.k9saksbehandling"
-    - name: APP_DIAGNOSEKODER
-      value: "http://diagnosekode-api.k9saksbehandling/diagnosekoder"
     - name: MEDISINSK_VILKAR_FRONTEND_URL
       value: "https://medisinsk-vilkar-frontend.intern.nav.no/"
     - name: OMSORGSDAGER_FRONTEND_URL

diff --git a/jest.config.js b/jest.config.js
@@ -19,6 +19,9 @@ module.exports = {
         '<rootDir>/packages/utils-test/src/setup-test-env-hooks.ts',
       ],
       testEnvironment: 'jsdom',
+      testEnvironmentOptions: {
+        customExportConditions: ['node'],
+      },
       testMatch: ['**/?(*.)+(spec).+(js|jsx|ts|tsx)'],
       testPathIgnorePatterns: ['/node_modules/', '/dist/'],
       transform: {

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "ts-check": "tsc  --pretty",
     "lint": "eslint --cache packages --ext .ts,.tsx,.js,.jsx",
     "lint:fix": "eslint --fix --cache packages --ext .ts,.tsx,.js,.jsx",
-    "less:lint": "stylelint \"packages/**/*.less\"",
+    "css:lint": "stylelint \"packages/**/*.css\"",
     "dev": "yarn dev-env-variables cross-env NODE_ENV=development APP_URL_K9FORMIDLING=http://localhost:8060/rest/dummy webpack serve --config webpack/webpack.dev.ts",
     "dev-env-variables": "cross-env KLAGE_KABAL=true VARSELTEKST=true DOKUMENTDATA=true UNNTAKSBEHANDLING=true UTENLANDSOPPHOLD=true SOKNADPERIODESTRIPE=false TYPE_MEDISINSKE_OPPLYSNINGER_BREV=true LOS_MARKER_BEHANDLING=true LOS_MARKER_BEHANDLING_SUBMIT=true AKSJONSPUNKT_9014=true AKSJONSPUNKT_9015=true FRITEKST_REDIGERING=true FIX_SOKNADSFRIST_KALENDER_OG_READONLY=true INKLUDER_KALENDER_PILS=true",
     "dev-lokal": "cross-env NODE_ENV=development APP_URL_SAK=http://k9-sak:8080 APP_URL_K9OPPDRAG=http://k9-oppdrag:8070 APP_URL_K9FORMIDLING_DD=http://k9-formidling-dokumentdata:8294 APP_URL_K9FORMIDLING=http://k9-formidling:8290 SPLITTET_SAMMENLINGNING_BEREGNING=true webpack serve --config webpack/webpack.dev.ts",
@@ -41,79 +41,79 @@
     "packages/*"
   ],
   "dependencies": {
-    "@babel/runtime": "7.22.11",
-    "@formatjs/intl-datetimeformat": "6.10.0",
-    "@formatjs/intl-numberformat": "8.7.0",
-    "@navikt/aksel-icons": "4.11.1",
-    "@navikt/ds-css": "4.11.1",
-    "@navikt/ds-react": "4.11.1",
-    "@navikt/ds-tailwind": "^5.0.2",
-    "@navikt/familie-endringslogg": "8.1.1",
-    "@navikt/ft-plattform-komponenter": "2.2.16",
+    "@babel/runtime": "7.23.1",
+    "@formatjs/intl-datetimeformat": "6.10.3",
+    "@formatjs/intl-numberformat": "8.7.2",
+    "@navikt/aksel-icons": "5.5.0",
+    "@navikt/ds-css": "5.5.0",
+    "@navikt/ds-react": "5.5.0",
+    "@navikt/ds-tailwind": "^5.5.0",
+    "@navikt/familie-endringslogg": "9.0.3",
+    "@navikt/ft-plattform-komponenter": "2.3.2",
     "@popperjs/core": "2.11.8",
-    "@sentry/browser": "7.66.0",
+    "@sentry/browser": "7.70.0",
     "@storybook/testing-react": "2.0.1",
     "axios": "0.27.2",
-    "core-js": "3.32.1",
+    "core-js": "3.32.2",
     "date-fns": "2.30.0",
     "date-fns-tz": "2.0.0",
     "dotenv": "16.3.1",
     "eslint-webpack-plugin": "4.0.1",
     "history": "5.3.0",
-    "i18n-iso-countries": "7.6.0",
+    "i18n-iso-countries": "7.7.0",
     "node-cache": "5.1.2",
     "postcss-import": "^15.1.0",
     "postcss-less": "6.0.0",
     "postcss-loader": "^7.3.3",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-modal": "3.16.1",
-    "react-router": "6.15.0",
-    "react-router-dom": "6.15.0"
+    "react-router": "6.16.0",
+    "react-router-dom": "6.16.0"
   },
   "devDependencies": {
-    "@babel/core": "7.22.11",
-    "@babel/eslint-parser": "7.22.11",
+    "@babel/core": "7.23.0",
+    "@babel/eslint-parser": "7.22.15",
     "@babel/helper-regex": "7.10.5",
-    "@babel/preset-env": "7.22.14",
-    "@babel/preset-react": "7.22.5",
-    "@babel/preset-typescript": "7.22.11",
-    "@babel/register": "7.22.5",
+    "@babel/preset-env": "7.22.20",
+    "@babel/preset-react": "7.22.15",
+    "@babel/preset-typescript": "7.23.0",
+    "@babel/register": "7.22.15",
     "@commercetools/enzyme-extensions": "5.0.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
-    "@sentry/cli": "2.20.6",
-    "@storybook/addon-actions": "7.4.0",
-    "@storybook/addon-docs": "7.4.0",
-    "@storybook/addon-essentials": "7.4.0",
+    "@sentry/cli": "2.21.1",
+    "@storybook/addon-actions": "7.4.5",
+    "@storybook/addon-docs": "7.4.5",
+    "@storybook/addon-essentials": "7.4.5",
     "@storybook/addon-knobs": "7.0.2",
-    "@storybook/addons": "7.4.0",
-    "@storybook/cli": "7.4.0",
-    "@storybook/react": "7.4.0",
-    "@storybook/react-webpack5": "7.4.0",
+    "@storybook/addons": "7.4.5",
+    "@storybook/cli": "7.4.5",
+    "@storybook/react": "7.4.5",
+    "@storybook/react-webpack5": "7.4.5",
     "@storybook/storybook-deployer": "2.8.16",
-    "@storybook/theming": "7.4.0",
+    "@storybook/theming": "7.4.5",
     "@svgr/webpack": "7.0.0",
     "@testing-library/dom": "8.20.1",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "12.1.5",
     "@testing-library/user-event": "13.5.0",
-    "@types/chai": "4.3.5",
-    "@types/enzyme": "3.10.13",
+    "@types/chai": "4.3.6",
+    "@types/enzyme": "3.10.14",
     "@types/history": "5.0.0",
-    "@types/jest": "29.5.4",
-    "@types/prop-types": "15.7.5",
+    "@types/jest": "29.5.5",
+    "@types/prop-types": "15.7.7",
     "@types/react": "17.0.65",
     "@types/react-collapse": "5.0.1",
     "@types/react-router-dom": "5.3.3",
     "@types/redux-form": "8.3.5",
-    "@types/sinon": "10.0.15",
-    "@types/styled-components": "5.1.26",
-    "@typescript-eslint/eslint-plugin": "6.5.0",
-    "@typescript-eslint/parser": "6.5.0",
+    "@types/sinon": "10.0.16",
+    "@types/styled-components": "5.1.27",
+    "@typescript-eslint/eslint-plugin": "6.7.2",
+    "@typescript-eslint/parser": "6.7.2",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
-    "autoprefixer": "^10.4.15",
-    "axios-mock-adapter": "1.21.5",
-    "babel-jest": "29.6.4",
+    "autoprefixer": "^10.4.16",
+    "axios-mock-adapter": "1.22.0",
+    "babel-jest": "29.7.0",
     "babel-loader": "9.1.3",
     "body-parser": "1.20.2",
     "cache-loader": "4.1.0",
@@ -124,44 +124,44 @@
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
     "enzyme": "3.11.0",
-    "eslint": "8.48.0",
+    "eslint": "8.50.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-prettier": "8.10.0",
     "eslint-import-resolver-lerna": "2.0.0",
     "eslint-import-resolver-webpack": "0.13.7",
     "eslint-loader": "4.0.2",
     "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-jest": "27.2.3",
+    "eslint-plugin-jest": "27.4.0",
     "eslint-plugin-jest-dom": "4.0.3",
     "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-react": "7.33.2",
-    "eslint-plugin-storybook": "0.6.13",
+    "eslint-plugin-storybook": "0.6.14",
     "external-remotes-plugin": "1.0.0",
     "file-loader": "6.2.0",
     "html-webpack-plugin": "5.5.3",
     "husky": "8.0.3",
     "identity-obj-proxy": "3.0.0",
     "ignore-styles": "5.0.1",
-    "jest": "29.6.4",
-    "jest-environment-jsdom": "29.6.4",
-    "jest-runner-eslint": "2.1.0",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-runner-eslint": "2.1.2",
     "jest-transform-stub": "2.0.0",
     "jsdom": "22.1.0",
-    "lerna": "7.2.0",
+    "lerna": "7.3.0",
     "less": "4.2.0",
     "less-loader": "11.1.3",
     "lint-staged": "13.3.0",
     "mini-css-extract-plugin": "2.7.6",
-    "msw": "1.3.0",
-    "postcss": "^8.4.29",
+    "msw": "1.3.1",
+    "postcss": "^8.4.30",
     "prettier": "3.0.3",
     "raf": "3.4.1",
     "react-popper": "2.3.0",
     "react-test-renderer": "18.2.0",
     "redux-mock-store": "1.5.4",
-    "sinon": "15.1.0",
+    "sinon": "15.2.0",
     "source-map-loader": "4.0.1",
-    "storybook": "7.4.0",
+    "storybook": "7.4.5",
     "storybook-react-router": "1.0.8",
     "stylelint": "15.10.3",
     "stylelint-order": "6.0.3",
@@ -180,7 +180,8 @@
     "react-dom": "17.0.2",
     "react-test-renderer": "18.2.0",
     "parse-url": "8.1.0",
-    "@types/react": "17"
+    "@types/react": "17",
+    "@editorjs/editorjs": "2.27.2"
   },
   "msw": {
     "workerDirectory": "public"

diff --git a/packages/assets/styles/arrowForProcessMenu.less b/packages/assets/styles/arrowForProcessMenu.less