Merge pull request #100 from nojaf/update-vite

Update to Vite 7, React 19, modernize configurations

Author: nojaf

src/NewProject.res

@@ -2,7 +2,7 @@ open Node
 
 module P = ClackPrompts
 
-let packageNameRegExp = %re("/^[a-z0-9-]+$/")
+let packageNameRegExp = /^[a-z0-9-]+$/
 
 let validateProjectName = projectName =>
   if projectName->String.trim->String.length === 0 {
@@ -19,20 +19,20 @@ let updatePackageJson = async (~projectName, ~versions) =>
   await JsonUtils.updateJsonFile("package.json", json =>
     switch json {
     | 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"))
+        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"))
+        }
       }
-    }
     | _ => ()
     }
   )
@@ -55,6 +55,11 @@ let updateRescriptJson = async (~projectName, ~versions) =>
       if Option.isNone(versions.rescriptCoreVersion) {
         RescriptJsonUtils.removeRescriptCore(config)
       }
+
+      // https://github.com/rescript-lang/rescript/blob/master/CHANGELOG.md#1200-beta3
+      if CompareVersions.satisfies(versions.rescriptVersion, ">=12.0.0-beta.3") {
+        RescriptJsonUtils.modernizeConfigurationFields(config)
+      }
     | _ => ()
     }
   )
@@ -119,8 +124,10 @@ let createNewProject = async () => {
       validate: validateProjectName,
     })->P.resultOrRaise
 
-    let templateName =
-      await P.select({message: "Select a template", options: getTemplateOptions()})->P.resultOrRaise
+    let templateName = await P.select({
+      message: "Select a template",
+      options: getTemplateOptions(),
+    })->P.resultOrRaise
 
     let versions = await RescriptVersions.promptVersions()
 

src/RescriptJsonUtils.res

@@ -27,3 +27,18 @@ let removeRescriptCore = (config: Dict.t<JSON.t>) => {
   | _ => ()
   }
 }
+
+let renameConfigKey = (config: Dict.t<JSON.t>, ~from, ~to) => {
+  switch config->Dict.get(from) {
+  | Some(value) =>
+    config->Dict.set(to, value)
+    config->Dict.delete(from)
+  | _ => ()
+  }
+}
+
+let modernizeConfigurationFields = (config: Dict.t<JSON.t>) => {
+  renameConfigKey(config, ~from="bs-dependencies", ~to="dependencies")
+  renameConfigKey(config, ~from="bs-dev-dependencies", ~to="dev-dependencies")
+  renameConfigKey(config, ~from="bsc-flags", ~to="compiler-flags")
+}

src/Templates.res

@@ -10,7 +10,7 @@ let templates = [
   {
     name: "rescript-template-vite",
     displayName: "Vite",
-    shortDescription: "Vite 6, React and Tailwind 4",
+    shortDescription: "Vite 7, React and Tailwind 4",
   },
   {
     name: "rescript-template-nextjs",