Skip to content

Commit e02f1b6

Browse files
committed
work around invalid es6 code generated
ref rescript-lang/rescript#2456
1 parent 968a559 commit e02f1b6

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/Express.re

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[%%raw "import Express from 'express'"];
2+
13
type complete;
24

35
module Error = {
@@ -396,8 +398,8 @@ module Middleware = {
396398
"limit": Js.nullable(int),
397399
"parameterLimit": Js.nullable(int)
398400
};
399-
[@bs.module "express"] [@bs.val] external json_ : jsonOptions => t = "json";
400-
[@bs.module "express"] [@bs.val] external urlencoded_ : urlEncodedOptions => t = "urlencoded";
401+
[@bs.scope "Express"] [@bs.val] external json_ : jsonOptions => t = "json";
402+
[@bs.scope "Express"] [@bs.val] external urlencoded_ : urlEncodedOptions => t = "urlencoded";
401403
let json = (~inflate=true, ~strict=true, ~limit=?, ()) =>
402404
json_({
403405
"inflate": inflate |> Js.Boolean.to_js_boolean,
@@ -549,7 +551,7 @@ module Router = {
549551
.
550552
"caseSensitive": Js.boolean, "mergeParams": Js.boolean, "strict": Js.boolean
551553
};
552-
[@bs.module "express"] [@bs.val] external make_ : routerArgs => t = "Router";
554+
[@bs.scope "Express"] [@bs.val] external make_ : routerArgs => t = "Router";
553555
let make = (~caseSensitive=false, ~mergeParams=false, ~strict=false, ()) =>
554556
make_({
555557
"caseSensitive": caseSensitive |> Js.Boolean.to_js_boolean,
@@ -571,7 +573,8 @@ module App = {
571573
let useRouter = (app, router) => Router.asMiddleware(router) |> use(app);
572574
let useRouterOnPath = (app, ~path, router) =>
573575
Router.asMiddleware(router) |> useOnPath(app, ~path);
574-
[@bs.module] external make : unit => t = "express";
576+
[@bs.val] external make : unit => t = "Express";
577+
let make = make;
575578

576579
/*** [make ()] creates an instance of the App class. */
577580
external asMiddleware : t => Middleware.t = "%identity";
@@ -595,9 +598,9 @@ module Static = {
595598
[@bs.set] external etag : (options, Js.boolean) => unit = "";
596599
/* ... add all the other options */
597600
type t;
598-
[@bs.module "express"] external make : (string, options) => t = "static";
601+
[@bs.scope "Express"] [@bs.val] external make : (string, options) => t = "static";
599602

600603
/*** [make directory] creates a static middleware for [directory] */
601604
external asMiddleware : t => Middleware.t = "%identity";
602605
/*** [asMiddleware static] casts [static] to a Middleware type */
603-
};
606+
};

0 commit comments

Comments
 (0)