Skip to content

Commit

Permalink
test: fix Cannot redefine property: window due to node bump
Browse files Browse the repository at this point in the history
remove automerge test
  • Loading branch information
andrewinci committed Jun 3, 2023
1 parent 028f76c commit c3b149b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 74 deletions.
8 changes: 2 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,7 @@
},
"transformIgnorePatterns": [
"/node_modules/(?!react-dnd|dnd-core|@react-dnd)"
],
"globals": {
"window": {},
"location": {}
}
]
},
"stylelint": {
"customSyntax": "postcss-jsx",
Expand Down Expand Up @@ -170,7 +166,7 @@
"husky": "^8.0.3",
"ip": "^1.1.8",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.3.1",
"jest-environment-jsdom": "^29.5.0",
"jest-localstorage-mock": "^2.4.26",
"jest-location-mock": "^1.0.9",
"lint-staged": "^13.2.2",
Expand Down
28 changes: 0 additions & 28 deletions src/app/state/automerge-state.test.ts

This file was deleted.

49 changes: 9 additions & 40 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1725,16 +1725,6 @@
slash "^3.0.0"
strip-ansi "^6.0.0"

"@jest/environment@^29.3.1":
version "29.3.1"
resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6"
integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==
dependencies:
"@jest/fake-timers" "^29.3.1"
"@jest/types" "^29.3.1"
"@types/node" "*"
jest-mock "^29.3.1"

"@jest/environment@^29.5.0":
version "29.5.0"
resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65"
Expand Down Expand Up @@ -1767,18 +1757,6 @@
expect "^29.5.0"
jest-snapshot "^29.5.0"

"@jest/fake-timers@^29.3.1":
version "29.3.1"
resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67"
integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==
dependencies:
"@jest/types" "^29.3.1"
"@sinonjs/fake-timers" "^9.1.2"
"@types/node" "*"
jest-message-util "^29.3.1"
jest-mock "^29.3.1"
jest-util "^29.3.1"

"@jest/fake-timers@^29.5.0":
version "29.5.0"
resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.5.0.tgz#d4d09ec3286b3d90c60bdcd66ed28d35f1b4dc2c"
Expand Down Expand Up @@ -6074,18 +6052,18 @@ jest-each@^29.5.0:
jest-util "^29.5.0"
pretty-format "^29.5.0"

jest-environment-jsdom@^29.3.1:
version "29.3.1"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz#14ca63c3e0ef5c63c5bcb46033e50bc649e3b639"
integrity sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA==
jest-environment-jsdom@^29.5.0:
version "29.5.0"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.5.0.tgz#cfe86ebaf1453f3297b5ff3470fbe94739c960cb"
integrity sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==
dependencies:
"@jest/environment" "^29.3.1"
"@jest/fake-timers" "^29.3.1"
"@jest/types" "^29.3.1"
"@jest/environment" "^29.5.0"
"@jest/fake-timers" "^29.5.0"
"@jest/types" "^29.5.0"
"@types/jsdom" "^20.0.0"
"@types/node" "*"
jest-mock "^29.3.1"
jest-util "^29.3.1"
jest-mock "^29.5.0"
jest-util "^29.5.0"
jsdom "^20.0.0"

jest-environment-node@^29.5.0:
Expand Down Expand Up @@ -6205,15 +6183,6 @@ jest-message-util@^29.5.0:
slash "^3.0.0"
stack-utils "^2.0.3"

jest-mock@^29.3.1:
version "29.3.1"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e"
integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==
dependencies:
"@jest/types" "^29.3.1"
"@types/node" "*"
jest-util "^29.3.1"

jest-mock@^29.5.0:
version "29.5.0"
resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.5.0.tgz#26e2172bcc71d8b0195081ff1f146ac7e1518aed"
Expand Down

0 comments on commit c3b149b

Please sign in to comment.