ReScript 11, ReScript Core 1.2.0 etc. (#47)

* ReScript 11, ReScript Core 1.2.0 etc.

* Take "esmodule" vs. "es6" into account

Author: cknitt

package-lock.json

@@ -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"
   }
-}
+}

package.json

@@ -5,7 +5,7 @@
     "subdirs": true
   },
   "package-specs": {
-    "module": "es6",
+    "module": "esmodule",
     "in-source": true
   },
   "suffix": ".res.mjs",

rescript.json

@@ -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",
   },
 ]
@@ -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

src/ExistingJsProject.res

@@ -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) =>