Skip to content

Commit

Permalink
Merge pull request #40 from shakacode/rescript-11
Browse files Browse the repository at this point in the history
Rescript 11
  • Loading branch information
alex35mil authored Feb 28, 2024
2 parents 8cfbf98 + 5a4223a commit ec688ea
Show file tree
Hide file tree
Showing 67 changed files with 929 additions and 2,753 deletions.
283 changes: 214 additions & 69 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions .github/workflows/scripts/print-esy-cache.js

This file was deleted.

5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ node_modules/
.cache
.merlin
.bsb.lock
*.bs.js
*.res.js
.DS_Store
/_esy
/_build
/_release
/lib/lib/
/examples/lib/
/scripts/aws.env
/scripts/aws.pem
rescript-logger-ppx.install
5 changes: 5 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# History
## UNRELEASED

## 4.0.0
- Update to ReScript 11.
- Add `Edge` logger.
- **[BREAKING]** Remove Linux `arm64` binary.

## 3.1.0
- Add Linux `arm64` binary.

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,10 @@ let reducer =
These entries are logged on the `debug` level so none of it will appear in your production builds.

### Custom loggers
`rescript-logger` ships with 3 loggers:
`rescript-logger` ships with 4 loggers:
- `ReScriptLogger.Browser` (default)
- `ReScriptLogger.Node`
- `ReScriptLogger.Edge` (to use in edge environment, such as Cloudflare Workers)
- `ReScriptLogger.Universal` (picks either `Browser` or `Node` logger at runtime depending on an environment, useful for apps with SSR)

And you can easily plug your own.
Expand Down
15 changes: 7 additions & 8 deletions devbox.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"packages": [
"path:./nix/ocaml#ocaml",
"path:./nix/ocaml#dune",
"path:./nix/ocaml#findlib",
"path:./nix/ocaml#ppxlib",
"path:./nix/ocaml#merlin",
"path:./nix/ocaml#lsp",
"ocamlPackages.ocaml",
"ocamlPackages.dune_3",
"ocamlPackages.findlib",
"ocamlPackages.ppxlib",
"ocamlPackages.alcotest",
"ocamlPackages.ocaml-lsp",
"nodejs",
"yarn",
"awscli2"
"yarn"
],
"shell": {
"init_hook": [
Expand Down
34 changes: 24 additions & 10 deletions devbox.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
{
"lockfile_version": "1",
"packages": {
"awscli2": {
"resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#awscli2",
"source": "nixpkg"
},
"nodejs": {
"resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#nodejs",
"source": "nixpkg"
},
"path:./nix/ocaml#dune": {},
"path:./nix/ocaml#findlib": {},
"path:./nix/ocaml#lsp": {},
"path:./nix/ocaml#merlin": {},
"path:./nix/ocaml#ocaml": {},
"path:./nix/ocaml#ppxlib": {},
"ocamlPackages.alcotest": {
"resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#ocamlPackages.alcotest",
"source": "nixpkg"
},
"ocamlPackages.dune_3": {
"resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#ocamlPackages.dune_3",
"source": "nixpkg"
},
"ocamlPackages.findlib": {
"resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#ocamlPackages.findlib",
"source": "nixpkg"
},
"ocamlPackages.ocaml": {
"resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#ocamlPackages.ocaml",
"source": "nixpkg"
},
"ocamlPackages.ocaml-lsp": {
"resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#ocamlPackages.ocaml-lsp",
"source": "nixpkg"
},
"ocamlPackages.ppxlib": {
"resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#ocamlPackages.ppxlib",
"source": "nixpkg"
},
"yarn": {
"resolved": "github:NixOS/nixpkgs/f80ac848e3d6f0c12c52758c0f25c10c97ca3b62#yarn",
"source": "nixpkg"
Expand Down
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
(lang dune 2.6)
(name rescript-logger-ppx)
(name rescript-logger-ppx)
1 change: 1 addition & 0 deletions dune-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(lang dune 2.6)
24 changes: 0 additions & 24 deletions esy.json

This file was deleted.

3 changes: 0 additions & 3 deletions esy.lock/.gitattributes

This file was deleted.

3 changes: 0 additions & 3 deletions esy.lock/.gitignore

This file was deleted.

Loading

0 comments on commit ec688ea

Please sign in to comment.