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.

Sign up for GitHub

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(preamble): add the preamble before the // Generated comment #574

Merged
merged 2 commits into from
May 12, 2023
Merged

fix(preamble): add the preamble before the // Generated comment #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9762d88
fix(preamble): add the preamble before the `// Generated` comment
anmonteiro May 12, 2023
a828c60
add missing unstaged test
anmonteiro May 12, 2023
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
3 changes: 2 additions & 1 deletion Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ Unreleased
([#554](https://github.com/melange-re/melange/pull/554))
- melange: add `--preamble` flag to add a preamble to emitted JS. An example is
`"use client";` in React Server Components, which needs to appear before
imports ([#545](https://github.com/melange-re/melange/pull/545))
imports ([#545](https://github.com/melange-re/melange/pull/545),
[#574](https://github.com/melange-re/melange/pull/574))

0.3.2 2022-11-19
---------------
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions jscomp/core/js_dump_program.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ let es6_program ~package_info ~output_info ~output_dir f (x : J.deps_program) =

let pp_deps_program ~package_info ~(output_info : Js_packages_info.output_info)
~(output_prefix : string) (f : Ext_pp.t) (program : J.deps_program) =
if not !Js_config.no_version_header then (
P.string f Melange_version.header;
P.newline f);
Option.iter
(fun preamble ->
P.string f preamble;
P.newline f)
program.preamble;
if not !Js_config.no_version_header then (
P.string f Melange_version.header;
P.newline f);
if deps_program_is_empty program then P.string f empty_explanation
(* This is empty module, it won't be referred anywhere *)
else
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/dist/jscomp/test/preamble_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Generated by Melange
"use client";
// Generated by Melange
'use strict';


Expand Down
2 changes: 1 addition & 1 deletion nix/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ in
with ocamlPackages;

mkShell {
inputsFrom = lib.attrValues derivations ++ [ melange-compiler-libs ];
inputsFrom = lib.attrValues derivations;
nativeBuildInputs = [
ocamlformat
utop
Expand Down
34 changes: 34 additions & 0 deletions test/preamble.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Demonstrate usage of `--preamble`

$ . ./setup.sh
$ cat > x.ml <<EOF
> let x = 1
> EOF

$ melc x.ml --preamble '"use client";'
"use client";
// Generated by Melange
'use strict';


var x = 1;

exports.x = x;
/* No side effect */

$ cat > x.ml <<EOF
> [@@@bs.config { flags = [| "--preamble"; "\"use client\";" |] }]
> let x = 1
> EOF
$ melc x.ml
"use client";
// Generated by Melange
'use strict';


var x = 1;

exports.x = x;
/* No side effect */