Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e108404
bump adm-zim to 0.5.16
klacabane Apr 24, 2025
da71b8c
bump types/adm-zip and pin versions
klacabane Apr 24, 2025
1697faa
bootstrap
klacabane Apr 24, 2025
ab5d63f
UInt global
klacabane Apr 24, 2025
59dce82
Merge branch 'main' into update-adm-zip-version
klacabane Apr 24, 2025
34cec3d
Revert "UInt global"
klacabane Apr 25, 2025
1082d89
uint global
klacabane Apr 25, 2025
b79baae
targeted Uint globals
klacabane Apr 25, 2025
4e15eea
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Apr 25, 2025
5aea072
remove globals
klacabane Apr 26, 2025
f4e5727
Merge branch 'main' into update-adm-zip-version
klacabane Apr 26, 2025
39e375a
Merge branch 'main' into update-adm-zip-version
klacabane Apr 26, 2025
e14e7bb
Merge branch 'main' into update-adm-zip-version
klacabane Apr 28, 2025
655d4b2
Merge branch 'main' into update-adm-zip-version
klacabane Apr 28, 2025
00069d7
remove discover config change
klacabane Apr 30, 2025
46e841a
Merge branch 'main' into update-adm-zip-version
klacabane May 1, 2025
d5addc5
Merge branch 'main' into update-adm-zip-version
klacabane May 6, 2025
6421cf3
Merge branch 'main' into update-adm-zip-version
klacabane May 9, 2025
9cc97ec
Merge branch 'main' into update-adm-zip-version
klacabane May 12, 2025
f73d063
Merge branch 'main' into update-adm-zip-version
klacabane May 27, 2025
971a883
Merge branch 'main' into update-adm-zip-version
klacabane Jun 5, 2025
a7c3be3
fix bad merge
klacabane Jun 5, 2025
345af35
Merge branch 'main' into update-adm-zip-version
klacabane Jun 9, 2025
10f2a8e
Merge branch 'main' into update-adm-zip-version
klacabane Jun 18, 2025
f0b2e60
Merge branch 'main' into update-adm-zip-version
klacabane Jul 1, 2025
a6bb539
Merge remote-tracking branch 'upstream/main' into update-adm-zip-version
darnautov Jul 3, 2025
38d6ad6
[CI] Auto-commit changed files from 'node scripts/capture_oas_snapsho…
kibanamachine Jul 3, 2025
7330c2c
[CI] Auto-commit changed files from 'node scripts/eslint_all_files --…
kibanamachine Jul 3, 2025
0ec6f93
Merge branch 'main' into update-adm-zip-version
klacabane Jul 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@
"@xstate/react": "^3.2.2",
"@xstate5/react": "npm:@xstate/react@^5.0.3",
"@xyflow/react": "^12.7.1",
"adm-zip": "^0.5.9",
"adm-zip": "^0.5.16",
"ai": "^4.3.15",
"ajv": "^8.17.1",
"ansi-regex": "^6.1.0",
Expand Down Expand Up @@ -1663,7 +1663,7 @@
"@testing-library/react": "^16.3.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.6.1",
"@types/adm-zip": "^0.5.0",
"@types/adm-zip": "^0.5.7",
"@types/archiver": "^6.0.3",
"@types/async": "^3.2.24",
"@types/aws4": "^1.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ module.exports = {
preset: '@kbn/test/jest_integration',
rootDir: '../../../../..',
roots: ['<rootDir>/x-pack/solutions/security/plugins/security_solution'],
globals: {
Uint8Array: Uint8Array,
},
Comment on lines +12 to +14
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See jestjs/jest#4422

Without setting this global this condition fails because Uint8Array types are different, which in turn fails the tests

I've attempted to set once in the root jest config but ended up with a lot of unrelated tests failing, so I opted for setting it on specific configs instead

};
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ module.exports = {
'<rootDir>/x-pack/solutions/security/plugins/security_solution/server/lib/**/*.{ts,tsx}',
],
moduleNameMapper: require('../__mocks__/module_name_map'),
globals: {
Uint8Array: Uint8Array,
},
};
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11411,10 +11411,10 @@
dependencies:
"@turf/helpers" "6.x"

"@types/adm-zip@^0.5.0":
version "0.5.0"
resolved "https://registry.yarnpkg.com/@types/adm-zip/-/adm-zip-0.5.0.tgz#94c90a837ce02e256c7c665a6a1eb295906333c1"
integrity sha512-FCJBJq9ODsQZUNURo5ILAQueuA8WJhRvuihS3ke2iI25mJlfV2LK8jG2Qj2z2AWg8U0FtWWqBHVRetceLskSaw==
"@types/adm-zip@^0.5.7":
version "0.5.7"
resolved "https://registry.yarnpkg.com/@types/adm-zip/-/adm-zip-0.5.7.tgz#eec10b6f717d3948beb64aca0abebc4b344ac7e9"
integrity sha512-DNEs/QvmyRLurdQPChqq0Md4zGvPwHerAJYWk9l2jCbD1VPpnzRJorOdiq4zsw09NFbYnhfsoEhWtxIzXpn2yw==
dependencies:
"@types/node" "*"

Expand Down Expand Up @@ -13554,10 +13554,10 @@ acorn@^8.0.4, acorn@^8.1.0, acorn@^8.11.0, acorn@^8.14.0, acorn@^8.4.1, acorn@^8
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==

adm-zip@^0.5.9:
version "0.5.9"
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.9.tgz#b33691028333821c0cf95c31374c5462f2905a83"
integrity sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==
adm-zip@^0.5.16:
version "0.5.16"
resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.16.tgz#0b5e4c779f07dedea5805cdccb1147071d94a909"
integrity sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==

after-all-results@^2.0.0:
version "2.0.0"
Expand Down