Merge branch 'cloudflare:main' into main

Laurry-gee · Aug 10, 2023 · 675ab1a · 675ab1a
2 parents f13ca7f + 94fed9d
commit 675ab1a
Show file tree

Hide file tree

Showing 28 changed files with 524 additions and 272 deletions.
diff --git a/.changeset/breezy-pants-allow.md b/.changeset/breezy-pants-allow.md
diff --git a/.changeset/curly-wombats-suffer.md b/.changeset/curly-wombats-suffer.md
diff --git a/.changeset/eight-rice-raise.md b/.changeset/eight-rice-raise.md
diff --git a/.changeset/few-rivers-tan.md b/.changeset/few-rivers-tan.md
diff --git a/.changeset/warm-students-provide.md b/.changeset/warm-students-provide.md
@@ -0,0 +1,5 @@
+---
+"edge-preview-authenticated-proxy": patch
+---
+
+No longer included the preview token twice in rawhttp requests
diff --git a/fixtures/pages-d1-shim/CHANGELOG.md b/fixtures/pages-d1-shim/CHANGELOG.md
@@ -0,0 +1,7 @@
+# pages-d1-shim
+
+## 0.0.1
+
+### Patch Changes
+
+- [#3595](https://github.com/cloudflare/workers-sdk/pull/3595) [`c302bec6`](https://github.com/cloudflare/workers-sdk/commit/c302bec639c0eec10d07d6b950c0a2d3e16eab1e) Thanks [@geelen](https://github.com/geelen)! - Removing the D1 shim from the build process, in preparation for the Open Beta. D1 can now be used with --no-bundle enabled.
diff --git a/fixtures/pages-d1-shim/package.json b/fixtures/pages-d1-shim/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "pages-d1-shim",
-	"version": "0.0.0",
+	"version": "0.0.1",
 	"private": true,
 	"sideEffects": false,
 	"scripts": {

diff --git a/fixtures/pages-workerjs-directory/CHANGELOG.md b/fixtures/pages-workerjs-directory/CHANGELOG.md
@@ -0,0 +1,7 @@
+# pages-workerjs-directory
+
+## 0.0.1
+
+### Patch Changes
+
+- [#3595](https://github.com/cloudflare/workers-sdk/pull/3595) [`c302bec6`](https://github.com/cloudflare/workers-sdk/commit/c302bec639c0eec10d07d6b950c0a2d3e16eab1e) Thanks [@geelen](https://github.com/geelen)! - Removing the D1 shim from the build process, in preparation for the Open Beta. D1 can now be used with --no-bundle enabled.
diff --git a/fixtures/pages-workerjs-directory/package.json b/fixtures/pages-workerjs-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "pages-workerjs-directory",
-	"version": "0.0.0",
+	"version": "0.0.1",
 	"private": true,
 	"sideEffects": false,
 	"scripts": {

diff --git a/fixtures/pages-workerjs-directory/public/_worker.js/index.js b/fixtures/pages-workerjs-directory/public/_worker.js/index.js
@@ -1,4 +1,5 @@
-import staticMod from "./static.js";
+import staticJsMod from "./static.js";
+import staticMjsMod from "./static.mjs";
 import add from "./add.wasm";
 
 export default {
@@ -10,8 +11,12 @@ export default {
 			return new Response(addModule.exports.add(1, 2).toString());
 		}
 
-		if (pathname === "/static") {
-			return new Response(staticMod);
+		if (pathname === "/static-js") {
+			return new Response(`static import text (via js): '${staticJsMod}'`);
+		}
+
+		if (pathname === "/static-mjs") {
+			return new Response(`static import text (via mjs): '${staticMjsMod}'`);
 		}
 
 		if (pathname === "/d1") {

diff --git a/fixtures/pages-workerjs-directory/public/_worker.js/other-other-script.mjs b/fixtures/pages-workerjs-directory/public/_worker.js/other-other-script.mjs
@@ -0,0 +1 @@
+export default "other-other-script-test";
diff --git a/fixtures/pages-workerjs-directory/public/_worker.js/static.js b/fixtures/pages-workerjs-directory/public/_worker.js/static.js
@@ -1 +1 @@
-export default "static";
+export default "js static";
diff --git a/fixtures/pages-workerjs-directory/public/_worker.js/static.mjs b/fixtures/pages-workerjs-directory/public/_worker.js/static.mjs
@@ -0,0 +1 @@
+export default "mjs static";
diff --git a/fixtures/pages-workerjs-directory/tests/index.test.ts b/fixtures/pages-workerjs-directory/tests/index.test.ts
@@ -31,11 +31,19 @@ describe("Pages _worker.js/ directory", () => {
 			fetch(`http://${ip}:${port}/wasm`).then((resp) => resp.text())
 		).resolves.toContain("3");
 		await expect(
-			fetch(`http://${ip}:${port}/static`).then((resp) => resp.text())
-		).resolves.toContain("static");
+			fetch(`http://${ip}:${port}/static-js`).then((resp) => resp.text())
+		).resolves.toEqual("static import text (via js): 'js static'");
+		await expect(
+			fetch(`http://${ip}:${port}/static-mjs`).then((resp) => resp.text())
+		).resolves.toEqual("static import text (via mjs): 'mjs static'");
 		await expect(
 			fetch(`http://${ip}:${port}/other-script.js`).then((resp) => resp.text())
 		).resolves.toContain("other-script-test");
+		await expect(
+			fetch(`http://${ip}:${port}/other-other-script.mjs`).then((resp) =>
+				resp.text()
+			)
+		).resolves.toContain("other-other-script-test");
 		await expect(
 			fetch(`http://${ip}:${port}/d1`).then((resp) => resp.text())
 		).resolves.toContain('{"1":1}');
@@ -70,6 +78,8 @@ describe("Pages _worker.js/ directory", () => {
 
 		expect(contents).not.toContain("D1_ERROR"); // No more D1 shim in the bundle!
 		expect(contents).toContain('"other-script-test"');
-		expect(contents).toContain('import staticMod from "./static.js";');
+		expect(contents).toContain('"other-other-script-test"');
+		expect(contents).toContain('import staticJsMod from "./static.js";');
+		expect(contents).toContain('import staticMjsMod from "./static.mjs";');
 	});
 });
diff --git a/fixtures/pages-ws-app/package.json b/fixtures/pages-ws-app/package.json
@@ -16,7 +16,7 @@
 	},
 	"devDependencies": {
 		"@cloudflare/workers-tsconfig": "*",
-		"miniflare": "3.20230724.0",
+		"miniflare": "3.20230801.0",
 		"wrangler": "*",
 		"ws": "^8.8.0"
 	},