From d50f730af3807f52405dffa21eecac0320dc7c91 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Wed, 5 Jul 2023 15:21:26 +0100 Subject: [PATCH 1/5] bump workerd version --- package-lock.json | 278 ++++++++++++++++---------------- packages/miniflare/package.json | 2 +- 2 files changed, 139 insertions(+), 141 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce353a22c..adf57476f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,6 +53,81 @@ "node": ">=14.19 <15 || >=16.15 <17 || >=18" } }, + "node_modules/@cloudflare/workerd-darwin-64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20230628.0.tgz", + "integrity": "sha512-ndtsGCR3WKcNvq2eE2teQXcE+r7PwMh3jnyxPuc4/Fed4q3DQC++da4zNn8f+D+dLd7myifGeygbHic86vh4OA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-darwin-arm64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20230628.0.tgz", + "integrity": "sha512-cvGUkP517K43PzlMm0Q9WFBJCOC8UR+E5qNf+nO2fewAx8SCyeqrOboVliDBaQmI8z6F6f59L6Gh4QuxEJEjdA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-linux-64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20230628.0.tgz", + "integrity": "sha512-NRYVNTuhvAxBzkj3V1TkYl1LiV9xxT6yk3OUXzcA6eUPH2EQYkDeOkWhAeuKrTi5JY8gLUvvxs5OOj5WTL9jYQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-linux-arm64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20230628.0.tgz", + "integrity": "sha512-IVrP/Pf12k9S31TDjnHSUe/xrYLkuvQN+DtoUSWVgpe0Mj1w8uHUPGpRIc8XQF+6OWFUQr2SgGsEtjeYZm3Hlw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16" + } + }, + "node_modules/@cloudflare/workerd-windows-64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20230628.0.tgz", + "integrity": "sha512-y6scWqHFHhlf2a1AsT0UeMyWSloIO1baVxp9DW62gFO8BwWrTPgwiG9Rr09zllY5tSxkrU7VOPsEbK9NNcRMsA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=16" + } + }, "node_modules/@cloudflare/workers-types": { "version": "4.20230419.0", "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230419.0.tgz", @@ -5090,6 +5165,25 @@ "node": ">=0.10.0" } }, + "node_modules/workerd": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20230628.0.tgz", + "integrity": "sha512-V4b+xfsBtogUmDa5yYWWROgTAVkKi09sqbT/2dBh1KhEuRgENScgo/VysTtZsX5Fmxd8qEo1phpNJeTC+DW1iA==", + "hasInstallScript": true, + "bin": { + "workerd": "bin/workerd" + }, + "engines": { + "node": ">=16" + }, + "optionalDependencies": { + "@cloudflare/workerd-darwin-64": "1.20230628.0", + "@cloudflare/workerd-darwin-arm64": "1.20230628.0", + "@cloudflare/workerd-linux-64": "1.20230628.0", + "@cloudflare/workerd-linux-arm64": "1.20230628.0", + "@cloudflare/workerd-windows-64": "1.20230628.0" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "dev": true, @@ -5353,7 +5447,7 @@ "source-map-support": "0.5.21", "stoppable": "^1.1.0", "undici": "^5.13.0", - "workerd": "0.20230628.0", + "workerd": "1.20230628.0", "ws": "^8.11.0", "youch": "^3.2.2", "zod": "^3.20.6" @@ -5376,100 +5470,6 @@ "node": ">=16.13" } }, - "packages/miniflare/node_modules/@cloudflare/workerd-darwin-64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-0.20230628.0.tgz", - "integrity": "sha512-sU09zB0qtxulvRfR9xP2j29PGS3xhv1IP6r3IetVI/OU1xNVVDc1u8P9E+YTewv35pIp5ji4i3RFRDHbXDk5/Q==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=16" - } - }, - "packages/miniflare/node_modules/@cloudflare/workerd-darwin-arm64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-0.20230628.0.tgz", - "integrity": "sha512-eBOKZxQVDiemv13c3SOJU61hCveem2BGQ4m6Zgot2mHnBzn6DHAurEn1+J53bK4LIjPjokDGq9qH7/fA7nph9w==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=16" - } - }, - "packages/miniflare/node_modules/@cloudflare/workerd-linux-64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-0.20230628.0.tgz", - "integrity": "sha512-V+Xehom5mrSqXH9rETcwNjqS3n0P+NE+j+Wx5DbY+2oNWaAhqZ45TZCdB75BnFFemBdjHYGzw+bsMeum7uK/lQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=16" - } - }, - "packages/miniflare/node_modules/@cloudflare/workerd-linux-arm64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-0.20230628.0.tgz", - "integrity": "sha512-Gk3ovm+8dEMq+C/pyNaKdBJXFZn/836JRthPh4BgEoDv7pOhHklpDdpPj6YY2J6Ck6xFTf8xgNeJ6iUeKSOZCA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=16" - } - }, - "packages/miniflare/node_modules/@cloudflare/workerd-windows-64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-0.20230628.0.tgz", - "integrity": "sha512-E12UI3RYLc3+SEGNBXQYHS+520gYBcfnNV5j67S3de+W3GtLP4OLl71ZXRAKX158662H6Peh2iMGLRzyY/aF8A==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=16" - } - }, - "packages/miniflare/node_modules/workerd": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/workerd/-/workerd-0.20230628.0.tgz", - "integrity": "sha512-MNAxAhR6eJFWQ9yB3YpzU5E850rMclgSXLg4YcS3WiwkJDn3xhgW9W7/EwZVjn6+4ZTyUEcTDlgS4GIuQq32tg==", - "hasInstallScript": true, - "bin": { - "workerd": "bin/workerd" - }, - "engines": { - "node": ">=16" - }, - "optionalDependencies": { - "@cloudflare/workerd-darwin-64": "0.20230628.0", - "@cloudflare/workerd-darwin-arm64": "0.20230628.0", - "@cloudflare/workerd-linux-64": "0.20230628.0", - "@cloudflare/workerd-linux-arm64": "0.20230628.0", - "@cloudflare/workerd-windows-64": "0.20230628.0" - } - }, "packages/tre": { "name": "miniflare", "version": "0.20230628.0", @@ -5521,6 +5521,36 @@ "execa": "^7.1.0" } }, + "@cloudflare/workerd-darwin-64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20230628.0.tgz", + "integrity": "sha512-ndtsGCR3WKcNvq2eE2teQXcE+r7PwMh3jnyxPuc4/Fed4q3DQC++da4zNn8f+D+dLd7myifGeygbHic86vh4OA==", + "optional": true + }, + "@cloudflare/workerd-darwin-arm64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20230628.0.tgz", + "integrity": "sha512-cvGUkP517K43PzlMm0Q9WFBJCOC8UR+E5qNf+nO2fewAx8SCyeqrOboVliDBaQmI8z6F6f59L6Gh4QuxEJEjdA==", + "optional": true + }, + "@cloudflare/workerd-linux-64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20230628.0.tgz", + "integrity": "sha512-NRYVNTuhvAxBzkj3V1TkYl1LiV9xxT6yk3OUXzcA6eUPH2EQYkDeOkWhAeuKrTi5JY8gLUvvxs5OOj5WTL9jYQ==", + "optional": true + }, + "@cloudflare/workerd-linux-arm64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20230628.0.tgz", + "integrity": "sha512-IVrP/Pf12k9S31TDjnHSUe/xrYLkuvQN+DtoUSWVgpe0Mj1w8uHUPGpRIc8XQF+6OWFUQr2SgGsEtjeYZm3Hlw==", + "optional": true + }, + "@cloudflare/workerd-windows-64": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20230628.0.tgz", + "integrity": "sha512-y6scWqHFHhlf2a1AsT0UeMyWSloIO1baVxp9DW62gFO8BwWrTPgwiG9Rr09zllY5tSxkrU7VOPsEbK9NNcRMsA==", + "optional": true + }, "@cloudflare/workers-types": { "version": "4.20230419.0", "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230419.0.tgz", @@ -7657,54 +7687,10 @@ "source-map-support": "0.5.21", "stoppable": "^1.1.0", "undici": "^5.13.0", - "workerd": "0.20230628.0", + "workerd": "1.20230628.0", "ws": "^8.11.0", "youch": "^3.2.2", "zod": "^3.20.6" - }, - "dependencies": { - "@cloudflare/workerd-darwin-64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-0.20230628.0.tgz", - "integrity": "sha512-sU09zB0qtxulvRfR9xP2j29PGS3xhv1IP6r3IetVI/OU1xNVVDc1u8P9E+YTewv35pIp5ji4i3RFRDHbXDk5/Q==", - "optional": true - }, - "@cloudflare/workerd-darwin-arm64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-0.20230628.0.tgz", - "integrity": "sha512-eBOKZxQVDiemv13c3SOJU61hCveem2BGQ4m6Zgot2mHnBzn6DHAurEn1+J53bK4LIjPjokDGq9qH7/fA7nph9w==", - "optional": true - }, - "@cloudflare/workerd-linux-64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-0.20230628.0.tgz", - "integrity": "sha512-V+Xehom5mrSqXH9rETcwNjqS3n0P+NE+j+Wx5DbY+2oNWaAhqZ45TZCdB75BnFFemBdjHYGzw+bsMeum7uK/lQ==", - "optional": true - }, - "@cloudflare/workerd-linux-arm64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-0.20230628.0.tgz", - "integrity": "sha512-Gk3ovm+8dEMq+C/pyNaKdBJXFZn/836JRthPh4BgEoDv7pOhHklpDdpPj6YY2J6Ck6xFTf8xgNeJ6iUeKSOZCA==", - "optional": true - }, - "@cloudflare/workerd-windows-64": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-0.20230628.0.tgz", - "integrity": "sha512-E12UI3RYLc3+SEGNBXQYHS+520gYBcfnNV5j67S3de+W3GtLP4OLl71ZXRAKX158662H6Peh2iMGLRzyY/aF8A==", - "optional": true - }, - "workerd": { - "version": "0.20230628.0", - "resolved": "https://registry.npmjs.org/workerd/-/workerd-0.20230628.0.tgz", - "integrity": "sha512-MNAxAhR6eJFWQ9yB3YpzU5E850rMclgSXLg4YcS3WiwkJDn3xhgW9W7/EwZVjn6+4ZTyUEcTDlgS4GIuQq32tg==", - "requires": { - "@cloudflare/workerd-darwin-64": "0.20230628.0", - "@cloudflare/workerd-darwin-arm64": "0.20230628.0", - "@cloudflare/workerd-linux-64": "0.20230628.0", - "@cloudflare/workerd-linux-arm64": "0.20230628.0", - "@cloudflare/workerd-windows-64": "0.20230628.0" - } - } } }, "minimatch": { @@ -8591,6 +8577,18 @@ "version": "1.2.3", "dev": true }, + "workerd": { + "version": "1.20230628.0", + "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20230628.0.tgz", + "integrity": "sha512-V4b+xfsBtogUmDa5yYWWROgTAVkKi09sqbT/2dBh1KhEuRgENScgo/VysTtZsX5Fmxd8qEo1phpNJeTC+DW1iA==", + "requires": { + "@cloudflare/workerd-darwin-64": "1.20230628.0", + "@cloudflare/workerd-darwin-arm64": "1.20230628.0", + "@cloudflare/workerd-linux-64": "1.20230628.0", + "@cloudflare/workerd-linux-arm64": "1.20230628.0", + "@cloudflare/workerd-windows-64": "1.20230628.0" + } + }, "wrap-ansi": { "version": "7.0.0", "dev": true, diff --git a/packages/miniflare/package.json b/packages/miniflare/package.json index a87bda2f5..6f348a22d 100644 --- a/packages/miniflare/package.json +++ b/packages/miniflare/package.json @@ -39,7 +39,7 @@ "source-map-support": "0.5.21", "stoppable": "^1.1.0", "undici": "^5.13.0", - "workerd": "0.20230628.0", + "workerd": "1.20230628.0", "ws": "^8.11.0", "youch": "^3.2.2", "zod": "^3.20.6" From 28d9909cc661c180a657c7eab02680d71f5bd075 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Wed, 5 Jul 2023 17:16:17 +0100 Subject: [PATCH 2/5] bump timeout --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e39edf18c..360ab159c 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "lint": "eslint \"packages/*/{src,test}/**/*.ts\" \"scripts/**/*.{js,mjs}\" \"types/**/*.ts\"", "lint:fix": "npm run lint -- --fix", "prepublishOnly": "npm run lint && npm run clean && npm run build && npm run types:bundle && npm run test", - "test": "npm run build && ava && rimraf ./.tmp", + "test": "npm run build && ava --timeout=1m && rimraf ./.tmp", "types:build": "tsc && tsc -p packages/miniflare/src/workers/tsconfig.json", "types:bundle": "npm run types:build && node scripts/types.mjs" }, From 164de67bfb779f25ac122e58bcf5a769964df271 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Wed, 5 Jul 2023 17:38:03 +0100 Subject: [PATCH 3/5] bump timeout --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 360ab159c..b2759a6ee 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "lint": "eslint \"packages/*/{src,test}/**/*.ts\" \"scripts/**/*.{js,mjs}\" \"types/**/*.ts\"", "lint:fix": "npm run lint -- --fix", "prepublishOnly": "npm run lint && npm run clean && npm run build && npm run types:bundle && npm run test", - "test": "npm run build && ava --timeout=1m && rimraf ./.tmp", + "test": "npm run build && ava --timeout=5m && rimraf ./.tmp", "types:build": "tsc && tsc -p packages/miniflare/src/workers/tsconfig.json", "types:bundle": "npm run types:build && node scripts/types.mjs" }, From 4916aa0074550522c316467cadfa3d8ed9c372f1 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Wed, 5 Jul 2023 18:32:30 +0100 Subject: [PATCH 4/5] bump timeout --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2759a6ee..f51ae6e35 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "lint": "eslint \"packages/*/{src,test}/**/*.ts\" \"scripts/**/*.{js,mjs}\" \"types/**/*.ts\"", "lint:fix": "npm run lint -- --fix", "prepublishOnly": "npm run lint && npm run clean && npm run build && npm run types:bundle && npm run test", - "test": "npm run build && ava --timeout=5m && rimraf ./.tmp", + "test": "npm run build && ava --timeout=10m && rimraf ./.tmp", "types:build": "tsc && tsc -p packages/miniflare/src/workers/tsconfig.json", "types:bundle": "npm run types:build && node scripts/types.mjs" }, From 06ac6c1a40f38142a265de7c47a5960efd2ced78 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Thu, 6 Jul 2023 00:58:37 +0100 Subject: [PATCH 5/5] change nodeJS version --- .github/workflows/test.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f5d9b9d9..a81f05de3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - node: [16.13.0, latest] + node: [16.13.0, 18] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/package.json b/package.json index f51ae6e35..e39edf18c 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "lint": "eslint \"packages/*/{src,test}/**/*.ts\" \"scripts/**/*.{js,mjs}\" \"types/**/*.ts\"", "lint:fix": "npm run lint -- --fix", "prepublishOnly": "npm run lint && npm run clean && npm run build && npm run types:bundle && npm run test", - "test": "npm run build && ava --timeout=10m && rimraf ./.tmp", + "test": "npm run build && ava && rimraf ./.tmp", "types:build": "tsc && tsc -p packages/miniflare/src/workers/tsconfig.json", "types:bundle": "npm run types:build && node scripts/types.mjs" },