@aex.is/zero 0.1.7 → 0.1.9

package/README.md

@@ -22,7 +22,7 @@ zero
 
 ## Requirements
 
-- Bun installed and available on PATH.
+- One package manager installed: npm, pnpm, yarn, or bun.
 
 ## Generated starters
 

package/dist/config/frameworks.js

@@ -13,7 +13,6 @@ export const frameworks = [
             '@radix-ui/react-slot'
         ],
         scaffold: {
-            command: 'bunx',
             packageName: 'create-next-app@latest',
             argSets: [
                 [
@@ -25,7 +24,6 @@ export const frameworks = [
                     '--no-src-dir',
                     '--import-alias',
                     '@/*',
-                    '--use-bun',
                     '--skip-install'
                 ],
                 [
@@ -37,7 +35,6 @@ export const frameworks = [
                     '--no-src-dir',
                     '--import-alias',
                     '@/*',
-                    '--use-bun'
                 ],
                 [
                     '--ts',
@@ -77,7 +74,6 @@ export const frameworks = [
             'react-native-svg'
         ],
         scaffold: {
-            command: 'bunx',
             packageName: 'create-expo-app',
             argSets: [
                 ['--template', 'expo-router', '--yes', '--no-install'],

package/dist/config/package-managers.js

@@ -0,0 +1,41 @@
+export const packageManagers = [
+    {
+        id: 'npm',
+        label: 'npm',
+        runner: { command: 'npx', args: [] },
+        install: ['npm', 'install'],
+        add: ['npm', 'install'],
+        dev: ['npm', 'run', 'dev']
+    },
+    {
+        id: 'pnpm',
+        label: 'pnpm',
+        runner: { command: 'pnpm', args: ['dlx'] },
+        install: ['pnpm', 'install'],
+        add: ['pnpm', 'add'],
+        dev: ['pnpm', 'dev']
+    },
+    {
+        id: 'yarn',
+        label: 'yarn',
+        runner: { command: 'yarn', args: ['dlx'] },
+        install: ['yarn', 'install'],
+        add: ['yarn', 'add'],
+        dev: ['yarn', 'dev']
+    },
+    {
+        id: 'bun',
+        label: 'bun',
+        runner: { command: 'bunx', args: [] },
+        install: ['bun', 'install'],
+        add: ['bun', 'add'],
+        dev: ['bun', 'run', 'dev']
+    }
+];
+export function getPackageManagerDefinition(id) {
+    const manager = packageManagers.find((item) => item.id === id);
+    if (!manager) {
+        throw new Error(`Unknown package manager: ${id}`);
+    }
+    return manager;
+}

package/dist/engine/installers.js

@@ -1,13 +1,15 @@
 import { execa } from 'execa';
 import { getModulePackages } from '../config/modules.js';
+import { getPackageManagerDefinition } from '../config/package-managers.js';
 const baseEnv = {
     ...process.env,
     CI: '1'
 };
-export async function installBaseDependencies(targetDir, extraPackages = []) {
+export async function installBaseDependencies(targetDir, packageManager, extraPackages = []) {
+    const manager = getPackageManagerDefinition(packageManager);
     if (extraPackages.length > 0) {
         const packages = Array.from(new Set(extraPackages)).sort();
-        await execa('bun', ['add', ...packages], {
+        await execa(manager.add[0], [...manager.add.slice(1), ...packages], {
             cwd: targetDir,
             stdio: 'inherit',
             env: baseEnv,
@@ -15,19 +17,20 @@ export async function installBaseDependencies(targetDir, extraPackages = []) {
         });
         return;
     }
-    await execa('bun', ['install'], {
+    await execa(manager.install[0], manager.install.slice(1), {
         cwd: targetDir,
         stdio: 'inherit',
         env: baseEnv,
         shell: false
     });
 }
-export async function installModulePackages(framework, moduleIds, targetDir) {
+export async function installModulePackages(framework, moduleIds, targetDir, packageManager) {
     const packages = getModulePackages(moduleIds, framework);
     if (packages.length === 0) {
         return;
     }
-    await execa('bun', ['add', ...packages], {
+    const manager = getPackageManagerDefinition(packageManager);
+    await execa(manager.add[0], [...manager.add.slice(1), ...packages], {
         cwd: targetDir,
         stdio: 'inherit',
         env: baseEnv,

package/dist/engine/scaffold.js

@@ -8,6 +8,7 @@ import { installBaseDependencies, installModulePackages } from './installers.js'
 import { writeEnvExample } from './env.js';
 import { assertAssetSources, generateExpoAssets, generateNextAssets, resolveAssetSources } from './assets.js';
 import { buildNextTemplateFiles, buildExpoTemplateFiles, componentsJsonTemplate } from './templates.js';
+import { getPackageManagerDefinition } from '../config/package-managers.js';
 const baseEnv = {
     ...process.env,
     CI: '1'
@@ -17,10 +18,12 @@ export async function scaffoldProject(config) {
     const targetDir = path.resolve(process.cwd(), directoryInput);
     await ensureEmptyTargetDir(targetDir);
     const framework = getFrameworkDefinition(config.framework);
+    const packageManager = getPackageManagerDefinition(config.packageManager);
     const sources = resolveAssetSources();
     await assertAssetSources(sources);
     console.log(`Scaffolding ${framework.label}...`);
-    await runScaffoldCommand(framework.scaffold.command, framework.scaffold.packageName, directoryInput, framework.scaffold.argSets);
+    const argSets = buildScaffoldArgs(framework, config.packageManager);
+    await runScaffoldCommand(packageManager.runner, framework.scaffold.packageName, directoryInput, argSets);
     console.log('Applying framework templates...');
     if (config.framework === 'nextjs') {
         await applyNextTemplates(config, targetDir);
@@ -45,15 +48,16 @@ export async function scaffoldProject(config) {
             assetsDir: path.join(targetDir, 'assets')
         });
     }
-    console.log('Installing base dependencies with Bun...');
-    await installBaseDependencies(targetDir, framework.packages);
+    console.log(`Installing base dependencies with ${packageManager.label}...`);
+    await installBaseDependencies(targetDir, config.packageManager, framework.packages);
     console.log('Installing module packages...');
-    await installModulePackages(config.framework, config.modules, targetDir);
+    await installModulePackages(config.framework, config.modules, targetDir, config.packageManager);
     console.log('Generating .env.example...');
     await writeEnvExample(config.modules, config.framework, targetDir);
     console.log('Scaffold complete.');
     const cdTarget = directoryInput === '.' ? '.' : directoryInput.includes(' ') ? `"${directoryInput}"` : directoryInput;
-    console.log(`\nNext steps:\n  1) cd ${cdTarget}\n  2) bun run dev`);
+    const devCommand = packageManager.dev.join(' ');
+    console.log(`\nNext steps:\n  1) cd ${cdTarget}\n  2) ${devCommand}`);
 }
 async function ensureEmptyTargetDir(targetDir) {
     try {
@@ -75,12 +79,12 @@ async function ensureEmptyTargetDir(targetDir) {
         throw error;
     }
 }
-async function runScaffoldCommand(command, packageName, directoryInput, argSets) {
+async function runScaffoldCommand(runner, packageName, directoryInput, argSets) {
     const errors = [];
     const targetArg = directoryInput === '.' ? '.' : directoryInput;
     for (const args of argSets) {
         try {
-            await execa(command, [packageName, targetArg, ...args], {
+            await execa(runner.command, [...runner.args, packageName, targetArg, ...args], {
                 stdio: 'inherit',
                 env: baseEnv,
                 shell: false
@@ -96,6 +100,31 @@ async function runScaffoldCommand(command, packageName, directoryInput, argSets)
         : 'Scaffold failed for unknown reasons.';
     throw new Error(message);
 }
+function buildScaffoldArgs(framework, packageManager) {
+    if (framework.id !== 'nextjs') {
+        return framework.scaffold.argSets;
+    }
+    const flag = resolveNextPackageManagerFlag(packageManager);
+    if (!flag) {
+        return framework.scaffold.argSets;
+    }
+    const withFlag = framework.scaffold.argSets.map((args) => [...args, flag]);
+    return [...withFlag, ...framework.scaffold.argSets];
+}
+function resolveNextPackageManagerFlag(packageManager) {
+    switch (packageManager) {
+        case 'npm':
+            return '--use-npm';
+        case 'pnpm':
+            return '--use-pnpm';
+        case 'yarn':
+            return '--use-yarn';
+        case 'bun':
+            return '--use-bun';
+        default:
+            return null;
+    }
+}
 async function applyNextTemplates(config, targetDir) {
     const srcAppDir = path.join(targetDir, 'src', 'app');
     const usesSrcDir = await pathExists(srcAppDir);

package/dist/engine/templates.js

@@ -401,7 +401,7 @@ export function ContactForm() {
         />
       </label>
       <button
-        className="self-start text-base font-bold underline underline-offset-4 disabled:opacity-60"
+        className="self-start text-base font-bold underline underline-offset-4"
         type="submit"
         disabled={status === 'sending'}
       >
@@ -929,6 +929,7 @@ export function ContactForm() {
         paddingHorizontal={0}
         paddingVertical={0}
         alignSelf=\"flex-start\"
+        disabled={status === 'sending'}
         onPress={submit}
       >
         <Text fontFamily={FONT_BOLD} fontSize={FONT_SIZE} color={fg} textDecorationLine=\"underline\">

package/dist/env/detect.js

@@ -1,4 +1,5 @@
 import which from 'which';
+import { getPackageManagerDefinition } from '../config/package-managers.js';
 export function detectPlatform() {
     switch (process.platform) {
         case 'darwin':
@@ -14,23 +15,22 @@ export function detectPlatform() {
 export function detectShell(platform = detectPlatform()) {
     return platform === 'windows' ? 'powershell' : 'posix';
 }
-export async function isBunAvailable() {
+export async function isCommandAvailable(command) {
     try {
-        await which('bun');
+        await which(command);
         return true;
     }
     catch {
         return false;
     }
 }
-export async function assertBunAvailable() {
-    const available = await isBunAvailable();
+export async function assertPackageManagerAvailable(packageManager) {
+    const manager = getPackageManagerDefinition(packageManager);
+    const command = manager.install[0];
+    const available = await isCommandAvailable(command);
     if (!available) {
         const platform = detectPlatform();
         const shell = detectShell(platform);
-        const hint = platform === 'windows'
-            ? 'Install Bun for Windows and reopen PowerShell.'
-            : 'Install Bun and ensure it is on your PATH.';
-        throw new Error(`Bun is required but was not found in PATH. (${platform}/${shell}) ${hint}`);
+        throw new Error(`${manager.label} is required but was not found in PATH. (${platform}/${shell}) Install ${manager.label} and retry.`);
     }
 }

package/dist/index.js

@@ -1,10 +1,14 @@
 #!/usr/bin/env node
 import { runWizard } from './cli/bubbletea.js';
-import { assertBunAvailable } from './env/detect.js';
+import { assertPackageManagerAvailable } from './env/detect.js';
 import { scaffoldProject } from './engine/scaffold.js';
 async function main() {
+    const config = await runWizard();
+    if (!config) {
+        return;
+    }
     try {
-        await assertBunAvailable();
+        await assertPackageManagerAvailable(config.packageManager);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -12,10 +16,6 @@ async function main() {
         process.exitCode = 1;
         return;
     }
-    const config = await runWizard();
-    if (!config) {
-        return;
-    }
     try {
         await scaffoldProject(config);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aex.is/zero",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Aexis Zero scaffolding CLI",
   "license": "UNLICENSED",
   "type": "module",