@zenithbuild/core 1.3.18 → 1.3.20

package/cli/commands/dev.ts

@@ -219,14 +219,15 @@ export async function dev(options: DevOptions = {}): Promise<void> {
             // Remove lines from top that are imports, whitespace, or comments
             while (jsLines.length > 0 && jsLines[0] !== undefined) {
                 const line = jsLines[0].trim()
-                if (
-                    line.startsWith('import ') ||
-                    line === '' ||
-                    line.startsWith('//') ||
-                    line.startsWith('/*') ||
-                    line.startsWith('*')
-                ) {
+                if (line === '' || line.startsWith('//') || line.startsWith('/*') || line.startsWith('*')) {
                     jsLines.shift()
+                } else if (line.startsWith('import ')) {
+                    // Handle multiline imports: consume until we find a semicolon or empty line
+                    let currentLine = jsLines.shift() || ''
+                    while (!currentLine.trim().endsWith(';') && jsLines.length > 0) {
+                        const nextPart = jsLines.shift() || ''
+                        currentLine += ' ' + nextPart
+                    }
                 } else {
                     break
                 }
@@ -234,8 +235,23 @@ export async function dev(options: DevOptions = {}): Promise<void> {
 
             let jsWithoutImports = jsLines.join('\n')
 
+            const ZEN_RUNTIME_IMPORTS = [
+                'import {',
+                '  signal as zenSignal,',
+                '  state as zenState,',
+                '  effect as zenEffect,',
+                '  memo as zenMemo,',
+                '  ref as zenRef,',
+                '  onMount as zenOnMount,',
+                '  onUnmount as zenOnUnmount,',
+                '  batch as zenBatch,',
+                '  untrack as zenUntrack',
+                '} from "@zenithbuild/runtime";'
+            ].join('\n');
+
             // Combine: structured imports first, then cleaned script body
-            const fullScript = (result.finalized.npmImports || '') + '\n\n' + jsWithoutImports
+            // We inject runtime imports manually because npmImports excludes them
+            const fullScript = ZEN_RUNTIME_IMPORTS + '\n\n' + (result.finalized.npmImports || '') + '\n\n' + jsWithoutImports
 
             logger.debug(`Page Imports: ${result.finalized.npmImports ? result.finalized.npmImports.split('\n').length : 0} lines`)
 
@@ -274,8 +290,15 @@ export async function dev(options: DevOptions = {}): Promise<void> {
         // Runtime MUST be a regular script (not module) to execute synchronously
         // before the page module script runs and needs its globals
         const runtimeTag = `<script src="/runtime.js"></script>`
+        const importMap = `<script type="importmap">
+{
+  "imports": {
+    "@zenithbuild/runtime": "/runtime.js"
+  }
+}
+</script>`
         const scriptTag = `<script type="module">\n${page.script}\n</script>`
-        const allScripts = `${runtimeTag}\n${scriptTag}`
+        const allScripts = `${importMap}\n${runtimeTag}\n${scriptTag}`
 
         let html = page.html;
         if (html.includes('</head>')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/core",
-  "version": "1.3.18",
+  "version": "1.3.20",
   "description": "Core library for the Zenith framework",
   "license": "MIT",
   "type": "module",