Skip to content

Set suffix according module system name #61

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

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Set suffix according module system name #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions src/ExistingJsProject.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ let updateRescriptJson = async (~projectName, ~sourceDir, ~moduleSystem, ~suffix
}
)

let getSuffixForModuleSystem = moduleSystem =>
switch moduleSystem {
| "esmodule" | "es6" | "es6-global" => ".res.mjs"
| _ => ".res.js"
}

let getModuleSystemOptions = (~versions) => [
{
P.value: "commonjs",
Expand Down Expand Up @@ -72,7 +66,7 @@ let addToExistingProject = async (~projectName) => {
options: getModuleSystemOptions(~versions),
})->P.resultOrRaise

let suffix = moduleSystem->getSuffixForModuleSystem
let suffix = moduleSystem->ModuleSystem.getSuffix

let shouldCheckJsFilesIntoGit = await P.confirm({
message: `Do you want to check generated ${suffix} files into git?`,
Expand Down
5 changes: 5 additions & 0 deletions src/ModuleSystem.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
let getSuffix = moduleSystem =>
switch moduleSystem {
| "esmodule" | "es6" | "es6-global" => ".res.mjs"
| _ => ".res.js"
}
3 changes: 3 additions & 0 deletions src/NewProject.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ let updateRescriptJson = async (~projectName, ~versions) =>
| Some(Object(packageSpecs)) | Some(Array([Object(packageSpecs)])) =>
let moduleSystemName = versions->RescriptVersions.esmModuleSystemName
packageSpecs->Dict.set("module", String(moduleSystemName))

let suffix = moduleSystemName->ModuleSystem.getSuffix
config->Dict.set("suffix", String(suffix))
| _ => ()
}
| _ => ()
Expand Down