Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/sass-1.67.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wordshaker authored Sep 19, 2023
2 parents b36f9b1 + effb14a commit cce3554
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 47 deletions.
74 changes: 37 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"babel-core": "^6.26.3",
"babel-jest": "^29.6.4",
"babel-jest": "^29.7.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"eslint": "^8.49.0",
Expand Down
56 changes: 47 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1098,9 +1098,9 @@
jest-haste-map "^29.6.4"
slash "^3.0.0"

"@jest/transform@^29.6.4":
version "29.6.4"
resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.6.4.tgz#a6bc799ef597c5d85b2e65a11fd96b6b239bab5a"
"@jest/transform@^29.6.4", "@jest/transform@^29.7.0":
version "29.7.0"
resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
dependencies:
"@babel/core" "^7.11.6"
"@jest/types" "^29.6.3"
Expand All @@ -1110,9 +1110,9 @@
convert-source-map "^2.0.0"
fast-json-stable-stringify "^2.1.0"
graceful-fs "^4.2.9"
jest-haste-map "^29.6.4"
jest-haste-map "^29.7.0"
jest-regex-util "^29.6.3"
jest-util "^29.6.3"
jest-util "^29.7.0"
micromatch "^4.0.4"
pirates "^4.0.4"
slash "^3.0.0"
Expand Down Expand Up @@ -2173,11 +2173,11 @@ babel-helpers@^6.24.1:
babel-runtime "^6.22.0"
babel-template "^6.24.1"

babel-jest@^29.6.4:
version "29.6.4"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.6.4.tgz#98dbc45d1c93319c82a8ab4a478b670655dd2585"
babel-jest@^29.6.4, babel-jest@^29.7.0:
version "29.7.0"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
dependencies:
"@jest/transform" "^29.6.4"
"@jest/transform" "^29.7.0"
"@types/babel__core" "^7.1.14"
babel-plugin-istanbul "^6.1.1"
babel-preset-jest "^29.6.3"
Expand Down Expand Up @@ -4758,6 +4758,24 @@ jest-haste-map@^29.6.4:
optionalDependencies:
fsevents "^2.3.2"

jest-haste-map@^29.7.0:
version "29.7.0"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
dependencies:
"@jest/types" "^29.6.3"
"@types/graceful-fs" "^4.1.3"
"@types/node" "*"
anymatch "^3.0.3"
fb-watchman "^2.0.0"
graceful-fs "^4.2.9"
jest-regex-util "^29.6.3"
jest-util "^29.7.0"
jest-worker "^29.7.0"
micromatch "^4.0.4"
walker "^1.0.8"
optionalDependencies:
fsevents "^2.3.2"

jest-junit@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-16.0.0.tgz#d838e8c561cf9fdd7eb54f63020777eee4136785"
Expand Down Expand Up @@ -4970,6 +4988,17 @@ jest-util@^29.4.1, jest-util@^29.6.3, jest-util@^29.7.0:
graceful-fs "^4.2.9"
picomatch "^2.2.3"

jest-util@^29.7.0:
version "29.7.0"
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
dependencies:
"@jest/types" "^29.6.3"
"@types/node" "*"
chalk "^4.0.0"
ci-info "^3.2.0"
graceful-fs "^4.2.9"
picomatch "^2.2.3"

jest-validate@^29.6.3:
version "29.6.3"
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.6.3.tgz#a75fca774cfb1c5758c70d035d30a1f9c2784b4d"
Expand Down Expand Up @@ -5019,6 +5048,15 @@ jest-worker@^29.6.4:
merge-stream "^2.0.0"
supports-color "^8.0.0"

jest-worker@^29.7.0:
version "29.7.0"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
dependencies:
"@types/node" "*"
jest-util "^29.7.0"
merge-stream "^2.0.0"
supports-color "^8.0.0"

jest@^29.6.4:
version "29.6.4"
resolved "https://registry.yarnpkg.com/jest/-/jest-29.6.4.tgz#7c48e67a445ba264b778253b5d78d4ebc9d0a622"
Expand Down

0 comments on commit cce3554

Please sign in to comment.