noxt-cli 0.1.14 → 0.1.15

package/bin/cmd_create.js

@@ -10,6 +10,12 @@ import {
 import { spawnSync } from 'child_process';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const { _: args, ...options } = minimist(process.argv.slice(2), {
+  string: ['views'],   // treat as strings
+  unknown: (arg) => true
+});
+
+execute(args, options);
 
 async function copyDir(src, dest) {
   await mkdir(dest, { recursive: true });

package/bin/cmd_start.js

@@ -3,9 +3,15 @@ import fs from 'fs';
 import path from 'path';
 import yaml from 'js-yaml';
 import { startServer } from 'noxt-server';
+import minimist from 'minimist';
 //import 'console-with-location';
 
-const __dirname = path.dirname(new URL(import.meta.url).pathname);
+
+const { _: args, ...options } = minimist(process.argv.slice(2), {
+  string: ['views'],   // treat as strings
+  unknown: (arg) => true
+});
+await execute(args, options);
 
 function die(msg) {
   console.error(msg);
@@ -18,7 +24,7 @@ function warn(msg) {
 
 export async function execute([recipe], options) {
   // read deafault config
-  let config = yaml.load(fs.readFileSync(path.resolve(__dirname, '../default.config.yaml'), 'utf8'));
+  let config = {} // yaml.load(fs.readFileSync(path.resolve(__dirname, '../default.config.yaml'), 'utf8'));
 
   // read local config if exists
   const configPath = 'noxt.config.yaml';
@@ -45,8 +51,7 @@ export async function execute([recipe], options) {
     config[key] = options[key] ?? config[key];
   }
 
-
-  startServer({ config, recipe }).catch(err => {
+  startServer({ config, recipe, import: p => import(p) }).catch(err => {
     console.error(`[noxt-server] Error starting server: ${err.message}`);
     console.log(`[noxt-server]`, err.stack);
     process.exit(1);

package/bin/noxt-cli

@@ -1,25 +1,15 @@
-#!/usr/bin/env node
-import minimist from 'minimist';
-//import 'console-with-location';
+#!/bin/sh
+echo "Noxt CLI"
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
-import  * as cmd_start  from './cmd_start.js';
-import  * as cmd_create  from './cmd_create.js';
+if [ "$1" = "start" ]; then
+  node --input-type=module -e "$(cat "$SCRIPT_DIR/cmd_start.js")" "$@"
+  exit
+fi
 
-const commands = {
-  start: cmd_start,
-  create: cmd_create,
-};
+if [ "$1" = "create" ]; then
+  cat $(dirname $(realpath $0))/cmd_create.js | node - "$@"
+  exit
+fi
 
-const { _: args, ...options } = minimist(process.argv.slice(2), {
-  string: ['views'],   // treat as strings
-  unknown: (arg) => true
-});
-
-const cmd = args.shift() ?? 'start';
-
-if (cmd in commands) {
-  await commands[cmd].execute(args, options);
-} else {
-  console.log(`Usage: noxt-cli <${Object.keys(commands).join('|')}> [options]`);
-  process.exit(1);
-}
+echo "Usage: noxt-cli <start|create> [options]"

package/default.config.yaml

@@ -1,7 +1,5 @@
 port: 3000
 ssl: false
 host: localhost
-logLevel: info
-views: []
-static: []
-context: []
+views: views
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noxt-cli",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "CLI starter for noxt-server",
   "type": "module",
   "bin": {
@@ -21,7 +21,7 @@
   ],
   "author": "Zoran Obradović [https://github.com/zocky]",
   "license": "GPL-3.0-or-later",
-  "dependencies": {
+  "peerDependencies": {
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
     "noxt-server": "^0.1.14"

package/starter/package.json

@@ -8,7 +8,11 @@
     "dev": "nodemon -e js,jsx,css,yaml,json,html --exec  noxt-cli start app/main",
     "prod": "NODE_ENV=production noxt-cli start app/main"
   },
+  "dependencies": {
+    "minimist": "^1.2.8"
+  },
   "devDependencies": {
+    "noxt-server": "^0.1.14",
     "nodemon": "^3.0.1"
   }
 }

package/starter/views/pages/PageTasks.jsx

@@ -4,17 +4,17 @@ export const fetch = {
   tasks: 'https://jsonplaceholder.typicode.com/todos'
 }
 
-export default function PageTasks({ tasks }, {
+export default async function PageTasks({ tasks }, {
   // all components are available here
   Json, PageTask, Sidebar,
   // so are request and response objects
   req, res, params,
   // utils are extendable by your units in ../../units
   utils,
-  // use slot(name,key,value) to pass values to the layout
+  // use await slot(name,key,value) to pass values to the layout
   slot,
 }) {
-  slot('title', 'main', 'Tasks');
+  await slot('title', 'main', 'Tasks');
   return (
     <>
       <main>