@ryziz/cli 0.0.38 → 0.0.39

package/index.js

@@ -1,15 +1,9 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
-import { readFileSync, readdirSync, mkdirSync, existsSync, cpSync, watch as fsWatch } from 'node:fs';
-import { join, resolve, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { createRequire } from 'node:module';
-import { build } from 'esbuild';
-import { task } from '@ryziz/flow';
+import runBuild from './src/build.js';
 
-const require = createRequire(import.meta.url);
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf-8'));
+const pkg = createRequire(import.meta.url)('./package.json');
 
 const program = new Command();
 program.name('ryziz').version(pkg.version);
@@ -18,61 +12,3 @@ program.command('dev').action(() => runBuild(true));
 program.command('build').action(() => runBuild(false));
 
 program.parse();
-
-function runBuild(watch) {
-  task(watch ? 'Serving' : 'Bundling', {
-    'Configuring': (c) => {
-      c.root = process.cwd();
-      c.out = 'dist';
-      c.pub = join(c.root, 'public');
-      c.pkg = require.resolve('@ryziz/router/package.json');
-      if (!existsSync(c.out)) mkdirSync(c.out, { recursive: true });
-    },
-    'Scanning': (c) => {
-      const src = resolve(c.root, 'src');
-      if (existsSync(src)) {
-        const files = readdirSync(src).filter((f) => f.startsWith('pages.') && f.endsWith('.jsx'));
-        const maps = files.map((f, i) => ({
-          n: `R${i}`,
-          p: join(src, f).replace(/\\/g, '/'),
-          r: ('/' + f.slice(6, -4)).replace(/^\/index$/, '/').replace(/\./g, '/').replace(/\$/g, ':'),
-        }));
-        c.imp = maps.map((m) => `import ${m.n} from '${m.p}';`).join('\n');
-        c.rts = `[${maps.map((m) => `{path:'${m.r}',element:<${m.n}/>}`).join(',')}]`;
-      } else {
-        c.imp = ''; c.rts = '[]';
-      }
-    },
-    'Building': async (c) => {
-      const cp = () => existsSync(c.pub) && cpSync(c.pub, c.out, { recursive: true });
-
-      await build({
-        entryPoints: [join(dirname(c.pkg), 'entry.jsx')],
-        bundle: true,
-        outfile: join(c.out, 'assets/index.js'),
-        plugins: [{
-          name: 'vr',
-          setup(b) {
-            b.onResolve({ filter: /^virtual:routes$/ }, (a) => ({ path: a.path, namespace: 'vr' }));
-            b.onLoad({ filter: /.*/, namespace: 'vr' }, () => ({
-              contents: `import React from 'react';\n${c.imp}\nexport default ${c.rts};`,
-              loader: 'jsx',
-              resolveDir: c.root,
-            }));
-          },
-        }],
-        loader: { '.js': 'jsx', '.jsx': 'jsx' },
-        jsx: 'automatic',
-        watch: watch && {
-          onRebuild(e) { !e && (console.log('Reloaded'), cp()); },
-        },
-      });
-
-      cp();
-      if (watch) {
-        if (existsSync(c.pub)) fsWatch(c.pub, { recursive: true }, cp);
-        await new Promise(() => { });
-      }
-    },
-  });
-}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ryziz/cli",
-    "version": "0.0.38",
+    "version": "0.0.39",
     "type": "module",
     "bin": {
         "ryziz": "./index.js",

package/src/build.js

@@ -0,0 +1,47 @@
+import { context } from 'esbuild';
+import { existsSync, readdirSync, mkdirSync, cpSync, watch, rmSync } from 'node:fs';
+import { join, resolve, dirname } from 'node:path';
+import { createRequire } from 'node:module';
+import { task } from '@ryziz/flow';
+
+export default (isDev) => task('Building', {
+  'Preparing': (c) => {
+    c.root = process.cwd(); c.dist = 'dist'; c.public = join(c.root, 'public');
+    if (existsSync(c.dist)) rmSync(c.dist, { recursive: true, force: true });
+    mkdirSync(c.dist, { recursive: true });
+  },
+  'Setup': async (c) => {
+    const getRoutes = () => {
+      const src = resolve(c.root, 'src'), files = existsSync(src) ? readdirSync(src).filter((f) => /^pages\..+\.jsx$/.test(f)) : [];
+      const imports = files.map((file, index) => `import R${index} from './src/${file}';`).join('\n');
+      const exports = files.map((file, index) => `{path:'${('/' + file.slice(6, -4)).replace(/^\/index$/, '/').replace(/\./g, '/').replace(/\$/g, ':')}',element:<R${index}/>}`).join(',');
+      return { contents: `import React from 'react';\n${imports}\nexport default [${exports}];`, loader: 'jsx', resolveDir: c.root, watchDirs: [src] };
+    };
+
+    c.builder = await context({
+      entryPoints: { index: join(dirname(createRequire(import.meta.url).resolve('@ryziz/router/package.json')), 'entry.jsx') },
+      bundle: true, splitting: true, format: 'esm', outdir: join(c.dist, 'assets'), loader: { '.js': 'jsx' }, jsx: 'automatic', nodePaths: [join(c.root, 'node_modules')],
+      plugins: [
+        { name: 'log', setup: (b) => b.onEnd(() => { c.onBuilt?.(); }) },
+        { name: 'vr', setup: (b) => { b.onResolve({ filter: /^virtual:routes$/ }, (a) => ({ path: a.path, namespace: 'vr' })); b.onLoad({ filter: /.*/, namespace: 'vr' }, getRoutes); } },
+      ],
+      alias: {
+        'react': join(c.root, 'node_modules/react'),
+        'react-dom': join(c.root, 'node_modules/react-dom'),
+        'react-router': join(c.root, 'node_modules/react-router'),
+      },
+    });
+  },
+  'Building': async (c) => {
+    await c.builder.rebuild();
+    if (existsSync(c.public)) cpSync(c.public, c.dist, { recursive: true });
+    if (!isDev) await c.builder.dispose();
+  },
+  'Watching': async (c) => {
+    if (!isDev) c.skip();
+    let isFirst = true; c.onBuilt = () => isFirst ? (isFirst = false) : console.log('Client build updated');
+    if (existsSync(c.public)) watch(c.public, { recursive: true }, () => { console.log('Public assets updated'); cpSync(c.public, c.dist, { recursive: true }); });
+    await c.builder.watch();
+    await new Promise(() => { });
+  },
+});