This repository has been archived by the owner on Aug 3, 2023. It is now read-only.
Allow non-Webpack Workers Sites #1833
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xortive
reviewed
Apr 2, 2021
| @@ -327,7 +321,7 @@ impl Manifest { | |||
| Not inherited: Must be defined for every environment individually. | |||
| */ | |||
| let mut target = Target { | |||
| target_type, // Top level | |||
There was a problem hiding this comment.
top level is correct -- we don't let you override target_type in environments
xortive
reviewed
Apr 2, 2021
There was a problem hiding this comment.
Could we:
- forbid the rust type (it won't work)
- for the javascript type fail if no
[build], or a[build]section with no/emptycommand? Something like:
Workers Sites requires using a bundler, and your configuration indicates that you aren't using one. You can fix this by:
* setting your project type to "webpack" to use our automatically configured webpack bundler.
* setting your project type to "javascript", and configuring a build command in the `[build]` section if you wish to use your choice of bundler.
xortive
approved these changes
Apr 5, 2021
xortive
reviewed
Apr 5, 2021
| @@ -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)?); | |||
There was a problem hiding this comment.
Without it, script_path is relative to the entrypoint. By joining package_dir with script_path, we get an absolute path, which is needed since wrangler actually executes in the project directory (parent).
So yes, it's needed, otherwise wrangler can't find that script to deploy.
src/settings/toml/manifest.rs
Outdated
| TargetType::JavaScript => { | ||
| if let Some(build) = &self.build { | ||
| if build.command.is_none() { | ||
| failure::bail!(format!( |
There was a problem hiding this comment.
nit: would be nice if this message wasn't duplicated but I'm not too bothered by it if it's inconvenient to structure the code that way
xortive
approved these changes
Apr 9, 2021
This was referenced Apr 9, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Right now, custom build commands don't work with Workers SItes. This should enable them.