Separate the core file from bundle

bryanjos · bryanjos · commit a51923dd455e · 2017-09-30T11:48:19.000-05:00
diff --git a/lib/elixir_script/passes/output.ex b/lib/elixir_script/passes/output.ex
@@ -49,14 +49,7 @@ defmodule ElixirScript.Output do
   end
 
   defp concat(code) do
-    bootstrap_code = get_bootstrap_js()
-    "'use strict';\nexport #{bootstrap_code}\n#{code}"
-  end
-
-  defp get_bootstrap_js() do
-    operating_path = Path.join([Mix.Project.build_path, "lib", "elixir_script", "priv"])
-    path = Path.join([operating_path, "build", "iife", "ElixirScript.Core.js"])
-    File.read!(path)
+    "'use strict';\nimport ElixirScript from './ElixirScript.Core.js';\n#{code}"
   end
 
   defp prepare_js_ast(js_ast) do
@@ -80,20 +73,27 @@ defmodule ElixirScript.Output do
 
   defp output(code, path, js_modules) do
     file_name = get_output_file_name(path)
+    output_dir = Path.dirname(file_name)
 
-    if !File.exists?(Path.dirname(file_name)) do
-      File.mkdir_p!(Path.dirname(file_name))
+    if !File.exists?(output_dir) do
+      File.mkdir_p!(output_dir)
     end
 
     apps = get_app_names()
-    output_dir = Path.dirname(file_name)
     Enum.each(js_modules, fn({_, _, path, _}) ->
       copy_javascript_module(apps, output_dir, path)
     end)
 
+    copy_bootstrap_js(output_dir)
     File.write!(file_name, code)
   end
 
+  defp copy_bootstrap_js(directory) do
+    operating_path = Path.join([Mix.Project.build_path, "lib", "elixir_script", "priv"])
+    path = Path.join([operating_path, "build", "es", "ElixirScript.Core.js"])
+    File.cp!(path, Path.join([directory, "ElixirScript.Core.js"]))
+  end
+
   def get_output_file_name(path) do
     case Path.extname(path) do
       ".js" ->
diff --git a/package.json b/package.json
@@ -11,7 +11,8 @@
   },
   "scripts": {
     "lint": "eslint src/javascript/lib/**/*.js src/javascript/tests/**/*.js",
-    "lint:fix": "eslint src/javascript/lib/**/*.js src/javascript/tests/**/*.js --fix",
+    "lint:fix":
+      "eslint src/javascript/lib/**/*.js src/javascript/tests/**/*.js --fix",
     "build": "rollup -c rollup.config.js",
     "clean": "rm -rf priv/build",
     "test": "nyc ava src/javascript/tests"
@@ -44,11 +45,12 @@
     "rollup-plugin-node-resolve": "^3.0.0"
   },
   "ava": {
-    "require": [
-      "babel-register"
-    ],
+    "require": ["babel-register"],
     "babel": {
       "babelrc": true
     }
+  },
+  "@std/esm": {
+    "esm": "js"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -20,5 +20,8 @@ export default {
       keepClassName: true,
     }),
   ],
-  output: [{ file: 'priv/build/iife/ElixirScript.Core.js', format: 'iife' }],
+  output: [
+    { file: 'priv/build/iife/ElixirScript.Core.js', format: 'iife' },
+    { file: 'priv/build/es/ElixirScript.Core.js', format: 'es', sourcemap: 'inline' },
+  ],
 };
diff --git a/test/support/helpers.ex b/test/support/helpers.ex
@@ -13,7 +13,8 @@ defmodule Helpers do
     |> Enum.join(",")
 
     main = """
-    import Elixir, {ElixirScript} from './#{filename}.mjs'
+    import ElixirScript from './ElixirScript.Core.js';
+    import Elixir from './#{filename}.mjs';
 
     const mod = Elixir.#{inspect module}.__load(Elixir)
     const ret = mod.#{func}(#{args_to_js})
