Skip to content

Commit d25ba3a

Browse files
Set suffix according module system name (#61)
1 parent 68c602a commit d25ba3a

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/ExistingJsProject.res

+1-7
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ let updateRescriptJson = async (~projectName, ~sourceDir, ~moduleSystem, ~suffix
3838
}
3939
)
4040

41-
let getSuffixForModuleSystem = moduleSystem =>
42-
switch moduleSystem {
43-
| "esmodule" | "es6" | "es6-global" => ".res.mjs"
44-
| _ => ".res.js"
45-
}
46-
4741
let getModuleSystemOptions = (~versions) => [
4842
{
4943
P.value: "commonjs",
@@ -72,7 +66,7 @@ let addToExistingProject = async (~projectName) => {
7266
options: getModuleSystemOptions(~versions),
7367
})->P.resultOrRaise
7468

75-
let suffix = moduleSystem->getSuffixForModuleSystem
69+
let suffix = moduleSystem->ModuleSystem.getSuffix
7670

7771
let shouldCheckJsFilesIntoGit = await P.confirm({
7872
message: `Do you want to check generated ${suffix} files into git?`,

src/ModuleSystem.res

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
let getSuffix = moduleSystem =>
2+
switch moduleSystem {
3+
| "esmodule" | "es6" | "es6-global" => ".res.mjs"
4+
| _ => ".res.js"
5+
}

src/NewProject.res

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ let updateRescriptJson = async (~projectName, ~versions) =>
3232
| Some(Object(packageSpecs)) | Some(Array([Object(packageSpecs)])) =>
3333
let moduleSystemName = versions->RescriptVersions.esmModuleSystemName
3434
packageSpecs->Dict.set("module", String(moduleSystemName))
35+
36+
let suffix = moduleSystemName->ModuleSystem.getSuffix
37+
config->Dict.set("suffix", String(suffix))
3538
| _ => ()
3639
}
3740
| _ => ()

0 commit comments

Comments
 (0)