chore: resilved merge conflicts

This commit is contained in:
MiroslavDionisiev 2024-07-24 10:43:00 +03:00
commit acb83ec37d
2 changed files with 11 additions and 28 deletions

35
package-lock.json generated
View file

@ -17,11 +17,11 @@
"@commitlint/config-conventional": "19.2.2",
"@types/jest": "29.5.12",
"cz-conventional-changelog": "3.3.0",
"husky": "9.0.11",
"husky": "9.1.1",
"jest": "29.7.0",
"scratch-semantic-release-config": "1.0.14",
"semantic-release": "22.0.12",
"webpack": "5.92.1"
"webpack": "5.93.0"
},
"peerDependencies": {
"@babel/preset-env": "^7.24.0",
@ -7124,21 +7124,6 @@
"dev": true,
"license": "ISC"
},
"node_modules/fsevents": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/function-bind": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@ -7723,13 +7708,12 @@
}
},
"node_modules/husky": {
"version": "9.0.11",
"resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz",
"integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==",
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/husky/-/husky-9.1.1.tgz",
"integrity": "sha512-fCqlqLXcBnXa/TJXmT93/A36tJsjdJkibQ1MuIiFyCCYUlpYpIaj2mv1w+3KR6Rzu1IC3slFTje5f6DUp2A2rg==",
"dev": true,
"license": "MIT",
"bin": {
"husky": "bin.mjs"
"husky": "bin.js"
},
"engines": {
"node": ">=18"
@ -20555,10 +20539,9 @@
"license": "BSD-2-Clause"
},
"node_modules/webpack": {
"version": "5.92.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
"integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
"license": "MIT",
"version": "5.93.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz",
"integrity": "sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==",
"dependencies": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^1.0.5",

View file

@ -36,11 +36,11 @@
"@commitlint/config-conventional": "19.2.2",
"@types/jest": "29.5.12",
"cz-conventional-changelog": "3.3.0",
"husky": "9.0.11",
"husky": "9.1.1",
"jest": "29.7.0",
"scratch-semantic-release-config": "1.0.14",
"semantic-release": "22.0.12",
"webpack": "5.92.1"
"webpack": "5.93.0"
},
"peerDependencies": {
"@babel/preset-env": "^7.24.0",