Skip to content

Commit ec80eed

Browse files
committed
for runtime, es6 use .mjs
1 parent 1687741 commit ec80eed

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

jscomp/core/js_packages_info.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ type t =
8282
let runtime_package_specs : t = {
8383
name = Pkg_runtime;
8484
module_systems =[
85-
{module_system = Es6; path = "lib/es6"; suffix = Js};
85+
{module_system = Es6; path = "lib/es6"; suffix = Mjs};
8686
{module_system = NodeJS; path = "lib/js"; suffix = Js};
8787
]
8888
}

jscomp/others/release.ninja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
bsc_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6 -nopervasives -unsafe -w +50 -warn-error A -open Bs_stdlib_mini -I ./runtime
2+
bsc_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6:.mjs -nopervasives -unsafe -w +50 -warn-error A -open Bs_stdlib_mini -I ./runtime
33

44
rule cc
55
command = $bsc -bs-cmi -bs-cmj $bsc_flags -I others $in

jscomp/runtime/release.ninja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
bsc_no_open_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6 -nopervasives -unsafe -w +50 -warn-error A
2+
bsc_no_open_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6:.mjs -nopervasives -unsafe -w +50 -warn-error A
33
bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
44

55
rule cc

jscomp/stdlib-406/release.ninja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
bsc_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6 -w -9-3-106 -warn-error A -I runtime -I others
2+
bsc_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6:.mjs -w -9-3-106 -warn-error A -I runtime -I others
33

44
rule cc
55
command = $bsc -bs-cmi -bs-cmj $bsc_flags -I stdlib-406 $in

scripts/ninja.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ async function runtimeNinja(devmode = true) {
868868
var externalDeps = devmode ? [compilerTarget] : [];
869869
var ninjaOutput = devmode ? "build.ninja" : "release.ninja";
870870
var templateRuntimeRules = `
871-
bsc_no_open_flags = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6 -nopervasives -unsafe -w +50 -warn-error A
871+
bsc_no_open_flags = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6:.mjs -nopervasives -unsafe -w +50 -warn-error A
872872
bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
873873
${ruleCC(ninjaCwd)}
874874
${ninjaQuickBuidList([
@@ -963,7 +963,7 @@ async function othersNinja(devmode = true) {
963963
var ninjaCwd = "others";
964964

965965
var templateOthersRules = `
966-
bsc_flags = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6 -nopervasives -unsafe -w +50 -warn-error A -open Bs_stdlib_mini -I ./runtime
966+
bsc_flags = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6:.mjs -nopervasives -unsafe -w +50 -warn-error A -open Bs_stdlib_mini -I ./runtime
967967
${ruleCC(ninjaCwd)}
968968
${
969969
devmode
@@ -1088,7 +1088,7 @@ async function stdlibNinja(devmode = true) {
10881088
// deprecations diabled due to string_of_float
10891089
var warnings = "-w -9-3-106 -warn-error A";
10901090
var templateStdlibRules = `
1091-
${bsc_flags} = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6 ${warnings} -I runtime -I others
1091+
${bsc_flags} = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js -bs-package-output es6:lib/es6:.mjs ${warnings} -I runtime -I others
10921092
${ruleCC(ninjaCwd)}
10931093
${ninjaQuickBuidList([
10941094
[

0 commit comments

Comments
 (0)