Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: cargo publish fails without absolute paths #13993

Merged
merged 3 commits into from
Mar 17, 2022
Merged

fix: cargo publish fails without absolute paths #13993

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d8eb85
Revert "chore: improve build times for `ext/` changes (#13927)"
ry Mar 16, 2022
ee8eb28
fix
ry Mar 16, 2022
1d306df
cycle cache key
bartlomieju Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@ry
ry committed Mar 16, 2022
commit ee8eb28eda4054afd1b487d4dccf9c43c47070ab
8 changes: 7 additions & 1 deletion cli/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ fn create_compiler_snapshot(
// using the same op that is used in `tsc.rs` for loading modules and reading
// files, but a slightly different implementation at build time.
fn op_load(state: &mut OpState, args: LoadArgs) -> Result<Value, AnyError> {
let op_crate_libs = state.borrow::<HashMap<&str, &str>>();
let op_crate_libs = state.borrow::<HashMap<&str, PathBuf>>();
let path_dts = state.borrow::<PathBuf>();
let re_asset =
Regex::new(r"asset:/{3}lib\.(\S+)\.d\.ts").expect("bad regex");
Expand Down Expand Up @@ -237,6 +237,12 @@ fn create_compiler_snapshot(
// this corresponds to `ts.ScriptKind.TypeScript`
"scriptKind": 3
}))
} else {
Err(custom_error(
"InvalidSpecifier",
format!("An invalid specifier was requested: {}", args.specifier),
))
}
} else {
Err(custom_error(
"InvalidSpecifier",
Expand Down