Skip to content

ReScript 11, ReScript Core 1.2.0 etc. #47

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 2 commits into from
Apr 19, 2024
Merged

ReScript 11, ReScript Core 1.2.0 etc. #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e775cc
ReScript 11, ReScript Core 1.2.0 etc.
cknitt Apr 19, 2024
8aab293
Take "esmodule" vs. "es6" into account
cknitt Apr 19, 2024
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
173 changes: 107 additions & 66 deletions package-lock.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
},
"devDependencies": {
"@clack/prompts": "0.7.0",
"@rescript/core": "^0.6.0",
"@rescript/core": "^1.2.0",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-terser": "^0.4.4",
"compare-versions": "^6.1.0",
"rescript": "^11.0.1",
"rollup": "^4.9.1"
"rescript": "^11.1.0",
"rollup": "^4.14.3"
}
}
}
2 changes: 1 addition & 1 deletion rescript.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"subdirs": true
},
"package-specs": {
"module": "es6",
"module": "esmodule",
"in-source": true
},
"suffix": ".res.mjs",
Expand Down
10 changes: 5 additions & 5 deletions src/ExistingJsProject.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ let updateRescriptJson = async (~projectName, ~sourceDir, ~moduleSystem, ~suffix

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

let moduleSystemOptions = [
let getModuleSystemOptions = (~versions) => [
{
P.value: "commonjs",
label: "CommonJS",
hint: "Use require syntax and .res.js extension",
},
{
value: "es6",
label: "ES6",
value: RescriptVersions.esmModuleSystemName(versions),
label: "ES Modules",
hint: "Use import syntax and .res.mjs extension",
},
]
Expand All @@ -69,7 +69,7 @@ let addToExistingProject = async (~projectName) => {

let moduleSystem = await P.select({
message: "What module system will you use?",
options: moduleSystemOptions,
options: getModuleSystemOptions(~versions),
})->P.resultOrRaise

let suffix = moduleSystem->getSuffixForModuleSystem
Expand Down
2 changes: 1 addition & 1 deletion src/JsonUtils.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let updateJsonFile = (filename, updateFn) =>
updateFile(filename, contents => {
let json = JSON.parseExn(contents)
updateFn(json)
JSON.stringifyWithIndent(json, 2)
JSON.stringify(json, ~space=2)
})

let getStringValue = (json: JSON.t, ~fieldName) =>
Expand Down
Loading