diff --git a/README.md b/README.md index e769fc5..36af33c 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ It was made for my personal use but is available publicly in the hopes that it m ## Deploy +For the time being, Wrangler 1 is required: `npm i -g @cloudflare/wrangler` +This will change in future. + To deploy to your Cloudflare Workers account, edit the relevant entries in `wrangler.toml`, add a secret with `wrangler secret put WORKERLINKS_SECRET` and use `wrangler publish`. For debugging, you either can use `wrangler preview`, though note you will need to login and configure a preview KV namespace in `wrangler.toml` - or use Miniflare (See below). diff --git a/index.js b/index.js index 3acb08b..e740319 100644 --- a/index.js +++ b/index.js @@ -15,6 +15,7 @@ async function handleRequest(request) { } else { secret = WORKERLINKS_SECRET } + var key = new URL(request.url).pathname var shorturl = new URL(request.url).origin + key @@ -27,17 +28,14 @@ async function handleRequest(request) { ) } else if (request.method == 'POST') { if (key != '/') { - return new Response( - JSON.stringify({ - code: '405 Method Not Allowed', - message: 'POST not valid for individual keys. Did you mean PUT?', - }), + return Response.json( { - status: 405, - headers: { - 'Content-Type': 'application/json', - }, + code: '405 Method Not Allowed', + message: 'POST not valid for individual keys. Did you mean PUT?' }, + { + status: 405 + } ) } key = '/' + Math.random().toString(36).slice(5) @@ -51,103 +49,68 @@ async function handleRequest(request) { } else if (request.method == 'GET' || request.method == 'HEAD') { let url = await kv.get(key) if (url == null) { - return new Response( - JSON.stringify( - { - code: '404 Not Found', - message: 'Key does not exist or has not propagated.', - }, - null, - 2, - ), + return Response.json( { - status: 404, - headers: { - 'Content-Type': 'application/json', - }, + code: '404 Not Found', + message: 'Key does not exist or has not propagated.' }, + { + status: 404 + } ) } else { return new Response(null, { status: 302, headers: { Location: url } }) } } else if (request.method == 'DELETE') { if (request.headers.get('Authorization') != secret) { - return new Response( - JSON.stringify( - { - code: '401 Unauthorized', - message: 'Unauthorized.', - }, - null, - 2, - ), + return Response.json( { - status: 401, - headers: { - 'Content-Type': 'application/json', - }, + code: '401 Unauthorized', + message: 'Unauthorized.' }, + { + status: 401 + } ) } shorturl = new URL(request.url).origin + key let url = await kv.get(key) if (url == null) { - return new Response( - JSON.stringify( - { - code: '404 Not Found', - message: 'Key does not exist or has not propagated.', - }, - null, - 2, - ), + return Response.json( + { + code: '404 Not Found', + message: 'Key does not exist or has not propagated.' + }, { status: 404, - headers: { - 'Content-Type': 'application/json', - }, - }, + } ) } else { await kv.delete(key) - return new Response( - JSON.stringify( - { - message: 'Short URL deleted succesfully.', - key: key.substr(1), - shorturl: shorturl, - longurl: url, - }, - null, - 2, - ), + return Response.json( { - status: 200, - headers: { - 'Content-Type': 'application/json', - }, + message: 'Short URL deleted succesfully.', + key: key.substr(1), + shorturl: shorturl, + longurl: url }, + { + status: 200 + } ) } } - return new Response( - JSON.stringify( - { - code: '405 Method Not Allowed', - message: - 'Unsupported method. Please use one of GET, PUT, POST, DELETE, HEAD.', - }, - null, - 2, - ), + return Response.json( { - status: 405, - headers: { - 'Content-Type': 'application/json', - }, + code: '405 Method Not Allowed', + message: + 'Unsupported method. Please use one of GET, PUT, POST, DELETE, HEAD.' }, + { + status: 405 + } ) } @@ -166,60 +129,39 @@ function validateUrl(url) { async function putLink(givenSecret, shorturl, key, url) { if (givenSecret != secret) { - return new Response( - JSON.stringify( - { - code: '401 Unauthorized', - message: 'Unauthorized.', - }, - null, - 2, - ), + return Response.json( { - status: 401, - headers: { - 'Content-Type': 'application/json', - }, + code: '401 Unauthorized', + message: 'Unauthorized.' }, + { + status: 401 + } ) } if (url == null || !validateUrl(url)) { - return new Response( - JSON.stringify( - { - code: '400 Bad Request', - message: "No valid URL given. Please set a 'URL' header.", - }, - null, - 2, - ), + return Response.json( { - status: 400, - headers: { - 'Content-Type': 'application/json', - }, + code: '400 Bad Request', + message: "No valid URL given. Please set a 'URL' header." }, + { + status: 400 + } ) } await kv.put(key, url) - return new Response( - JSON.stringify( - { - message: 'URL created succesfully.', - key: key.substr(1), - shorturl: shorturl, - longurl: url, - }, - null, - 2, - ), + return Response.json( { - status: 200, - headers: { - 'Content-Type': 'application/json', - }, + message: 'URL created succesfully.', + key: key.substr(1), + shorturl: shorturl, + longurl: url }, + { + status: 200 + } ) } diff --git a/package.json b/package.json index f53cf5e..170cf3c 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "author": "Erisa A", "license": "MIT", "devDependencies": { - "@cloudflare/wrangler": "^1.19.1", - "miniflare": "^2.3.0", + "@cloudflare/wrangler": "^1.19.12", + "miniflare": "^2.5.0", "prettier": "^2.6.1" } } diff --git a/wrangler.toml b/wrangler.toml index faf3817..990b3af 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -7,7 +7,7 @@ zone_id = "f0af03c025f4c50c50e71ed4e08dd754" kv_namespaces = [ { binding = "kv", id = "1be44406edc142a084435e24dbf8ae1d", preview_id = "15cfb90ecd654b8f8a9ccd600832093f" }] compatibility_flags = [] -compatibility_date = "2021-11-13" +compatibility_date = "2022-06-06" # Remove or comment out the route line if using workers_dev workers_dev = false diff --git a/yarn.lock b/yarn.lock index 3c3110a..eef6839 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@cloudflare/wrangler@^1.19.1": - version "1.19.11" - resolved "https://registry.yarnpkg.com/@cloudflare/wrangler/-/wrangler-1.19.11.tgz#bace35405b423e3da3a5a06f5cd1bcb96b5d2406" - integrity sha512-aUoSHodCx79b1mMxv2L68fEQmMj+6vFO5dwCozBPL8AE81XumeUau2RfqQEAInciESdiJbYnam7b1q2D59PQew== +"@cloudflare/wrangler@^1.19.12": + version "1.19.12" + resolved "https://registry.yarnpkg.com/@cloudflare/wrangler/-/wrangler-1.19.12.tgz#17ff0ad7e816d3ea79069a31654d98328d4df75c" + integrity sha512-ALuQDzJetYGqzNuIa3KY8S8X9rvZjIh5uEY3nK31jV/EmBamiiSJn4XIdPuSn65FaEmmZem78OJIWFyu80OIuA== dependencies: axios "^0.21.1" rimraf "^3.0.2" @@ -16,142 +16,143 @@ resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c" integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg== -"@miniflare/cache@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/cache/-/cache-2.3.0.tgz#664af6ca212241653bef5e2b93b4608dbac103c7" - integrity sha512-lOf3WVtrs0ac7KOtsQ+JOGHWR90zsqqJbolE+Wt4hIZuvM2U3t1RD2Ms7U20J301msVIsBAd02IL57H95LXQtQ== +"@miniflare/cache@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/cache/-/cache-2.5.0.tgz#2292ca0459942177ae5bf4d51286fefaed17967d" + integrity sha512-tJuDbWwzYsk4pJvPPJzdlfdGFqNnn1IN3JVrGDCq8UwOXm0K8hFiSwq2nMjjT+Z/9X2FfimgaXOx81zjPL+FjQ== dependencies: - "@miniflare/core" "2.3.0" - "@miniflare/shared" "2.3.0" + "@miniflare/core" "2.5.0" + "@miniflare/shared" "2.5.0" http-cache-semantics "^4.1.0" - undici "4.13.0" + undici "5.3.0" -"@miniflare/cli-parser@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/cli-parser/-/cli-parser-2.3.0.tgz#536f1d09a6de3c59ce8c9de99abc0dbcac8df37c" - integrity sha512-yQzU+OBBvWshr9qVxAe6bWXJLNfpmLYrfkfR3u+rPOo2LYnccWg0f/8jtxrXM1TIyu+tCOJGqCODpO//XtrwWw== +"@miniflare/cli-parser@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/cli-parser/-/cli-parser-2.5.0.tgz#034723ffdc841e67e8b9310c7f686ec6fc2b12ec" + integrity sha512-aY/wQ4Rwy8x0Awtb8TzhKFYp4g1Y8xBhtKFfHOZpYCEFCVfKtgdk0pHPKctf/ClK0qJdT3siJKeXxsH2GRAMXg== dependencies: - "@miniflare/shared" "2.3.0" + "@miniflare/shared" "2.5.0" kleur "^4.1.4" -"@miniflare/core@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/core/-/core-2.3.0.tgz#29e5756d2772d09c6cdf77d2c84fc85888e30bf8" - integrity sha512-Dltb3p+Uq5Lx53DuInckHYaDoMrBq49HE/p/oUDXmzHmQy7EAM6v+nJGKmiM9Uen4OqyqsmlmPWqntSMjaX7Jg== +"@miniflare/core@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/core/-/core-2.5.0.tgz#c5cab53fbae4f0c37f2d185b2f64fcc19565e3c0" + integrity sha512-BtMRi17DiimcpmDjQiIU6mIYSo/h21lVGC082n5G3JTF7AcGFAs7N2Fz2YLiYuc3zYc6qJx/NIjDoOqL2gfp3A== dependencies: "@iarna/toml" "^2.2.5" - "@miniflare/shared" "2.3.0" - "@miniflare/watcher" "2.3.0" - busboy "^0.3.1" + "@miniflare/shared" "2.5.0" + "@miniflare/watcher" "2.5.0" + busboy "^1.6.0" dotenv "^10.0.0" kleur "^4.1.4" set-cookie-parser "^2.4.8" - undici "4.13.0" + undici "5.3.0" + urlpattern-polyfill "^4.0.3" -"@miniflare/durable-objects@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/durable-objects/-/durable-objects-2.3.0.tgz#7db50fd6071bf5f2e64655e5c1836c829aee43be" - integrity sha512-YuzxBBu9xBU3xxD4TzGdeVVMXrE76AWJE4MIqkJR5UmASqayyv//cApGw3+C01NHe07cpbrTM1QTgFo2eBncwQ== +"@miniflare/durable-objects@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/durable-objects/-/durable-objects-2.5.0.tgz#b92b5f7bebdf7743ba2948edfe999f6ad939ad22" + integrity sha512-HJuP5Lsm/CCaSx3dePZiywAniGqTpU1ocCEqV6kE4zX1C0uGplfjPPXo5xsVc2NXkD+0ZL65rJzcj2tfrwKZlg== dependencies: - "@miniflare/core" "2.3.0" - "@miniflare/shared" "2.3.0" - "@miniflare/storage-memory" "2.3.0" - undici "4.13.0" + "@miniflare/core" "2.5.0" + "@miniflare/shared" "2.5.0" + "@miniflare/storage-memory" "2.5.0" + undici "5.3.0" -"@miniflare/html-rewriter@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/html-rewriter/-/html-rewriter-2.3.0.tgz#5feaf023d19d3542df02a3b0f643c12d9ac45986" - integrity sha512-cyWhmQgzhtRlBeg0mxP5FmAq/75ChuLwWQlhokx88XkGnteuh0/DOk3OxIMaveF2oDHKmIlLFgSlzv4NbT1Mng== +"@miniflare/html-rewriter@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/html-rewriter/-/html-rewriter-2.5.0.tgz#777542c0062703ecce578e3a630658a66722c56d" + integrity sha512-bV2lQ/2clPeBmDth+cMnCBFYk8xtGs83S6PhfwmNNd24rzHvOEch1h/VCtEUy8k+rtgDSpc9pVkd31k0tMsyxQ== dependencies: - "@miniflare/core" "2.3.0" - "@miniflare/shared" "2.3.0" + "@miniflare/core" "2.5.0" + "@miniflare/shared" "2.5.0" html-rewriter-wasm "^0.4.1" - undici "4.13.0" + undici "5.3.0" -"@miniflare/http-server@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/http-server/-/http-server-2.3.0.tgz#78c18468934bc2cbca1fc493a48c3a1e3a830adb" - integrity sha512-jTzsRuro3yWVb4T85znBGw1w+ydimgi2PJvHrTuGFKDjFam+R037fGH+HZCAjAgPiBHTroXfkeSXypJLXbQBEg== +"@miniflare/http-server@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/http-server/-/http-server-2.5.0.tgz#6460e67cf11d079d9a2a1b6feb43cdf1d8c77173" + integrity sha512-+sRPgNq0Q4Q6t1k94ncYzgcf/UNIv0Bz4ubUu6InJy4kMaJKeJPOLlU55lTXJSYfBZM/L4NvAui2i5vA9g2BrA== dependencies: - "@miniflare/core" "2.3.0" - "@miniflare/shared" "2.3.0" - "@miniflare/web-sockets" "2.3.0" + "@miniflare/core" "2.5.0" + "@miniflare/shared" "2.5.0" + "@miniflare/web-sockets" "2.5.0" kleur "^4.1.4" selfsigned "^2.0.0" - undici "4.13.0" + undici "5.3.0" ws "^8.2.2" youch "^2.2.2" -"@miniflare/kv@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/kv/-/kv-2.3.0.tgz#152c58fff3cd2ea1cd82859d46c3b6bc7d8026e7" - integrity sha512-m0zu5sRoaFDm+WVTnLRrz8+77b6eVxQN7cLN6ZQiKP3Nd8cAggPdaIIef8dVksWbPvOW9DztoUVZTB1v9EOaLA== +"@miniflare/kv@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/kv/-/kv-2.5.0.tgz#c5683a323f5420ff3354a97ad039a953d0fab30a" + integrity sha512-5dzcUMMOKl8u75FXbpy2BHp38uafjzo3RW2HEm6EY8QoM/vHw6RChFzJ9YEPJDbvcHR8gdMpgC65LYPTjifc3g== dependencies: - "@miniflare/shared" "2.3.0" + "@miniflare/shared" "2.5.0" -"@miniflare/runner-vm@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/runner-vm/-/runner-vm-2.3.0.tgz#c2881a7f7cb78244c3456be044bf604520743543" - integrity sha512-/aB997YodNcRFxtlnvEn4BJSIqKXRw29FexOqCWwWv+b7XQkTTxd4IfSocIFi6du3265gp85icqP/hxsLAQBVg== +"@miniflare/runner-vm@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/runner-vm/-/runner-vm-2.5.0.tgz#7f025e130c5d307fa79ed6f8354c8d921136fc0e" + integrity sha512-0n85cOBq91D7roqsIqJESDnj0oRi+xNVjDfd5uDIT1dW1qo5asA5Mwx6ntzCJB1BcB4khNatUIwpO3ZT+kT/YQ== dependencies: - "@miniflare/shared" "2.3.0" + "@miniflare/shared" "2.5.0" -"@miniflare/scheduler@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/scheduler/-/scheduler-2.3.0.tgz#9feaf76bbdff5924a41157d6b18d998d13b66b59" - integrity sha512-Er80srMNXbxqGbYXtiZkD8UlveHsw4cpwcytQgsEJCHG7/48vC/rpmtN0zKOWFEHifaOUvHhURZRJu+S2E4Stg== +"@miniflare/scheduler@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/scheduler/-/scheduler-2.5.0.tgz#f893d6ed33b263eaee7620841a58f5144af08378" + integrity sha512-+a/I2QLp3UaZpKVobzFH3eHsi5ubhBp8q/AH/sCDwcZmatbCp2+oDrjMgTqhF6Fm8ryR4BYkHQOgkGZ5l7gQjw== dependencies: - "@miniflare/core" "2.3.0" - "@miniflare/shared" "2.3.0" + "@miniflare/core" "2.5.0" + "@miniflare/shared" "2.5.0" cron-schedule "^3.0.4" -"@miniflare/shared@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/shared/-/shared-2.3.0.tgz#7ad2f09bc85125872301578848b46b7d8b4a77ce" - integrity sha512-TvCSUe1op5AKINx3zHSSdfAbdoV3eSF3MzeVQA4+1NmtuefY8cjujQCdILeAxg3oPbHXaZkc7j1zZ13rYdvwGQ== +"@miniflare/shared@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/shared/-/shared-2.5.0.tgz#eaf47da30e800213d4888969f8783e0ca9bb9a36" + integrity sha512-2oPxhnCGg8DNoo0NzUdc2BylGGeHQQvFJ6mDODjxbSXybeQC0+Ul5Ujv/FyU9W/eTbUEWNqKBycINyuXqSnJ/w== dependencies: ignore "^5.1.8" kleur "^4.1.4" -"@miniflare/sites@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/sites/-/sites-2.3.0.tgz#b8d158b402fa52c35d27c478743e01714f75beb1" - integrity sha512-WkRBxQbf6k/eS1D/D1mw30Zs253TFeIkWFh8HQ8Z36Kdt79rNVezT9YmRpahUfvYXmubTquV5JftNOAhvbOJXA== +"@miniflare/sites@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/sites/-/sites-2.5.0.tgz#433c81c9c62d658b7d3efd399e4f16f6041aa021" + integrity sha512-AwYZb6ppP00YLkVNJnCe0lzJJemCDwibFjJywECY+aXFFNRo80sLpePPOXytplaUpen1uxnxUc8vdKBFVoB5cQ== dependencies: - "@miniflare/kv" "2.3.0" - "@miniflare/shared" "2.3.0" - "@miniflare/storage-file" "2.3.0" + "@miniflare/kv" "2.5.0" + "@miniflare/shared" "2.5.0" + "@miniflare/storage-file" "2.5.0" -"@miniflare/storage-file@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/storage-file/-/storage-file-2.3.0.tgz#34b6653ef37d3269fef1fdfa680b153f05831e31" - integrity sha512-1rda/MC0R8wVC6N7Na2EdSGNAZv6o/yugp7Z+GikJ1vbgi1+9soAczDzFtaq4jrBzAkCFOMT79DgkSKSl59vxg== +"@miniflare/storage-file@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/storage-file/-/storage-file-2.5.0.tgz#d784d7a2be728f602cca3fbc284e84007a0c6708" + integrity sha512-ytwWZEIn3eMBnI2FdqvM5+mJVuI2aIBeZNjhZFuF5/AW3v1uslqY55Qd5Fnfn+2C7z6ivVaUv/TlEwot9ZDUnw== dependencies: - "@miniflare/shared" "2.3.0" - "@miniflare/storage-memory" "2.3.0" + "@miniflare/shared" "2.5.0" + "@miniflare/storage-memory" "2.5.0" -"@miniflare/storage-memory@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/storage-memory/-/storage-memory-2.3.0.tgz#1a6ac118243aefe6b91232c739316a995eb0296f" - integrity sha512-cMqQK9neRySchoNUVhQYOmLFrYkAjT5V113Wfxmsz93dladQ1/mXOsndqPrlb+5hhnwbw4Ns67nyzkHUe9sX/g== +"@miniflare/storage-memory@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/storage-memory/-/storage-memory-2.5.0.tgz#b49db62730fec2d6b9d17238a5f64c4406120872" + integrity sha512-cydVKLY0cZe2Sah0jV3s9MK3gmYLrQQcpCdMHMBEUz+nRfjfnuzs4WXzzUXCWwNT+WFC0V2WvDp2sMt+lVsmsA== dependencies: - "@miniflare/shared" "2.3.0" + "@miniflare/shared" "2.5.0" -"@miniflare/watcher@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/watcher/-/watcher-2.3.0.tgz#82c8cba1c37d619f4790bc9b230cdaa45f677fdf" - integrity sha512-G0ZE9WHIcdR2TlPXwwQabULDIMZ9LujfC0tn+yXmPXKxgWoJWcWFmUbkhVDcOJzkIz2TAhRlLbW11n8nChUHFQ== +"@miniflare/watcher@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/watcher/-/watcher-2.5.0.tgz#eec9e3418d7bc6355ad7bf45938fadff3e809263" + integrity sha512-6ECE7po8NBxLmr2M00f7TWLEp1dMaAm3swf4D3ZU2xy3IqSBZE3QbOBuczYEYUIk7F+kXgaREISQg4e5QdECXQ== dependencies: - "@miniflare/shared" "2.3.0" + "@miniflare/shared" "2.5.0" -"@miniflare/web-sockets@2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@miniflare/web-sockets/-/web-sockets-2.3.0.tgz#50c548dffc55cb4f418f270cf41759663bb1141b" - integrity sha512-3xcPG1vfiMb2obVC4jNtS5VzUxzM1rdUrWPCG86gpZaHky0xC1U7Tp+eFdxQFTty99HPYrrVKXl1ww2h1LGWRA== +"@miniflare/web-sockets@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@miniflare/web-sockets/-/web-sockets-2.5.0.tgz#6abf085485c61d79f7cb724ff5c41ae004174c17" + integrity sha512-nnLBtbHdmgGUNTxP0IeAz1B4UGCO/6W+4edzjogtz3JJumKQE+ink5+SIrmL0C1Pitrc2+kO2WYsQzWh3a2Amg== dependencies: - "@miniflare/core" "2.3.0" - "@miniflare/shared" "2.3.0" - undici "4.13.0" + "@miniflare/core" "2.5.0" + "@miniflare/shared" "2.5.0" + undici "5.3.0" ws "^8.2.2" "@types/stack-trace@0.0.29": @@ -184,12 +185,12 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -busboy@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b" - integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw== +busboy@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" + integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== dependencies: - dicer "0.3.0" + streamsearch "^1.1.0" chownr@^2.0.0: version "2.0.0" @@ -211,13 +212,6 @@ cron-schedule@^3.0.4: resolved "https://registry.yarnpkg.com/cron-schedule/-/cron-schedule-3.0.5.tgz#8a85ed3016ff2a5479f9c32a6f0e6b0a93a02b6f" integrity sha512-YjtB4jy7RJEX8j9GokHp+y8S/ihCHjrD2Z3E13LSGP/+G0Sdv+MEKsZu5wPLLWwW1HQc4HwpGMFU3GUTStZTaA== -dicer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" - integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== - dependencies: - streamsearch "0.1.2" - dotenv@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" @@ -285,29 +279,29 @@ kleur@^4.1.4: resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d" integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA== -miniflare@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/miniflare/-/miniflare-2.3.0.tgz#ab2308c58d80337c384f2d2ffa1312f98615fea5" - integrity sha512-0lK4Df+jfqLDSDDgj4AOJffb1G6sN7XvB5QGUaquEakW+qPdurydyNhFKcFKBgpk4ozN6WTmB2x802iPXQcJJQ== +miniflare@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/miniflare/-/miniflare-2.5.0.tgz#befe1e5cf598f9b6e67af74669747e9730b27da7" + integrity sha512-3IR+n/kLBA7zQ20HDjnA0HufQlr197krD8jPsaYO5wTrkIUCTvrilbI0sCo0X9CP/I3BCIl8fiZc1Jf7+MX7jQ== dependencies: - "@miniflare/cache" "2.3.0" - "@miniflare/cli-parser" "2.3.0" - "@miniflare/core" "2.3.0" - "@miniflare/durable-objects" "2.3.0" - "@miniflare/html-rewriter" "2.3.0" - "@miniflare/http-server" "2.3.0" - "@miniflare/kv" "2.3.0" - "@miniflare/runner-vm" "2.3.0" - "@miniflare/scheduler" "2.3.0" - "@miniflare/shared" "2.3.0" - "@miniflare/sites" "2.3.0" - "@miniflare/storage-file" "2.3.0" - "@miniflare/storage-memory" "2.3.0" - "@miniflare/web-sockets" "2.3.0" + "@miniflare/cache" "2.5.0" + "@miniflare/cli-parser" "2.5.0" + "@miniflare/core" "2.5.0" + "@miniflare/durable-objects" "2.5.0" + "@miniflare/html-rewriter" "2.5.0" + "@miniflare/http-server" "2.5.0" + "@miniflare/kv" "2.5.0" + "@miniflare/runner-vm" "2.5.0" + "@miniflare/scheduler" "2.5.0" + "@miniflare/shared" "2.5.0" + "@miniflare/sites" "2.5.0" + "@miniflare/storage-file" "2.5.0" + "@miniflare/storage-memory" "2.5.0" + "@miniflare/web-sockets" "2.5.0" kleur "^4.1.4" semiver "^1.1.0" source-map-support "^0.5.20" - undici "4.13.0" + undici "5.3.0" minimatch@^3.0.4: version "3.1.2" @@ -405,10 +399,10 @@ stack-trace@0.0.10: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= +streamsearch@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" + integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== tar@^6.1.10: version "6.1.11" @@ -422,10 +416,15 @@ tar@^6.1.10: mkdirp "^1.0.3" yallist "^4.0.0" -undici@4.13.0: - version "4.13.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-4.13.0.tgz#7d10fe150c3241a6b3b0eba80eff59c9fb40f359" - integrity sha512-8lk8S/f2V0VUNGf2scU2b+KI2JSzEQLdCyRNRF3XmHu+5jectlSDaPSBCXAHFaUlt1rzngzOBVDgJS9/Gue/KA== +undici@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.3.0.tgz#869d47bafa7f72ccaf8738258f0283bf3dd179ca" + integrity sha512-8LxC/xmR2GCE4q1heE1sJxVnnf5S6yQ2dObvMFBBWkB8aQlaqNuWovgRFWRMB7KUdLPGZfOTTmUeeLEJYX56iQ== + +urlpattern-polyfill@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-4.0.3.tgz#c1fa7a73eb4e6c6a1ffb41b24cf31974f7392d3b" + integrity sha512-DOE84vZT2fEcl9gqCUTcnAw5ZY5Id55ikUcziSUntuEFL3pRvavg5kwDmTEUJkeCHInTlV/HexFomgYnzO5kdQ== wrappy@1: version "1.0.2"