Skip to content

Commit

Permalink
Merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
paal2707 committed Dec 12, 2024
2 parents be478ab + 95de927 commit a28f69b
Show file tree
Hide file tree
Showing 181 changed files with 6,389 additions and 2,266 deletions.
614 changes: 307 additions & 307 deletions .yarn/releases/yarn-4.5.1.cjs → .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableTelemetry: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
31 changes: 31 additions & 0 deletions benchmarks/splitDashedKey.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* eslint-disable no-console */
import { Bench } from 'tinybench';

import { splitDashedKey, splitDashedKeyIterative, splitDashedKeyRegex } from 'src/utils/splitDashedKey';

const inputs: string[] = ['mycomponent-0-1', 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6-100-200'];

const bench = new Bench({
name: 'splitDashedKey benchmark',
time: 100,
setup: (_task, mode) => {
// Run the garbage collector before warmup at each cycle
if (mode === 'warmup' && typeof globalThis.gc === 'function') {
globalThis.gc();
}
},
});

for (const input of inputs) {
bench
.add(`[${input}] original`, () => splitDashedKey(input))
.add(`[${input}] regex`, () => splitDashedKeyRegex(input))
.add(`[${input}] iterative`, () => splitDashedKeyIterative(input));
}

bench.run().then(() => {
const table = bench.table();

console.log(bench.name);
console.table(table);
});
15 changes: 15 additions & 0 deletions benchmarks/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"include": ["*.ts"],
"compilerOptions": {
"target": "ESNext",
"module": "ESNext",
"strict": true,
"esModuleInterop": true,
"moduleResolution": "Bundler",
"noEmit": true,
"noUncheckedIndexedAccess": true,
"paths": {
"src/*": ["../src/*"],
},
}
}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.6'
services:
webpack:
container_name: app-frontend-react
image: node:20
image: node:22
volumes:
- ./:/usr/src/app
working_dir: /usr/src/app
Expand Down
142 changes: 74 additions & 68 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,103 +22,109 @@
"test:preview": "jest-preview",
"test:clear-cache": "jest --clearCache",
"cy:open": "cypress open --env environment=tt02",
"cy:open:docker": "cypress open --env environment=docker",
"cy:run": "cypress run --env environment=tt02",
"cy:run:docker": "cypress run --env environment=docker",
"cy:parallel": "cypress-parallel -s cy:run -t 3 -d test/e2e/integration",
"cy:parallel:docker": "cypress-parallel -s cy:run:docker -t 3 -d test/e2e/integration",
"tsc": "yarn gen && tsc && tsc --project test/tsconfig.json",
"tsc:watch": "yarn gen && tsc --watch",
"tsc:watch:cypress": "yarn gen && tsc --watch --project test/tsconfig.json",
"lint": "yarn gen && eslint ."
"lint": "yarn gen && eslint .",
"bench": "tsx --expose_gc --tsconfig benchmarks/tsconfig.json benchmarks/${0}"
},
"devDependencies": {
"@babel/core": "7.26.0",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/plugin-transform-runtime": "7.25.9",
"@babel/preset-env": "7.26.0",
"@babel/preset-react": "7.25.9",
"@babel/runtime": "^7.21.0",
"@babel/runtime-corejs3": "^7.21.0",
"@eslint/compat": "^1.1.1",
"@faker-js/faker": "^9.0.0",
"@percy/cli": "^1.30.1",
"@percy/cypress": "^3.1.2",
"@babel/runtime": "7.26.0",
"@babel/runtime-corejs3": "7.26.0",
"@eslint/compat": "1.2.3",
"@faker-js/faker": "9.2.0",
"@percy/cli": "1.30.4",
"@percy/cypress": "3.1.2",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@tanstack/react-query-devtools": "^5.25.0",
"@tanstack/react-query-devtools": "5.62.3",
"@testing-library/cypress": "10.0.2",
"@testing-library/dom": "^10.0.0",
"@testing-library/dom": "10.4.0",
"@testing-library/jest-dom": "6.6.3",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@types/dot-object": "2.1.6",
"@types/jest": "29.5.14",
"@types/js-levenshtein": "^1.1.1",
"@types/json-schema": "^7.0.11",
"@types/leaflet": "^1",
"@types/js-levenshtein": "1.1.3",
"@types/json-schema": "7.0.15",
"@types/leaflet": "1",
"@types/marked": "6.0.0",
"@types/mime": "4.0.0",
"@types/node": "^20.10.5",
"@types/node": "22.10.1",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@types/react-router-dom": "5.3.3",
"@types/uuid": "10.0.0",
"@typescript-eslint/eslint-plugin": "8.14.0",
"@typescript-eslint/parser": "8.14.0",
"@typescript-eslint/eslint-plugin": "8.17.0",
"@typescript-eslint/parser": "8.17.0",
"axe-core": "4.10.2",
"babel-jest": "29.7.0",
"babel-loader": "9.2.1",
"caniuse-lite": "^1.0.30001466",
"core-js": "^3.29.1",
"caniuse-lite": "1.0.30001686",
"core-js": "3.39.0",
"cross-env": "7.0.3",
"css-loader": "7.1.2",
"cypress": "13.15.2",
"cypress": "13.16.0",
"cypress-axe": "1.5.0",
"cypress-iframe": "^1.0.1",
"cypress-multi-reporters": "^2.0.4",
"cypress-network-idle": "^1.14.2",
"cypress-iframe": "1.0.1",
"cypress-multi-reporters": "2.0.4",
"cypress-network-idle": "1.14.2",
"cypress-plugin-tab": "1.0.5",
"cypress-wait-until": "^3.0.0",
"dotenv": "16.4.5",
"esbuild-loader": "^4.0.2",
"eslint": "9.14.0",
"cypress-wait-until": "3.0.2",
"dotenv": "16.4.6",
"esbuild-loader": "4.2.2",
"eslint": "9.16.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "4.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-no-relative-import-paths": "1.5.5",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react-hooks": "5.0.0",
"eslint-plugin-simple-import-sort": "12.1.1",
"eslint-plugin-sonarjs": "2.0.4",
"eslint-plugin-testing-library": "6.4.0",
"eslint-plugin-unused-imports": "^4.0.0",
"eslint-plugin-testing-library": "7.0.0",
"eslint-plugin-unused-imports": "4.1.4",
"fork-ts-checker-notifier-webpack-plugin": "9.0.0",
"fork-ts-checker-webpack-plugin": "9.0.2",
"globals": "^15.8.0",
"http-server": "^14.1.1",
"husky": "9.1.6",
"globals": "15.13.0",
"http-server": "14.1.1",
"husky": "9.1.7",
"identity-obj-proxy": "3.0.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-junit": "16.0.0",
"jest-mock-axios": "4.8.0",
"jest-preview": "^0.3.1",
"js-levenshtein": "^1.1.6",
"jest-preview": "0.3.1",
"js-levenshtein": "1.1.6",
"jsdom": "25.0.1",
"lint-staged": "15.2.10",
"mime": "4.0.4",
"mini-css-extract-plugin": "2.9.2",
"postcss-modules": "^6.0.0",
"prettier": "3.3.3",
"postcss-modules": "6.0.1",
"prettier": "3.4.1",
"react-refresh": "0.14.2",
"resize-observer-polyfill": "1.5.1",
"source-map-loader": "5.0.0",
"style-loader": "4.0.0",
"terser-webpack-plugin": "5.3.10",
"tinybench": "3.0.7",
"ts-jest": "29.2.5",
"ts-loader": "9.5.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript-plugin-css-modules": "^5.1.0",
"use-immer": "^0.10.0",
"ts-node": "10.9.2",
"tsconfig-paths": "4.2.0",
"tsx": "4.19.2",
"typescript-plugin-css-modules": "5.1.0",
"use-immer": "0.10.0",
"utility-types": "3.11.0",
"webpack": "5.96.1",
"webpack-cli": "5.1.4",
Expand All @@ -127,53 +133,53 @@
"dependencies": {
"@altinn/altinn-design-system": "0.30.2",
"@babel/polyfill": "7.12.1",
"@date-fns/tz": "^1.1.2",
"@date-fns/tz": "1.2.0",
"@digdir/design-system-react": "0.54.0",
"@digdir/designsystemet-css": "0.10.0",
"@digdir/designsystemet-react": "0.63.1",
"@digdir/designsystemet-theme": "0.15.3",
"@material-ui/core": "4.12.4",
"@material-ui/pickers": "3.3.11",
"@navikt/aksel-icons": "^7.0.0",
"@tanstack/react-query": "^5.25.0",
"@navikt/aksel-icons": "7.6.0",
"@tanstack/react-query": "5.62.3",
"ajv": "8.17.1",
"ajv-errors": "3.0.0",
"ajv-formats": "3.0.1",
"ajv-formats-draft2019": "^1.6.1",
"axios": "1.7.7",
"ajv-formats-draft2019": "1.6.1",
"axios": "1.7.8",
"classnames": "2.5.1",
"cypress-parallel": "^0.14.0",
"date-fns": "^4.1.0",
"dompurify": "3.2.0",
"cypress-parallel": "0.14.0",
"date-fns": "4.1.0",
"dompurify": "3.2.2",
"dot-object": "2.1.5",
"eslint-plugin-preferred-import-path": "^1.1.0",
"fast-array-diff": "^1.1.0",
"fast-json-patch": "^3.1.1",
"eslint-plugin-preferred-import-path": "1.1.0",
"fast-array-diff": "1.1.0",
"fast-json-patch": "3.1.1",
"html-react-parser": "5.1.18",
"immer": "^10.0.3",
"immer": "10.1.1",
"jsonpointer": "5.0.1",
"leaflet": "^1.9.4",
"lru-cache": "^11.0.0",
"marked": "14.1.4",
"marked-mangle": "^1.0.1",
"node-polyfill-webpack-plugin": "^4.0.0",
"leaflet": "1.9.4",
"lru-cache": "11.0.2",
"marked": "15.0.3",
"marked-mangle": "1.1.10",
"node-polyfill-webpack-plugin": "4.0.0",
"react": "18.3.1",
"react-content-loader": "7.0.2",
"react-day-picker": "^9.0.8",
"react-day-picker": "9.4.1",
"react-device-detect": "2.2.3",
"react-dom": "18.3.1",
"react-dropzone": "14.3.5",
"react-helmet-async": "^2.0.5",
"react-leaflet": "^4.2.1",
"react-number-format": "^5.3.1",
"react-helmet-async": "2.0.5",
"react-leaflet": "4.2.1",
"react-number-format": "5.4.2",
"react-router-dom": "6.28.0",
"react-toastify": "^10.0.0",
"terraformer-wkt-parser": "^1.2.1",
"typescript": "5.6.3",
"typescript-eslint": "^8.0.0",
"react-toastify": "10.0.6",
"terraformer-wkt-parser": "1.2.1",
"typescript": "5.7.2",
"typescript-eslint": "8.17.0",
"uuid": "11.0.3",
"zustand": "^5.0.0"
"zustand": "5.0.1"
},
"packageManager": "[email protected].1",
"packageManager": "[email protected].3",
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
".husky/pre-commit-check-for-skipped-tests",
Expand Down
Loading

0 comments on commit a28f69b

Please sign in to comment.