chore: resolved merge conflicts and updated scratch-gui version

This commit is contained in:
MiroslavDionisiev 2024-08-08 10:57:55 +03:00
commit f4e119b051
2 changed files with 398 additions and 928 deletions

1308
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -57,16 +57,16 @@
"react-twitter-embed": "3.0.3",
"react-use": "17.5.1",
"scratch-parser": "5.2.1",
"scratch-storage": "2.3.190"
"scratch-storage": "2.3.204"
},
"devDependencies": {
"@babel/cli": "7.24.8",
"@babel/core": "7.24.9",
"@babel/eslint-parser": "7.24.8",
"@babel/core": "7.25.2",
"@babel/eslint-parser": "7.25.1",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-transform-async-to-generator": "7.24.7",
"@babel/plugin-transform-object-rest-spread": "7.24.7",
"@babel/preset-env": "7.24.8",
"@babel/preset-env": "7.25.3",
"@babel/preset-react": "7.24.7",
"@formatjs/intl-datetimeformat": "6.12.5",
"@formatjs/intl-locale": "3.4.6",
@ -75,7 +75,7 @@
"@formatjs/intl-relativetimeformat": "11.2.14",
"@types/jest": "29.5.12",
"async": "3.2.5",
"autoprefixer": "10.4.19",
"autoprefixer": "10.4.20",
"babel-loader": "8.3.0",
"babel-plugin-transform-require-context": "0.1.1",
"bowser": "1.9.4",
@ -102,7 +102,7 @@
"formsy-react-components": "1.1.0",
"git-bundle-sha": "0.0.2",
"glob": "5.0.15",
"google-libphonenumber": "3.2.37",
"google-libphonenumber": "3.2.38",
"html-webpack-plugin": "5.6.0",
"iso-3166-2": "1.0.0",
"jest": "29.7.0",
@ -121,7 +121,7 @@
"pako": "0.2.8",
"plotly.js": "1.47.4",
"postcss-import": "^12.0.0",
"postcss": "8.4.39",
"postcss": "8.4.40",
"postcss-loader": "4.3.0",
"postcss-simple-vars": "^5.0.1",
"prop-types": "15.8.1",
@ -143,8 +143,8 @@
"regenerator-runtime": "0.13.9",
"sass": "1.77.8",
"sass-loader": "10.5.2",
"scratch-gui": "3.6.15",
"scratch-l10n": "3.18.230",
"scratch-gui": "4.0.8",
"scratch-l10n": "3.18.252",
"selenium-webdriver": "4.23.0",
"slick-carousel": "1.8.1",
"stream-browserify": "3.0.0",