Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix extensions printing #2674

Merged
merged 32 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
46e0a4b
Add case for one extension inside switch
davesnx Aug 22, 2022
b1e8d4f
Remove unused Reason_string file
davesnx Aug 22, 2022
b7bc85e
Add case for one extension inside switch
davesnx Aug 22, 2022
a846484
Remove unused Reason_string file
davesnx Aug 22, 2022
95f66ff
Inline attributes on attach_std_item_attrs
davesnx Aug 22, 2022
5151a94
Run esy install
davesnx Aug 22, 2022
da9a768
Try to break less cases
davesnx Aug 22, 2022
70c8329
Toplevel module with extension break if needed
davesnx Oct 7, 2022
d480558
Add last sequence of let binding to be inlined an attribute
davesnx Oct 7, 2022
96627dc
Change attach_std_item_attrs instead of case by case
davesnx Oct 8, 2022
d6aaa86
Remove case for toplevel wrapping
davesnx Oct 8, 2022
0fe6788
Remove logging
davesnx Oct 8, 2022
8155157
Update expected output for extensions
davesnx Oct 8, 2022
40a85d4
Revert change on removing args
davesnx Oct 29, 2022
25df70e
Don't copy node_modules and js into _build dir
davesnx Oct 29, 2022
90acd1f
Merge branch 'master' into fix-extensions
davesnx Oct 29, 2022
d020018
Merge branch 'fix-extensions' of github.com:/davesnx/reason into fix-…
davesnx Oct 29, 2022
b4a3d03
Remove wrapping when there's no extension
davesnx Nov 2, 2022
8aeda67
Always break on attributes (but not on extensions)
davesnx Nov 2, 2022
95d7051
Separate labelled argument and list argument
davesnx Nov 3, 2022
942e843
Always break on module expressions
davesnx Nov 3, 2022
5a5bdb2
Abstract module_binding let
davesnx Nov 3, 2022
98da6b1
Break always when there's more than one structure inside attributes
davesnx Nov 3, 2022
3fb5d1d
Break when extension contain attributes
davesnx Nov 3, 2022
c3d7faa
Fix always break on more than one item
davesnx Nov 3, 2022
cf9ce95
Always_rc on modexpr
davesnx Nov 3, 2022
c0cb1ab
Ensure module with one structure_item gets formated rec
davesnx Nov 8, 2022
50d6634
Remove closed } in extension snapshot
davesnx Nov 8, 2022
ca939a1
Update trailing formatting
davesnx Nov 8, 2022
2cab09e
Revert Always_rec on module type signature
davesnx Nov 12, 2022
17097b9
Update all snapshots to make tests pass
davesnx Nov 12, 2022
81bb3a0
Break module when is not empty, remove the one item exception
davesnx Nov 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dune
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(ignored_subdirs (node_modules js))
(data_only_dirs node_modules js)
davesnx marked this conversation as resolved.
Show resolved Hide resolved
76 changes: 22 additions & 54 deletions esy.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
{
"name": "reason-cli",
"notes": "This is just the dev package config (also built as globally installable reason-cli). See ./refmt.json ./rtop.json for individual release package configs.",
"notes":
"This is just the dev package config (also built as globally installable reason-cli). See ./refmt.json ./rtop.json for individual release package configs.",
"license": "MIT",
"version": "3.8.1",
"dependencies": {
"ocaml": " >= 4.2.0 < 4.15.0",
"@opam/dune": "2.9.3",
"@opam/fix": "*",
"@opam/ocamlfind": "*",
"@opam/menhir": " >= 20180523.0.0",
"@opam/utop": " >= 1.17.0",
"@opam/merlin-extend": " >= 0.6",
"@opam/ocamlfind": "*",
"@opam/ppx_derivers": "< 2.0.0",
"@opam/result": "*",
"@opam/dune": "2.9.3",
"@opam/ppx_derivers": "< 2.0.0"
},
"devDependencies": {
"@opam/odoc": "*",
"ocaml": "~4.12.0"
"@opam/utop": " >= 1.17.0",
"ocaml": " >= 4.2.0 < 4.15.0"
},
"devDependencies": { "@opam/odoc": "*", "ocaml": "~4.12.0" },
"notes-ctd": [
"This is how you make an esy monorepo for development, but then release the monorepo as many individual packages:",
"1. Create a packageName-dev esy.json at the root and list the sum of all dependencies",
Expand All @@ -27,56 +25,26 @@
"5. Copy ./scripts/esy-prepublish.js in to your repo and change packages= to your set of packages."
],
"esy": {
"build": [["dune", "build", "-p", "reason,rtop"]],
"build": [ [ "dune", "build", "-p", "reason,rtop" ] ],
"install": [
["esy-installer", "reason.install"],
["esy-installer", "rtop.install"]
[ "esy-installer", "reason.install" ],
[ "esy-installer", "rtop.install" ]
],
"exportedEnv": {
"INPUT_ARGUMENTS": {
"scope": "global",
"val": "a"
},
"BUILD_REQUESTEDFOREMAIL": {
"scope": "global",
"val": "b"
},
"VSTS_SECRET_VARIABLES": {
"scope": "global",
"val": "c"
},
"SYSTEM_PULLREQUEST_MERGEDAT": {
"scope": "global",
"val": "d"
}
"INPUT_ARGUMENTS": { "scope": "global", "val": "a" },
"BUILD_REQUESTEDFOREMAIL": { "scope": "global", "val": "b" },
"VSTS_SECRET_VARIABLES": { "scope": "global", "val": "c" },
"SYSTEM_PULLREQUEST_MERGEDAT": { "scope": "global", "val": "d" }
},
"release": {
"bin": {
"rtop": "rtop",
"refmt": "refmt"
},
"bin": { "rtop": "rtop", "refmt": "refmt" },
"includePackages": [
"root",
"@opam/base-bytes",
"@opam/base-threads",
"@opam/base-unix",
"@opam/camomile",
"@opam/lambda-term",
"@opam/lwt",
"@opam/lwt_log",
"@opam/lwt_react",
"@opam/menhir",
"@opam/mmap",
"@opam/ocplib-endian",
"@opam/ocamlfind",
"@opam/ppx_derivers",
"@opam/react",
"@opam/result",
"@opam/seq",
"@opam/charInfo_width",
"@opam/utop",
"@opam/zed",
"ocaml"
"root", "@opam/base-bytes", "@opam/base-threads", "@opam/base-unix",
"@opam/camomile", "@opam/lambda-term", "@opam/lwt", "@opam/lwt_log",
"@opam/lwt_react", "@opam/menhir", "@opam/mmap",
"@opam/ocplib-endian", "@opam/ocamlfind", "@opam/ppx_derivers",
"@opam/react", "@opam/result", "@opam/seq", "@opam/charInfo_width",
"@opam/utop", "@opam/zed", "ocaml"
],
"rewritePrefix": true
}
Expand Down
Loading