Merge branch 'master' into throw-error-instance

Author: aspeddro

.github/workflows/ci.yml

@@ -20,6 +20,67 @@ env:
   OCAMLRUNPARAM: b
 
 jobs:
+  build-rewatch:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [
+            macos-13, # x64
+            macos-14, # ARM
+            ubuntu-latest, # x64
+            buildjet-2vcpu-ubuntu-2204-arm, # ARM
+            windows-latest,
+          ]
+        include:
+          - os: macos-13
+            rust-target: x86_64-apple-darwin
+          - os: macos-14
+            rust-target: aarch64-apple-darwin
+          - os: ubuntu-latest
+            rust-target: x86_64-unknown-linux-musl
+          - os: buildjet-2vcpu-ubuntu-2204-arm
+            rust-target: aarch64-unknown-linux-musl
+          - os: windows-latest
+            rust-target: x86_64-pc-windows-gnu
+
+    runs-on: ${{matrix.os}}
+
+    env:
+      RUST_BACKTRACE: "1"
+      SCCACHE_GHA_ENABLED: "true"
+      RUSTC_WRAPPER: "sccache"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install musl gcc
+        if: runner.os == 'Linux'
+        run: sudo apt-get install -y musl-tools
+
+      - name: Set up sccache
+        uses: mozilla-actions/sccache-action@v0.0.4
+        with:
+          version: "v0.8.0"
+
+      - name: Install rust toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          targets: ${{matrix.rust-target}}
+
+      - name: Build rewatch
+        run: cargo build --manifest-path rewatch/Cargo.toml --target ${{matrix.rust-target}} --release
+
+      - name: Get artifact dir name
+        run: node .github/workflows/get_artifact_dir_name.js
+
+      - name: "Upload artifact: rewatch binary"
+        uses: actions/upload-artifact@v4
+        with:
+          name: rewatch-${{env.artifact_dir_name}}
+          path: rewatch/target/${{matrix.rust-target}}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }}
+
   # Build statically linked Linux binaries in an Alpine-based Docker container
   # See https://ocamlpro.com/blog/2021_09_02_generating_static_and_portable_executables_with_ocaml
   # for more info.
@@ -59,6 +120,7 @@ jobs:
   # Therefore, only upload the binaries from the static build
   upload-linux-arm64-binaries:
     needs:
+      - build-rewatch
       - static-binaries-linux
 
     runs-on: buildjet-2vcpu-ubuntu-2204-arm
@@ -73,31 +135,33 @@ jobs:
         with:
           name: static-binaries-linux-${{ runner.arch }}
 
-      - name: Make static linux binaries executable
-        if: runner.os == 'Linux'
-        run: |
-          chmod +x ninja/ninja
-          chmod +x _build/install/default/bin/*
-
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 18
 
+      - name: Get artifact dir name
+        run: node .github/workflows/get_artifact_dir_name.js
+
+      - name: Download rewatch binary
+        uses: actions/download-artifact@v4
+        with:
+          name: rewatch-${{ env.artifact_dir_name }}
+          path: rewatch
+
       - name: Copy exes to platform bin dirs
         run: node ./scripts/copyExes.js
 
-      - name: Prepare artifact upload
-        run: node .github/workflows/get_artifact_info.js
-
       - name: "Upload artifacts: binaries"
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
-          path: ${{ env.artifact_path }}
+          name: binaries-${{ env.artifact_dir_name }}
+          path: ${{ env.artifact_dir_name }}
 
   build:
-    needs: static-binaries-linux
+    needs:
+      - build-rewatch
+      - static-binaries-linux
 
     strategy:
       fail-fast: false
@@ -133,10 +197,20 @@ jobs:
         with:
           name: static-binaries-linux-${{ runner.arch }}
 
+      - name: Get artifact dir name
+        run: node .github/workflows/get_artifact_dir_name.js
+
+      - name: Download rewatch binary
+        uses: actions/download-artifact@v4
+        with:
+          name: rewatch-${{ env.artifact_dir_name }}
+          path: rewatch
+
       - name: Make static linux binaries executable
         if: runner.os == 'Linux'
         run: |
           chmod +x ninja/ninja
+          chmod +x rewatch/rewatch
           chmod +x _build/install/default/bin/*
 
       - name: Use OCaml ${{matrix.ocaml_compiler}}
@@ -252,14 +326,11 @@ jobs:
           KEYCDN_PASSWORD: ${{ secrets.KEYCDN_PASSWORD }}
         run: bash playground/upload_bundle.sh
 
-      - name: Prepare artifact upload
-        run: node .github/workflows/get_artifact_info.js
-
       - name: "Upload artifacts: binaries"
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
-          path: ${{ env.artifact_path }}
+          name: binaries-${{ env.artifact_dir_name }}
+          path: ${{ env.artifact_dir_name }}
 
       - name: "Upload artifacts: lib/ocaml"
         if: runner.os == 'Linux'
@@ -286,6 +357,8 @@ jobs:
 
       - name: Download artifacts
         uses: actions/download-artifact@v4
+        with:
+          pattern: "@(binaries-*|lib-ocaml)"
 
       - name: Move artifacts
         run: ./scripts/moveArtifacts.sh

.github/workflows/get_artifact_dir_name.js

@@ -0,0 +1,10 @@
+const fs = require("fs");
+const os = require("os");
+
+const artifactDirName = require("../../scripts/bin_path").dirName;
+
+// Pass artifactDirName to subsequent GitHub actions
+fs.appendFileSync(
+  process.env.GITHUB_ENV,
+  `artifact_dir_name=${artifactDirName}${os.EOL}`
+);

.github/workflows/get_artifact_info.js

@@ -12,20 +12,86 @@
 
 # 12.0.0-alpha.1 (Unreleased)
 
+#### :rocket: New Feature
+
+- Allow `@directive` on functions for emitting function level directive code (`let serverAction = @directive("'use server'") (~name) => {...}`). https://github.com/rescript-lang/rescript-compiler/pull/6756
+- Add `rewatch` to the npm package as an alternative build tool. https://github.com/rescript-lang/rescript-compiler/pull/6762
+
 #### :boom: Breaking Change
 
 - `lazy` syntax is no longer supported. If you're using it, use `Lazy` module or `React.lazy_` instead. https://github.com/rescript-lang/rescript-compiler/pull/6342
 - Remove handling of attributes with `bs.` prefix (`@bs.as` -> `@as` etc.). https://github.com/rescript-lang/rescript-compiler/pull/6643
 - Remove obsolete `@bs.open` feature. https://github.com/rescript-lang/rescript-compiler/pull/6629
 - Drop Node.js version <18 support, due to it reaching End-of-Life. https://github.com/rescript-lang/rescript-compiler/pull/6429
 
+#### :bug: Bug Fix
+
+- Fix unhandled cases for exotic idents (allow to use exotic PascalCased identifiers for types). https://github.com/rescript-lang/rescript-compiler/pull/6777
+- Fix issue of incorrect switch cases with identical bodies when mixing object and array. https://github.com/rescript-lang/rescript-compiler/pull/6792
+- Fix formatter eats comments on the first argument of an uncurried function. https://github.com/rescript-lang/rescript-compiler/pull/6763 
+- Fix formatter removes parens in pipe operator with anonymous uncurried function. https://github.com/rescript-lang/rescript-compiler/pull/6766
+
 #### :house: Internal
 
 - Build with OCaml 5.1.1. https://github.com/rescript-lang/rescript-compiler/pull/6641
+- Convert OCaml codebase to snake case style. https://github.com/rescript-lang/rescript-compiler/pull/6702
+- Fix location of let bindings with attributes. https://github.com/rescript-lang/rescript-compiler/pull/6791
+- Refactor uppercase exotic ident handling. https://github.com/rescript-lang/rescript-compiler/pull/6779
 
 #### :nail_care: Polish
 
 - Make the `--help` arg be prioritized in the CLI, so correctly prints help message and skip other commands. https://github.com/rescript-lang/rescript-compiler/pull/6667
+- Remove redundant space for empty return in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6745
+- Remove redundant space for export in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6560
+- Remove redundant space after continue in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6743
+- Remove empty export blocks in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6744
+- Fix indent for returned/thrown/wrapped in parentheses objects in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6746
+- Fix indent in generated js code. https://github.com/rescript-lang/rescript-compiler/pull/6747
+- In generated code, use `let` instead of `var`. https://github.com/rescript-lang/rescript-compiler/pull/6102
+- Turn off transformation for closures inside loops when capturing loop variables, now that `let` is emitted instead of `var`. https://github.com/rescript-lang/rescript-compiler/pull/6480
+- Improve unused attribute warning message. https://github.com/rescript-lang/rescript-compiler/pull/6787
+- Remove unused -no-stdlib compiler option. https://github.com/rescript-lang/rescript-compiler/pull/6778
+
+# 11.1.0
+
+#### :bug: Bug Fix
+
+- Revert escape JSX prop names with hyphens (#6705). https://github.com/rescript-lang/rescript-compiler/pull/6731
+
+# 11.1.0-rc.8
+
+#### :rocket: New Feature
+
+- Add `%todo` extension for leaving implementation for later. https://github.com/rescript-lang/rescript-compiler/pull/6713
+- Add `-warn-error` argument for generating errors in CI. Useful for `%todo` extension. https://github.com/rescript-lang/rescript-compiler/pull/6717
+
+#### :bug: Bug Fix
+
+- Improve error when using `@deriving(accessors)` on a variant with record arguments. https://github.com/rescript-lang/rescript-compiler/pull/6712
+- Stop escaping JSX prop names with hyphens. https://github.com/rescript-lang/rescript-compiler/pull/6705
+- Fix trailing undefined for optional parameters not omitted with `@send` and `@new`. https://github.com/rescript-lang/rescript-compiler/pull/6716
+- Fix JSX4 adding the incorrect type annotation for the prop `ref` in `React.forwardRef` component. https://github.com/rescript-lang/rescript-compiler/pull/6718
+- Fix description for warning number 110. https://github.com/rescript-lang/rescript-compiler/pull/6725
+
+#### :nail_care: Polish
+
+- Module spec `es6` and `es6-global` is deprecated in favor of `esmodule`. https://github.com/rescript-lang/rescript-compiler/pull/6709
+
+# 11.1.0-rc.7
+
+#### :bug: Bug Fix
+
+- Fix variance setting for builtin `dict` type. Fixes issues around inference. https://github.com/rescript-lang/rescript-compiler/pull/6707 
+
+# 11.1.0-rc.6
+
+#### :rocket: New Feature
+
+- Add experimental BigInt support. https://github.com/rescript-lang/rescript-compiler/pull/6670, https://github.com/rescript-lang/rescript-compiler/pull/6696
+
+#### :bug: Bug Fix
+
+- Fix mishandling of uncurried functions in super errors. https://github.com/rescript-lang/rescript-compiler/pull/6694
 
 # 11.1.0-rc.5
 

CHANGELOG.md

@@ -16,6 +16,7 @@ Happy hacking!
 
 - [NodeJS v18](https://nodejs.org/)
 - C compiler toolchain (usually installed with `xcode` on Mac)
+- Rust toolchain (required to build rewatch; follow the instructions at https://www.rust-lang.org/tools/install)
 - `opam` (OCaml Package Manager)
 - VSCode (+ [OCaml Platform Extension](https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform))
 
@@ -91,6 +92,11 @@ make test-syntax-roundtrip
 make artifacts
 ```
 
+## Coding Style
+
+- OCaml Code: snake case format is used, e.g, `to_string`
+- ReScript Code: the camel case format is used, e.g `toString`
+
 ## Adding new Files to the Npm Package
 
 To make sure that no files are added to or removed from the npm package inadvertently, an artifact list is kept at `packages/artifacts.txt`. During CI build, it is verified that only the files that are listed there are actually included in the npm package.

CONTRIBUTING.md

@@ -2,7 +2,7 @@ SHELL = /bin/bash
 
 DUNE_BIN_DIR = ./_build/install/default/bin
 
-build: ninja
+build: ninja rewatch
 	dune build
 	./scripts/copyExes.js
 
@@ -15,6 +15,10 @@ bench:
 dce:
 	reanalyze.exe -dce-cmt _build/default/jscomp
 
+rewatch:
+	cargo build --manifest-path rewatch/Cargo.toml
+	cp rewatch/target/debug/rewatch rewatch
+
 ninja/ninja:
 	./scripts/buildNinjaBinary.js
 
@@ -78,10 +82,11 @@ clean-gentype:
 
 clean:
 	dune clean
-	./scripts/ninja.js clean
+	cargo clean --manifest-path rewatch/Cargo.toml && rm -f rewatch/rewatch
+	./scripts/ninja.js clean && rm -f ninja/ninja
 
 clean-all: clean clean-gentype
 
 .DEFAULT_GOAL := build
 
-.PHONY: build watch ninja bench dce test test-syntax test-syntax-roundtrip test-gentype test-all lib playground playground-cmijs playground-release artifacts format checkformat clean-gentype clean clean-all
+.PHONY: build watch rewatch ninja bench dce test test-syntax test-syntax-roundtrip test-gentype test-all lib playground playground-cmijs playground-release artifacts format checkformat clean-gentype clean clean-all

Makefile

@@ -2,8 +2,8 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "definitions": {
     "module-format": {
-      "enum": ["commonjs", "es6", "es6-global"],
-      "description": "es6-global generate relative `require` paths instead of relying on NodeJS' module resolution. Default: commonjs."
+      "enum": ["esmodule", "commonjs", "es6", "es6-global"],
+      "description": "es6 and es6-global are deprecated. Default: commonjs."
     },
     "suffix-spec": {
       "type": "string",
@@ -472,10 +472,6 @@
       "$ref": "#/definitions/package-specs",
       "description": "ReScript can currently output to [Commonjs](https://en.wikipedia.org/wiki/CommonJS), and [ES6 modules](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import)"
     },
-    "use-stdlib": {
-      "type": "boolean",
-      "description": "(Experimental) whether to use the OCaml standard library. Default: true"
-    },
     "external-stdlib": {
       "type": "string",
       "description": "Use the external stdlib library instead of the one shipped with the compiler package"

docs/docson/build-schema.json

@@ -45,7 +45,6 @@ let package_specs = "package-specs"
 let type_ = "type"
 let export_all = "all"
 let export_none = "none"
-let use_stdlib = "use-stdlib"
 let external_stdlib = "external-stdlib"
 let reason = "reason"
 let react_jsx = "react-jsx"

jscomp/bsb/bsb_build_schemas.ml

@@ -41,16 +41,18 @@ let rev_lib_bs = ".." // ".."
 
 (* access the js directory from "lib/bs",
    it would be '../js'
+
+   TODO: should be renamed, js -> cjs, es6 -> mjs in v12
 *)
 let lib_bs_prefix_of_format (x : Ext_module_system.t) =
   ".."
-  // match x with NodeJS -> "js" | Es6 -> "es6" | Es6_global -> "es6_global"
+  // match x with Commonjs -> "js" | Esmodule -> "es6" | Es6_global -> "es6_global"
 
 (* lib/js, lib/es6, lib/es6_global *)
 let top_prefix_of_format (x : Ext_module_system.t) =
   match x with
-  | NodeJS -> lib_js
-  | Es6 -> lib_es6
+  | Commonjs -> lib_js
+  | Esmodule -> lib_es6
   | Es6_global -> lib_es6_global
 
 let rev_lib_bs_prefix p = rev_lib_bs // p

jscomp/bsb/bsb_config.ml

@@ -33,8 +33,10 @@ val lib_js : string
 val lib_bs : string
 
 val lib_es6 : string
+[@@ocaml.deprecated "will be removed in v12"]
 
 val lib_es6_global : string
+[@@ocaml.deprecated "will be removed in v12"]
 
 val lib_ocaml : string