Merge branch 'master' into rewatch-root

Author: nojaf

CHANGELOG.md

@@ -19,19 +19,25 @@
 #### :rocket: New Feature
 
 - Add optional `message` argument to `Result.getOrThrow` and improve default error message. https://github.com/rescript-lang/rescript/pull/7630
+- Add `RegExp.escape` binding. https://github.com/rescript-lang/rescript/pull/7695
 
 #### :nail_care: Polish
 
 - Configuration fields `bs-dependencies`, `bs-dev-dependencies` and `bsc-flags` are now deprecated in favor of `dependencies`, `dev-dependencies` and `compiler-flags`. https://github.com/rescript-lang/rescript/pull/7658
+- Better error message if platform binaries package is not found. https://github.com/rescript-lang/rescript/pull/7698
 
 #### :house: Internal
 
 - Add rust linting to CI with `clippy`. https://github.com/rescript-lang/rescript/pull/7675
 - AST: use `Typ.arrows` for creation, after the refactoring of arrow types. https://github.com/rescript-lang/rescript/pull/7662
+- Don't skip Stdlib docstring tests. https://github.com/rescript-lang/rescript/pull/7694
+- Remove all leftovers of pinned-dependencies handling. https://github.com/rescript-lang/rescript/pull/7686
 
 #### :bug: Bug fix
 
 - Fix `--create-sourcedirs` generation with for a single project. https://github.com/rescript-lang/rescript/pull/7671
+- Fix rewatch not recompiling on changes under windows. https://github.com/rescript-lang/rescript/pull/7690
+- Fix locations of regex literals. https://github.com/rescript-lang/rescript/pull/7683
 
 # 12.0.0-beta.2
 

analysis/examples/example-project/bsconfig.json renamed to analysis/examples/example-project/rescript.json

@@ -7,6 +7,5 @@
     "in-source": true
   },
   "suffix": ".mjs",
-  "pinned-dependencies": ["common", "myplugin", "app"],
   "bs-dependencies": ["common", "myplugin", "app"]
 }

analysis/examples/larger-project/bsconfig.json renamed to analysis/examples/larger-project/rescript.json

@@ -213,16 +213,21 @@ let findProjectFiles ~public ~namespace ~path ~sourceDirectories ~libBs =
 
 let findDependencyFiles base config =
   let deps =
-    config |> Json.get "bs-dependencies" |> bind Json.array
-    |> Option.value ~default:[]
-    |> List.filter_map Json.string
+    match
+      ( config |> Json.get "dependencies" |> bind Json.array,
+        config |> Json.get "bs-dependencies" |> bind Json.array )
+    with
+    | None, None -> []
+    | Some deps, None | _, Some deps -> deps |> List.filter_map Json.string
   in
   let devDeps =
-    config
-    |> Json.get "bs-dev-dependencies"
-    |> bind Json.array
-    |> Option.map (List.filter_map Json.string)
-    |> Option.value ~default:[]
+    match
+      ( config |> Json.get "dev-dependencies" |> bind Json.array,
+        config |> Json.get "bs-dev-dependencies" |> bind Json.array )
+    with
+    | None, None -> []
+    | Some devDeps, None | _, Some devDeps ->
+      devDeps |> List.filter_map Json.string
   in
   let deps = deps @ devDeps in
   Log.log ("Dependencies: " ^ String.concat " " deps);

analysis/examples/workspace-project/app/bsconfig.json renamed to analysis/examples/workspace-project/app/rescript.json

@@ -138,15 +138,20 @@ let newBsPackage ~rootPath =
                [path]
            in
            let bind f x = Option.bind x f in
-           let bsc_flags =
-             Json.get "bsc-flags" config
-             |> bind Json.array |> Option.value ~default:[]
+           let compiler_flags =
+             match
+               ( Json.get "compiler-flags" config |> bind Json.array,
+                 Json.get "bsc-flags" config |> bind Json.array )
+             with
+             | Some compiler_flags, None | _, Some compiler_flags ->
+               compiler_flags
+             | None, None -> []
            in
            let no_pervasives =
-             bsc_flags
+             compiler_flags
              |> List.exists (fun s -> Json.string s = Some "-nopervasives")
            in
-           let opens_from_bsc_flags =
+           let opens_from_compiler_flags =
              List.fold_left
                (fun opens item ->
                  match item |> Json.string with
@@ -158,15 +163,15 @@ let newBsPackage ~rootPath =
                      let path = name |> String.split_on_char '.' in
                      path :: opens
                    | _ -> opens))
-               [] bsc_flags
+               [] compiler_flags
            in
            let opens_from_pervasives =
              if no_pervasives then []
              else [["Stdlib"]; ["Pervasives"; "JsxModules"]]
            in
            let opens =
              opens_from_pervasives @ opens_from_namespace
-             |> List.rev_append opens_from_bsc_flags
+             |> List.rev_append opens_from_compiler_flags
              |> List.map (fun path -> path @ ["place holder"])
            in
            {

analysis/examples/workspace-project/common/bsconfig.json renamed to analysis/examples/workspace-project/common/rescript.json

@@ -6,11 +6,28 @@
 
 const target = `${process.platform}-${process.arch}`;
 
+const supportedPlatforms = [
+  "darwin-arm64",
+  "darwin-x64",
+  "linux-arm64",
+  "linux-x64",
+  "win32-x64",
+];
+
 /** @type {BinaryModuleExports} */
 let mod;
-try {
-  mod = await import(`@rescript/${target}`);
-} catch {
+
+if (supportedPlatforms.includes(target)) {
+  const binPackageName = `@rescript/${target}`;
+
+  try {
+    mod = await import(binPackageName);
+  } catch {
+    throw new Error(
+      `Package ${binPackageName} not found. Make sure the rescript package is installed correctly.`,
+    );
+  }
+} else {
   throw new Error(`Platform ${target} is not supported!`);
 }