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

Jump to bottom

es6 module support (success with rollup) #1149

Closed
wants to merge 5 commits into from
Closed

es6 module support (success with rollup) #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ec6e7c
experimental es6 support
bobzhang Feb 1, 2017
0b7053b
es6 module support
bobzhang Feb 1, 2017
6a9ce77
split caml_oo_curry (less used) from curry
bobzhang Feb 2, 2017
1500a39
fix Makefile
bobzhang Feb 2, 2017
b156ab7
rollup examples
bobzhang Feb 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions jscomp/all.depend
View file
Open in desktop
Expand Up @@ -463,8 +463,8 @@ core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
core/js_stmt_make.cmx core/js_program_loader.cmx core/js_op_util.cmx \
core/js_op.cmx core/js_number.cmx core/js_fun_env.cmx \
core/js_exp_make.cmx common/js_config.cmx core/js_closure.cmx core/j.cmx \
ext/ident_set.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx ext/ext_list.cmx \
ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
ext/ident_set.cmx ext/ext_string.cmx ext/ext_pp_scope.cmx ext/ext_pp.cmx \
ext/ext_list.cmx ext/ext_ident.cmx common/bs_version.cmx core/js_dump.cmi
core/js_pass_debug.cmx : core/js_dump.cmx common/js_config.cmx core/j.cmx \
ext/ext_pervasives.cmx ext/ext_filename.cmx core/js_pass_debug.cmi
core/js_of_lam_option.cmx : core/js_exp_make.cmx common/js_config.cmx \
Expand Down
21 changes: 6 additions & 15 deletions jscomp/bin/bsb.ml
View file
Open in desktop
Expand Up @@ -2447,7 +2447,7 @@ module Js_config : sig

type module_system =
| NodeJS | AmdJS | Goog (* This will be serliazed *)

| Es6

type package_info =
(module_system * string )
Expand Down Expand Up @@ -2557,6 +2557,7 @@ val string : string
val bytes : string
val float : string
val curry : string
val caml_oo_curry : string
(* val bigarray : string *)
(* val unix : string *)
val int64 : string
Expand Down Expand Up @@ -2615,24 +2616,12 @@ end = struct
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)







type env =
| NodeJS
| AmdJS
| Goog (* of string option *)



type path = string
type module_system = env =
type module_system =
| NodeJS
| AmdJS
| Goog

| Es6

type package_info =
( module_system * string )
Expand Down Expand Up @@ -2682,6 +2671,7 @@ let set_npm_package_path s =
| "commonjs" -> NodeJS
| "amdjs" -> AmdJS
| "goog" -> Goog
| "es6" -> Es6
| _ ->
Ext_pervasives.bad_argf "invalid module system %s" package_name), path
| [path] ->
Expand Down Expand Up @@ -2776,6 +2766,7 @@ let float = "Caml_float"
let hash = "Caml_hash"
let oo = "Caml_oo"
let curry = "Curry"
let caml_oo_curry = "Caml_oo_curry"
let int64 = "Caml_int64"
let md5 = "Caml_md5"
let weak = "Caml_weak"
Expand Down
23 changes: 7 additions & 16 deletions jscomp/bin/bsdep.ml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ val version : string

end = struct
#1 "bs_version.ml"
let version = "1.4.2"
let version = "1.4.3"

end
module Terminfo : sig
Expand Down Expand Up @@ -24594,7 +24594,7 @@ module Js_config : sig

type module_system =
| NodeJS | AmdJS | Goog (* This will be serliazed *)

| Es6

type package_info =
(module_system * string )
Expand Down Expand Up @@ -24704,6 +24704,7 @@ val string : string
val bytes : string
val float : string
val curry : string
val caml_oo_curry : string
(* val bigarray : string *)
(* val unix : string *)
val int64 : string
Expand Down Expand Up @@ -24762,24 +24763,12 @@ end = struct
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)







type env =
| NodeJS
| AmdJS
| Goog (* of string option *)



type path = string
type module_system = env =
type module_system =
| NodeJS
| AmdJS
| Goog

| Es6

type package_info =
( module_system * string )
Expand Down Expand Up @@ -24829,6 +24818,7 @@ let set_npm_package_path s =
| "commonjs" -> NodeJS
| "amdjs" -> AmdJS
| "goog" -> Goog
| "es6" -> Es6
| _ ->
Ext_pervasives.bad_argf "invalid module system %s" package_name), path
| [path] ->
Expand Down Expand Up @@ -24923,6 +24913,7 @@ let float = "Caml_float"
let hash = "Caml_hash"
let oo = "Caml_oo"
let curry = "Curry"
let caml_oo_curry = "Caml_oo_curry"
let int64 = "Caml_int64"
let md5 = "Caml_md5"
let weak = "Caml_weak"
Expand Down
23 changes: 7 additions & 16 deletions jscomp/bin/bsppx.ml
View file
Open in desktop
Expand Up @@ -6441,7 +6441,7 @@ module Js_config : sig

type module_system =
| NodeJS | AmdJS | Goog (* This will be serliazed *)

| Es6

type package_info =
(module_system * string )
Expand Down Expand Up @@ -6551,6 +6551,7 @@ val string : string
val bytes : string
val float : string
val curry : string
val caml_oo_curry : string
(* val bigarray : string *)
(* val unix : string *)
val int64 : string
Expand Down Expand Up @@ -6609,24 +6610,12 @@ end = struct
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)







type env =
| NodeJS
| AmdJS
| Goog (* of string option *)



type path = string
type module_system = env =
type module_system =
| NodeJS
| AmdJS
| Goog

| Es6

type package_info =
( module_system * string )
Expand Down Expand Up @@ -6676,6 +6665,7 @@ let set_npm_package_path s =
| "commonjs" -> NodeJS
| "amdjs" -> AmdJS
| "goog" -> Goog
| "es6" -> Es6
| _ ->
Ext_pervasives.bad_argf "invalid module system %s" package_name), path
| [path] ->
Expand Down Expand Up @@ -6770,6 +6760,7 @@ let float = "Caml_float"
let hash = "Caml_hash"
let oo = "Caml_oo"
let curry = "Curry"
let caml_oo_curry = "Caml_oo_curry"
let int64 = "Caml_int64"
let md5 = "Caml_md5"
let weak = "Caml_weak"
Expand Down Expand Up @@ -9114,7 +9105,7 @@ val version : string

end = struct
#1 "bs_version.ml"
let version = "1.4.2"
let version = "1.4.3"

end
module Ast_ffi_types : sig
Expand Down