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.

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

Remove .js and .ts from require / import #4002

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions compiler/crates/relay-codegen/src/printer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ use indexmap::IndexMap;
use intern::string_key::StringKey;
use std::fmt::Result as FmtResult;
use std::fmt::Write;
use std::path::Path;

pub fn print_operation(
schema: &SDLSchema,
Expand Down Expand Up @@ -470,6 +471,25 @@ impl<'b> JSONPrinter<'b> {
},
Primitive::JSModuleDependency(key) => match self.js_module_format {
JsModuleFormat::CommonJS => {
let path = Path::new(key.lookup());
let extension = path.extension();

if let Some(extension) = extension {
if extension == "ts" || extension == "js" {
let path_without_extension = path.with_extension("");

let path_without_extension = path_without_extension
.to_str()
.expect("could not convert `path_without_extension` to a str");

return self.write_js_dependency(
f,
key.to_string(),
format!("./{}", path_without_extension),
);
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the Path/PathBuf types have utilities for extracting the extension, let's use those? there is also the camino crate, which is basically utf8-only versions of Path/PathBuf which might help since the string is already utf8.

-- @josephsavona (internal review)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing tsx

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed #4303


self.write_js_dependency(f, key.to_string(), format!("./{}", key))
}
JsModuleFormat::Haste => {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading