npm - vaderjs - Versions diffs - 1.4.0-16b2234 → 1.4.0-22bho234 - Mend

vaderjs 1.4.0-16b2234 → 1.4.0-22bho234

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/README.md CHANGED Viewed

@@ -17,14 +17,10 @@
 > Do not use any alpha versions as these where changed multiple times any version under latest is considered lts and are deemed to be stable
 ## Get Started
-1. Installing Bun.js - (Required)
-> Warning - do not use wsl version of bun with vader alot will not work due to path resolution use the experimental version :}
-([Install Bun](https://bun.sh/docs/installation))
-2. Install vaderjs
+1. Install vaderjs
  ```bash
-   bun add vaderjs@latest
+    npx vaderjs@latest
  ```
 4.  Create Proper Folders

package/binaries/generator.js CHANGED Viewed

@@ -89,11 +89,9 @@ wss.on("connection", async function connection(ws) {
       baseFolder = baseFolder.replace("//", "/");
       globalThis.routeDocuments[folder] = `<!DOCTYPE html>
-      <html lang="en">
+      <html>
       <head>
           <meta charset="UTF-8">
-          <meta http-equiv="X-UA-Compatible" content="IE=edge">
-          <meta name="viewport" content="width=device-width, initial-scale=1.0">
           <title>Document</title>
           <script id="server">
           window.$SERVER = true
@@ -197,6 +195,4 @@ wss.on("connection", async function connection(ws) {
     }
   });
-});
+});

package/binaries/main.js CHANGED Viewed

@@ -1,4 +1,3 @@
-#!/usr/bin/env bun
 import { Glob } from "bun";
 import fs from "fs";
 import * as Bun from "bun";
@@ -324,7 +323,7 @@ async function generateProviderRoutes(){
             }
             routes.forEach((r) => {
                if(r.path === '/'
-               || prev.find((p) => p.source === '/'+ r.path + '/index.html')
+               || prev.find((p) => p.destination === '/'+ r.path + '/index.html')
                ){
                 return void 0;
                }
@@ -556,6 +555,7 @@ async function transForm(){
     if(globalThis.mode === 'dev' && !globalThis.oneAndDone || globalThis.mode === 'build'){
+        console.log('Generating routes...')
         /**
          * @description - create an html file for each route
@@ -606,17 +606,20 @@ switch (true) {
       globalThis.mode = 'dev'
         Server(port)
         transForm()
         Bun.spawn({
             cwd: process.cwd() + '/node_modules/vaderjs/binaries/',
-            env:{
+            env: {
+                PWD: process.cwd(),
                 FOLDERS: 'pages,src,public',
-                PWD: process.cwd(),
+                onExit: (code) => {
+                    globalThis.isBuilding = false
+                    globalThis.oneAndDone = true
+                }
             },
-            cmd: ['node', 'watcher.js'],
-            onExit: (code) => {
-                console.log('Exited', code)
-            }
+            cmd: ['node', 'watcher.js'],
         })
         const ws = new WebSocket(`ws://localhost:${3434}`)
         ws.on('open', () => {
             console.log('Watching for changes...')
@@ -668,23 +671,7 @@ url: http://localhost:${port}
          Server(port)
         break;
       default:
-      // add color
-      console.log(`
-  Vader.js is a reactive framework for building interactive applications for the web built ontop of bun.js!
-  Usage: vader <command>
-  Commands:
-     vaderjs dev  -p <number>    Start the development server
-     vaderjs build   Build the project to ./dist
-     vaderjs start  -p <number>  Production Mode (default 3000 or process.env.PORT)
-  Learn more about vader:           https://vader-js.pages.dev/
-      `)
       break;
   }

package/binaries/win32/check.ps1 ADDED Viewed

@@ -0,0 +1,7 @@
+$chrometest = Test-Path 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe'
+if($chrometest -eq $true){
+   Write-Host "Google Chrome is installed"
+}else{
+   Write-Host "Google Chrome is not installed"
+}

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "vaderjs",
   "description": "A Reactive library aimed to helping you build reactive applications inspired by react.js",
   "module": "vader.js",
-  "version": "1.4.0-16b2234",
+  "version": "1.4.0-22bho234",
   "bin": {
     "vader": "./vader.js"
   },
@@ -32,6 +32,5 @@
     "dotenv":"latest",
     "prettier": "latest",
     "source-map": "latest"
   }
 }

package/vader.js CHANGED Viewed

@@ -1,50 +1,266 @@
 #!/usr/bin/env node
-import fs from 'fs';
-let vaderisInstalled = process.cwd() + '/node_modules/vaderjs/binaries/main.js'
-if(!fs.existsSync(process.cwd() +'/_dev')){
-  fs.mkdirSync(process.cwd() +'/_dev');
+import { exec } from "child_process";
+import fs from "fs";
+globalThis.currentCommand = null;
+globalThis.isRunning = false;
+let vaderisInstalled = process.cwd() + "/node_modules/vaderjs/vader.js";
+if (!fs.existsSync(process.cwd() + "/_dev")) {
+  fs.mkdirSync(process.cwd() + "/_dev");
 }
-if(!fs.existsSync(process.cwd() +'/_dev/vader.js')){
-    console.log('Copying vader to dev folder....')
-    fs.copyFileSync(vaderisInstalled, process.cwd() +'/_dev/vader.js');
-}
+if (!fs.existsSync(process.cwd() + "/_dev/vader.js")) {
+  console.log("Copying vader to dev folder....");
+  fs.copyFileSync(vaderisInstalled, process.cwd() + "/_dev/vader.js");
+}
-let args = process.argv.slice(2);
+function checkIFBundleIsInstalled() {
+   if(fs.existsSync(process.cwd() + '/_dev/bun')){
+     return new Promise((resolve, reject) => {
+       resolve(true);
+     });
+   }
+   return new Promise((resolve, reject) => {
+    exec("bun -v", (err, stdout, stderr) => {
+      if (err) {
+        reject(err);
+      }
+      if (stdout) {
+        resolve(`Bun.js is installed: ${stdout}`);
+      }
+      if (stderr) {
+        reject(`Bun.js is not installed: ${stderr}`);
+      }
+    });
+  });
+}
-function run(arg){
-    if(!fs.existsSync(process.cwd() + '/package.json')){
-        fs.writeFileSync(process.cwd() + '/package.json', JSON.stringify({name: 'my_app', version: '1.0.0'}, null, 2));
-        return;
-    }
-    let packageJson = JSON.parse(fs.readFileSync(process.cwd() + '/package.json').toString());
-    if(!packageJson.scripts){
-        packageJson.scripts = {};
-    }
-    packageJson.scripts['dev'] = 'bun run ./_dev/vader.js dev';
-    packageJson.scripts['build'] = 'bun run ./_dev/vader.js build';
-    packageJson.scripts['start'] = 'bun run ./_dev/vader.js start';
-    if(!packageJson.dependencies){
-        packageJson.dependencies = {};
-    }
-    fs.writeFileSync(process.cwd() + '/package.json', JSON.stringify(packageJson, null, 2));
-    console.log(`
-    Vader.js is a reactive framework for building interactive applications for the web built ontop of bun.js!
-    Usage: vader <command>
-    Commands:
-       bun run dev  -p <number>    Start the development server
-       bun run build   Build the project to ./dist
+function run() {
+  if (!fs.existsSync(process.cwd() + "/package.json")) {
+    fs.writeFileSync(
+      process.cwd() + "/package.json",
+      JSON.stringify({ name: "my_app", version: "1.0.0" }, null, 2)
+    );
+    return;
+  }
+  let packageJson = JSON.parse(
+    fs.readFileSync(process.cwd() + "/package.json").toString()
+  );
+  if (!packageJson.scripts) {
+    packageJson.scripts = {};
+  }
+  packageJson.scripts["dev"] = "bun run ./_dev/vader.js dev";
+  packageJson.scripts["build"] = "bun run ./_dev/vader.js build";
+  packageJson.scripts["start"] = "bun run ./_dev/vader.js start";
+  if (!packageJson.dependencies) {
+    packageJson.dependencies = {};
+  }
+  fs.writeFileSync(
+    process.cwd() + "/package.json",
+    JSON.stringify(packageJson, null, 2)
+  );
+  if (currentCommand) {
+    let child = exec(currentCommand)
+    child.stdout.pipe(process.stdout);
+    child.stderr.pipe(process.stderr);
+    child.on('exit', (code) => {
+      process.exit(code);
+    });
+    child.on('message', (message) => {
+        console.log(message.toString());
+    });
+    child.on('error', (err) => {
+      console.error(err);
+    });
+    return
+  }
+console.log(`
+  Vader.js is a reactive framework for building interactive applications for the web built ontop of bun.js!
+  Usage: npx vaderjs <command>
+   Commands:
-       bun run start  -p <number>  Production Mode (default 3000 or process.env.PORT)
-    Learn more about vader:           https://vader-js.pages.dev/
+   vaderjs run dev  -p <number>    Start the development server
-        `)
+   vaderjs run build   Build the project to ./dist
+   vaderjs run start  -p <number>  Production Mode (default 3000 or process.env.PORT)
+   Learn more about vader:      https://vader-js.pages.dev/
+   `);
 }
-run()
+function checkIFChromeIumIsInstalled() {
+  let platform = process.platform;
+  let findChrome = {
+    windows:`powershell -c "${ process.cwd()  + '\\node_modules\\vaderjs\\binaries\\win32\\check.ps1'}"`,
+    others: "/usr/bin/chromium-browser --version",
+  };
+  let installCommands = {
+    windows: `winget install Google.Chrome`,
+    others: "sudo apt-get install chromium-browser -y",
+  };
+  findChrome.windows = findChrome.windows.replace(/\n/g, " ");
+  let commandToRun =
+    platform === "win32" ? findChrome.windows : findChrome.others;
+  return new Promise((resolve, reject) => {
+     if(fs.existsSync(process.cwd() + '/_dev/chrome')){
+       resolve(true);
+     }else{
+       exec(commandToRun, (err, stdout, stderr) => {
+        let hasError = false;
+        if (err) {
+          console.log(err);
+            hasError = true;
+          console.log(
+            `Attempting to install DEPENDENCY: ${platform === "win32" ? "Google Chrome" : "Chromium"}`
+          );
+        }
+        if (stdout && !hasError) {
+          resolve(
+            `${platform === "win32" ? "Google Chrome" : "Chromium"} is installed: ${stdout}`
+          );
+          fs.writeFileSync(process.cwd() + '/_dev/chrome', `Installed: ${stdout}`);
+        }
+        if (stderr) {
+          console.log(stderr);
+          console.log(
+            `Installing DEPENDENCY: ${platform === "win32" ? "Google Chrome" : "Chromium"}`
+          );
+          let installCommand =
+            platform === "win32"
+              ? installCommands.windows
+              : installCommands.others;
+          return new Promise((resolve, reject) => {
+            exec(installCommand, (err, stdout, stderr) => {
+              if (err) {
+                reject(err);
+              }
+              if (stdout) {
+                resolve(
+                  `${platform === "win32" ? "Google Chrome" : "Chromium"} installed successfully: ${stdout}`
+                );
+                fs.writeFileSync(process.cwd() + '/_dev/chrome', `Installed: ${stdout}`);
+                run();
+              }
+              if (stderr) {
+                reject(
+                  `${platform === "win32" ? "Google Chrome" : "Chromium"} failed to install: ${stderr}`
+                );
+              }
+            });
+          });
+        }
+      });
+     }
+  });
+}
+let Commands = {
+  dev: `bun run dev`,
+  build: `bun run build`,
+  start: `bun run start`,
+};
+let port = process.argv.includes("-p") || process.argv.includes("--port")
+    ? process.argv[process.argv.indexOf("-p") + 1] || process.argv[process.argv.indexOf("--port") + 1] || process.env.PORT || 3000
+    : process.env.PORT || 3000;
+switch (true) {
+  case process.argv.includes("dev") &&
+    !process.argv.includes("build") &&
+    !process.argv.includes("start"):
+    currentCommand = Commands.dev +  (port ? ` -p ${port}` : "");
+    break;
+  case process.argv.includes("build") &&
+    !process.argv.includes("dev") &&
+    !process.argv.includes("start"):
+    currentCommand = Commands.build + (port ? ` -p ${port}` : "");
+    break;
+  case process.argv.includes("start") &&
+    !process.argv.includes("dev") &&
+    !process.argv.includes("build"):
+    currentCommand = Commands.start + (port ? ` -p ${port}` : "");
+    break;
+  default:
+    currentCommand = null;
+    break;
+}
+checkIFChromeIumIsInstalled()
+  .then((stdout) => {
+    if (stdout) {
+      checkIFBundleIsInstalled()
+        .then((stdout) => {
+          if (stdout && !isRunning) {
+            if(!fs.existsSync(process.cwd() + '/_dev/bun')){
+                fs.writeFileSync(process.cwd() + "/_dev/bun", `Installed: ${stdout}`);
+            }
+            run();
+            globalThis.isRunning = true;
+          }
+        })
+        .catch(async (err) => {
+          console.log("Bun.js is not installed. Installing....");
+          let installScipt = {
+            windows: 'powershell -c "irm bun.sh/install.ps1|iex',
+            others: "curl -fsSL https://bun.sh/install.sh | bash",
+          };
+          let scriptotRun =
+            process.platform === "win32"
+              ? installScipt.windows
+              : installScipt.others;
+          exec(scriptotRun, async (err, stdout, stderr) => {
+            if (err) {
+              console.log("Error installing bun.js");
+              process.exit(1);
+            }
+            if (stdout) {
+              if (!platform === "win32") {
+                await new Promise((resolve, reject) => {
+                  console.log(`Adding bun.js to path...`);
+                  let shell = null;
+                  exec("source ~/.bashrc", (err, stdout, stderr) => {
+                    if (err) {
+                      console.log("Error installing bun.js");
+                      return;
+                    }
+                    if (stdout) {
+                      run();
+                    }
+                    if (stderr) {
+                      console.log("Error installing bun.js");
+                      process.exit(1);
+                    }
+                  });
+                });
+                exec("chmod +x bun.sh/install.sh", (err, stdout, stderr) => {
+                  if (err) {
+                    console.log("Error installing bun.js");
+                    return;
+                  }
+                  if (stdout) {
+                    console.log("Bun.js installed successfully");
+                    run();
+                  }
+                  if (stderr) {
+                    console.log("Error installing bun.js");
+                    process.exit(1);
+                  }
+                });
+              }
+              run();
+            }
+          });
+        });
+    }
+  })
+  .catch(async (err) => {
+    console.error(err);
+    process.exit(1);
+  });