Drop support for bs-platform.

Author: cristianoc

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Sync with latest parser/printer.
 - Support paths to rescript executables in arm64 architectures.
 - Fix issue where `@inline` was not suported by the command to generate an interface file.
+- `*` Drop support for `bs-patform`. Only `rescript` supported.
 
 ## 1.3.0
 

analysis/src/BuildSystem.ml

@@ -9,15 +9,10 @@ let getBsPlatformDir rootPath =
   let result =
     ModuleResolution.resolveNodeModulePath ~startPath:rootPath "rescript"
   in
-  let result =
-    if result = None then
-      ModuleResolution.resolveNodeModulePath ~startPath:rootPath "bs-platform"
-    else result
-  in
   match result with
   | Some path -> Some path
   | None ->
-    let message = "bs-platform could not be found" in
+    let message = "rescript could not be found" in
     Log.log message;
     None
 

server/src/constants.ts

@@ -12,12 +12,6 @@ export let bscNativeReScriptPartialPath = path.join(
   platformDir,
   "bsc.exe"
 );
-export let bscNativePartialPath = path.join(
-  "node_modules",
-  "bs-platform",
-  platformDir,
-  "bsc.exe"
-);
 
 export let analysisDevPath = path.join(
   path.dirname(__dirname),

server/src/utils.ts

@@ -38,16 +38,6 @@ export let findProjectRootOfFile = (
   }
 };
 
-// TODO: races here?
-// TODO: this doesn't handle file:/// scheme
-
-// We need to recursively search for bs-platform/{platform}/bsc.exe upward from
-// the project's root, because in some setups, such as yarn workspace/monorepo,
-// the node_modules/bs-platform package might be hoisted up instead of alongside
-// the project root.
-// Also, if someone's ever formatting a regular project setup's dependency
-// (which is weird but whatever), they'll at least find an upward bs-platform
-// from the dependent.
 export let findBscBinaryFromProjectRoot = (
   source: p.DocumentUri
 ): null | p.DocumentUri => {
@@ -56,12 +46,9 @@ export let findBscBinaryFromProjectRoot = (
   // also invokes another JS wrapper. _That_ JS wrapper ultimately calls the
   // (unexposed) bsc -format anyway.
   let bscNativeReScriptPath = path.join(dir, c.bscNativeReScriptPartialPath);
-  let bscNativePath = path.join(dir, c.bscNativePartialPath);
 
   if (fs.existsSync(bscNativeReScriptPath)) {
     return bscNativeReScriptPath;
-  } else if (fs.existsSync(bscNativePath)) {
-    return bscNativePath;
   } else if (dir === source) {
     // reached the top
     return null;
@@ -98,7 +85,9 @@ let findBuildBinaryBase = ({
   return null;
 };
 
-export let findBuildBinaryFromConfig = (pathToBinaryDirFromConfig: p.DocumentUri) =>
+export let findBuildBinaryFromConfig = (
+  pathToBinaryDirFromConfig: p.DocumentUri
+) =>
   findBuildBinaryBase({
     rescriptPath: path.join(pathToBinaryDirFromConfig, c.rescriptBinName),
     bsbPath: path.join(pathToBinaryDirFromConfig, c.bsbBinName),