frontend-hamroun 1.2.71 → 1.2.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend-hamroun",
-  "version": "1.2.71",
+  "version": "1.2.72",
   "description": "A lightweight full-stack JavaScript framework",
   "type": "module",
   "main": "./dist/index.js",

package/templates/go-wasm-app/build-wasm.js

@@ -24,6 +24,14 @@ function checkGoInstallation() {
   }
 }
 
+// Ensure directory exists
+function ensureDir(dir) {
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+    console.log(`Created directory: ${dir}`);
+  }
+}
+
 // Build Go WASM modules
 async function buildWasmModules() {
   // Check if Go is installed
@@ -37,17 +45,10 @@ async function buildWasmModules() {
   // Output directory for WASM files
   const wasmOutputDir = resolve(__dirname, 'public', 'wasm');
   
-  // Create output directory if it doesn't exist
-  if (!fs.existsSync(wasmOutputDir)) {
-    fs.mkdirSync(wasmOutputDir, { recursive: true });
-  }
+  // Create directories if they don't exist
+  ensureDir(goSourceDir);
+  ensureDir(wasmOutputDir);
   
-  // Create Go source directory if it doesn't exist
-  if (!fs.existsSync(goSourceDir)) {
-    fs.mkdirSync(goSourceDir, { recursive: true });
-    console.log(`Created Go source directory: ${goSourceDir}`);
-  }
-
   // Get the Go root directory
   const goRoot = execSync('go env GOROOT', { encoding: 'utf8' }).trim();
   
@@ -61,30 +62,17 @@ async function buildWasmModules() {
   console.log(`Copying ${wasmExecJsPath} to ${wasmExecJsDest}`);
   fs.copyFileSync(wasmExecJsPath, wasmExecJsDest);
   
-  // Copy Node.js WASM executor if it exists
-  if (fs.existsSync(wasmExecNodeJsPath)) {
-    console.log(`Copying ${wasmExecNodeJsPath} to ${wasmExecNodeJsDest}`);
-    fs.copyFileSync(wasmExecNodeJsPath, wasmExecNodeJsDest);
+  console.log(`Copying ${wasmExecNodeJsPath} to ${wasmExecNodeJsDest}`);
+  fs.copyFileSync(wasmExecNodeJsPath, wasmExecNodeJsDest);
+  
+  // Build all Go files in the WASM directory
+  const goFiles = fs.readdirSync(goSourceDir).filter(file => file.endsWith('.go'));
+  
+  if (goFiles.length === 0) {
+    console.log('No Go files found in src/wasm');
     
-    // Also try to copy the go_js_wasm_exec script that's needed in some Go versions
-    try {
-      const goJsWasmExecPath = join(goRoot, 'misc', 'wasm', 'go_js_wasm_exec');
-      if (fs.existsSync(goJsWasmExecPath)) {
-        const goJsWasmExecDest = join(wasmOutputDir, 'go_js_wasm_exec');
-        fs.copyFileSync(goJsWasmExecPath, goJsWasmExecDest);
-        fs.chmodSync(goJsWasmExecDest, '755'); // Make executable
-        console.log(`Copied go_js_wasm_exec to ${goJsWasmExecDest}`);
-      }
-    } catch (error) {
-      console.warn("Could not copy go_js_wasm_exec:", error.message);
-    }
-  } else {
-    console.warn(`${wasmExecNodeJsPath} not found, skipping Node.js WASM support`);
-  }
-
-  // Create an example Go file if it doesn't exist
-  const exampleGoFile = join(goSourceDir, 'example.go');
-  if (!fs.existsSync(exampleGoFile)) {
+    // Create an example Go file
+    const exampleGoFile = join(goSourceDir, 'example.go');
     const exampleGoContent = `//go:build js && wasm
 // +build js,wasm
 
@@ -164,14 +152,9 @@ func main() {
     
     fs.writeFileSync(exampleGoFile, exampleGoContent);
     console.log(`Created example Go file at ${exampleGoFile}`);
-  }
-  
-  // Get list of Go files
-  const goFiles = fs.readdirSync(goSourceDir).filter(file => file.endsWith('.go'));
-  
-  if (goFiles.length === 0) {
-    console.log('No Go files found in src/wasm');
-    return;
+    
+    // Add the new file to the list
+    goFiles.push('example.go');
   }
   
   // Build each Go file
@@ -189,10 +172,16 @@ func main() {
       
       // Ensure the directory is clean (doesn't exist from previous builds)
       if (fs.existsSync(tempDir)) {
-        fs.rmSync(tempDir, { recursive: true, force: true });
+        if (isWindows) {
+          // On Windows, we need to handle directory removal differently
+          execSync(`rmdir /s /q "${tempDir}"`, { shell: true });
+        } else {
+          fs.rmSync(tempDir, { recursive: true, force: true });
+        }
       }
       
-      fs.mkdirSync(tempDir, { recursive: true });
+      // Create the temporary directory
+      ensureDir(tempDir);
       
       // Copy the Go file to the temp directory
       const tempGoFile = join(tempDir, goFile);
@@ -221,7 +210,15 @@ func main() {
       }
       
       // Clean up temporary directory
-      fs.rmSync(tempDir, { recursive: true, force: true });
+      try {
+        if (isWindows) {
+          execSync(`rmdir /s /q "${tempDir}"`, { shell: true });
+        } else {
+          fs.rmSync(tempDir, { recursive: true, force: true });
+        }
+      } catch (cleanupError) {
+        console.warn(`Warning: Failed to clean up temp directory ${tempDir}:`, cleanupError);
+      }
       
       console.log(`✓ Successfully built ${wasmFileName}`);
     } catch (error) {

package/templates/go-wasm-app/package.json

@@ -5,17 +5,19 @@
   "type": "module",
   "main": "server.js",
   "scripts": {
-    "prepare": "mkdir -p public/wasm || mkdir public\\wasm",
     "build:wasm": "node build-wasm.js",
-    "dev": "npm run prepare && npm run build:wasm && node --watch server.js",
-    "build": "npm run build:wasm && mkdir -p dist && cp -r public/* dist/",
-    "start": "NODE_ENV=production node server.js"
+    "prepare": "node -e \"if (!require('fs').existsSync('public/wasm')) { require('fs').mkdirSync('public/wasm', {recursive: true}); }\"",
+    "dev": "npm run build:wasm && node --watch server.js",
+    "build": "npm run build:wasm && node -e \"require('fs').mkdirSync('dist', {recursive: true}); require('fs-extra').copySync('public', 'dist')\"",
+    "start": "cross-env NODE_ENV=production node server.js"
   },
   "dependencies": {
     "express": "^4.18.2",
-    "frontend-hamroun": "^1.2.70"
+    "frontend-hamroun": "^1.2.71",
+    "fs-extra": "^10.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.9"
+    "@babel/core": "^7.22.9",
+    "cross-env": "^7.0.3"
   }
 }