From e61629f89f4cb4b8b68538c85427000265c7e2ab Mon Sep 17 00:00:00 2001 From: Percs <83934299+Percslol@users.noreply.github.com> Date: Thu, 6 Mar 2025 09:36:42 -0600 Subject: [PATCH] update some dependencies --- pnpm-lock.yaml | 48 ++++++++++---------- rewriter/Cargo.lock | 20 ++++---- rewriter/native/Cargo.toml | 2 +- rewriter/rewriter/Cargo.toml | 4 +- src/client/shared/requests/xmlhttprequest.ts | 1 - src/client/swruntime.ts | 4 +- src/shared/rewriters/js.ts | 1 + 7 files changed, 41 insertions(+), 39 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d59ec31..5bae5c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -544,8 +544,8 @@ packages: '@types/tapable@2.2.7': resolution: {integrity: sha512-D6QzACV9vNX3r8HQQNTOnpG+Bv1rko+yEA82wKs3O9CQ5+XW7HI7TED17/UE7+5dIxyxZIWTxKbsBeF6uKFCwA==} - '@types/ws@8.5.14': - resolution: {integrity: sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==} + '@types/ws@8.18.0': + resolution: {integrity: sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==} '@typescript-eslint/eslint-plugin@8.26.0': resolution: {integrity: sha512-cLr1J6pe56zjKYajK6SSSre6nl1Gj6xDp1TY0trpgPzjVbgDwd09v2Ws37LABxzkicmUjhEeg/fAUjPJJB1v5Q==} @@ -667,8 +667,8 @@ packages: resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==} engines: {node: '>=0.4.0'} - acorn@8.14.0: - resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} + acorn@8.14.1: + resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} engines: {node: '>=0.4.0'} hasBin: true @@ -2254,8 +2254,8 @@ packages: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} - terser-webpack-plugin@5.3.12: - resolution: {integrity: sha512-jDLYqo7oF8tJIttjXO6jBY5Hk8p3A8W4ttih7cCEq64fQFWmgJ4VqAQjKr7WwIDlmXKEc6QeoRb5ecjZ+2afcg==} + terser-webpack-plugin@5.3.14: + resolution: {integrity: sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==} engines: {node: '>= 10.13.0'} peerDependencies: '@swc/core': '*' @@ -2882,8 +2882,8 @@ snapshots: '@babel/code-frame': 7.25.7 '@rsdoctor/types': 0.4.13(@rspack/core@1.2.7)(webpack@5.97.1) '@types/estree': 1.0.5 - acorn: 8.14.0 - acorn-import-assertions: 1.9.0(acorn@8.14.0) + acorn: 8.14.1 + acorn-import-assertions: 1.9.0(acorn@8.14.1) acorn-walk: 8.3.4 chalk: 4.1.2 connect: 3.7.0 @@ -3109,7 +3109,7 @@ snapshots: dependencies: tapable: 2.2.1 - '@types/ws@8.5.14': + '@types/ws@8.18.0': dependencies: '@types/node': 22.13.9 @@ -3277,19 +3277,19 @@ snapshots: mime-types: 2.1.35 negotiator: 0.6.3 - acorn-import-assertions@1.9.0(acorn@8.14.0): + acorn-import-assertions@1.9.0(acorn@8.14.1): dependencies: - acorn: 8.14.0 + acorn: 8.14.1 - acorn-jsx@5.3.2(acorn@8.14.0): + acorn-jsx@5.3.2(acorn@8.14.1): dependencies: - acorn: 8.14.0 + acorn: 8.14.1 acorn-walk@8.3.4: dependencies: - acorn: 8.14.0 + acorn: 8.14.1 - acorn@8.14.0: {} + acorn@8.14.1: {} ajv-formats@2.1.1(ajv@8.17.1): optionalDependencies: @@ -3776,8 +3776,8 @@ snapshots: espree@10.3.0: dependencies: - acorn: 8.14.0 - acorn-jsx: 5.3.2(acorn@8.14.0) + acorn: 8.14.1 + acorn-jsx: 5.3.2(acorn@8.14.1) eslint-visitor-keys: 4.2.0 esquery@1.6.0: @@ -4885,7 +4885,7 @@ snapshots: tapable@2.2.1: {} - terser-webpack-plugin@5.3.12(webpack@5.97.1): + terser-webpack-plugin@5.3.14(webpack@5.97.1): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 @@ -4897,7 +4897,7 @@ snapshots: terser@5.39.0: dependencies: '@jridgewell/source-map': 0.3.6 - acorn: 8.14.0 + acorn: 8.14.1 commander: 2.20.3 source-map-support: 0.5.21 @@ -4992,7 +4992,7 @@ snapshots: webpack-bundle-analyzer@4.10.2(bufferutil@4.0.9): dependencies: '@discoveryjs/json-ext': 0.5.7 - acorn: 8.14.0 + acorn: 8.14.1 acorn-walk: 8.3.4 commander: 7.2.0 debounce: 1.2.1 @@ -5009,7 +5009,7 @@ snapshots: webpack-bundle-analyzer@4.6.1(bufferutil@4.0.9): dependencies: - acorn: 8.14.0 + acorn: 8.14.1 acorn-walk: 8.3.4 chalk: 4.1.2 commander: 7.2.0 @@ -5041,7 +5041,7 @@ snapshots: '@types/serve-index': 1.9.4 '@types/serve-static': 1.15.7 '@types/sockjs': 0.3.36 - '@types/ws': 8.5.14 + '@types/ws': 8.18.0 ansi-html-community: 0.0.8 bonjour-service: 1.3.0 chokidar: 3.6.0 @@ -5082,7 +5082,7 @@ snapshots: '@webassemblyjs/ast': 1.14.1 '@webassemblyjs/wasm-edit': 1.14.1 '@webassemblyjs/wasm-parser': 1.14.1 - acorn: 8.14.0 + acorn: 8.14.1 browserslist: 4.24.4 chrome-trace-event: 1.0.4 enhanced-resolve: 5.18.1 @@ -5097,7 +5097,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.12(webpack@5.97.1) + terser-webpack-plugin: 5.3.14(webpack@5.97.1) watchpack: 2.4.2 webpack-sources: 3.2.3 transitivePeerDependencies: diff --git a/rewriter/Cargo.lock b/rewriter/Cargo.lock index af486d9..db756bc 100644 --- a/rewriter/Cargo.lock +++ b/rewriter/Cargo.lock @@ -31,9 +31,9 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anyhow" -version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" [[package]] name = "arrayvec" @@ -115,7 +115,7 @@ dependencies = [ "static_assertions", "tap", "thin-vec", - "thiserror 2.0.11", + "thiserror 2.0.12", "time", ] @@ -1310,7 +1310,7 @@ version = "0.1.0" dependencies = [ "oxc", "smallvec", - "thiserror 2.0.11", + "thiserror 2.0.12", ] [[package]] @@ -1488,11 +1488,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl 2.0.12", ] [[package]] @@ -1508,9 +1508,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", @@ -1671,7 +1671,7 @@ dependencies = [ "js-sys", "oxc", "rewriter", - "thiserror 2.0.11", + "thiserror 2.0.12", "wasm-bindgen", "web-sys", ] diff --git a/rewriter/native/Cargo.toml b/rewriter/native/Cargo.toml index 9ea0463..39f5554 100644 --- a/rewriter/native/Cargo.toml +++ b/rewriter/native/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" workspace = true [dependencies] -anyhow = "1.0.94" +anyhow = "1.0.97" oxc = { workspace = true } rewriter = { version = "0.1.0", path = "../rewriter" } url = "2.5.4" diff --git a/rewriter/rewriter/Cargo.toml b/rewriter/rewriter/Cargo.toml index b8c6d6d..7f79941 100644 --- a/rewriter/rewriter/Cargo.toml +++ b/rewriter/rewriter/Cargo.toml @@ -8,8 +8,8 @@ workspace = true [dependencies] oxc = { workspace = true } -smallvec = "1.13.2" -thiserror = "2.0.6" +smallvec = "1.14.0" +thiserror = "2.0.12" [features] default = ["debug"] diff --git a/src/client/shared/requests/xmlhttprequest.ts b/src/client/shared/requests/xmlhttprequest.ts index f548595..b972b78 100644 --- a/src/client/shared/requests/xmlhttprequest.ts +++ b/src/client/shared/requests/xmlhttprequest.ts @@ -40,7 +40,6 @@ export default function (client: ScramjetClient, self: Self) { // sync xhr to service worker is not supported // there's a nice way of polyfilling this though, we can spin on an atomic using sharedarraybuffer. this will maintain the sync behavior - // @ts-expect-error maxbytelength not in types yet i guess const sab = new SharedArrayBuffer(1024, { maxByteLength: 2147483647 }); const view = new DataView(sab); diff --git a/src/client/swruntime.ts b/src/client/swruntime.ts index 7341a94..4afdffd 100644 --- a/src/client/swruntime.ts +++ b/src/client/swruntime.ts @@ -38,7 +38,9 @@ export class ScramjetServiceWorkerRuntime { postMessage: () => {}, addEventListener: () => {}, removeEventListener: () => {}, - dispatchEvent: (_e: Event) => {}, + dispatchEvent: (_e: Event): boolean => { + return false; + }, }, showNotification: async () => {}, unregister: async () => true, diff --git a/src/shared/rewriters/js.ts b/src/shared/rewriters/js.ts index 2ce19ed..6811f5b 100644 --- a/src/shared/rewriters/js.ts +++ b/src/shared/rewriters/js.ts @@ -58,6 +58,7 @@ function rewriteJsWrapper( const err1 = err as Error; console.warn("failed rewriting js for", source, err1, input); err1.message = `failed rewriting js for "${source}": ${err1.message}`; + return input; } const after = performance.now();