[pull] master from rescript-lang:master

.devcontainer/.dockerignore

@@ -0,0 +1,99 @@
+*~
+_build
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+ *~
+*.annot
+*.mj
+*.bak
+*.swp
+*.swo
+*.flambda
+*.jsx
+*.lambda
+*.rawlambda
+*.s
+*.o
+*.lam
+*.0.js
+*#
+*.log
+.#*
+*.cmj
+*.rawlambda
+*.lambda
+*.zip
+*.mlast
+*.mliast
+
+.idea
+.DS_Store
+
+node_modules
+*.dump
+coverage
+
+.ninja_log
+.bsdeps
+.bsbuild
+lib/ocaml
+tests/build_tests/*/lib/
+#ignore temporary directory
+*.goog.js
+*.jsoo.js
+*.so
+tmp/
+tracing*.json
+
+_opam
+
+.env
+playground/packages/
+playground/stdlib/
+playground/*.cmj
+playground/*.cmi
+playground/.netrc
+playground/compiler.*js
+
+rewatch/target/
+rewatch/rewatch
+
+tests/tools_tests/**/*.res.js
+tests/tools_tests/lib
+tests/analysis_tests*/lib
+tests/analysis_tests/**/*.bs.js
+
+/linux/*.exe
+/linuxarm64/*.exe
+/darwin/*.exe
+/darwinarm64/*.exe
+/win32/*.exe
+
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+*.tsbuildinfo
+
+# package tarballs
+package.tgz
+*.exe
+
+/ninja/ninja
+/ninja/build.ninja

.devcontainer/Dockerfile

@@ -2,9 +2,14 @@ FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm
 LABEL org.opencontainers.image.authors="Christoph Knittel <[email protected]>"
 LABEL org.opencontainers.image.description="Docker image for ReScript development."
 
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
-    opam \
+    cmake \
+    ninja-build \
     musl-tools \
     python-is-python3 \
     && rm -rf /var/lib/apt/lists/*
+
+# Install OPAM
+ARG OPAM_VERSION=2.4.1
+RUN printf '\n\n' | bash -c "sh <(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --version $OPAM_VERSION"

.devcontainer/devcontainer.json

@@ -2,7 +2,11 @@
   "name": "ReScript Compiler",
   "build": {
     "context": ".",
-    "dockerfile": "Dockerfile"
+    "dockerfile": "Dockerfile",
+    "args": {
+      "USER_UID": "${localEnv:UID}",
+      "USER_GID": "${localEnv:GID}"
+    }
   },
   "features": {
     "ghcr.io/devcontainers/features/github-cli:1": {
@@ -23,5 +27,7 @@
       ]
     }
   },
-  "postCreateCommand": ".devcontainer/postCreate.sh"
+  "postCreateCommand": ".devcontainer/postCreate.sh",
+  "remoteUser": "vscode",
+  "containerUser": "vscode"
 }

.devcontainer/postCreate.sh

@@ -2,14 +2,14 @@
 
 # Install dev dependencies from OPAM
 opam init -y --bare --disable-sandboxing
-opam switch create 5.2.0 --packages ocaml-option-static
-opam install . --deps-only -y
-
-# For IDE support, install the OCaml language server
-opam install ocaml-lsp-server -y
+opam switch create 5.3.0
+opam install . --deps-only --with-test --with-dev-setup -y
 
 # Add OPAM environment setup to shell startup script
 echo 'eval $(opam env)' >> ~/.zshrc
 echo 'eval $(opam env)' >> ~/.bashrc
 
-npm install --ignore-scripts
+nvm install
+
+corepack enable
+printf "\n" | yarn 

.gitattributes

@@ -1,4 +1,8 @@
+* text=auto eol=lf
+
 *.ml linguist-language=OCaml
 *.mli linguist-language=OCaml
 *.res linguist-language=ReScript
 *.resi linguist-language=ReScript
+
+.yarn/releases/* binary linguist-vendored