Commit 1417348

authored

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

1 parent a6bb637 commit 1417348Copy full SHA for 1417348

File tree

+31

-6

lines changed

+31

-6

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ open Node`
`2`	`2`
`3`	`3`	`module P = ClackPrompts`
`4`	`4`
`5`		`-let updatePackageJson = async () =>`
	`5`	`+let updatePackageJson = async (~versions) =>`
`6`	`6`	`await JsonUtils.updateJsonFile("package.json", json =>`
`7`	`7`	`switch json {`
`8`	`8`	`\| Object(config) =>`
`@@ -15,7 +15,12 @@ let updatePackageJson = async () =>`
`15`	`15`	`}`
`16`	`16`	`scripts->Dict.set("res:build", String("rescript"))`
`17`	`17`	`scripts->Dict.set("res:clean", String("rescript clean"))`
`18`		`- scripts->Dict.set("res:dev", String("rescript -w"))`
	`18`	`+`
	`19`	`+ if RescriptVersions.usesRewatch(versions) {`
	`20`	`+ scripts->Dict.set("res:dev", String("rescript watch"))`
	`21`	`+ } else {`
	`22`	`+ scripts->Dict.set("res:dev", String("rescript -w"))`
	`23`	`+ }`
`19`	`24`	`\| _ => ()`
`20`	`25`	`}`
`21`	`26`	`)`
`@@ -101,7 +106,7 @@ let addToExistingProject = async (~projectName) => {`
`101`	`106`	await Fs.Promises.appendFile(gitignorePath, `*/${suffix}${Os.eol}`)
`102`	`107`	`}`
`103`	`108`
`104`		`- await updatePackageJson()`
	`109`	`+ await updatePackageJson(~versions)`
`105`	`110`	`await updateRescriptJson(~projectName, ~sourceDir, ~moduleSystem, ~suffix, ~versions)`
`106`	`111`
`107`	`112`	`if !Fs.existsSync(sourceDirPath) {`

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,24 @@ let validateProjectName = projectName =>`
`15`	`15`	`None`
`16`	`16`	`}`
`17`	`17`
`18`		`-let updatePackageJson = async (~projectName) =>`
	`18`	`+let updatePackageJson = async (~projectName, ~versions) =>`
`19`	`19`	`await JsonUtils.updateJsonFile("package.json", json =>`
`20`	`20`	`switch json {`
`21`		`- \| Object(config) => config->Dict.set("name", String(projectName))`
	`21`	`+ \| Object(config) => {`
	`22`	`+ config->Dict.set("name", String(projectName))`
	`23`	`+`
	`24`	`+ let scripts = switch config->Dict.get("scripts") {`
	`25`	`+ \| Some(Object(scripts)) => scripts`
	`26`	`+ \| _ =>`
	`27`	`+ let scripts = Dict.make()`
	`28`	`+ config->Dict.set("scripts", Object(scripts))`
	`29`	`+ scripts`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ if RescriptVersions.usesRewatch(versions) {`
	`33`	`+ scripts->Dict.set("res:dev", String("rescript watch"))`
	`34`	`+ }`
	`35`	`+ }`
`22`	`36`	`\| _ => ()`
`23`	`37`	`}`
`24`	`38`	`)`
`@@ -69,7 +83,7 @@ let createProject = async (~templateName, ~projectName, ~versions) => {`
`69`	`83`	`Process.chdir(projectPath)`
`70`	`84`
`71`	`85`	`await Fs.Promises.rename("_gitignore", ".gitignore")`
`72`		`- await updatePackageJson(~projectName)`
	`86`	`+ await updatePackageJson(~projectName, ~versions)`
`73`	`87`	`await updateRescriptJson(~projectName, ~versions)`
`74`	`88`
`75`	`89`	`await RescriptVersions.installVersions(versions)`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ module P = ClackPrompts`
`3`	`3`	`let rescript12VersionRange = ">=12.0.0-alpha.5"`
`4`	`4`	let rescriptVersionRange = `11.x.x \|\| ${rescript12VersionRange}`
`5`	`5`	`let rescriptCoreVersionRange = ">=1.0.0"`
	`6`	`+let rescriptRewatchVersionRange = ">=12.0.0-alpha.15"`
`6`	`7`
`7`	`8`	`type versions = {rescriptVersion: string, rescriptCoreVersion: option<string>}`
`8`	`9`
`@@ -95,3 +96,6 @@ let installVersions = async ({rescriptVersion, rescriptCoreVersion}) => {`
`95`	`96`
`96`	`97`	`let esmModuleSystemName = ({rescriptVersion}) =>`
`97`	`98`	`CompareVersions.compareVersions(rescriptVersion, "11.1.0-rc.8") > 0. ? "esmodule" : "es6"`
	`99`	`+`
	`100`	`+let usesRewatch = ({rescriptVersion}) =>`
	`101`	`+ CompareVersions.satisfies(rescriptVersion, rescriptRewatchVersionRange)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,5 @@ let promptVersions: unit => promise<versions>`
`5`	`5`	`let installVersions: versions => promise<unit>`
`6`	`6`
`7`	`7`	`let esmModuleSystemName: versions => string`
	`8`	`+`
	`9`	`+let usesRewatch: versions => bool`

Comments

(0)