Skip to content

Commit

Permalink
Merge pull request #948 from navikt/dependabot/npm_and_yarn/all-minor…
Browse files Browse the repository at this point in the history
…-patch-c14dcca040

Bump the all-minor-patch group with 50 updates
  • Loading branch information
akgagnat authored Jan 8, 2024
2 parents 41b3641 + fdc712f commit 3bdd3a9
Show file tree
Hide file tree
Showing 10 changed files with 561 additions and 532 deletions.
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,37 +42,37 @@
"devDependencies": {
"@testing-library/cypress": "^10.0.1",
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/user-event": "^14.5.1",
"@types/react": "18.2.33",
"@types/react-dom": "^18.2.14",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"@vitejs/plugin-react": "^4.1.0",
"@testing-library/jest-dom": "^6.1.6",
"@testing-library/user-event": "^14.5.2",
"@types/react": "18.2.46",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.17.0",
"@typescript-eslint/parser": "^6.17.0",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/browser": "^0.34.6",
"@vitest/coverage-v8": "^0.34.6",
"concurrently": "^8.2.1",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"cypress": "^13.3.1",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"cypress": "^13.6.2",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-testing-library": "^6.1.0",
"eslint-plugin-vitest": "^0.3.2",
"eslint-plugin-testing-library": "^6.2.0",
"eslint-plugin-vitest": "^0.3.20",
"eslint-plugin-vitest-globals": "^1.4.0",
"husky": "^8.0.3",
"jsdom": "^22.1.0",
"lint-staged": "^15.2.0",
"prettier": "^3.0.3",
"prettier-plugin-organize-imports": "^3.2.3",
"prettier": "^3.1.1",
"prettier-plugin-organize-imports": "^3.2.4",
"rimraf": "^5.0.5",
"typescript": "^5.2.2",
"typescript": "^5.3.3",
"vite": "^4.4.11",
"vite-plugin-html": "^3.2.0",
"vite-tsconfig-paths": "^4.2.0",
"vite-plugin-html": "^3.2.1",
"vite-tsconfig-paths": "^4.2.3",
"vitest": "0.34.6",
"vitest-fetch-mock": "^0.2.2"
},
Expand Down
36 changes: 18 additions & 18 deletions packages/bygger-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,38 @@
"test:coverage": "vitest --run --coverage"
},
"dependencies": {
"@octokit/auth-app": "^6.0.1",
"@octokit/auth-app": "^6.0.2",
"@octokit/rest": "^20.0.2",
"@octokit/webhooks-types": "^7.3.1",
"@navikt/skjemadigitalisering-shared-domain": "1.0.0",
"bcryptjs": "^2.4.3",
"csv-stringify": "^6.4.4",
"csv-stringify": "^6.4.5",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"express-correlation-id": "^2.0.1",
"express-rate-limit": "^7.1.1",
"jose": "^5.1.3",
"express-rate-limit": "^7.1.5",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"luxon": "^3.4.2",
"luxon": "^3.4.4",
"node-fetch": "^3.3.2",
"node-jose": "^2.2.0",
"pusher": "^5.1.3",
"pusher": "^5.2.0",
"uuid": "^9.0.1",
"winston": "^3.11.0"
},
"devDependencies": {
"@types/bcryptjs": "^2.4.4",
"@types/express": "^4.17.19",
"@types/express-correlation-id": "^1.2.4",
"@types/jsonwebtoken": "^9.0.3",
"@types/luxon": "^3.3.2",
"@types/memorystream": "^0.3.2",
"@types/node": "^20.8.6",
"@types/node-fetch": "^2.6.6",
"@types/node-jose": "^1.1.11",
"@types/uuid": "^9.0.5",
"@types/bcryptjs": "^2.4.6",
"@types/express": "^4.17.21",
"@types/express-correlation-id": "^1.2.6",
"@types/jsonwebtoken": "^9.0.5",
"@types/luxon": "^3.3.7",
"@types/memorystream": "^0.3.4",
"@types/node": "^20.10.6",
"@types/node-fetch": "^2.6.10",
"@types/node-jose": "^1.1.13",
"@types/uuid": "^9.0.7",
"memorystream": "^0.3.1",
"nock": "^13.3.4",
"vite-plugin-node": "^3.0.2"
"nock": "^13.4.0",
"vite-plugin-node": "^3.1.0"
}
}
9 changes: 6 additions & 3 deletions packages/bygger-backend/src/services/ReportService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ class ReportService {
const paperInnsendingUrl = navFormUtils.isNone('innsending', form)
? `${baseInnsendingUrl}`
: navFormUtils.isPaper('innsending', form)
? `${baseInnsendingUrl}?sub=paper`
: undefined;
? `${baseInnsendingUrl}?sub=paper`
: undefined;

const ettersendingUrl = hasAttachment ? baseEttersendingUrl : undefined;
const paperEttersendingUrl =
Expand All @@ -163,7 +163,10 @@ class ReportService {
if (modified && published) {
const modifiedDate = DateTime.fromISO(modified);
const publishedDate = DateTime.fromISO(published);
unpublishedChanges = publishedDate.until(modifiedDate).isEmpty() ? 'nei' : 'ja';
const interval = publishedDate.until(modifiedDate);
if (interval.isValid) {
unpublishedChanges = interval.isEmpty() ? 'nei' : 'ja';
}
}
const numberOfSignatures = signatures?.length || 1;
stringifier.write([
Expand Down
6 changes: 4 additions & 2 deletions packages/bygger/cypress/e2e/translations.spec.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ describe('Translations', () => {

it('shows error message', () => {
cy.findByRole('link', { name: 'Språk' }).click();
cy.findByText('Henting av oversettelser for dette skjemaet feilet. Last siden på nytt.').should('be.visible');
cy.findAllByText('Henting av oversettelser for dette skjemaet feilet. Last siden på nytt.').should(
'be.visible',
);
});
});
});
Expand Down Expand Up @@ -78,7 +80,7 @@ describe('Translations', () => {
cy.findByRole('link', { name: 'Globale Oversettelser' }).click();
cy.findByRole('heading', { name: 'Norsk nynorsk' }).should('exist');
cy.wait('@getTranslationsFailure');
cy.findByText('Henting av globale oversettelser feilet. Last siden på nytt.').should('be.visible');
cy.findAllByText('Henting av globale oversettelser feilet. Last siden på nytt.').should('be.visible');
});
});
});
Expand Down
10 changes: 5 additions & 5 deletions packages/bygger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
"@navikt/ds-react": "^5.10.1",
"@navikt/skjemadigitalisering-shared-components": "1.0.0",
"@navikt/skjemadigitalisering-shared-domain": "1.0.0",
"classnames": "^2.3.2",
"classnames": "^2.5.1",
"lodash.clonedeep": "^4.5.0",
"lodash.isequal": "^4.5.0",
"lodash.merge": "^4.6.2",
"moment": "^2.29.4",
"moment": "^2.30.1",
"prop-types": "^15.8.1",
"pusher": "^5.1.3",
"pusher": "^5.2.0",
"pusher-js": "^8.3.0",
"react": "^18.2.0",
"react-csv": "^2.2.2",
"react-debounce-input": "^3.3.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.16.0"
"react-router-dom": "^6.21.1"
},
"devDependencies": {
"@testing-library/react": "^14.0.0",
"@testing-library/react": "^14.1.2",
"lodash.template": "^4.5.0"
}
}
32 changes: 16 additions & 16 deletions packages/fyllut-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@
"test:coverage": "vitest --run --coverage"
},
"dependencies": {
"@elastic/ecs-morgan-format": "^1.1.0",
"@elastic/ecs-morgan-format": "^1.5.1",
"@navikt/nav-dekoratoren-moduler": "^2.1.3",
"@navikt/skjemadigitalisering-shared-domain": "1.0.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"express-correlation-id": "^2.0.1",
"express-rate-limit": "^7.1.1",
"express-rate-limit": "^7.1.5",
"glob": "^10.3.4",
"i18n-iso-countries": "^7.7.0",
"jose": "^5.1.3",
"jose": "^5.2.0",
"jsonwebtoken": "^9.0.2",
"luxon": "^3.4.2",
"luxon": "^3.4.4",
"morgan": "^1.10.0",
"mustache-express": "^1.3.2",
"node-cache": "^5.1.2",
"node-fetch": "^3.3.2",
"node-jose": "^2.2.0",
"prom-client": "^15.0.0",
"prom-client": "^15.1.0",
"qs": "^6.11.2",
"react": "^18.2.0",
"winston": "^3.11.0"
},
"devDependencies": {
"@types/cookie-parser": "^1.4.4",
"@types/cors": "^2.8.14",
"@types/express": "^4.17.19",
"@types/express-correlation-id": "^1.2.4",
"@types/jsonwebtoken": "^9.0.3",
"@types/mustache-express": "^1.2.3",
"@types/node": "^20.8.6",
"@types/node-fetch": "^2.6.6",
"@types/node-jose": "^1.1.11",
"@types/cookie-parser": "^1.4.6",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/express-correlation-id": "^1.2.6",
"@types/jsonwebtoken": "^9.0.5",
"@types/mustache-express": "^1.2.5",
"@types/node": "^20.10.6",
"@types/node-fetch": "^2.6.10",
"@types/node-jose": "^1.1.13",
"@types/supertest": "^2.0.14",
"nock": "^13.3.4",
"nock": "^13.4.0",
"supertest": "^6.3.3",
"vite-plugin-node": "^3.0.2"
"vite-plugin-node": "^3.1.0"
}
}
10 changes: 5 additions & 5 deletions packages/fyllut/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
"@navikt/ds-react": "^5.10.1",
"@navikt/skjemadigitalisering-shared-components": "1.0.0",
"@navikt/skjemadigitalisering-shared-domain": "1.0.0",
"axe-core": "^4.8.2",
"classnames": "^2.3.2",
"axe-core": "^4.8.3",
"classnames": "^2.5.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.16.0"
"react-router-dom": "^6.21.1"
},
"devDependencies": {
"@mocks-server/cypress-commands": "^6.1.1",
"@testing-library/react": "^14.0.0",
"@testing-library/react": "^14.1.2",
"cypress-axe": "^1.5.0",
"cypress-wait-until": "^2.0.1",
"lodash.template": "^4.5.0",
"moment": "^2.29.4",
"moment": "^2.30.1",
"prop-types": "^15.8.1"
}
}
14 changes: 7 additions & 7 deletions packages/shared-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@
"@navikt/fnrvalidator": "^1.3.3",
"@navikt/skjemadigitalisering-shared-domain": "1.0.0",
"amplitude-js": "8.21.9",
"classnames": "2.3.2",
"classnames": "2.5.1",
"eventemitter2": "^6.4.9",
"file-saver": "2.0.5",
"formiojs": "4.14.14",
"@formio/react": "5.3.0",
"ibantools": "^4.3.5",
"ibantools": "^4.3.8",
"lodash.clonedeep": "^4.5.0",
"lodash.set": "^4.3.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-jss": "^10.10.0",
"react-router-dom": "^6.16.0",
"react-select": "^5.7.7"
"react-router-dom": "^6.21.1",
"react-select": "^5.8.0"
},
"devDependencies": {
"@testing-library/react": "^14.0.0",
"i18next": "^23.4.6",
"@testing-library/react": "^14.1.2",
"i18next": "^23.7.13",
"lodash.merge": "^4.6.2",
"lodash.template": "^4.5.0",
"nock": "^13.3.4",
"nock": "^13.4.0",
"power-assert": "^1.6.1"
}
}
2 changes: 1 addition & 1 deletion packages/shared-domain/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
},
"dependencies": {
"formiojs": "4.14.14",
"moment": "^2.29.4"
"moment": "^2.30.1"
}
}
Loading

0 comments on commit 3bdd3a9

Please sign in to comment.