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

Follow redirect location as new referrers for nested module imports #2031

Merged
merged 7 commits into from
Apr 2, 2019
Merged

Follow redirect location as new referrers for nested module imports #2031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb68833
Follow redirect location as new referrers for nested module imports
kevinkassimo Apr 1, 2019
ab4e27e
Make existing tests work again
kevinkassimo Apr 1, 2019
d5b79d2
Address comments
kevinkassimo Apr 1, 2019
8dd76fd
Add comments and slight tweak
kevinkassimo Apr 1, 2019
6aea655
Add tests
kevinkassimo Apr 1, 2019
070d966
Rename
kevinkassimo Apr 2, 2019
ddfeb69
Reorder
kevinkassimo Apr 2, 2019
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
5 changes: 5 additions & 0 deletions cli/compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ impl WorkerBehavior for CompilerBehavior {
#[derive(Debug, Clone)]
pub struct ModuleMetaData {
pub module_name: String,
pub module_redirect_source_name: Option<String>, // source of redirect
pub filename: String,
pub media_type: msg::MediaType,
pub source_code: Vec<u8>,
Expand Down Expand Up @@ -250,6 +251,9 @@ pub fn compile_sync(
) {
Ok(serde_json::Value::Object(map)) => ModuleMetaData {
module_name: module_meta_data_.module_name.clone(),
module_redirect_source_name: module_meta_data_
.module_redirect_source_name
.clone(),
filename: module_meta_data_.filename.clone(),
media_type: module_meta_data_.media_type,
source_code: module_meta_data_.source_code.clone(),
Expand Down Expand Up @@ -342,6 +346,7 @@ mod tests {

let mut out = ModuleMetaData {
module_name: "xxx".to_owned(),
module_redirect_source_name: None,
filename: "/tests/002_hello.ts".to_owned(),
media_type: msg::MediaType::TypeScript,
source_code: include_bytes!("../tests/002_hello.ts").to_vec(),
Expand Down
Loading