Merge pull request #1833 from GregBrimble/custom-builds-rc

Allow non-Webpack Workers Sites

src/settings/toml/builder.rs

@@ -12,7 +12,7 @@ const WATCH_DIR: &str = "src";
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Builder {
-    command: Option<String>,
+    pub command: Option<String>,
     #[serde(default = "project_root")]
     pub cwd: PathBuf,
     #[serde(default = "upload_dir")]

src/settings/toml/manifest.rs

@@ -312,11 +312,30 @@ impl Manifest {
         environment_name: Option<&str>,
         preview: bool,
     ) -> Result<Target, failure::Error> {
-        // Site projects are always webpack for now; don't let toml override this.
-        let target_type = match self.site {
-            Some(_) => TargetType::Webpack,
-            None => self.target_type.clone(),
-        };
+        if self.site.is_some() {
+            match self.target_type {
+                TargetType::Rust => {
+                    failure::bail!(format!(
+                        "{} Workers Sites does not support Rust type projects.",
+                        emoji::WARN
+                    ))
+                }
+                TargetType::JavaScript => {
+                    let error_message = format!(
+                        "{} Workers Sites requires using a bundler, and your configuration indicates that you aren't using one. You can fix this by:\n* setting your project type to \"webpack\" to use our automatically configured webpack bundler.\n* setting your project type to \"javascript\", and configuring a build command in the `[build]` section if you wish to use your choice of bundler.",
+                        emoji::WARN
+                    );
+                    if let Some(build) = &self.build {
+                        if build.command.is_none() {
+                            failure::bail!(error_message)
+                        }
+                    } else {
+                        failure::bail!(error_message)
+                    }
+                }
+                _ => {}
+            }
+        }
 
         /*
         From https://developers.cloudflare.com/workers/cli-wrangler/configuration#keys
@@ -327,7 +346,7 @@ impl Manifest {
         Not inherited: Must be defined for every environment individually.
         */
         let mut target = Target {
-            target_type,                                 // Top level
+            target_type: self.target_type.clone(),       // Top level
             account_id: self.account_id.clone(),         // Inherited
             webpack_config: self.webpack_config.clone(), // Inherited
             build: self.build.clone(),                   // Inherited

src/upload/form/mod.rs

@@ -58,6 +58,14 @@ pub fn build(
         }
     }
 
+    if let Some(asset_manifest) = asset_manifest {
+        log::info!("adding __STATIC_CONTENT_MANIFEST");
+        let binding = "__STATIC_CONTENT_MANIFEST".to_string();
+        let asset_manifest_blob = get_asset_manifest_blob(asset_manifest)?;
+        let text_blob = TextBlob::new(asset_manifest_blob, binding)?;
+        text_blobs.push(text_blob);
+    }
+
     match target_type {
         TargetType::Rust => {
             log::info!("Rust project detected. Publishing...");
@@ -89,7 +97,7 @@ pub fn build(
                     log::info!("Plain JavaScript project detected. Publishing...");
                     let package_dir = target.package_dir()?;
                     let package = Package::new(&package_dir)?;
-                    let script_path = package.main(&package_dir)?;
+                    let script_path = package_dir.join(package.main(&package_dir)?);
 
                     let assets = ServiceWorkerAssets::new(
                         script_path,
@@ -185,14 +193,6 @@ pub fn build(
                 wasm_modules.push(wasm_module);
             }
 
-            if let Some(asset_manifest) = asset_manifest {
-                log::info!("adding __STATIC_CONTENT_MANIFEST");
-                let binding = "__STATIC_CONTENT_MANIFEST".to_string();
-                let asset_manifest_blob = get_asset_manifest_blob(asset_manifest)?;
-                let text_blob = TextBlob::new(asset_manifest_blob, binding)?;
-                text_blobs.push(text_blob);
-            }
-
             let assets = ServiceWorkerAssets::new(
                 script_path,
                 wasm_modules,