Skip to content

Commit

Permalink
ret
Browse files Browse the repository at this point in the history
  • Loading branch information
@frodehansen2
frodehansen2 committed Oct 7, 2024
1 parent 281dda5 commit 4b70589
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 140 deletions.
6 changes: 1 addition & 5 deletions apps/endringsmelding-pleiepenger/e2e-server.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ const startServer = async (html) => {

const logError = (errorMessage, details) => console.log(errorMessage, details);

const appSettings = getAppSettings(true);
console.log('appSettings', appSettings);
console.info(appSettings);

getDecorator(appSettings)
getDecorator(getAppSettings(true))
.then(renderApp, (error) => {
logError('Failed to get decorator', error);
process.exit(1);
Expand Down
3 changes: 2 additions & 1 deletion apps/endringsmelding-pleiepenger/nais/dev-gcp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@

"SIF_PUBLIC_APPSTATUS_DATASET": "staging",
"SIF_PUBLIC_APPSTATUS_PROJECT_ID": "ryujtq87",
"DEKORATOR_URL": "https://dekoratoren.ekstern.dev.nav.no/?simple=true&chatbot=false&urlLookupTable=false&logoutUrl=https://endringsmelding-pleiepenger.intern.dev.nav.no/oauth2/logout",
"SIF_PUBLIC_DEKORATOR_URL": "https://dekoratoren.ekstern.dev.nav.no/?simple=true&chatbot=false&urlLookupTable=false&logoutUrl=https://endringsmelding-pleiepenger.intern.dev.nav.no/oauth2/logout",
"SIF_PUBLIC_DOMAIN_URL": "https://endringsmelding-pleiepenger.intern.dev.nav.no",
"SIF_PUBLIC_LOGIN_URL": "http://localhost:8081/auth-mock/cookie?subject=mockSubject&redirect_location=http://localhost:8080",
"SIF_PUBLIC_INNSYN_URL": "https://dine-pleiepenger.intern.dev.nav.no/innsyn",
"SIF_PUBLIC_MINSIDE_URL": "https://www.nav.no/minside",
"SIF_PUBLIC_FEATURE_NYNORSK": "on",
"SIF_PUBLIC_FEATURE_VELG_SCENARIO": "on",

"K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH": "/familie/sykdom-i-familien/soknad/endringsmelding-pleiepenger/api/k9-brukerdialog",
"K9_BRUKERDIALOG_PROSESSERING_API_SCOPE": "dev-gcp:dusseldorf:k9-brukerdialog-prosessering",
"K9_BRUKERDIALOG_PROSESSERING_API_URL": "http://k9-brukerdialog-prosessering",

"K9_SAK_INNSYN_FRONTEND_PATH": "/familie/sykdom-i-familien/soknad/endringsmelding/api/k9-sak-innsyn",
"K9_SAK_INNSYN_API_URL": "http://k9-sak-innsyn-api",
"K9_SAK_INNSYN_TOKENX_AUDIENCE": "dev-gcp:dusseldorf:k9-sak-innsyn-api",
Expand Down
266 changes: 132 additions & 134 deletions apps/endringsmelding-pleiepenger/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,135 +1,133 @@
{
"author": "NAV",
"description": "Endringsmelding - pleiepenger sykt barn",
"type": "module",
"license": "MIT",
"name": "@navikt/endringsmelding-pleiepenger",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "2.31.27",
"private": true,
"dependencies": {
"@navikt/ds-css": "7.1.2",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.1.2",
"@navikt/ds-tailwind": "7.1.2",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-formik-ds": "*",
"@navikt/sif-common-forms-ds": "*",
"@navikt/sif-common-hooks": "*",
"@navikt/sif-common-sentry": "*",
"@navikt/sif-common-soknad-ds": "*",
"@navikt/sif-common-ui": "*",
"@navikt/sif-common-utils": "*",
"axios": "1.7.7",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"date-fns": "3.6.0",
"dayjs": "1.11.13",
"dotenv": "16.4.5",
"express": "4.21.0",
"express-rate-limit": "7.4.1",
"flat": "6.0.1",
"formik": "2.4.6",
"http-proxy-middleware": "3.0.2",
"intl": "1.2.5",
"jose": "5.9.3",
"jsdom": "25.0.1",
"lodash": "4.17.21",
"mustache-express": "1.3.2",
"object-hash": "3.0.0",
"openid-client": "5.7.0",
"react": "18.3.1",
"react-day-picker": "8.10.1",
"react-dom": "18.3.1",
"react-intl": "6.7.0",
"react-modal": "3.16.1",
"react-router-dom": "6.26.2"
},
"devDependencies": {
"@axe-core/playwright": "4.10.0",
"@babel/core": "7.25.7",
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-transform-modules-commonjs": "7.25.7",
"@babel/preset-env": "7.25.7",
"@babel/preset-react": "7.25.7",
"@babel/preset-typescript": "7.25.7",
"@mswjs/data": "0.16.2",
"@navikt/ds-tailwind": "7.1.2",
"@navikt/nav-dekoratoren-moduler": "3.1.0",
"@playwright/test": "1.47.2",
"@sentry/vite-plugin": "2.22.5",
"@sif/eslint-config": "*",
"@storybook/addon-actions": "8.3.5",
"@storybook/addon-essentials": "8.3.5",
"@storybook/addon-interactions": "8.3.5",
"@storybook/addon-links": "8.3.5",
"@storybook/node-logger": "8.3.5",
"@storybook/preset-create-react-app": "8.3.5",
"@storybook/react": "8.3.5",
"@storybook/testing-library": "0.2.2",
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.0.1",
"@types/flat": "5.0.5",
"@types/intl": "1.2.2",
"@types/js-cookie": "3.0.6",
"@types/object-hash": "3.0.6",
"@types/react": "18.3.11",
"@types/react-document-title": "2.0.9",
"@types/react-dom": "18.3.0",
"@types/react-modal": "3.16.3",
"@types/react-router-dom": "5.3.3",
"@vitejs/plugin-react": "4.3.2",
"axe-core": "4.10.0",
"babel-polyfill": "6.26.0",
"cross-env": "7.0.3",
"mockdate": "3.0.5",
"msw": "2.4.9",
"playwright-core": "1.47.2",
"postcss": "8.4.47",
"postcss-import": "16.1.0",
"react-responsive": "10.0.0",
"react-scripts": "5.0.1",
"storybook": "8.3.5",
"storybook-addon-mock": "5.0.0",
"tailwindcss": "3.4.13",
"typescript": "5.6.2",
"vite": "5.4.8",
"vite-plugin-checker": "0.8.0",
"vitest": "2.1.2"
},
"scripts": {
"build-storybook": "storybook build",
"build": "vite build --base=/familie/sykdom-i-familien/soknad/endringsmelding-pleiepenger",
"clean": "rm -rf node_modules .dist",
"codegen": "playwright codegen",
"dev-api": "PORT=8089 node ./src/mocks/server.cjs",
"dev": "node ./dev-server.cjs",
"e2e": "playwright test",
"lint:eslint": "eslint \"./src/**/*.{js,ts,tsx}\"",
"lint:fix": "eslint --quiet --fix './src/**/*.{js,ts,tsx}'",
"lint:tsc": "tsc --noEmit",
"playwright-test": "playwright test",
"pw": "playwright test --ui",
"start-e2e-server": "node ./e2e-server.cjs",
"storybook": "storybook dev -p 6006",
"test": "vitest run"
},
"eslintConfig": {
"overrides": [
{
"files": [
"**/*.stories.*"
],
"rules": {
"import/no-anonymous-default-export": "off"
}
}
]
},
"msw": {
"workerDirectory": [
"dist"
]
}
}
"author": "NAV",
"description": "Endringsmelding - pleiepenger sykt barn",
"type": "module",
"license": "MIT",
"name": "@navikt/endringsmelding-pleiepenger",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "2.31.27",
"private": true,
"dependencies": {
"@navikt/ds-css": "7.1.2",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.1.2",
"@navikt/ds-tailwind": "7.1.2",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-formik-ds": "*",
"@navikt/sif-common-forms-ds": "*",
"@navikt/sif-common-hooks": "*",
"@navikt/sif-common-sentry": "*",
"@navikt/sif-common-soknad-ds": "*",
"@navikt/sif-common-ui": "*",
"@navikt/sif-common-utils": "*",
"axios": "1.7.7",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"date-fns": "3.6.0",
"dayjs": "1.11.13",
"dotenv": "16.4.5",
"express": "4.21.0",
"express-rate-limit": "7.4.1",
"flat": "6.0.1",
"formik": "2.4.6",
"http-proxy-middleware": "3.0.2",
"intl": "1.2.5",
"jose": "5.9.3",
"jsdom": "25.0.1",
"lodash": "4.17.21",
"mustache-express": "1.3.2",
"object-hash": "3.0.0",
"openid-client": "5.7.0",
"react": "18.3.1",
"react-day-picker": "8.10.1",
"react-dom": "18.3.1",
"react-intl": "6.7.0",
"react-modal": "3.16.1",
"react-router-dom": "6.26.2"
},
"devDependencies": {
"@axe-core/playwright": "4.10.0",
"@babel/core": "7.25.7",
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-transform-modules-commonjs": "7.25.7",
"@babel/preset-env": "7.25.7",
"@babel/preset-react": "7.25.7",
"@babel/preset-typescript": "7.25.7",
"@mswjs/data": "0.16.2",
"@navikt/ds-tailwind": "7.1.2",
"@navikt/nav-dekoratoren-moduler": "3.1.0",
"@playwright/test": "1.47.2",
"@sentry/vite-plugin": "2.22.5",
"@sif/eslint-config": "*",
"@storybook/addon-actions": "8.3.5",
"@storybook/addon-essentials": "8.3.5",
"@storybook/addon-interactions": "8.3.5",
"@storybook/addon-links": "8.3.5",
"@storybook/node-logger": "8.3.5",
"@storybook/preset-create-react-app": "8.3.5",
"@storybook/react": "8.3.5",
"@storybook/testing-library": "0.2.2",
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.0.1",
"@types/flat": "5.0.5",
"@types/intl": "1.2.2",
"@types/js-cookie": "3.0.6",
"@types/object-hash": "3.0.6",
"@types/react": "18.3.11",
"@types/react-document-title": "2.0.9",
"@types/react-dom": "18.3.0",
"@types/react-modal": "3.16.3",
"@types/react-router-dom": "5.3.3",
"@vitejs/plugin-react": "4.3.2",
"axe-core": "4.10.0",
"babel-polyfill": "6.26.0",
"cross-env": "7.0.3",
"mockdate": "3.0.5",
"msw": "2.4.9",
"playwright-core": "1.47.2",
"postcss": "8.4.47",
"postcss-import": "16.1.0",
"react-responsive": "10.0.0",
"react-scripts": "5.0.1",
"storybook": "8.3.5",
"storybook-addon-mock": "5.0.0",
"tailwindcss": "3.4.13",
"typescript": "5.6.2",
"vite": "5.4.8",
"vite-plugin-checker": "0.8.0",
"vitest": "2.1.2"
},
"scripts": {
"build-storybook": "storybook build",
"build": "vite build --base=/familie/sykdom-i-familien/soknad/endringsmelding-pleiepenger",
"clean": "rm -rf node_modules .dist",
"codegen": "playwright codegen",
"dev-api": "PORT=8089 node ./src/mocks/server.cjs",
"dev": "node ./dev-server.cjs",
"lint:eslint": "eslint \"./src/**/*.{js,ts,tsx}\"",
"lint:fix": "eslint --quiet --fix './src/**/*.{js,ts,tsx}'",
"lint:tsc": "tsc --noEmit",
"playwright-test": "playwright test",
"start-e2e-server": "node ./e2e-server.cjs",
"storybook": "storybook dev -p 6006",
"test": "vitest run"
},
"eslintConfig": {
"overrides": [
{
"files": [
"**/*.stories.*"
],
"rules": {
"import/no-anonymous-default-export": "off"
}
}
]
},
"msw": {
"workerDirectory": [
"dist"
]
}
}
2 changes: 2 additions & 0 deletions apps/endringsmelding-pleiepenger/playwright.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export default defineConfig({
env: {
SIF_PUBLIC_FEATURE_VELG_SCENARIO: 'on',
NOW: '2023-01-01',
SIF_PUBLIC_DEKORATOR_URL:
'https://dekoratoren.ekstern.dev.nav.no/?simple=true&chatbot=false&urlLookupTable=false&logoutUrl=https://endringsmelding-pleiepenger.intern.dev.nav.no/oauth2/logout',
},
},
});

0 comments on commit 4b70589

Please sign in to comment.