feat(manifest): add main entry #95
Merged
Conversation
This file contains hidden or 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
ashleygwilliams
force-pushed
the
index-main
branch
from
916219c to
fa9c364
Compare
ashleygwilliams
force-pushed
the
index-main
branch
from
819cc7c to
267d9f0
Compare
ashleygwilliams
changed the title
mgattozzi
approved these changes
Apr 19, 2018
| @@ -13,11 +14,15 @@ pub fn cargo_install_wasm_bindgen() -> Result<(), Error> { | |||
| let pb = PBAR.message(&step); | |||
| let output = Command::new("cargo") | |||
| .arg("install") | |||
| .arg("wasm-bindgen") | |||
| .arg("wasm-bindgen-cli") | |||
There was a problem hiding this comment.
ah that was the error you mentioned before nice catch!
| .output()?; | ||
| pb.finish(); | ||
| if !output.status.success() { | ||
| let s = String::from_utf8_lossy(&output.stderr); | ||
| if s.contains("already exists") { | ||
| PBAR.one_off_message("wasm-bindgen already installed"); |
There was a problem hiding this comment.
What if there's a newer version that needs to be installed? I think we can add that in a separate PR though. This is just to patch broken behavior for now
| @@ -46,6 +51,9 @@ pub fn wasm_bindgen_build(path: &str, name: &str) -> Result<(), Error> { | |||
| PBAR.error("wasm-bindgen failed to execute properly"); | |||
| bail!(format!("Details:\n{}", s)); | |||
| } else { | |||
| let js_file = format!("{}/pkg/{}.js", path, binary_name); | |||
| let index_file = format!("{}/pkg/index.js", path); | |||
| fs::rename(&js_file, &index_file)?; | |||
There was a problem hiding this comment.
Ah okay I see. We didn't have an index.js file so npm complained. This part looks good to me
There was a problem hiding this comment.
npm didn't complain but this is leveraging npm better
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #94
this PR does a few things:
wasm_bindgenrun that renames the generated js file toindex.jsmainentry to thepackage.jsonthat points toindex.jsmainentrypackage.jsoncontents in some tests