Skip to content

feat: changed watch script in package.json when using rewatch #93

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

Merged
merged 1 commit into from
Jul 15, 2025
Merged
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
11 changes: 8 additions & 3 deletions src/ExistingJsProject.res
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ open Node

module P = ClackPrompts

let updatePackageJson = async () =>
let updatePackageJson = async (~versions) =>
await JsonUtils.updateJsonFile("package.json", json =>
switch json {
| Object(config) =>
Expand All @@ -15,7 +15,12 @@ let updatePackageJson = async () =>
}
scripts->Dict.set("res:build", String("rescript"))
scripts->Dict.set("res:clean", String("rescript clean"))
scripts->Dict.set("res:dev", String("rescript -w"))

if RescriptVersions.usesRewatch(versions) {
scripts->Dict.set("res:dev", String("rescript watch"))
} else {
scripts->Dict.set("res:dev", String("rescript -w"))
}
| _ => ()
}
)
Expand Down Expand Up @@ -101,7 +106,7 @@ let addToExistingProject = async (~projectName) => {
await Fs.Promises.appendFile(gitignorePath, `**/*${suffix}${Os.eol}`)
}

await updatePackageJson()
await updatePackageJson(~versions)
await updateRescriptJson(~projectName, ~sourceDir, ~moduleSystem, ~suffix, ~versions)

if !Fs.existsSync(sourceDirPath) {
Expand Down
20 changes: 17 additions & 3 deletions src/NewProject.res
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,24 @@ let validateProjectName = projectName =>
None
}

let updatePackageJson = async (~projectName) =>
let updatePackageJson = async (~projectName, ~versions) =>
await JsonUtils.updateJsonFile("package.json", json =>
switch json {
| Object(config) => config->Dict.set("name", String(projectName))
| Object(config) => {
config->Dict.set("name", String(projectName))

let scripts = switch config->Dict.get("scripts") {
| Some(Object(scripts)) => scripts
| _ =>
let scripts = Dict.make()
config->Dict.set("scripts", Object(scripts))
scripts
}

if RescriptVersions.usesRewatch(versions) {
scripts->Dict.set("res:dev", String("rescript watch"))
}
}
| _ => ()
}
)
Expand Down Expand Up @@ -69,7 +83,7 @@ let createProject = async (~templateName, ~projectName, ~versions) => {
Process.chdir(projectPath)

await Fs.Promises.rename("_gitignore", ".gitignore")
await updatePackageJson(~projectName)
await updatePackageJson(~projectName, ~versions)
await updateRescriptJson(~projectName, ~versions)

await RescriptVersions.installVersions(versions)
Expand Down
4 changes: 4 additions & 0 deletions src/RescriptVersions.res
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module P = ClackPrompts
let rescript12VersionRange = ">=12.0.0-alpha.5"
let rescriptVersionRange = `11.x.x || ${rescript12VersionRange}`
let rescriptCoreVersionRange = ">=1.0.0"
let rescriptRewatchVersionRange = ">=12.0.0-alpha.15"

type versions = {rescriptVersion: string, rescriptCoreVersion: option<string>}

Expand Down Expand Up @@ -95,3 +96,6 @@ let installVersions = async ({rescriptVersion, rescriptCoreVersion}) => {

let esmModuleSystemName = ({rescriptVersion}) =>
CompareVersions.compareVersions(rescriptVersion, "11.1.0-rc.8") > 0. ? "esmodule" : "es6"

let usesRewatch = ({rescriptVersion}) =>
CompareVersions.satisfies(rescriptVersion, rescriptRewatchVersionRange)
2 changes: 2 additions & 0 deletions src/RescriptVersions.resi
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ let promptVersions: unit => promise<versions>
let installVersions: versions => promise<unit>

let esmModuleSystemName: versions => string

let usesRewatch: versions => bool