From cef31cd59a339f600801e5b0c52e56f000004d0a Mon Sep 17 00:00:00 2001 From: Ayush Pahwa Date: Wed, 20 Nov 2024 14:23:56 +0530 Subject: [PATCH 1/6] update: version upgrade --- app/client/package.json | 8 +- app/client/yarn.lock | 334 +++++++++++++++++++++++++++++++++------- 2 files changed, 279 insertions(+), 63 deletions(-) diff --git a/app/client/package.json b/app/client/package.json index dc06ada8d35f..a75c50f541f9 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -260,7 +260,7 @@ "@types/deep-diff": "^1.0.0", "@types/dom-view-transitions": "^1.0.5", "@types/downloadjs": "^1.4.2", - "@types/jest": "^27.4.1", + "@types/jest": "^29.5.3", "@types/jshint": "^2.12.0", "@types/lodash": "^4.14.120", "@types/mixpanel-browser": "^2.50.1", @@ -329,9 +329,9 @@ "eslint-plugin-testing-library": "^6.2.0", "factory.ts": "^0.5.1", "husky": "^8.0.0", - "jest": "^27.4.1", + "jest": "^29.6.1", "jest-canvas-mock": "^2.3.1", - "jest-environment-jsdom": "^27.4.1", + "jest-environment-jsdom": "^29.6.1", "jest-styled-components": "^7.0.8", "json5": "^2.2.3", "knip": "^5.30.2", @@ -354,7 +354,7 @@ "redux-devtools-extension": "^2.13.8", "redux-mock-store": "^1.5.4", "redux-saga-test-plan": "^4.0.6", - "ts-jest": "29.1.0", + "ts-jest": "^29.1.0", "ts-jest-mock-import-meta": "^0.12.0", "ts-node": "^10.9.1", "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 8a8e26fa7269..05ce5e305d41 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -10628,13 +10628,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*, @types/jest@npm:^29.2.3": - version: 29.5.12 - resolution: "@types/jest@npm:29.5.12" +"@types/jest@npm:*, @types/jest@npm:^29.2.3, @types/jest@npm:^29.5.3": + version: 29.5.14 + resolution: "@types/jest@npm:29.5.14" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: 19b1efdeed9d9a60a81edc8226cdeae5af7479e493eaed273e01243891c9651f7b8b4c08fc633a7d0d1d379b091c4179bbaa0807af62542325fd72f2dd17ce1c + checksum: 18dba4623f26661641d757c63da2db45e9524c9be96a29ef713c703a9a53792df9ecee9f7365a0858ddbd6440d98fe6b65ca67895ca5884b73cbc7ffc11f3838 languageName: node linkType: hard @@ -10648,16 +10648,6 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^27.4.1": - version: 27.4.1 - resolution: "@types/jest@npm:27.4.1" - dependencies: - jest-matcher-utils: ^27.0.0 - pretty-format: ^27.0.0 - checksum: 5184f3eef4832d01ee8f59bed15eec45ccc8e29c724a5e6ce37bf74396b37bdf04f557000f45ba4fc38ae6075cf9cfcce3d7a75abc981023c61ceb27230a93e4 - languageName: node - linkType: hard - "@types/js-levenshtein@npm:^1.1.0": version: 1.1.0 resolution: "@types/js-levenshtein@npm:1.1.0" @@ -10665,6 +10655,17 @@ __metadata: languageName: node linkType: hard +"@types/jsdom@npm:^20.0.0": + version: 20.0.1 + resolution: "@types/jsdom@npm:20.0.1" + dependencies: + "@types/node": "*" + "@types/tough-cookie": "*" + parse5: ^7.0.0 + checksum: d55402c5256ef451f93a6e3d3881f98339fe73a5ac2030588df056d6835df8367b5a857b48d27528289057e26dcdd3f502edc00cb877c79174cb3a4c7f2198c1 + languageName: node + linkType: hard + "@types/jshint@npm:^2.12.0": version: 2.12.0 resolution: "@types/jshint@npm:2.12.0" @@ -11261,6 +11262,13 @@ __metadata: languageName: node linkType: hard +"@types/tough-cookie@npm:*": + version: 4.0.5 + resolution: "@types/tough-cookie@npm:4.0.5" + checksum: f19409d0190b179331586365912920d192733112a195e870c7f18d20ac8adb7ad0b0ff69dad430dba8bc2be09593453a719cfea92dc3bda19748fd158fe1498d + languageName: node + linkType: hard + "@types/trusted-types@npm:^2.0.2": version: 2.0.3 resolution: "@types/trusted-types@npm:2.0.3" @@ -12280,7 +12288,7 @@ __metadata: languageName: node linkType: hard -"abab@npm:^2.0.3, abab@npm:^2.0.5": +"abab@npm:^2.0.3, abab@npm:^2.0.5, abab@npm:^2.0.6": version: 2.0.6 resolution: "abab@npm:2.0.6" checksum: 6ffc1af4ff315066c62600123990d87551ceb0aafa01e6539da77b0f5987ac7019466780bf480f1787576d4385e3690c81ccc37cfda12819bf510b8ab47e5a3e @@ -12330,6 +12338,16 @@ __metadata: languageName: node linkType: hard +"acorn-globals@npm:^7.0.0": + version: 7.0.1 + resolution: "acorn-globals@npm:7.0.1" + dependencies: + acorn: ^8.1.0 + acorn-walk: ^8.0.2 + checksum: 2a2998a547af6d0db5f0cdb90acaa7c3cbca6709010e02121fb8b8617c0fbd8bab0b869579903fde358ac78454356a14fadcc1a672ecb97b04b1c2ccba955ce8 + languageName: node + linkType: hard + "acorn-import-assertions@npm:^1.7.6": version: 1.9.0 resolution: "acorn-import-assertions@npm:1.9.0" @@ -12368,7 +12386,7 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:8.2.0, acorn-walk@npm:^8.1.1, acorn-walk@npm:^8.2.0": +"acorn-walk@npm:8.2.0": version: 8.2.0 resolution: "acorn-walk@npm:8.2.0" checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 @@ -12382,7 +12400,16 @@ __metadata: languageName: node linkType: hard -"acorn@npm:8.10.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.2, acorn@npm:^8.9.0": +"acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1, acorn-walk@npm:^8.2.0": + version: 8.3.4 + resolution: "acorn-walk@npm:8.3.4" + dependencies: + acorn: ^8.11.0 + checksum: 4ff03f42323e7cf90f1683e08606b0f460e1e6ac263d2730e3df91c7665b6f64e696db6ea27ee4bed18c2599569be61f28a8399fa170c611161a348c402ca19c + languageName: node + linkType: hard + +"acorn@npm:8.10.0": version: 8.10.0 resolution: "acorn@npm:8.10.0" bin: @@ -12409,6 +12436,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.1.0, acorn@npm:^8.11.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": + version: 8.14.0 + resolution: "acorn@npm:8.14.0" + bin: + acorn: bin/acorn + checksum: 8755074ba55fff94e84e81c72f1013c2d9c78e973c31231c8ae505a5f966859baf654bddd75046bffd73ce816b149298977fff5077a3033dedba0ae2aad152d4 + languageName: node + linkType: hard + "add-px-to-style@npm:1.0.0": version: 1.0.0 resolution: "add-px-to-style@npm:1.0.0" @@ -12794,7 +12830,7 @@ __metadata: "@types/dom-view-transitions": ^1.0.5 "@types/downloadjs": ^1.4.2 "@types/google.maps": ^3.51.0 - "@types/jest": ^27.4.1 + "@types/jest": ^29.5.3 "@types/jshint": ^2.12.0 "@types/lodash": ^4.14.120 "@types/mixpanel-browser": ^2.50.1 @@ -12910,9 +12946,9 @@ __metadata: immer: ^9.0.6 interweave: ^12.7.2 interweave-autolink: ^4.4.2 - jest: ^27.4.1 + jest: ^29.6.1 jest-canvas-mock: ^2.3.1 - jest-environment-jsdom: ^27.4.1 + jest-environment-jsdom: ^29.6.1 jest-styled-components: ^7.0.8 js-regex-pl: ^1.0.1 js-sha256: ^0.9.0 @@ -13018,7 +13054,7 @@ __metadata: tinycolor2: ^1.4.2 tinymce: 6.8.3 toposort: ^2.0.2 - ts-jest: 29.1.0 + ts-jest: ^29.1.0 ts-jest-mock-import-meta: ^0.12.0 ts-node: ^10.9.1 tslib: ^2.3.1 @@ -14318,7 +14354,7 @@ __metadata: languageName: node linkType: hard -"bs-logger@npm:0.x": +"bs-logger@npm:0.x, bs-logger@npm:^0.2.6": version: 0.2.6 resolution: "bs-logger@npm:0.2.6" dependencies: @@ -16347,6 +16383,17 @@ __metadata: languageName: node linkType: hard +"data-urls@npm:^3.0.2": + version: 3.0.2 + resolution: "data-urls@npm:3.0.2" + dependencies: + abab: ^2.0.6 + whatwg-mimetype: ^3.0.0 + whatwg-url: ^11.0.0 + checksum: 033fc3dd0fba6d24bc9a024ddcf9923691dd24f90a3d26f6545d6a2f71ec6956f93462f2cdf2183cc46f10dc01ed3bcb36731a8208456eb1a08147e571fe2a76 + languageName: node + linkType: hard + "date-fns@npm:^2.0.1, date-fns@npm:^2.24.0, date-fns@npm:^2.29.3": version: 2.30.0 resolution: "date-fns@npm:2.30.0" @@ -16445,10 +16492,10 @@ __metadata: languageName: node linkType: hard -"decimal.js@npm:^10.2.1": - version: 10.3.1 - resolution: "decimal.js@npm:10.3.1" - checksum: 0351ac9f05fe050f23227aa6a4573bee2d58fa7378fcf28d969a8c789525032effb488a90320fd3fe86a66e17b4bc507d811b15eada5b7f0e7ec5d2af4c24a59 +"decimal.js@npm:^10.2.1, decimal.js@npm:^10.4.2": + version: 10.4.3 + resolution: "decimal.js@npm:10.4.3" + checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae languageName: node linkType: hard @@ -17077,6 +17124,15 @@ __metadata: languageName: node linkType: hard +"domexception@npm:^4.0.0": + version: 4.0.0 + resolution: "domexception@npm:4.0.0" + dependencies: + webidl-conversions: ^7.0.0 + checksum: ddbc1268edf33a8ba02ccc596735ede80375ee0cf124b30d2f05df5b464ba78ef4f49889b6391df4a04954e63d42d5631c7fcf8b1c4f12bc531252977a5f13d5 + languageName: node + linkType: hard + "domhandler@npm:2.3": version: 2.3.0 resolution: "domhandler@npm:2.3.0" @@ -17494,10 +17550,10 @@ __metadata: languageName: node linkType: hard -"entities@npm:^4.2.0, entities@npm:^4.3.0, entities@npm:^4.4.0": - version: 4.4.0 - resolution: "entities@npm:4.4.0" - checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2 +"entities@npm:^4.2.0, entities@npm:^4.3.0, entities@npm:^4.4.0, entities@npm:^4.5.0": + version: 4.5.0 + resolution: "entities@npm:4.5.0" + checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7 languageName: node linkType: hard @@ -20366,6 +20422,15 @@ __metadata: languageName: node linkType: hard +"html-encoding-sniffer@npm:^3.0.0": + version: 3.0.0 + resolution: "html-encoding-sniffer@npm:3.0.0" + dependencies: + whatwg-encoding: ^2.0.0 + checksum: 8d806aa00487e279e5ccb573366a951a9f68f65c90298eac9c3a2b440a7ffe46615aff2995a2f61c6746c639234e6179a97e18ca5ccbbf93d3725ef2099a4502 + languageName: node + linkType: hard + "html-entities@npm:^2.1.0, html-entities@npm:^2.3.2": version: 2.3.3 resolution: "html-entities@npm:2.3.3" @@ -20678,7 +20743,7 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": +"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" dependencies: @@ -22102,7 +22167,7 @@ __metadata: languageName: node linkType: hard -"jest-environment-jsdom@npm:^27.4.1, jest-environment-jsdom@npm:^27.5.1": +"jest-environment-jsdom@npm:^27.5.1": version: 27.5.1 resolution: "jest-environment-jsdom@npm:27.5.1" dependencies: @@ -22117,6 +22182,27 @@ __metadata: languageName: node linkType: hard +"jest-environment-jsdom@npm:^29.6.1": + version: 29.7.0 + resolution: "jest-environment-jsdom@npm:29.7.0" + dependencies: + "@jest/environment": ^29.7.0 + "@jest/fake-timers": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/jsdom": ^20.0.0 + "@types/node": "*" + jest-mock: ^29.7.0 + jest-util: ^29.7.0 + jsdom: ^20.0.0 + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + checksum: 559aac134c196fccc1dfc794d8fc87377e9f78e894bb13012b0831d88dec0abd7ece99abec69da564b8073803be4f04a9eb4f4d1bb80e29eec0cb252c254deb8 + languageName: node + linkType: hard + "jest-environment-node@npm:^27.5.1": version: 27.5.1 resolution: "jest-environment-node@npm:27.5.1" @@ -22284,7 +22370,7 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^27.0.0, jest-matcher-utils@npm:^27.5.1": +"jest-matcher-utils@npm:^27.5.1": version: 27.5.1 resolution: "jest-matcher-utils@npm:27.5.1" dependencies: @@ -22916,7 +23002,7 @@ __metadata: languageName: node linkType: hard -"jest@npm:^27.4.1, jest@npm:^27.4.3": +"jest@npm:^27.4.3": version: 27.5.1 resolution: "jest@npm:27.5.1" dependencies: @@ -22934,7 +23020,7 @@ __metadata: languageName: node linkType: hard -"jest@npm:^29.3.1, jest@npm:^29.5.0, jest@npm:^29.6.4": +"jest@npm:^29.3.1, jest@npm:^29.5.0, jest@npm:^29.6.1, jest@npm:^29.6.4": version: 29.7.0 resolution: "jest@npm:29.7.0" dependencies: @@ -23108,6 +23194,45 @@ __metadata: languageName: node linkType: hard +"jsdom@npm:^20.0.0": + version: 20.0.3 + resolution: "jsdom@npm:20.0.3" + dependencies: + abab: ^2.0.6 + acorn: ^8.8.1 + acorn-globals: ^7.0.0 + cssom: ^0.5.0 + cssstyle: ^2.3.0 + data-urls: ^3.0.2 + decimal.js: ^10.4.2 + domexception: ^4.0.0 + escodegen: ^2.0.0 + form-data: ^4.0.0 + html-encoding-sniffer: ^3.0.0 + http-proxy-agent: ^5.0.0 + https-proxy-agent: ^5.0.1 + is-potential-custom-element-name: ^1.0.1 + nwsapi: ^2.2.2 + parse5: ^7.1.1 + saxes: ^6.0.0 + symbol-tree: ^3.2.4 + tough-cookie: ^4.1.2 + w3c-xmlserializer: ^4.0.0 + webidl-conversions: ^7.0.0 + whatwg-encoding: ^2.0.0 + whatwg-mimetype: ^3.0.0 + whatwg-url: ^11.0.0 + ws: ^8.11.0 + xml-name-validator: ^4.0.0 + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + checksum: 6e2ae21db397133a061b270c26d2dbc0b9051733ea3b896a7ece78d79f475ff0974f766a413c1198a79c793159119169f2335ddb23150348fbfdcfa6f3105536 + languageName: node + linkType: hard + "jsesc@npm:^2.5.1": version: 2.5.2 resolution: "jsesc@npm:2.5.2" @@ -23946,7 +24071,7 @@ __metadata: languageName: node linkType: hard -"make-error@npm:1.x, make-error@npm:^1.1.1": +"make-error@npm:1.x, make-error@npm:^1.1.1, make-error@npm:^1.3.6": version: 1.3.6 resolution: "make-error@npm:1.3.6" checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 @@ -25532,10 +25657,10 @@ __metadata: languageName: node linkType: hard -"nwsapi@npm:^2.2.0": - version: 2.2.0 - resolution: "nwsapi@npm:2.2.0" - checksum: 5ef4a9bc0c1a5b7f2e014aa6a4b359a257503b796618ed1ef0eb852098f77e772305bb0e92856e4bbfa3e6c75da48c0113505c76f144555ff38867229c2400a7 +"nwsapi@npm:^2.2.0, nwsapi@npm:^2.2.2": + version: 2.2.13 + resolution: "nwsapi@npm:2.2.13" + checksum: d34fb7838517c3c7e8cc824e443275b08b57f6a025a860693d18c56ddcfd176e32df9bf0ae7f5a95c7a32981501caa1f9fda31b59f28aa72a4b9d01f573a8e6b languageName: node linkType: hard @@ -26172,6 +26297,15 @@ __metadata: languageName: node linkType: hard +"parse5@npm:^7.0.0, parse5@npm:^7.1.1": + version: 7.2.1 + resolution: "parse5@npm:7.2.1" + dependencies: + entities: ^4.5.0 + checksum: 11253cf8aa2e7fc41c004c64cba6f2c255f809663365db65bd7ad0e8cf7b89e436a563c20059346371cc543a6c1b567032088883ca6a2cbc88276c666b68236d + languageName: node + linkType: hard + "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -27598,7 +27732,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^27.0.0, pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1": +"pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1": version: 27.5.1 resolution: "pretty-format@npm:27.5.1" dependencies: @@ -30403,6 +30537,15 @@ __metadata: languageName: node linkType: hard +"saxes@npm:^6.0.0": + version: 6.0.0 + resolution: "saxes@npm:6.0.0" + dependencies: + xmlchars: ^2.2.0 + checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b + languageName: node + linkType: hard + "scheduler@npm:^0.19.1": version: 0.19.1 resolution: "scheduler@npm:0.19.1" @@ -30511,7 +30654,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": +"semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3": version: 7.6.3 resolution: "semver@npm:7.6.3" bin: @@ -32425,15 +32568,15 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^4.0.0, tough-cookie@npm:^4.1.3": - version: 4.1.3 - resolution: "tough-cookie@npm:4.1.3" +"tough-cookie@npm:^4.0.0, tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3": + version: 4.1.4 + resolution: "tough-cookie@npm:4.1.4" dependencies: psl: ^1.1.33 punycode: ^2.1.1 universalify: ^0.2.0 url-parse: ^1.5.3 - checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc + checksum: 5815059f014c31179a303c673f753f7899a6fce94ac93712c88ea5f3c26e0c042b5f0c7a599a00f8e0feeca4615dba75c3dffc54f3c1a489978aa8205e09307c languageName: node linkType: hard @@ -32455,6 +32598,15 @@ __metadata: languageName: node linkType: hard +"tr46@npm:^3.0.0": + version: 3.0.0 + resolution: "tr46@npm:3.0.0" + dependencies: + punycode: ^2.1.1 + checksum: 44c3cc6767fb800490e6e9fd64fd49041aa4e49e1f6a012b34a75de739cc9ed3a6405296072c1df8b6389ae139c5e7c6496f659cfe13a04a4bff3a1422981270 + languageName: node + linkType: hard + "tr46@npm:~0.0.3": version: 0.0.3 resolution: "tr46@npm:0.0.3" @@ -32565,18 +32717,18 @@ __metadata: linkType: hard "ts-jest@npm:^29.1.0": - version: 29.2.4 - resolution: "ts-jest@npm:29.2.4" + version: 29.2.5 + resolution: "ts-jest@npm:29.2.5" dependencies: - bs-logger: 0.x + bs-logger: ^0.2.6 ejs: ^3.1.10 - fast-json-stable-stringify: 2.x + fast-json-stable-stringify: ^2.1.0 jest-util: ^29.0.0 json5: ^2.2.3 - lodash.memoize: 4.x - make-error: 1.x - semver: ^7.5.3 - yargs-parser: ^21.0.1 + lodash.memoize: ^4.1.2 + make-error: ^1.3.6 + semver: ^7.6.3 + yargs-parser: ^21.1.1 peerDependencies: "@babel/core": ">=7.0.0-beta.0 <8" "@jest/transform": ^29.0.0 @@ -32597,7 +32749,7 @@ __metadata: optional: true bin: ts-jest: cli.js - checksum: 142246f12bb11d5edbfb5a65e298097667e2c4d390e316e356416ce00d3cd157220dbfb9de2a56b38f30776bc92ba59eff9fd78e9345ba4c6712783f27f5475a + checksum: d60d1e1d80936f6002b1bb27f7e062408bc733141b9d666565503f023c340a3196d506c836a4316c5793af81a5f910ab49bb9c13f66e2dc66de4e0f03851dbca languageName: node linkType: hard @@ -33651,6 +33803,15 @@ __metadata: languageName: node linkType: hard +"w3c-xmlserializer@npm:^4.0.0": + version: 4.0.0 + resolution: "w3c-xmlserializer@npm:4.0.0" + dependencies: + xml-name-validator: ^4.0.0 + checksum: eba070e78deb408ae8defa4d36b429f084b2b47a4741c4a9be3f27a0a3d1845e277e3072b04391a138f7e43776842627d1334e448ff13ff90ad9fb1214ee7091 + languageName: node + linkType: hard + "wait-on@npm:^7.0.0": version: 7.2.0 resolution: "wait-on@npm:7.2.0" @@ -33804,6 +33965,13 @@ __metadata: languageName: node linkType: hard +"webidl-conversions@npm:^7.0.0": + version: 7.0.0 + resolution: "webidl-conversions@npm:7.0.0" + checksum: f05588567a2a76428515333eff87200fae6c83c3948a7482ebb109562971e77ef6dc49749afa58abb993391227c5697b3ecca52018793e0cb4620a48f10bd21b + languageName: node + linkType: hard + "webpack-bundle-analyzer@npm:^3.6.0": version: 3.9.0 resolution: "webpack-bundle-analyzer@npm:3.9.0" @@ -34017,6 +34185,15 @@ __metadata: languageName: node linkType: hard +"whatwg-encoding@npm:^2.0.0": + version: 2.0.0 + resolution: "whatwg-encoding@npm:2.0.0" + dependencies: + iconv-lite: 0.6.3 + checksum: 7087810c410aa9b689cbd6af8773341a53cdc1f3aae2a882c163bd5522ec8ca4cdfc269aef417a5792f411807d5d77d50df4c24e3abb00bb60192858a40cc675 + languageName: node + linkType: hard + "whatwg-fetch@npm:^3.6.2": version: 3.6.2 resolution: "whatwg-fetch@npm:3.6.2" @@ -34031,6 +34208,23 @@ __metadata: languageName: node linkType: hard +"whatwg-mimetype@npm:^3.0.0": + version: 3.0.0 + resolution: "whatwg-mimetype@npm:3.0.0" + checksum: ce08bbb36b6aaf64f3a84da89707e3e6a31e5ab1c1a2379fd68df79ba712a4ab090904f0b50e6693b0dafc8e6343a6157e40bf18fdffd26e513cf95ee2a59824 + languageName: node + linkType: hard + +"whatwg-url@npm:^11.0.0": + version: 11.0.0 + resolution: "whatwg-url@npm:11.0.0" + dependencies: + tr46: ^3.0.0 + webidl-conversions: ^7.0.0 + checksum: ed4826aaa57e66bb3488a4b25c9cd476c46ba96052747388b5801f137dd740b73fde91ad207d96baf9f17fbcc80fc1a477ad65181b5eb5fa718d27c69501d7af + languageName: node + linkType: hard + "whatwg-url@npm:^5.0.0": version: 5.0.0 resolution: "whatwg-url@npm:5.0.0" @@ -34518,9 +34712,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.2.3, ws@npm:^8.4.2, ws@npm:~8.17.1": - version: 8.17.1 - resolution: "ws@npm:8.17.1" +"ws@npm:^8.11.0, ws@npm:^8.2.3, ws@npm:^8.4.2": + version: 8.18.0 + resolution: "ws@npm:8.18.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -34529,7 +34723,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 442badcce1f1178ec87a0b5372ae2e9771e07c4929a3180321901f226127f252441e8689d765aa5cfba5f50ac60dd830954afc5aeae81609aefa11d3ddf5cecf + checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975 languageName: node linkType: hard @@ -34548,6 +34742,21 @@ __metadata: languageName: node linkType: hard +"ws@npm:~8.17.1": + version: 8.17.1 + resolution: "ws@npm:8.17.1" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ">=5.0.2" + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 442badcce1f1178ec87a0b5372ae2e9771e07c4929a3180321901f226127f252441e8689d765aa5cfba5f50ac60dd830954afc5aeae81609aefa11d3ddf5cecf + languageName: node + linkType: hard + "ws@npm:~8.2.3": version: 8.2.3 resolution: "ws@npm:8.2.3" @@ -34579,6 +34788,13 @@ __metadata: languageName: node linkType: hard +"xml-name-validator@npm:^4.0.0": + version: 4.0.0 + resolution: "xml-name-validator@npm:4.0.0" + checksum: af100b79c29804f05fa35aa3683e29a321db9b9685d5e5febda3fa1e40f13f85abc40f45a6b2bf7bee33f68a1dc5e8eaef4cec100a304a9db565e6061d4cb5ad + languageName: node + linkType: hard + "xml@npm:^1.0.1": version: 1.0.1 resolution: "xml@npm:1.0.1" From 8d09b063e3d7091530a929194f9dda272ee368df Mon Sep 17 00:00:00 2001 From: Ayush Pahwa Date: Wed, 20 Nov 2024 14:24:21 +0530 Subject: [PATCH 2/6] update: move ts-jest to transform and add explicit module mapper entry --- app/client/jest.config.js | 49 +++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/app/client/jest.config.js b/app/client/jest.config.js index 47dc492327d8..5bb05e445566 100644 --- a/app/client/jest.config.js +++ b/app/client/jest.config.js @@ -12,7 +12,23 @@ module.exports = { ], roots: ["/src"], transform: { - "^.+\\.(png|js|ts|tsx)$": "ts-jest", + "^.+\\.(png|js|ts|tsx)$": [ + "ts-jest", + { + isolatedModules: true, + diagnostics: { + ignoreCodes: [1343], + }, + astTransformers: { + before: [ + { + path: "node_modules/ts-jest-mock-import-meta", + options: { metaObjectReplacement: { url: "https://www.url.com" } }, + }, + ], + }, + } + ], }, testEnvironment: "jsdom", testTimeout: 9000, @@ -52,22 +68,25 @@ module.exports = { "/node_modules/@blueprintjs/select/lib/esnext", "@appsmith/ads": "/node_modules/@appsmith/ads", "^canvas$": "jest-canvas-mock", + "^entities/(.*)$": "/src/entities/$1", // Match 'entities/*' + }, globals: { - "ts-jest": { - isolatedModules: true, - diagnostics: { - ignoreCodes: [1343], - }, - astTransformers: { - before: [ - { - path: "node_modules/ts-jest-mock-import-meta", - options: { metaObjectReplacement: { url: "https://www.url.com" } }, - }, - ], - }, - }, + //"ts-jest": { + // isolatedModules: true, + // diagnostics: { + // warnOnly: true, + // ignoreCodes: [1343], + // }, + // astTransformers: { + // before: [ + // { + // path: "node_modules/ts-jest-mock-import-meta", + // options: { metaObjectReplacement: { url: "https://www.url.com" } }, + // }, + // ], + // }, + //}, APPSMITH_FEATURE_CONFIGS: { sentry: { dsn: parseConfig("__APPSMITH_SENTRY_DSN__"), From 58fb855d963f865865883163868922ab59f4ef24 Mon Sep 17 00:00:00 2001 From: Ayush Pahwa Date: Wed, 20 Nov 2024 14:24:43 +0530 Subject: [PATCH 3/6] update: types inside stored snapshots --- .../__snapshots__/IconSelectControl.test.tsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/src/components/propertyControls/__snapshots__/IconSelectControl.test.tsx.snap b/app/client/src/components/propertyControls/__snapshots__/IconSelectControl.test.tsx.snap index cd8df41fb0b4..3e891f058e76 100644 --- a/app/client/src/components/propertyControls/__snapshots__/IconSelectControl.test.tsx.snap +++ b/app/client/src/components/propertyControls/__snapshots__/IconSelectControl.test.tsx.snap @@ -100,7 +100,7 @@ DOMTokenList { `; exports[` - Keyboard navigation Pressing '{Enter}' or ' ' should select the icon 3`] = ` -Array [ +[ "iconName", "add-row-top", true, @@ -115,7 +115,7 @@ DOMTokenList { `; exports[` - Keyboard navigation Pressing '{Enter}' or ' ' should select the icon 5`] = ` -Array [ +[ "iconName", "add-to-artifact", true, From 708dd90d4945f1c8dcf727b46ef1b19659e93e26 Mon Sep 17 00:00:00 2001 From: Ayush Pahwa Date: Thu, 21 Nov 2024 10:04:29 +0530 Subject: [PATCH 4/6] update: fix issue with global crypto being immutable --- app/client/test/setup.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/client/test/setup.ts b/app/client/test/setup.ts index 2578380198cf..c7f3e4009fdb 100644 --- a/app/client/test/setup.ts +++ b/app/client/test/setup.ts @@ -3,13 +3,16 @@ import { handlers } from "./__mocks__/apiHandlers"; import "../src/polyfills/requestIdleCallback"; import { Crypto } from "@peculiar/webcrypto"; +// since global crypto is immutable, we need to first delete it and then use the +// peculiar crypto lisrc/sagas/helper.test.tsb +delete global['crypto']; global.crypto = new Crypto(); export const server = setupServer(...handlers); jest.mock("api/Api", () => ({ __esModule: true, - default: class Api {}, + default: class Api { }, })); window.scrollTo = jest.fn(); @@ -18,7 +21,7 @@ Element.prototype.scrollBy = jest.fn(); jest.mock("../src/api/Api.ts", () => ({ __esModule: true, - default: class Api {}, + default: class Api { }, })); beforeAll(() => { @@ -83,7 +86,7 @@ document.createRange = () => { }; // jest events doesnt seem to be handling scrollTo -Element.prototype.scrollTo = () => {}; +Element.prototype.scrollTo = () => { }; class WorkerStub { url: string; @@ -91,7 +94,7 @@ class WorkerStub { constructor(stringUrl: string) { this.url = stringUrl; // eslint-disable-next-line @typescript-eslint/no-empty-function - this.onmessage = () => {}; + this.onmessage = () => { }; } postMessage(msg) { From 7db351685b8780314a426092ce168237941f5c26 Mon Sep 17 00:00:00 2001 From: Ayush Pahwa Date: Thu, 21 Nov 2024 10:07:03 +0530 Subject: [PATCH 5/6] refactor: remove unused comments --- app/client/jest.config.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/client/jest.config.js b/app/client/jest.config.js index 5bb05e445566..06e46734fe3e 100644 --- a/app/client/jest.config.js +++ b/app/client/jest.config.js @@ -72,21 +72,6 @@ module.exports = { }, globals: { - //"ts-jest": { - // isolatedModules: true, - // diagnostics: { - // warnOnly: true, - // ignoreCodes: [1343], - // }, - // astTransformers: { - // before: [ - // { - // path: "node_modules/ts-jest-mock-import-meta", - // options: { metaObjectReplacement: { url: "https://www.url.com" } }, - // }, - // ], - // }, - //}, APPSMITH_FEATURE_CONFIGS: { sentry: { dsn: parseConfig("__APPSMITH_SENTRY_DSN__"), From 99c7f2bf02a2fda5fe570774a2c7a993c38dea9b Mon Sep 17 00:00:00 2001 From: Ayush Pahwa Date: Thu, 21 Nov 2024 10:30:56 +0530 Subject: [PATCH 6/6] update: explicitely define the used types and removed unused comments --- .../packages/ast/src/actionCreator/index.ts | 21 +++++++------------ app/client/packages/ast/src/jsObject/index.ts | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/client/packages/ast/src/actionCreator/index.ts b/app/client/packages/ast/src/actionCreator/index.ts index fec4978b44f8..de42fb42b5c5 100644 --- a/app/client/packages/ast/src/actionCreator/index.ts +++ b/app/client/packages/ast/src/actionCreator/index.ts @@ -236,7 +236,7 @@ export const setCallbackFunctionField = ( currentValueAstWithComments, 0, undefined, - (type, node) => isCallExpressionNode(node), + (_type, node) => isCallExpressionNode(node), ); if (found) { @@ -717,7 +717,7 @@ export const replaceActionInQuery = ( }); simple(astWithComments, { - CallExpression(node) { + CallExpression(node: Node) { if ( isCallExpressionNode(node) && isMemberExpressionNode(node.callee) && @@ -800,16 +800,13 @@ export function canTranslateToUI( simple(astWithComments, { ConditionalExpression(node) { if ( - // @ts-expect-error: types not matched isCallExpressionNode(node.consequent) || - // @ts-expect-error: types not matched isCallExpressionNode(node.alternate) ) { canTranslate = false; } }, LogicalExpression(node) { - // @ts-expect-error: types not matched if (isCallExpressionNode(node.left) || isCallExpressionNode(node.right)) { canTranslate = false; } @@ -912,12 +909,10 @@ export function getMainAction( ExpressionStatement(node) { simple(node, { CallExpression(node) { - // @ts-expect-error: types not matched if (node.callee.type === NodeTypes.Identifier) { mainAction = generate(node, { comments: true }).trim(); } else { mainAction = - // @ts-expect-error: types not matched generate(node.callee, { comments: true }).trim() + "()"; } }, @@ -989,7 +984,7 @@ export function getThenCatchBlocksFromQuery( astWithComments, 0, undefined, - function (type, node) { + function (_type, node) { if (isCallExpressionNode(node)) { if (isMemberExpressionNode(node.callee)) { if (node.callee.object === rootCallExpression) { @@ -1020,7 +1015,7 @@ export function getThenCatchBlocksFromQuery( } const secondBlockType = firstBlockType === "then" ? "catch" : "then"; - const secondBlock = findNodeAt(ast, 0, undefined, function (type, node) { + const secondBlock = findNodeAt(ast, 0, undefined, function (_type, node) { if (isCallExpressionNode(node)) { if (isMemberExpressionNode(node.callee)) { if (node.callee.object === firstBlock) { @@ -1073,7 +1068,7 @@ export function setThenBlockInQuery( astWithComments, 0, undefined, - function (type, node) { + function (_type, node) { if (isCallExpressionNode(node)) { if (isMemberExpressionNode(node.callee)) { if (node.callee.object === rootCallExpression) { @@ -1117,7 +1112,7 @@ export function setThenBlockInQuery( astWithComments, 0, undefined, - function (type, node) { + function (_type, node) { if (isCallExpressionNode(node)) { if (isMemberExpressionNode(node.callee)) { if (node.callee.object === rootCallExpression) { @@ -1393,7 +1388,7 @@ function findNodeWithCalleeAndProperty( ) { if (!ast || !callee || !property) return undefined; - return findNodeAt(ast, 0, undefined, function (type, node) { + return findNodeAt(ast, 0, undefined, function (_type, node) { if (isCallExpressionNode(node)) { if (isMemberExpressionNode(node.callee)) { if (node.callee.object === callee) { @@ -1431,7 +1426,7 @@ export function getFunctionParams(code: string, evaluationVersion: number) { export function getQueryParam( code: string, - number: number, + _number: number, evaluationVersion: number, ) { try { diff --git a/app/client/packages/ast/src/jsObject/index.ts b/app/client/packages/ast/src/jsObject/index.ts index 96df9e01659d..71999691a33c 100644 --- a/app/client/packages/ast/src/jsObject/index.ts +++ b/app/client/packages/ast/src/jsObject/index.ts @@ -86,7 +86,7 @@ export const parseJSObject = (code: string) => { let JSObjectProperties: NodeWithLocation[] = []; simple(ast, { - ExportDefaultDeclaration(node) { + ExportDefaultDeclaration(node: Node) { if ( !isExportDefaultDeclarationNode(node) || !isObjectExpression(node.declaration)