From c92430ede2e350213c7d682334d8be2db62657e5 Mon Sep 17 00:00:00 2001 From: Percs <83934299+Percslol@users.noreply.github.com> Date: Sat, 23 Nov 2024 15:16:53 -0600 Subject: [PATCH] chore: update dependencies and code cleanup --- package.json | 26 +- pnpm-lock.yaml | 583 +++++++++++++++++++------------------- src/client/dom/element.ts | 14 +- src/client/dom/open.ts | 10 +- src/client/shared/wrap.ts | 8 +- static/sw.js | 55 ++-- 6 files changed, 349 insertions(+), 347 deletions(-) diff --git a/package.json b/package.json index 5dcd46f..3e04478 100644 --- a/package.json +++ b/package.json @@ -29,31 +29,31 @@ "author": "", "license": "ISC", "devDependencies": { - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "^9.14.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "^9.15.0", "@estruyf/github-actions-reporter": "^1.9.2", - "@fastify/static": "^8.0.2", + "@fastify/static": "^8.0.3", "@mercuryworkshop/bare-as-module3": "^2.2.5", "@mercuryworkshop/epoxy-transport": "^2.1.26", "@mercuryworkshop/libcurl-transport": "^1.3.14", "@nebula-services/bare-server-node": "^2.0.4", - "@playwright/test": "^1.48.2", + "@playwright/test": "^1.49.0", "@rsdoctor/rspack-plugin": "^0.4.8", - "@rspack/cli": "^1.1.0", - "@rspack/core": "^1.1.0", + "@rspack/cli": "^1.1.3", + "@rspack/core": "^1.1.3", "@types/eslint": "^9.6.1", "@types/estree": "^1.0.6", - "@types/node": "^22.9.0", - "@types/serviceworker": "^0.0.103", - "@typescript-eslint/eslint-plugin": "^8.13.0", - "@typescript-eslint/parser": "^8.13.0", + "@types/node": "^22.9.3", + "@types/serviceworker": "^0.0.105", + "@typescript-eslint/eslint-plugin": "^8.15.0", + "@typescript-eslint/parser": "^8.15.0", "dotenv": "^16.4.5", - "eslint": "^9.14.0", + "eslint": "^9.15.0", "fastify": "^5.1.0", - "playwright": "^1.48.2", + "playwright": "^1.49.0", "prettier": "^3.3.3", "tslib": "^2.8.1", - "typescript": "^5.6.3", + "typescript": "^5.7.2", "wisp-server-node": "^1.1.7" }, "dependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a198ec..09d9468 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,17 +31,17 @@ importers: version: 2.7.1 devDependencies: '@eslint/eslintrc': - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.2.0 + version: 3.2.0 '@eslint/js': - specifier: ^9.14.0 - version: 9.14.0 + specifier: ^9.15.0 + version: 9.15.0 '@estruyf/github-actions-reporter': specifier: ^1.9.2 - version: 1.9.2(@playwright/test@1.48.2) + version: 1.9.2(@playwright/test@1.49.0) '@fastify/static': - specifier: ^8.0.2 - version: 8.0.2 + specifier: ^8.0.3 + version: 8.0.3 '@mercuryworkshop/bare-as-module3': specifier: ^2.2.5 version: 2.2.5 @@ -55,17 +55,17 @@ importers: specifier: ^2.0.4 version: 2.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.5) '@playwright/test': - specifier: ^1.48.2 - version: 1.48.2 + specifier: ^1.49.0 + version: 1.49.0 '@rsdoctor/rspack-plugin': specifier: ^0.4.8 - version: 0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + version: 0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) '@rspack/cli': - specifier: ^1.1.0 - version: 1.1.0(@rspack/core@1.1.0)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + specifier: ^1.1.3 + version: 1.1.3(@rspack/core@1.1.3)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) '@rspack/core': - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.3 + version: 1.1.3 '@types/eslint': specifier: ^9.6.1 version: 9.6.1 @@ -73,29 +73,29 @@ importers: specifier: ^1.0.6 version: 1.0.6 '@types/node': - specifier: ^22.9.0 - version: 22.9.0 + specifier: ^22.9.3 + version: 22.9.3 '@types/serviceworker': - specifier: ^0.0.103 - version: 0.0.103 + specifier: ^0.0.105 + version: 0.0.105 '@typescript-eslint/eslint-plugin': - specifier: ^8.13.0 - version: 8.13.0(@typescript-eslint/parser@8.13.0(eslint@9.14.0)(typescript@5.6.3))(eslint@9.14.0)(typescript@5.6.3) + specifier: ^8.15.0 + version: 8.15.0(@typescript-eslint/parser@8.15.0(eslint@9.15.0)(typescript@5.7.2))(eslint@9.15.0)(typescript@5.7.2) '@typescript-eslint/parser': - specifier: ^8.13.0 - version: 8.13.0(eslint@9.14.0)(typescript@5.6.3) + specifier: ^8.15.0 + version: 8.15.0(eslint@9.15.0)(typescript@5.7.2) dotenv: specifier: ^16.4.5 version: 16.4.5 eslint: - specifier: ^9.14.0 - version: 9.14.0 + specifier: ^9.15.0 + version: 9.15.0 fastify: specifier: ^5.1.0 version: 5.1.0 playwright: - specifier: ^1.48.2 - version: 1.48.2 + specifier: ^1.49.0 + version: 1.49.0 prettier: specifier: ^3.3.3 version: 3.3.3 @@ -103,8 +103,8 @@ importers: specifier: ^2.8.1 version: 2.8.1 typescript: - specifier: ^5.6.3 - version: 5.6.3 + specifier: ^5.7.2 + version: 5.7.2 wisp-server-node: specifier: ^1.1.7 version: 1.1.7 @@ -149,28 +149,28 @@ packages: resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/config-array@0.18.0': - resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==} + '@eslint/config-array@0.19.0': + resolution: {integrity: sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/core@0.7.0': - resolution: {integrity: sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==} + '@eslint/core@0.9.0': + resolution: {integrity: sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/eslintrc@3.1.0': - resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==} + '@eslint/eslintrc@3.2.0': + resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@9.14.0': - resolution: {integrity: sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==} + '@eslint/js@9.15.0': + resolution: {integrity: sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/object-schema@2.1.4': resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/plugin-kit@0.2.2': - resolution: {integrity: sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==} + '@eslint/plugin-kit@0.2.3': + resolution: {integrity: sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@estruyf/github-actions-reporter@1.9.2': @@ -197,11 +197,11 @@ packages: '@fastify/merge-json-schemas@0.1.1': resolution: {integrity: sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA==} - '@fastify/send@3.1.1': - resolution: {integrity: sha512-LdiV2mle/2tH8vh6GwGl0ubfUAgvY+9yF9oGI1iiwVyNUVOQamvw5n+OFu6iCNNoyuCY80FFURBn4TZCbTe8LA==} + '@fastify/send@3.2.0': + resolution: {integrity: sha512-qF4TIEMjqk92jrOXjcqBrkk+HOXE70AwDKas9/AweFslbvSq0o1JEAHzC7YlggBaj4bN9pU70XIPyseEJ6vlXg==} - '@fastify/static@8.0.2': - resolution: {integrity: sha512-xJ+XaZVl4Y+lKztx8jGi+BE73aByhOmjMgaTx98E4XtVZxUpiaYQIMBlwACsJz+xohm0kvzV34BZoiZ+bsJtBQ==} + '@fastify/static@8.0.3': + resolution: {integrity: sha512-GHSoOVDIxEYEeVR5l044bRCuAKDErD/+9VE+Z9fnaTRr+DDz0Avrm4kKai1mHbPx6C0U7BVNthjd/gcMquZZUA==} '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} @@ -321,8 +321,8 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@playwright/test@1.48.2': - resolution: {integrity: sha512-54w1xCWfXuax7dz4W2M9uw0gDyh+ti/0K/MxcCUxChFh37kkdxPdfZDw5QBbuPUJHr1CiHJ1hXgSs+GgeQc5Zw==} + '@playwright/test@1.49.0': + resolution: {integrity: sha512-DMulbwQURa8rNIQrf94+jPJQ4FmOVdpE5ZppRNvWVjvhC+6sOeo28r8MgIpQRYouXRtt/FCCXU7zn20jnHR4Qw==} engines: {node: '>=18'} hasBin: true @@ -358,62 +358,62 @@ packages: '@rsdoctor/utils@0.4.8': resolution: {integrity: sha512-5m0dvwkdKAT5mONAf49oG1JEr+FXSThxwo36tfIHrUPNm3pnx8bDXFL3E5rNb9LK8Va7GFYe6hjmxTxyoaveFg==} - '@rspack/binding-darwin-arm64@1.1.0': - resolution: {integrity: sha512-02YmzmtKMNHCSMzVT5sgbJuPDn+HunkrtWq0D95Fh9sGKYap9cs0JOpzTfyAL3KXJ9JzVfOAZA3VgVQOBaQNWQ==} + '@rspack/binding-darwin-arm64@1.1.3': + resolution: {integrity: sha512-gpLUBMDAS/uEcnE+ODy1ILTeyp1oM4QCq8rRhKHuOfsIe1AZ9Mct59v2omIE/r+R4dnbJ0ikIpto9qJZ6P2u1A==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-x64@1.1.0': - resolution: {integrity: sha512-HtBh8p6hml7BWNtZaqWFtGbOFP/tvFDn1uPWmA3R32WTILUXNRWXIsLDY95U3Z2U1Gt3SL58SOpJjXlFIb6wZg==} + '@rspack/binding-darwin-x64@1.1.3': + resolution: {integrity: sha512-m1G7SzkRfr1oLgghbAxUwj1J7hSKhtskQZiVeqe5tewKimFr6xLpKSTLTnEtlW0gdGNf1+dRMX/4kLMwhOdY7g==} cpu: [x64] os: [darwin] - '@rspack/binding-linux-arm64-gnu@1.1.0': - resolution: {integrity: sha512-Q/i50Pieii3akdv5Q6my6QelV5Dpc8O/Ir4udpjYl0pbSdKamdI8M85fxrMxGAGcoNSD+X52fDvxJujXWMcP0w==} + '@rspack/binding-linux-arm64-gnu@1.1.3': + resolution: {integrity: sha512-MpOrO1oppxAm8J1ztNz6G5DG/oL9ZLHmIz9vYNV6PKnk+MPhCXqfhFmQ2hZm5VIVKuOobfYEJiDUqKg2MLg8gA==} cpu: [arm64] os: [linux] - '@rspack/binding-linux-arm64-musl@1.1.0': - resolution: {integrity: sha512-H7Eu3xC7LWPpxrI47n8X361eEGGpQOjZIWTz8tLdn4oNS2D9kqsBYES7LsuuLTTH4ueHTDuEtDdfZpBsE+qesw==} + '@rspack/binding-linux-arm64-musl@1.1.3': + resolution: {integrity: sha512-PnUDC1JxT6a5hJW0hhJ9ubWk3R+nk7eLXyNaORHyQH4k8o89Zm5GYoKnDgO4eRy41NB9/aBJQJRGSRn0iAsZgw==} cpu: [arm64] os: [linux] - '@rspack/binding-linux-x64-gnu@1.1.0': - resolution: {integrity: sha512-dIZSutPo2z/OaO2f6SVlcYA6lGBH+4TrRtWmMyPshpTNPrkCGGfDhC43fZ4jCiUj2PO/Hcn8jyKhci4leBsVBA==} + '@rspack/binding-linux-x64-gnu@1.1.3': + resolution: {integrity: sha512-+6JgyKXOp2QrHzlru95mge70tDkYlaY4NNE9xyrdj6PgTnM9cVPx4sLVhHC9+tWXaTFnccfEe9Tt6LjKnjHGaA==} cpu: [x64] os: [linux] - '@rspack/binding-linux-x64-musl@1.1.0': - resolution: {integrity: sha512-f6L2JWgbG9PKWnVw2YNZdntjzia1V2w2Xq458HkCQUDwhnEipWXaZ2zhfD9jcb4UYoMP8/2uD3B96sSFFNTdrQ==} + '@rspack/binding-linux-x64-musl@1.1.3': + resolution: {integrity: sha512-X0TJTVL1Roqq/tvN26QO4u62x2xp5tE0dlhwhbeCHrBdgBzc+PHvcv/8lclRcq6lDPzceAgcnNX/+RbWg0DzKg==} cpu: [x64] os: [linux] - '@rspack/binding-win32-arm64-msvc@1.1.0': - resolution: {integrity: sha512-opo6XR4iXh/QkHiauVQBlU2xR2JyjDmSwgkION27oszu81nr+IajTSXQX96x5I6Bq48GQLU4rItHse/doctQDA==} + '@rspack/binding-win32-arm64-msvc@1.1.3': + resolution: {integrity: sha512-Lvpp5Q30YiPNkuOFPawp2al2CTWElPeG3X0E9LFIfPdVkLc/e2nkf5a6zSYtnbD2oaskzQIYN/k27fWqWWcVHA==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-ia32-msvc@1.1.0': - resolution: {integrity: sha512-FBcG+OPJokSE3nPi1+ZamLK2V4IWdNC+GMr0z7LUrBiKc5lO70y5VkldfyPV1Z+doSuroVINlhK+lRHdQgGwYg==} + '@rspack/binding-win32-ia32-msvc@1.1.3': + resolution: {integrity: sha512-tC+xXcbTRX7l+NFnlGK8UhDIJrKma7S/MA1KDol23/I3Vw67EcaHDwG+q2v7uiJsxn9XooIOSCJhPKmUUfZNXg==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-x64-msvc@1.1.0': - resolution: {integrity: sha512-H/6Glp1nZvxWAD5+2hRrp1kBs9f+pLb/un2TdFSUNd2tyXq5GyHCe70+N9psbe/jjGxD8e1vPNQtN/VvkuR0Zg==} + '@rspack/binding-win32-x64-msvc@1.1.3': + resolution: {integrity: sha512-jeRaPJtsD/+m1QINgoDMA6D3kOcTwSHVmGSxR6fznLA5BKa76m8lewuALYxHHq9/qcgwJ4e6UtiwrO2JL3vxVQ==} cpu: [x64] os: [win32] - '@rspack/binding@1.1.0': - resolution: {integrity: sha512-zLduWacrw/bBYiFvhjN70f+AJxXnTzevywXp54vso8d0Nz7z4KIycdz/Ua5AGRUkG2ZuQw6waypN5pXf48EBcA==} + '@rspack/binding@1.1.3': + resolution: {integrity: sha512-fB1ziJ1UXO2P4ZDO+dviSNuxknUqrz6QQ6QGfpC+S1ClUy1HOhHXss/Yn78B/R9py6dlqZzmhmhz2d+XzFVApA==} - '@rspack/cli@1.1.0': - resolution: {integrity: sha512-+xUJhXyJ0gwP/5cNlXIiETZySUXOXiYf8DKPPHQcSf8MuTXnseX5tdC2mhbdHkaYuni9MqlBD+1ppyuvl/49sw==} + '@rspack/cli@1.1.3': + resolution: {integrity: sha512-fEMifh3b7U4lfSrv9VYw6VFAzkoccaFrCvHNmIE4bNPCXIqyVxbiKznE4RI/EhHB27oF4JBpnuvsiLZGDp5KNA==} hasBin: true peerDependencies: '@rspack/core': ^1.0.0-alpha || ^1.x - '@rspack/core@1.1.0': - resolution: {integrity: sha512-+IYWSe9D3wB97VVBfaojuWLv3wGIBe9pfJkxNObkorN60Nj3UHYzBLuACrHn4hW2mZjAWrv06ReHXJUEGzQqaQ==} + '@rspack/core@1.1.3': + resolution: {integrity: sha512-LdM1mAlBtEh9ozbpyWVW5uuL+aJMjYqd531pH5/i/EPDKNrOLrQWVNMa2dh07qLwJZXoTFMf7LWA7QNsmBUPJg==} engines: {node: '>=16.0.0'} peerDependencies: '@swc/helpers': '>=0.5.1' @@ -490,8 +490,8 @@ packages: '@types/node-forge@1.3.11': resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==} - '@types/node@22.9.0': - resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==} + '@types/node@22.9.3': + resolution: {integrity: sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==} '@types/qs@6.9.17': resolution: {integrity: sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==} @@ -514,8 +514,8 @@ packages: '@types/serve-static@1.15.7': resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==} - '@types/serviceworker@0.0.103': - resolution: {integrity: sha512-EOiLGcQeb/r/POn4Nlbz8XVApoYPtLNACbaqpge6sSuydA8nj/5S6oqISFRwQ33n8pIOIrWFm17S9cnmrO2QAw==} + '@types/serviceworker@0.0.105': + resolution: {integrity: sha512-bnALJ34rBKAbecaOCws//ru9Ipe7sWmA0qZQKvTV1w8GdtXc4ekJK1ui2xjDr7vIhFcZHrXUHWSTNGRIiZS0dw==} '@types/sockjs@0.3.36': resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==} @@ -526,8 +526,8 @@ packages: '@types/ws@8.5.13': resolution: {integrity: sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==} - '@typescript-eslint/eslint-plugin@8.13.0': - resolution: {integrity: sha512-nQtBLiZYMUPkclSeC3id+x4uVd1SGtHuElTxL++SfP47jR0zfkZBJHc+gL4qPsgTuypz0k8Y2GheaDYn6Gy3rg==} + '@typescript-eslint/eslint-plugin@8.15.0': + resolution: {integrity: sha512-+zkm9AR1Ds9uLWN3fkoeXgFppaQ+uEVtfOV62dDmsy9QCNqlRHWNEck4yarvRNrvRcHQLGfqBNui3cimoz8XAg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -537,8 +537,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.13.0': - resolution: {integrity: sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==} + '@typescript-eslint/parser@8.15.0': + resolution: {integrity: sha512-7n59qFpghG4uazrF9qtGKBZXn7Oz4sOMm8dwNWDQY96Xlm2oX67eipqcblDj+oY1lLCbf1oltMZFpUso66Kl1A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -547,40 +547,45 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@8.13.0': - resolution: {integrity: sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==} + '@typescript-eslint/scope-manager@8.15.0': + resolution: {integrity: sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.13.0': - resolution: {integrity: sha512-Rqnn6xXTR316fP4D2pohZenJnp+NwQ1mo7/JM+J1LWZENSLkJI8ID8QNtlvFeb0HnFSK94D6q0cnMX6SbE5/vA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/types@8.13.0': - resolution: {integrity: sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@typescript-eslint/typescript-estree@8.13.0': - resolution: {integrity: sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/utils@8.13.0': - resolution: {integrity: sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==} + '@typescript-eslint/type-utils@8.15.0': + resolution: {integrity: sha512-UU6uwXDoI3JGSXmcdnP5d8Fffa2KayOhUUqr/AiBnG1Gl7+7ut/oyagVeSkh7bxQ0zSXV9ptRh/4N15nkCqnpw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true - '@typescript-eslint/visitor-keys@8.13.0': - resolution: {integrity: sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==} + '@typescript-eslint/types@8.15.0': + resolution: {integrity: sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@typescript-eslint/typescript-estree@8.15.0': + resolution: {integrity: sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/utils@8.15.0': + resolution: {integrity: sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/visitor-keys@8.15.0': + resolution: {integrity: sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@webassemblyjs/ast@1.14.1': @@ -643,6 +648,7 @@ packages: acorn-import-assertions@1.9.0: resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} + deprecated: package has been renamed to acorn-import-attributes peerDependencies: acorn: ^8 @@ -772,8 +778,8 @@ packages: resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - bonjour-service@1.2.1: - resolution: {integrity: sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==} + bonjour-service@1.3.0: + resolution: {integrity: sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==} brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -813,8 +819,8 @@ packages: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - caniuse-lite@1.0.30001679: - resolution: {integrity: sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==} + caniuse-lite@1.0.30001683: + resolution: {integrity: sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==} chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -913,8 +919,8 @@ packages: resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==} engines: {node: '>= 0.6'} - cookie@1.0.1: - resolution: {integrity: sha512-Xd8lFX4LM9QEEwxQpF9J9NTUh8pmdJO0cyRJhFiDoLTk2eH8FXlRv2IFGYVadZpqI3j8fhNrSdKCeYPxiAhLXw==} + cookie@1.0.2: + resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} core-util-is@1.0.3: @@ -924,8 +930,8 @@ packages: resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} engines: {node: '>= 0.10'} - cross-spawn@7.0.5: - resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==} + cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} dayjs@1.11.13: @@ -1031,8 +1037,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.5.55: - resolution: {integrity: sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==} + electron-to-chromium@1.5.64: + resolution: {integrity: sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==} emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -1118,8 +1124,8 @@ packages: resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.14.0: - resolution: {integrity: sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==} + eslint@9.15.0: + resolution: {integrity: sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -1252,8 +1258,8 @@ packages: resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} engines: {node: '>=16'} - flatted@3.3.1: - resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} + flatted@3.3.2: + resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==} follow-redirects@1.15.9: resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} @@ -1732,8 +1738,8 @@ packages: resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} engines: {node: '>= 6.13.0'} - node-gyp-build@4.8.2: - resolution: {integrity: sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==} + node-gyp-build@4.8.4: + resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==} hasBin: true node-releases@2.0.18: @@ -1806,8 +1812,8 @@ packages: resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==} engines: {node: '>=8'} - p-retry@6.2.0: - resolution: {integrity: sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==} + p-retry@6.2.1: + resolution: {integrity: sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==} engines: {node: '>=16.17'} package-json-from-dist@1.0.1: @@ -1867,13 +1873,13 @@ packages: resolution: {integrity: sha512-xSEmD4pLnV54t0NOUN16yCl7RIB1c5UUOse5HSyEXtBp+FgFQyPeDutc+Q2ZO7/22vImV7VfEjH/1zV2QuqvYw==} hasBin: true - playwright-core@1.48.2: - resolution: {integrity: sha512-sjjw+qrLFlriJo64du+EK0kJgZzoQPsabGF4lBvsid+3CNIZIYLgnMj9V6JY5VhM2Peh20DJWIVpVljLLnlawA==} + playwright-core@1.49.0: + resolution: {integrity: sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==} engines: {node: '>=18'} hasBin: true - playwright@1.48.2: - resolution: {integrity: sha512-NjYvYgp4BPmiwfe31j4gHLa3J7bD2WiBz8Lk2RoSsmX38SVIARZ18VYjxLjAcDsAhA+F4iSEXTSGgjua0rrlgQ==} + playwright@1.49.0: + resolution: {integrity: sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==} engines: {node: '>=18'} hasBin: true @@ -2211,9 +2217,6 @@ packages: engines: {node: '>=10'} hasBin: true - text-table@0.2.0: - resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} - thingies@1.21.0: resolution: {integrity: sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==} engines: {node: '>=10.18'} @@ -2281,8 +2284,8 @@ packages: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} - typescript@5.6.3: - resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} + typescript@5.7.2: + resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} engines: {node: '>=14.17'} hasBin: true @@ -2496,14 +2499,14 @@ snapshots: '@discoveryjs/json-ext@0.5.7': {} - '@eslint-community/eslint-utils@4.4.1(eslint@9.14.0)': + '@eslint-community/eslint-utils@4.4.1(eslint@9.15.0)': dependencies: - eslint: 9.14.0 + eslint: 9.15.0 eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.1': {} - '@eslint/config-array@0.18.0': + '@eslint/config-array@0.19.0': dependencies: '@eslint/object-schema': 2.1.4 debug: 4.3.7 @@ -2511,9 +2514,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/core@0.7.0': {} + '@eslint/core@0.9.0': {} - '@eslint/eslintrc@3.1.0': + '@eslint/eslintrc@3.2.0': dependencies: ajv: 6.12.6 debug: 4.3.7 @@ -2527,18 +2530,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/js@9.14.0': {} + '@eslint/js@9.15.0': {} '@eslint/object-schema@2.1.4': {} - '@eslint/plugin-kit@0.2.2': + '@eslint/plugin-kit@0.2.3': dependencies: levn: 0.4.1 - '@estruyf/github-actions-reporter@1.9.2(@playwright/test@1.48.2)': + '@estruyf/github-actions-reporter@1.9.2(@playwright/test@1.49.0)': dependencies: '@actions/core': 1.11.1 - '@playwright/test': 1.48.2 + '@playwright/test': 1.49.0 ansi-to-html: 0.7.2 marked: 12.0.2 @@ -2562,7 +2565,7 @@ snapshots: dependencies: fast-deep-equal: 3.1.3 - '@fastify/send@3.1.1': + '@fastify/send@3.2.0': dependencies: '@lukeed/ms': 2.0.2 escape-html: 1.0.3 @@ -2570,10 +2573,10 @@ snapshots: http-errors: 2.0.0 mime: 3.0.0 - '@fastify/static@8.0.2': + '@fastify/static@8.0.3': dependencies: '@fastify/accept-negotiator': 2.0.0 - '@fastify/send': 3.1.1 + '@fastify/send': 3.2.0 content-disposition: 0.5.4 fastify-plugin: 5.0.1 fastq: 1.17.1 @@ -2645,7 +2648,7 @@ snapshots: '@mercuryworkshop/bare-as-module3@2.2.5': dependencies: - typescript: 5.6.3 + typescript: 5.7.2 '@mercuryworkshop/bare-mux@2.1.7': {} @@ -2703,20 +2706,20 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@playwright/test@1.48.2': + '@playwright/test@1.49.0': dependencies: - playwright: 1.48.2 + playwright: 1.49.0 '@polka/url@1.0.0-next.28': {} '@rsdoctor/client@0.4.8': {} - '@rsdoctor/core@0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': + '@rsdoctor/core@0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': dependencies: - '@rsdoctor/graph': 0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) - '@rsdoctor/sdk': 0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) - '@rsdoctor/types': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) - '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) + '@rsdoctor/graph': 0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + '@rsdoctor/sdk': 0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + '@rsdoctor/types': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) + '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) axios: 1.7.7 enhanced-resolve: 5.12.0 filesize: 10.1.6 @@ -2734,10 +2737,10 @@ snapshots: - utf-8-validate - webpack - '@rsdoctor/graph@0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': + '@rsdoctor/graph@0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': dependencies: - '@rsdoctor/types': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) - '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) + '@rsdoctor/types': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) + '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) lodash: 4.17.21 socket.io: 4.7.2(bufferutil@4.0.8)(utf-8-validate@6.0.5) source-map: 0.7.4 @@ -2748,14 +2751,14 @@ snapshots: - utf-8-validate - webpack - '@rsdoctor/rspack-plugin@0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': + '@rsdoctor/rspack-plugin@0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': dependencies: - '@rsdoctor/core': 0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) - '@rsdoctor/graph': 0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) - '@rsdoctor/sdk': 0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) - '@rsdoctor/types': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) - '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) - '@rspack/core': 1.1.0 + '@rsdoctor/core': 0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + '@rsdoctor/graph': 0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + '@rsdoctor/sdk': 0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + '@rsdoctor/types': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) + '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) + '@rspack/core': 1.1.3 lodash: 4.17.21 transitivePeerDependencies: - bufferutil @@ -2764,12 +2767,12 @@ snapshots: - utf-8-validate - webpack - '@rsdoctor/sdk@0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': + '@rsdoctor/sdk@0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': dependencies: '@rsdoctor/client': 0.4.8 - '@rsdoctor/graph': 0.4.8(@rspack/core@1.1.0)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) - '@rsdoctor/types': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) - '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) + '@rsdoctor/graph': 0.4.8(@rspack/core@1.1.3)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + '@rsdoctor/types': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) + '@rsdoctor/utils': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) '@types/fs-extra': 11.0.4 body-parser: 1.20.3 cors: 2.8.5 @@ -2788,7 +2791,7 @@ snapshots: - utf-8-validate - webpack - '@rsdoctor/types@0.4.8(@rspack/core@1.1.0)(webpack@5.95.0)': + '@rsdoctor/types@0.4.8(@rspack/core@1.1.3)(webpack@5.95.0)': dependencies: '@types/connect': 3.4.38 '@types/estree': 1.0.5 @@ -2796,12 +2799,12 @@ snapshots: source-map: 0.7.4 webpack: 5.95.0 optionalDependencies: - '@rspack/core': 1.1.0 + '@rspack/core': 1.1.3 - '@rsdoctor/utils@0.4.8(@rspack/core@1.1.0)(webpack@5.95.0)': + '@rsdoctor/utils@0.4.8(@rspack/core@1.1.3)(webpack@5.95.0)': dependencies: '@babel/code-frame': 7.25.7 - '@rsdoctor/types': 0.4.8(@rspack/core@1.1.0)(webpack@5.95.0) + '@rsdoctor/types': 0.4.8(@rspack/core@1.1.3)(webpack@5.95.0) '@types/estree': 1.0.5 acorn: 8.14.0 acorn-import-assertions: 1.9.0(acorn@8.14.0) @@ -2823,50 +2826,50 @@ snapshots: - supports-color - webpack - '@rspack/binding-darwin-arm64@1.1.0': + '@rspack/binding-darwin-arm64@1.1.3': optional: true - '@rspack/binding-darwin-x64@1.1.0': + '@rspack/binding-darwin-x64@1.1.3': optional: true - '@rspack/binding-linux-arm64-gnu@1.1.0': + '@rspack/binding-linux-arm64-gnu@1.1.3': optional: true - '@rspack/binding-linux-arm64-musl@1.1.0': + '@rspack/binding-linux-arm64-musl@1.1.3': optional: true - '@rspack/binding-linux-x64-gnu@1.1.0': + '@rspack/binding-linux-x64-gnu@1.1.3': optional: true - '@rspack/binding-linux-x64-musl@1.1.0': + '@rspack/binding-linux-x64-musl@1.1.3': optional: true - '@rspack/binding-win32-arm64-msvc@1.1.0': + '@rspack/binding-win32-arm64-msvc@1.1.3': optional: true - '@rspack/binding-win32-ia32-msvc@1.1.0': + '@rspack/binding-win32-ia32-msvc@1.1.3': optional: true - '@rspack/binding-win32-x64-msvc@1.1.0': + '@rspack/binding-win32-x64-msvc@1.1.3': optional: true - '@rspack/binding@1.1.0': + '@rspack/binding@1.1.3': optionalDependencies: - '@rspack/binding-darwin-arm64': 1.1.0 - '@rspack/binding-darwin-x64': 1.1.0 - '@rspack/binding-linux-arm64-gnu': 1.1.0 - '@rspack/binding-linux-arm64-musl': 1.1.0 - '@rspack/binding-linux-x64-gnu': 1.1.0 - '@rspack/binding-linux-x64-musl': 1.1.0 - '@rspack/binding-win32-arm64-msvc': 1.1.0 - '@rspack/binding-win32-ia32-msvc': 1.1.0 - '@rspack/binding-win32-x64-msvc': 1.1.0 + '@rspack/binding-darwin-arm64': 1.1.3 + '@rspack/binding-darwin-x64': 1.1.3 + '@rspack/binding-linux-arm64-gnu': 1.1.3 + '@rspack/binding-linux-arm64-musl': 1.1.3 + '@rspack/binding-linux-x64-gnu': 1.1.3 + '@rspack/binding-linux-x64-musl': 1.1.3 + '@rspack/binding-win32-arm64-msvc': 1.1.3 + '@rspack/binding-win32-ia32-msvc': 1.1.3 + '@rspack/binding-win32-x64-msvc': 1.1.3 - '@rspack/cli@1.1.0(@rspack/core@1.1.0)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': + '@rspack/cli@1.1.3(@rspack/core@1.1.3)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': dependencies: '@discoveryjs/json-ext': 0.5.7 - '@rspack/core': 1.1.0 - '@rspack/dev-server': 1.0.9(@rspack/core@1.1.0)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) + '@rspack/core': 1.1.3 + '@rspack/dev-server': 1.0.9(@rspack/core@1.1.3)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0) colorette: 2.0.19 exit-hook: 4.0.0 interpret: 3.1.1 @@ -2883,16 +2886,16 @@ snapshots: - webpack - webpack-cli - '@rspack/core@1.1.0': + '@rspack/core@1.1.3': dependencies: '@module-federation/runtime-tools': 0.5.1 - '@rspack/binding': 1.1.0 + '@rspack/binding': 1.1.3 '@rspack/lite-tapable': 1.0.1 - caniuse-lite: 1.0.30001679 + caniuse-lite: 1.0.30001683 - '@rspack/dev-server@1.0.9(@rspack/core@1.1.0)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': + '@rspack/dev-server@1.0.9(@rspack/core@1.1.3)(@types/express@4.17.21)(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack@5.95.0)': dependencies: - '@rspack/core': 1.1.0 + '@rspack/core': 1.1.3 chokidar: 3.6.0 connect-history-api-fallback: 2.0.0 express: 4.21.1 @@ -2918,26 +2921,26 @@ snapshots: '@types/body-parser@1.19.5': dependencies: '@types/connect': 3.4.38 - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/bonjour@3.5.13': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/connect-history-api-fallback@1.5.4': dependencies: '@types/express-serve-static-core': 5.0.1 - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/connect@3.4.38': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/cookie@0.4.1': {} '@types/cors@2.8.17': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/eslint@9.6.1': dependencies: @@ -2950,14 +2953,14 @@ snapshots: '@types/express-serve-static-core@4.19.6': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/qs': 6.9.17 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 '@types/express-serve-static-core@5.0.1': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/qs': 6.9.17 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -2972,27 +2975,27 @@ snapshots: '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/http-errors@2.0.4': {} '@types/http-proxy@1.17.15': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/json-schema@7.0.15': {} '@types/jsonfile@6.1.4': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/mime@1.3.5': {} '@types/node-forge@1.3.11': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 - '@types/node@22.9.0': + '@types/node@22.9.3': dependencies: undici-types: 6.19.8 @@ -3007,7 +3010,7 @@ snapshots: '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/serve-index@1.9.4': dependencies: @@ -3016,14 +3019,14 @@ snapshots: '@types/serve-static@1.15.7': dependencies: '@types/http-errors': 2.0.4 - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/send': 0.17.4 - '@types/serviceworker@0.0.103': {} + '@types/serviceworker@0.0.105': {} '@types/sockjs@0.3.36': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 '@types/tapable@2.2.7': dependencies: @@ -3031,88 +3034,89 @@ snapshots: '@types/ws@8.5.13': dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 - '@typescript-eslint/eslint-plugin@8.13.0(@typescript-eslint/parser@8.13.0(eslint@9.14.0)(typescript@5.6.3))(eslint@9.14.0)(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.15.0(@typescript-eslint/parser@8.15.0(eslint@9.15.0)(typescript@5.7.2))(eslint@9.15.0)(typescript@5.7.2)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.13.0(eslint@9.14.0)(typescript@5.6.3) - '@typescript-eslint/scope-manager': 8.13.0 - '@typescript-eslint/type-utils': 8.13.0(eslint@9.14.0)(typescript@5.6.3) - '@typescript-eslint/utils': 8.13.0(eslint@9.14.0)(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.13.0 - eslint: 9.14.0 + '@typescript-eslint/parser': 8.15.0(eslint@9.15.0)(typescript@5.7.2) + '@typescript-eslint/scope-manager': 8.15.0 + '@typescript-eslint/type-utils': 8.15.0(eslint@9.15.0)(typescript@5.7.2) + '@typescript-eslint/utils': 8.15.0(eslint@9.15.0)(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.15.0 + eslint: 9.15.0 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.4.0(typescript@5.6.3) + ts-api-utils: 1.4.0(typescript@5.7.2) optionalDependencies: - typescript: 5.6.3 + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.13.0(eslint@9.14.0)(typescript@5.6.3)': + '@typescript-eslint/parser@8.15.0(eslint@9.15.0)(typescript@5.7.2)': dependencies: - '@typescript-eslint/scope-manager': 8.13.0 - '@typescript-eslint/types': 8.13.0 - '@typescript-eslint/typescript-estree': 8.13.0(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.13.0 + '@typescript-eslint/scope-manager': 8.15.0 + '@typescript-eslint/types': 8.15.0 + '@typescript-eslint/typescript-estree': 8.15.0(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.15.0 debug: 4.3.7 - eslint: 9.14.0 + eslint: 9.15.0 optionalDependencies: - typescript: 5.6.3 + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.13.0': + '@typescript-eslint/scope-manager@8.15.0': dependencies: - '@typescript-eslint/types': 8.13.0 - '@typescript-eslint/visitor-keys': 8.13.0 + '@typescript-eslint/types': 8.15.0 + '@typescript-eslint/visitor-keys': 8.15.0 - '@typescript-eslint/type-utils@8.13.0(eslint@9.14.0)(typescript@5.6.3)': + '@typescript-eslint/type-utils@8.15.0(eslint@9.15.0)(typescript@5.7.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.13.0(typescript@5.6.3) - '@typescript-eslint/utils': 8.13.0(eslint@9.14.0)(typescript@5.6.3) + '@typescript-eslint/typescript-estree': 8.15.0(typescript@5.7.2) + '@typescript-eslint/utils': 8.15.0(eslint@9.15.0)(typescript@5.7.2) debug: 4.3.7 - ts-api-utils: 1.4.0(typescript@5.6.3) + eslint: 9.15.0 + ts-api-utils: 1.4.0(typescript@5.7.2) optionalDependencies: - typescript: 5.6.3 + typescript: 5.7.2 transitivePeerDependencies: - - eslint - supports-color - '@typescript-eslint/types@8.13.0': {} + '@typescript-eslint/types@8.15.0': {} - '@typescript-eslint/typescript-estree@8.13.0(typescript@5.6.3)': + '@typescript-eslint/typescript-estree@8.15.0(typescript@5.7.2)': dependencies: - '@typescript-eslint/types': 8.13.0 - '@typescript-eslint/visitor-keys': 8.13.0 + '@typescript-eslint/types': 8.15.0 + '@typescript-eslint/visitor-keys': 8.15.0 debug: 4.3.7 fast-glob: 3.3.2 is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.4.0(typescript@5.6.3) + ts-api-utils: 1.4.0(typescript@5.7.2) optionalDependencies: - typescript: 5.6.3 + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.13.0(eslint@9.14.0)(typescript@5.6.3)': + '@typescript-eslint/utils@8.15.0(eslint@9.15.0)(typescript@5.7.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0) - '@typescript-eslint/scope-manager': 8.13.0 - '@typescript-eslint/types': 8.13.0 - '@typescript-eslint/typescript-estree': 8.13.0(typescript@5.6.3) - eslint: 9.14.0 + '@eslint-community/eslint-utils': 4.4.1(eslint@9.15.0) + '@typescript-eslint/scope-manager': 8.15.0 + '@typescript-eslint/types': 8.15.0 + '@typescript-eslint/typescript-estree': 8.15.0(typescript@5.7.2) + eslint: 9.15.0 + optionalDependencies: + typescript: 5.7.2 transitivePeerDependencies: - supports-color - - typescript - '@typescript-eslint/visitor-keys@8.13.0': + '@typescript-eslint/visitor-keys@8.15.0': dependencies: - '@typescript-eslint/types': 8.13.0 - eslint-visitor-keys: 3.4.3 + '@typescript-eslint/types': 8.15.0 + eslint-visitor-keys: 4.2.0 '@webassemblyjs/ast@1.14.1': dependencies: @@ -3323,7 +3327,7 @@ snapshots: transitivePeerDependencies: - supports-color - bonjour-service@1.2.1: + bonjour-service@1.3.0: dependencies: fast-deep-equal: 3.1.3 multicast-dns: 7.2.5 @@ -3343,8 +3347,8 @@ snapshots: browserslist@4.24.2: dependencies: - caniuse-lite: 1.0.30001679 - electron-to-chromium: 1.5.55 + caniuse-lite: 1.0.30001683 + electron-to-chromium: 1.5.64 node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.2) @@ -3352,7 +3356,7 @@ snapshots: bufferutil@4.0.8: dependencies: - node-gyp-build: 4.8.2 + node-gyp-build: 4.8.4 bundle-name@4.1.0: dependencies: @@ -3370,7 +3374,7 @@ snapshots: callsites@3.1.0: {} - caniuse-lite@1.0.30001679: {} + caniuse-lite@1.0.30001683: {} chalk@2.4.2: dependencies: @@ -3474,7 +3478,7 @@ snapshots: cookie@0.7.1: {} - cookie@1.0.1: {} + cookie@1.0.2: {} core-util-is@1.0.3: {} @@ -3483,7 +3487,7 @@ snapshots: object-assign: 4.1.1 vary: 1.1.2 - cross-spawn@7.0.5: + cross-spawn@7.0.6: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 @@ -3568,7 +3572,7 @@ snapshots: ee-first@1.1.1: {} - electron-to-chromium@1.5.55: {} + electron-to-chromium@1.5.64: {} emoji-regex@8.0.0: {} @@ -3584,7 +3588,7 @@ snapshots: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.17 - '@types/node': 22.9.0 + '@types/node': 22.9.3 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -3643,15 +3647,15 @@ snapshots: eslint-visitor-keys@4.2.0: {} - eslint@9.14.0: + eslint@9.15.0: dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.15.0) '@eslint-community/regexpp': 4.12.1 - '@eslint/config-array': 0.18.0 - '@eslint/core': 0.7.0 - '@eslint/eslintrc': 3.1.0 - '@eslint/js': 9.14.0 - '@eslint/plugin-kit': 0.2.2 + '@eslint/config-array': 0.19.0 + '@eslint/core': 0.9.0 + '@eslint/eslintrc': 3.2.0 + '@eslint/js': 9.15.0 + '@eslint/plugin-kit': 0.2.3 '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.1 @@ -3659,7 +3663,7 @@ snapshots: '@types/json-schema': 7.0.15 ajv: 6.12.6 chalk: 4.1.2 - cross-spawn: 7.0.5 + cross-spawn: 7.0.6 debug: 4.3.7 escape-string-regexp: 4.0.0 eslint-scope: 8.2.0 @@ -3679,7 +3683,6 @@ snapshots: minimatch: 3.1.2 natural-compare: 1.4.0 optionator: 0.9.4 - text-table: 0.2.0 transitivePeerDependencies: - supports-color @@ -3711,7 +3714,7 @@ snapshots: execa@5.1.1: dependencies: - cross-spawn: 7.0.5 + cross-spawn: 7.0.6 get-stream: 6.0.1 human-signals: 2.1.0 is-stream: 2.0.1 @@ -3870,16 +3873,16 @@ snapshots: flat-cache@4.0.1: dependencies: - flatted: 3.3.1 + flatted: 3.3.2 keyv: 4.5.4 - flatted@3.3.1: {} + flatted@3.3.2: {} follow-redirects@1.15.9: {} foreground-child@3.3.0: dependencies: - cross-spawn: 7.0.5 + cross-spawn: 7.0.6 signal-exit: 4.1.0 form-data@4.0.1: @@ -4131,7 +4134,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 22.9.0 + '@types/node': 22.9.3 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -4181,7 +4184,7 @@ snapshots: light-my-request@6.3.0: dependencies: - cookie: 1.0.1 + cookie: 1.0.2 process-warning: 4.0.0 set-cookie-parser: 2.7.1 @@ -4278,7 +4281,7 @@ snapshots: node-forge@1.3.1: {} - node-gyp-build@4.8.2: {} + node-gyp-build@4.8.4: {} node-releases@2.0.18: {} @@ -4347,7 +4350,7 @@ snapshots: '@types/retry': 0.12.0 retry: 0.13.1 - p-retry@6.2.0: + p-retry@6.2.1: dependencies: '@types/retry': 0.12.2 is-network-error: 1.1.0 @@ -4409,11 +4412,11 @@ snapshots: sonic-boom: 4.2.0 thread-stream: 3.1.0 - playwright-core@1.48.2: {} + playwright-core@1.49.0: {} - playwright@1.48.2: + playwright@1.49.0: dependencies: - playwright-core: 1.48.2 + playwright-core: 1.49.0 optionalDependencies: fsevents: 2.3.2 @@ -4786,8 +4789,6 @@ snapshots: commander: 2.20.3 source-map-support: 0.5.21 - text-table@0.2.0: {} - thingies@1.21.0(tslib@2.8.1): dependencies: tslib: 2.8.1 @@ -4818,9 +4819,9 @@ snapshots: dependencies: tslib: 2.8.1 - ts-api-utils@1.4.0(typescript@5.6.3): + ts-api-utils@1.4.0(typescript@5.7.2): dependencies: - typescript: 5.6.3 + typescript: 5.7.2 tslib@2.8.1: {} @@ -4837,7 +4838,7 @@ snapshots: media-typer: 0.3.0 mime-types: 2.1.35 - typescript@5.6.3: {} + typescript@5.7.2: {} undici-types@6.19.8: {} @@ -4861,7 +4862,7 @@ snapshots: utf-8-validate@6.0.5: dependencies: - node-gyp-build: 4.8.2 + node-gyp-build: 4.8.4 util-deprecate@1.0.2: {} @@ -4934,7 +4935,7 @@ snapshots: '@types/sockjs': 0.3.36 '@types/ws': 8.5.13 ansi-html-community: 0.0.8 - bonjour-service: 1.2.1 + bonjour-service: 1.3.0 chokidar: 3.6.0 colorette: 2.0.19 compression: 1.7.5 @@ -4947,7 +4948,7 @@ snapshots: ipaddr.js: 2.2.0 launch-editor: 2.9.1 open: 10.1.0 - p-retry: 6.2.0 + p-retry: 6.2.1 rimraf: 5.0.10 schema-utils: 4.2.0 selfsigned: 2.4.1 diff --git a/src/client/dom/element.ts b/src/client/dom/element.ts index 46b47cf..943e7a1 100644 --- a/src/client/dom/element.ts +++ b/src/client/dom/element.ts @@ -233,13 +233,11 @@ export default function (client: ScramjetClient, self: typeof window) { const realwin = ctx.get() as Window; if (!realwin) return realwin; - if (SCRAMJETCLIENT in realwin.self) { - // if (realwin.location.href.includes("accounts.google.com")) return null; // don't question it - - return realwin.self[SCRAMJETCLIENT].globalProxy; + if (SCRAMJETCLIENT in realwin) { + return realwin[SCRAMJETCLIENT].globalProxy; } else { // hook the iframe - const newclient = new ScramjetClient(realwin.self); + const newclient = new ScramjetClient(realwin); newclient.hook(); return newclient.globalProxy; @@ -254,10 +252,10 @@ export default function (client: ScramjetClient, self: typeof window) { const realwin = contentwindow.apply(ctx.this); if (!realwin) return realwin; - if (SCRAMJETCLIENT in realwin.self) { - return realwin.self[SCRAMJETCLIENT].documentProxy; + if (SCRAMJETCLIENT in realwin) { + return realwin[SCRAMJETCLIENT].documentProxy; } else { - const newclient = new ScramjetClient(realwin.self); + const newclient = new ScramjetClient(realwin); newclient.hook(); return newclient.documentProxy; diff --git a/src/client/dom/open.ts b/src/client/dom/open.ts index 4a4dd38..2644268 100644 --- a/src/client/dom/open.ts +++ b/src/client/dom/open.ts @@ -14,10 +14,10 @@ export default function (client: ScramjetClient) { if (!realwin) return ctx.return(realwin); - if (SCRAMJETCLIENT in realwin.self) { - return ctx.return(realwin.self[SCRAMJETCLIENT].globalProxy.window); + if (SCRAMJETCLIENT in realwin) { + return ctx.return(realwin[SCRAMJETCLIENT].globalProxy); } else { - const newclient = new ScramjetClient(realwin.self); + const newclient = new ScramjetClient(realwin); // hook the opened window newclient.hook(); @@ -31,8 +31,8 @@ export default function (client: ScramjetClient) { get(ctx) { const realwin = ctx.get() as Window; - if (realwin && SCRAMJETCLIENT in realwin.self) { - return realwin.self[SCRAMJETCLIENT].globalProxy; + if (realwin && SCRAMJETCLIENT in realwin) { + return realwin[SCRAMJETCLIENT].globalProxy; } else { // the opener has to have been already hooked, so if we reach here then it's a real window return undefined; diff --git a/src/client/shared/wrap.ts b/src/client/shared/wrap.ts index b0b95ba..c9d1506 100644 --- a/src/client/shared/wrap.ts +++ b/src/client/shared/wrap.ts @@ -13,9 +13,9 @@ export function createWrapFn(client: ScramjetClient, self: typeof globalThis) { if (iswindow) { if (identifier === self.parent) { - if (SCRAMJETCLIENT in self.parent.self) { + if (SCRAMJETCLIENT in self.parent) { // ... then we're in a subframe, and the parent frame is also in a proxy context, so we should return its proxy - return self.parent.self[SCRAMJETCLIENT].globalProxy; + return self.parent[SCRAMJETCLIENT].globalProxy; } else { // ... then we should pretend we aren't nested and return the current window return client.globalProxy; @@ -24,7 +24,7 @@ export function createWrapFn(client: ScramjetClient, self: typeof globalThis) { return client.documentProxy; } else if (identifier === self.top) { // instead of returning top, we need to return the uppermost parent that's inside a scramjet context - let current = self.self; + let current = self; for (;;) { const test = current.parent.self; @@ -37,7 +37,7 @@ export function createWrapFn(client: ScramjetClient, self: typeof globalThis) { current = test; } - return current[SCRAMJETCLIENT].globalProxy.window; + return current[SCRAMJETCLIENT].globalProxy; } } diff --git a/static/sw.js b/static/sw.js index a16dfc4..106366e 100644 --- a/static/sw.js +++ b/static/sw.js @@ -35,33 +35,36 @@ self.addEventListener("message", ({ data }) => { }); scramjet.addEventListener("request", (e) => { - let headers = {}; - if (playgroundData && e.url.href === playgroundData.origin + "/") { - headers["content-type"] = "text/html"; - e.response = new Response(playgroundData.html, { - headers, - }); - } else if ( - playgroundData && - e.url.href === playgroundData.origin + "/style.css" - ) { - headers["content-type"] = "text/css"; - e.response = new Response(playgroundData.css, { - headers, - }); - } else if ( - playgroundData && - e.url.href === playgroundData.origin + "/script.js" - ) { - headers["content-type"] = "application/javascript"; - e.response = new Response(playgroundData.js, { - headers, - }); + if (playgroundData && e.url.href.startsWith(playgroundData.origin)) { + const headers = {}; + const origin = playgroundData.origin; + if (e.url.href === origin + "/") { + headers["content-type"] = "text/html"; + e.response = new Response(playgroundData.html, { + headers, + }); + } else if (e.url.href === origin + "/style.css") { + headers["content-type"] = "text/css"; + e.response = new Response(playgroundData.css, { + headers, + }); + } else if (e.url.href === origin + "/script.js") { + headers["content-type"] = "application/javascript"; + e.response = new Response(playgroundData.js, { + headers, + }); + e.response.rawHeaders = headers; + e.response.rawResponse = { + body: e.response.body, + headers: headers, + status: e.response.status, + statusText: e.response.statusText, + }; + e.response.finalURL = e.url.toString(); + } else { + return; + } } else { return; } - if (playgroundData) { - e.response.rawHeaders = headers; - e.response.finalURL = e.url.toString(); - } });