Use correct script path for type = "webpack" Workers Sites projects

mrbbot · mrbbot · commit ca799fa0c8c5 · 2021-12-16T20:01:47.000Z
diff --git a/packages/core/src/plugins/build.ts b/packages/core/src/plugins/build.ts
@@ -111,8 +111,17 @@ export function _populateBuildConfig(
   const env = configEnv ? ` --env ${configEnv}` : "";
 
   if (config.type === "webpack") {
+    let packageDir = "";
+    if (config.site) {
+      // If `site` is configured, built artifacts are isolated from static-site
+      // application code, see:
+      // - https://github.com/cloudflare/wrangler/blob/a3bc640f13c8a4d10f3211b577037f7c32aff7ae/src/settings/toml/target.rs#L38-L48
+      // - https://github.com/cloudflare/wrangler/blob/a3bc640f13c8a4d10f3211b577037f7c32aff7ae/src/settings/toml/site.rs#L30-L40
+      packageDir = config.site["entry-point"] ?? "workers-site";
+    }
+
     config.build.command = `wrangler build${env}`;
-    config.build.upload.main = path.join("worker", "script.js");
+    config.build.upload.main = path.join(packageDir, "worker", "script.js");
   } else if (config.type === "rust") {
     // This script will be included in the root index.js bundle, but rust.mjs
     // will be in the plugins subdirectory
diff --git a/packages/core/test/fixtures/wrangler/webpack-site-custom/.gitignore b/packages/core/test/fixtures/wrangler/webpack-site-custom/.gitignore
@@ -0,0 +1 @@
+worker/
diff --git a/packages/core/test/fixtures/wrangler/webpack-site-custom/entry/package-lock.json b/packages/core/test/fixtures/wrangler/webpack-site-custom/entry/package-lock.json
diff --git a/packages/core/test/fixtures/wrangler/webpack-site-custom/entry/package.json b/packages/core/test/fixtures/wrangler/webpack-site-custom/entry/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "webpack-site-custom-entry-worker",
+  "version": "1.0.0",
+  "main": "../src/index.js",
+  "private": "true"
+}
diff --git a/packages/core/test/fixtures/wrangler/webpack-site-custom/src/index.js b/packages/core/test/fixtures/wrangler/webpack-site-custom/src/index.js
@@ -0,0 +1,3 @@
+addEventListener("fetch", (event) => {
+  event.respondWith(new Response(`webpack-site-custom:${event.request.url}`));
+});
diff --git a/packages/core/test/fixtures/wrangler/webpack-site-custom/wrangler.toml b/packages/core/test/fixtures/wrangler/webpack-site-custom/wrangler.toml
@@ -0,0 +1,7 @@
+name = "webpack-site-custom-entry-worker"
+type = "webpack"
+compatibility_date = "2021-12-16"
+
+[site]
+bucket = "./public"
+entry-point = "./entry"
diff --git a/packages/core/test/fixtures/wrangler/webpack-site/.gitignore b/packages/core/test/fixtures/wrangler/webpack-site/.gitignore
@@ -0,0 +1 @@
+worker/
diff --git a/packages/core/test/fixtures/wrangler/webpack-site/src/index.js b/packages/core/test/fixtures/wrangler/webpack-site/src/index.js
@@ -0,0 +1,3 @@
+addEventListener("fetch", (event) => {
+  event.respondWith(new Response(`webpack-site:${event.request.url}`));
+});
diff --git a/packages/core/test/fixtures/wrangler/webpack-site/workers-site/package-lock.json b/packages/core/test/fixtures/wrangler/webpack-site/workers-site/package-lock.json
diff --git a/packages/core/test/fixtures/wrangler/webpack-site/workers-site/package.json b/packages/core/test/fixtures/wrangler/webpack-site/workers-site/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "webpack-site-worker",
+  "version": "1.0.0",
+  "main": "../src/index.js",
+  "private": "true"
+}
diff --git a/packages/core/test/fixtures/wrangler/webpack-site/wrangler.toml b/packages/core/test/fixtures/wrangler/webpack-site/wrangler.toml
@@ -0,0 +1,6 @@
+name = "webpack-site-worker"
+type = "webpack"
+compatibility_date = "2021-12-16"
+
+[site]
+bucket = "./public"
diff --git a/packages/core/test/plugins/build.spec.ts b/packages/core/test/plugins/build.spec.ts
@@ -168,8 +168,12 @@ test("BuildPlugin: beforeSetup: throws with exit code if build fails", async (t)
 });
 
 const fixturesPath = path.join(__dirname, "..", "..", "..", "test", "fixtures");
-const webpackPath = path.join(fixturesPath, "wrangler", "webpack");
-const rustPath = path.join(fixturesPath, "wrangler", "rust");
+const wranglerPath = path.join(fixturesPath, "wrangler");
+
+const webpackPath = path.join(wranglerPath, "webpack");
+const webpackSitePath = path.join(wranglerPath, "webpack-site");
+const webpackSiteCustomPath = path.join(wranglerPath, "webpack-site-custom");
+const rustPath = path.join(wranglerPath, "rust");
 
 // These tests require wrangler and rust to be installed, so skip them if not installed
 const wranglerInstalled = which.sync("wrangler", { nothrow: true });
@@ -196,6 +200,36 @@ webpackTest(
     t.is(await res.text(), "webpack:http://localhost:8787/");
   }
 );
+webpackTest(
+  '_populateBuildConfig: builds type "webpack" projects with Workers Site',
+  async (t) => {
+    const workerPath = path.join(webpackSitePath, "workers-site", "worker");
+    await rimrafPromise(workerPath);
+    const mf = useMiniflare(
+      { BuildPlugin },
+      { wranglerConfigPath: path.join(webpackSitePath, "wrangler.toml") }
+    );
+    await mf.getPlugins(); // Resolves once worker has been built
+    t.true(existsSync(path.join(workerPath, "script.js")));
+    const res = await mf.dispatchFetch("http://localhost:8787/");
+    t.is(await res.text(), "webpack-site:http://localhost:8787/");
+  }
+);
+webpackTest(
+  '_populateBuildConfig: builds type "webpack" projects with Workers Site using custom entry point',
+  async (t) => {
+    const workerPath = path.join(webpackSiteCustomPath, "entry", "worker");
+    await rimrafPromise(workerPath);
+    const mf = useMiniflare(
+      { BuildPlugin },
+      { wranglerConfigPath: path.join(webpackSiteCustomPath, "wrangler.toml") }
+    );
+    await mf.getPlugins(); // Resolves once worker has been built
+    t.true(existsSync(path.join(workerPath, "script.js")));
+    const res = await mf.dispatchFetch("http://localhost:8787/");
+    t.is(await res.text(), "webpack-site-custom:http://localhost:8787/");
+  }
+);
 
 const rustTest = wranglerInstalled && rustInstalled ? test : test.skip;
 rustTest('_populateBuildConfig: builds type "rust" projects', async (t) => {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+addEventListener("fetch", (event) => {`
	`2`	+ event.respondWith(new Response(`webpack-site-custom:${event.request.url}`));
	`3`	`+});`