@cilix/lightjs 0.0.6 → 0.0.7

package/core.js

@@ -21,7 +21,7 @@
 
 module.exports = (config, fs, path) => {
   const _files = {};
-  let includeRuntime = false;
+  let includeRuntime;
 
   function throw_error (err) {
     err.origin = 'light';
@@ -1564,8 +1564,8 @@ module.exports = (config, fs, path) => {
             } else {
               node.children.forEach(walk);
               if (node.data.name === 'head') {
-                if (includeRuntime) {
-                  emit('<script>');
+                if (js) {
+                  emit('<script type="module">');
                   emit(`document.addEventListener('DOMContentLoaded', function () {\n`);
                   emit(`(function (data){${js}})(${JSON.stringify(initial_state)})`);
                   emit('});');
@@ -2758,10 +2758,11 @@ module.exports = (config, fs, path) => {
   };
 
   const renderToAst = async (file, actions, _fileText) => {
+    includeRuntime = false;
     const fileText = file === 'default' ? _fileText : openFile(file);
     const tokens = tokenize(fileText, file);
     const ast = parse(tokens);
-    let js = '';
+    let js;
     if (includeRuntime) {
       const runtime = generateRuntime(ast, actions);
 

package/index.js

@@ -53,6 +53,14 @@ const addParentPaths = (code, p) => {
   return out;
 };
 
+const hideDynamicImports = (code) => {
+  return code.split('import(').join('__IMPORT_PLACEHOLDER__(');
+};
+
+const restoreDynamicImports = (code) => {
+  return code.split('__IMPORT_PLACEHOLDER__(').join('import(');
+};
+
 const esbuild_to_light_error = (e, chunk) => {
   let row = e.location.line - 1;
   let col = e.location.column;
@@ -88,7 +96,8 @@ Light.compile = async (name, opts) => {
     jsTransform: async (chunk) => {
       try {
         const opts = { format: 'cjs', loader: 'ts' };
-        const result = await esbuild.transform(chunk.code, opts);
+        const codeChunk = hideDynamicImports(chunk.code);
+        const result = await esbuild.transform(codeChunk, opts);
         return addParentPaths(result.code, chunk.parent_dir);
       } catch (e) {
         e.origin = 'esbuild';
@@ -106,7 +115,8 @@ Light.compile = async (name, opts) => {
         minify: opts.minify,
         write: false
       });
-      return result.outputFiles[0].text;
+      const output = restoreDynamicImports(result.outputFiles[0].text);
+      return output;
     }
   }, fs, path);
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cilix/lightjs",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "A new kind of JavaScript framework",
   "main": "index.js",
   "scripts": {