From deb27b8ceee7e2c1618224806262421fb4ab401f Mon Sep 17 00:00:00 2001 From: Abdur-Rahman Fashola Date: Sat, 25 May 2024 11:47:39 +0100 Subject: [PATCH 1/2] fix(push): fixed missing `web-push` error --- package-lock.json | 199 ++++++++++++++++++++------ packages/push/package.json | 3 +- packages/push/server/notifications.ts | 2 +- playground/package.json | 4 +- 4 files changed, 163 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbef6a4b..7ec6ca0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1685,7 +1685,7 @@ "version": "0.3.6", "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "devOptional": true, + "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25" @@ -1929,6 +1929,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, "optional": true, "engines": { "node": ">=14" @@ -2079,6 +2080,7 @@ "cpu": [ "arm" ], + "dev": true, "optional": true, "os": [ "android" @@ -2094,6 +2096,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "android" @@ -2109,6 +2112,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "android" @@ -2124,6 +2128,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -2139,6 +2144,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -2154,6 +2160,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -2169,6 +2176,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -2184,6 +2192,7 @@ "cpu": [ "arm" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2199,6 +2208,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2214,6 +2224,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2229,6 +2240,7 @@ "cpu": [ "loong64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2244,6 +2256,7 @@ "cpu": [ "mips64el" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2259,6 +2272,7 @@ "cpu": [ "ppc64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2274,6 +2288,7 @@ "cpu": [ "riscv64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2289,6 +2304,7 @@ "cpu": [ "s390x" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2304,6 +2320,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -2319,6 +2336,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "netbsd" @@ -2334,6 +2352,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "openbsd" @@ -2349,6 +2368,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "sunos" @@ -2364,6 +2384,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -2379,6 +2400,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "win32" @@ -2394,6 +2416,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -3988,6 +4011,17 @@ "node": ">=0.4.0" } }, + "node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -4267,6 +4301,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, "node_modules/assertion-error": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", @@ -4434,6 +4479,11 @@ "readable-stream": "^3.4.0" } }, + "node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + }, "node_modules/body-parser": { "version": "1.20.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", @@ -4564,6 +4614,11 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -5691,6 +5746,14 @@ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -8348,6 +8411,14 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "node_modules/http_ece": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.0.tgz", + "integrity": "sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==", + "engines": { + "node": ">=16" + } + }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -8363,6 +8434,18 @@ "node": ">= 0.8" } }, + "node_modules/https-proxy-agent": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", + "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/human-signals": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", @@ -9337,6 +9420,25 @@ "node": ">=4.0" } }, + "node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -10883,6 +10985,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + }, "node_modules/minimatch": { "version": "9.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", @@ -13906,7 +14013,7 @@ "version": "5.31.0", "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", - "devOptional": true, + "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -13924,7 +14031,7 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "devOptional": true + "dev": true }, "node_modules/test-exclude": { "version": "6.0.0", @@ -15315,6 +15422,7 @@ "cpu": [ "ppc64" ], + "dev": true, "optional": true, "os": [ "aix" @@ -15330,6 +15438,7 @@ "cpu": [ "arm" ], + "dev": true, "optional": true, "os": [ "android" @@ -15345,6 +15454,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "android" @@ -15360,6 +15470,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "android" @@ -15375,6 +15486,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -15390,6 +15502,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "darwin" @@ -15405,6 +15518,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -15420,6 +15534,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "freebsd" @@ -15435,6 +15550,7 @@ "cpu": [ "arm" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15450,6 +15566,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15465,6 +15582,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15480,6 +15598,7 @@ "cpu": [ "loong64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15495,6 +15614,7 @@ "cpu": [ "mips64el" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15510,6 +15630,7 @@ "cpu": [ "ppc64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15525,6 +15646,7 @@ "cpu": [ "riscv64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15540,6 +15662,7 @@ "cpu": [ "s390x" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15555,6 +15678,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "linux" @@ -15570,6 +15694,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "netbsd" @@ -15585,6 +15710,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "openbsd" @@ -15600,6 +15726,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "sunos" @@ -15615,6 +15742,7 @@ "cpu": [ "arm64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -15630,6 +15758,7 @@ "cpu": [ "ia32" ], + "dev": true, "optional": true, "os": [ "win32" @@ -15645,6 +15774,7 @@ "cpu": [ "x64" ], + "dev": true, "optional": true, "os": [ "win32" @@ -15789,6 +15919,24 @@ "@zxing/text-encoding": "0.9.0" } }, + "node_modules/web-push": { + "version": "3.6.7", + "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz", + "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==", + "dependencies": { + "asn1.js": "^5.3.0", + "http_ece": "1.2.0", + "https-proxy-agent": "^7.0.0", + "jws": "^4.0.0", + "minimist": "^1.2.5" + }, + "bin": { + "web-push": "src/cli.js" + }, + "engines": { + "node": ">= 16" + } + }, "node_modules/web-streams-polyfill": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", @@ -16472,7 +16620,8 @@ "version": "2.10.1", "license": "MIT", "dependencies": { - "bcryptjs": "^2.4.3" + "bcryptjs": "^2.4.3", + "web-push": "^3.6.7" }, "devDependencies": { "@remix-pwa/eslint-config": "^0.0.0", @@ -16487,7 +16636,7 @@ }, "packages/sw": { "name": "@remix-pwa/sw", - "version": "3.0.6", + "version": "3.0.7", "license": "MIT", "dependencies": { "@remix-run/server-runtime": "^2.8.1", @@ -16519,10 +16668,10 @@ }, "packages/sync": { "name": "@remix-pwa/sync", - "version": "3.0.1", + "version": "3.0.2", "license": "MIT", "dependencies": { - "@remix-pwa/sw": "^3.0.6", + "@remix-pwa/sw": "^3.0.7", "idb": "^8.0.0" }, "devDependencies": { @@ -16568,8 +16717,8 @@ "dependencies": { "@remix-pwa/client": "3.0.4", "@remix-pwa/push": "2.10.1", - "@remix-pwa/sw": "3.0.5", - "@remix-pwa/sync": "3.0.0", + "@remix-pwa/sw": "3.0.7", + "@remix-pwa/sync": "3.0.2", "@remix-pwa/worker-runtime": "2.1.2", "@remix-run/node": "^2.8.1", "@remix-run/react": "^2.8.1", @@ -16598,38 +16747,6 @@ "engines": { "node": ">=14.0.0" } - }, - "playground/node_modules/@remix-pwa/sw": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@remix-pwa/sw/-/sw-3.0.5.tgz", - "integrity": "sha512-SfvrRLApYe7XCnvCOdwBKP6Ok89M1NZhVL2Ufeju64IenEUEHmO6Vi6hDc3XKOFsNTFkhxJdc+llwA4oH42yOg==", - "dependencies": { - "@remix-run/server-runtime": "^2.8.1", - "idb": "^8.0.0", - "pako": "^2.1.0", - "tiny-invariant": "^1.3.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "@remix-run/dev": "^2.5.1", - "@remix-run/react": "^2.5.1", - "react": "^18.2.0", - "react-dom": "^18.2.0" - } - }, - "playground/node_modules/@remix-pwa/sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@remix-pwa/sync/-/sync-3.0.0.tgz", - "integrity": "sha512-2uya7lt79cQgimVuEXkKakzkSrPzcJkQjCab30ZWYag/vxCEqbds8lczg9WlcSAEfOK485aJMjYaiu7+Yhn45Q==", - "dependencies": { - "@remix-pwa/sw": "^3.0.5", - "idb": "^8.0.0" - }, - "engines": { - "node": ">=18.0.0" - } } } } diff --git a/packages/push/package.json b/packages/push/package.json index c3001348..66898308 100644 --- a/packages/push/package.json +++ b/packages/push/package.json @@ -61,6 +61,7 @@ "@types/web-push": "^3.6.3" }, "dependencies": { - "bcryptjs": "^2.4.3" + "bcryptjs": "^2.4.3", + "web-push": "^3.6.7" } } diff --git a/packages/push/server/notifications.ts b/packages/push/server/notifications.ts index c9d3ea00..3de24fbc 100644 --- a/packages/push/server/notifications.ts +++ b/packages/push/server/notifications.ts @@ -1,4 +1,4 @@ -import * as webpush from 'web-push'; +import webpush from 'web-push'; import type { SendNotificationParams } from './types.js'; diff --git a/playground/package.json b/playground/package.json index ad06d797..4ceccef1 100644 --- a/playground/package.json +++ b/playground/package.json @@ -23,8 +23,8 @@ "dependencies": { "@remix-pwa/client": "3.0.4", "@remix-pwa/push": "2.10.1", - "@remix-pwa/sw": "3.0.6", - "@remix-pwa/sync": "3.0.1", + "@remix-pwa/sw": "3.0.7", + "@remix-pwa/sync": "3.0.2", "@remix-pwa/worker-runtime": "2.1.2", "@remix-run/node": "^2.8.1", "@remix-run/react": "^2.8.1", From 5d588b3f0406ebceb9e4ee7a4635c94944dd95b9 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 25 May 2024 10:57:32 +0000 Subject: [PATCH 2/2] chore(release): @remix-pwa/push@2.10.2-dev.1 [skip ci] ## @remix-pwa/push 2.10.2-dev.1 (2024-05-25) ### Bug Fixes * **push:** fixed missing `web-push` error deb27b8 --- packages/push/CHANGELOG.md | 7 +++++++ packages/push/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/push/CHANGELOG.md b/packages/push/CHANGELOG.md index fc2f962e..3df8d942 100644 --- a/packages/push/CHANGELOG.md +++ b/packages/push/CHANGELOG.md @@ -1,3 +1,10 @@ +## @remix-pwa/push 2.10.2-dev.1 (2024-05-25) + + +### Bug Fixes + +* **push:** fixed missing `web-push` error deb27b8 + ## @remix-pwa/push 2.10.1 (2024-05-11) diff --git a/packages/push/package.json b/packages/push/package.json index 66898308..3fcee0aa 100644 --- a/packages/push/package.json +++ b/packages/push/package.json @@ -1,6 +1,6 @@ { "name": "@remix-pwa/push", - "version": "2.10.1", + "version": "2.10.2-dev.1", "description": "A package to handle everything Push API in the browser and server", "repository": { "type": "git",