Skip to content

Commit

Permalink
Merge branch 'development' into v2-translate
Browse files Browse the repository at this point in the history
  • Loading branch information
Zasa-san authored Sep 25, 2024
2 parents 8878777 + 01dfe0b commit 73788b6
Show file tree
Hide file tree
Showing 2 changed files with 135 additions and 85 deletions.
34 changes: 13 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,11 @@
]
},
"resolutions": {
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"bl": "^4.0.3",
"trim": "0.0.3",
"normalize-url": "6.0.1",
"trim": "1.0.1",
"node-fetch": "2.6.7",
"@types/istanbul-lib-report": "^3.0.0",
"underscore": "^1.13.6",
"socket.io-parser": "4.2.4",
"json-schema": "^0.4.0",
"@types/react": "^18.0.25 || ^18.3.1",
"@types/react-dom": "^18.0.9 || ^18.3.0",
"ws": "8.17.1"
"ws": "8.18.0",
"path-to-regexp": "0.1.11",
"body-parser": "^1.20.3"
},
"dependencies": {
"@aws-sdk/client-s3": "3.624.0",
Expand Down Expand Up @@ -133,7 +125,7 @@
"any-date-parser": "^1.5.4",
"bcryptjs": "^2.4.3",
"big.js": "^6.2.1",
"body-parser": "^1.20.2",
"body-parser": "^1.20.3",
"bootstrap": "3.4.1",
"child-process-promise": "^2.2.1",
"clean-insights-sdk": "^2.6.2",
Expand All @@ -147,10 +139,10 @@
"date-fns": "^3.6.0",
"diacritics": "^1.3.0",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"express-http-proxy": "2.1.1",
"express": "^4.21.0",
"express-http-proxy": "^2.1.1",
"express-prom-bundle": "^7.0.0",
"express-session": "1.18.0",
"express-session": "^1.18.0",
"filesize": "10.1.6",
"flag-icon-css": "^4.1.7",
"flowbite": "^2.3.0",
Expand Down Expand Up @@ -276,7 +268,7 @@
"@babel/register": "^7.24.6",
"@babel/traverse": "^7.25.4",
"@cfaester/enzyme-adapter-react-18": "^0.8.0",
"@chromatic-com/storybook": "^1.6.1",
"@chromatic-com/storybook": "^2.0.2",
"@cypress/react18": "^2.0.1",
"@storybook/addon-actions": "^8.1.11",
"@storybook/addon-essentials": "^8.1.11",
Expand All @@ -290,15 +282,15 @@
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "^15.0.7",
"@testing-library/user-event": "^14.5.2",
"@types/body-parser": "^1.19.2",
"@types/body-parser": "^1.19.5",
"@types/cheerio": "^0.22.30",
"@types/child-process-promise": "^2.2.1",
"@types/cookie": "^0.6.0",
"@types/enzyme": "3.10.12",
"@types/enzyme-adapter-react-16": "1.0.2",
"@types/expect-puppeteer": "4.4.7",
"@types/express": "4.17.21",
"@types/express-session": "1.18.0",
"@types/express": "^4.17.21",
"@types/express-session": "^1.18.0",
"@types/google.maps": "^3.48.2",
"@types/immutable": "^3.8.7",
"@types/jest": "29.5.12",
Expand Down Expand Up @@ -344,7 +336,7 @@
"copy-webpack-plugin": "12.0.2",
"css-loader": "^7.1.2",
"css-minimizer-webpack-plugin": "^7.0.0",
"cypress": "13.14.1",
"cypress": "13.14.2",
"cypress-axe": "^1.5.0",
"cypress-plugin-snapshots": "^1.4.4",
"cypress-real-events": "^1.13.0",
Expand Down
Loading

0 comments on commit 73788b6

Please sign in to comment.