feat: package manager (and bun)

cha0s · Jan 4, 2024 · 16934d5 · 16934d5
1 parent 7198ad9
commit 16934d5
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 109 deletions.
diff --git a/.gitignore b/.gitignore
@@ -117,6 +117,8 @@ dist
 
 # local
 /yarn.lock
+/bun.lockb
 
 # package-locals
 /packages/*/yarn.lock
+/packages/*/bun.lockb
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -17,7 +17,7 @@
   },
   "scripts": {
     "build": "NODE_PATH=./node_modules webpack --config ./build/webpack.config.js --mode production",
-    "clean": "rm -rf dist node_modules yarn.lock && yarn",
+    "clean": "rm -rf dist bun.lockb && bun install",
     "lint": "NODE_PATH=./node_modules eslint --config ./build/eslint.config.js .",
     "postversion": "cp package.json dist",
     "test": "npm run build && mocha -t 10000 --colors ./dist/test.js"

diff --git a/packages/core/src/server/commands.js b/packages/core/src/server/commands.js
@@ -17,7 +17,7 @@ const debug = D('@flecks/core/commands');
 const debugSilly = debug.extend('silly');
 const flecksRoot = normalize(FLECKS_CORE_ROOT);
 
-export {Argument};
+export {Argument, Option, program} from 'commander';
 
 export const processCode = (child) => new Promise((resolve, reject) => {
   child.on('error', reject);
@@ -45,45 +45,46 @@ export const spawnWith = (cmd, opts = {}) => {
 };
 
 export default (program, flecks) => {
+  const {packageManager} = flecks.get('@flecks/core/server');
   const commands = {
     add: {
       args: [
-        new Argument('<fleck>>', 'fleck'),
+        new Argument('<fleck>', 'fleck'),
       ],
       description: 'add a fleck to your application',
       action: async (fleck, opts) => {
-        const {
-          noYarn,
-        } = opts;
-        await processCode(
-          noYarn
-            ? spawn('npm', ['install', fleck], {stdio: 'inherit'})
-            : spawn('yarn', ['add', fleck], {stdio: 'inherit'}),
-        );
+        const args = [];
+        if ('yarn' === packageManager) {
+          args.push('yarn', ['add', fleck]);
+        }
+        else {
+          args.push(packageManager, ['install', fleck]);
+        }
+        args.push({stdio: 'inherit'});
+        await processCode(spawn(...args));
         await Flecks.addFleckToYml(fleck);
       },
-      options: [
-        ['--no-yarn', 'use npm instead of yarn'],
-      ],
     },
     clean: {
       description: 'remove node_modules, lock file, build artifacts, then reinstall',
       action: (opts) => {
-        const {
-          noYarn,
-        } = opts;
         rimraf.sync(join(flecksRoot, 'dist'));
         rimraf.sync(join(flecksRoot, 'node_modules'));
-        if (noYarn) {
-          rimraf.sync(join(flecksRoot, 'package-lock.json'));
-          return spawn('npm', ['install'], {stdio: 'inherit'});
+        switch (packageManager) {
+          case 'yarn':
+            rimraf.sync(join(flecksRoot, 'yarn.lock'));
+            break;
+          case 'bun':
+            rimraf.sync(join(flecksRoot, 'bun.lockb'));
+            break;
+          case 'npm':
+            rimraf.sync(join(flecksRoot, 'package-lock.json'));
+            break;
+          default:
+            break;
         }
-        rimraf.sync(join(flecksRoot, 'yarn.lock'));
-        return spawn('yarn', [], {stdio: 'inherit'});
+        return spawn(packageManager, ['install'], {stdio: 'inherit'});
       },
-      options: [
-        ['--no-yarn', 'use npm instead of yarn'],
-      ],
     },
   };
   const targets = flatten(flecks.invokeFlat('@flecks/core.targets'));

diff --git a/packages/core/src/server/index.js b/packages/core/src/server/index.js
@@ -21,7 +21,9 @@ export {dump as dumpYml, load as loadYml} from 'js-yaml';
 export {
   Argument,
   default as commands,
+  Option,
   processCode,
+  program,
   spawnWith,
 } from './commands';
 export {default as Flecks} from './flecks';
@@ -101,6 +103,10 @@ export const hooks = {
      * Build targets to exclude from ESLint.
      */
     'eslint.exclude': [],
+    /**
+     * The package manager used for tasks.
+     */
+    packageManager: 'npm',
     /**
      * Build targets to profile with `webpack.debug.ProfilingPlugin`.
      */

diff --git a/packages/create-app/src/build.js b/packages/create-app/src/build.js
@@ -1,9 +1,9 @@
 import {processCode, spawnWith} from '@flecks/core/server';
 
-export default async (cwd) => {
-  const code = await processCode(spawnWith(['yarn'], {cwd}));
+export default async (packageManager, cwd) => {
+  const code = await processCode(spawnWith([packageManager, 'install'], {cwd}));
   if (0 !== code) {
     return code;
   }
-  return processCode(spawnWith(['yarn', 'build'], {cwd}));
+  return processCode(spawnWith([packageManager, 'run', 'build'], {cwd}));
 };
diff --git a/packages/create-app/src/cli.js b/packages/create-app/src/cli.js
@@ -1,39 +1,72 @@
-import {join, normalize} from 'path';
+import {join} from 'path';
 
-import {Flecks} from '@flecks/core/server';
+import {
+  dumpYml,
+  Flecks,
+  loadYml,
+  Option,
+  program,
+  transform,
+} from '@flecks/core/server';
 import validate from 'validate-npm-package-name';
 
 import build from './build';
-import move from './move';
+import move, {testDestination} from './move';
 
 const {
   FLECKS_CORE_ROOT = process.cwd(),
 } = process.env;
 
-const cwd = normalize(FLECKS_CORE_ROOT);
-
-const create = async (flecks) => {
-  let name = process.argv[2];
-  const {errors} = validate(name);
-  if (errors) {
-    throw new Error(`@flecks/create-app: invalid app name: ${errors.join(', ')}`);
-  }
-  const destination = join(cwd, name);
-  if (!name.startsWith('@')) {
-    name = `@${name}/monorepo`;
-  }
-  await move(name, join(__dirname, 'template'), destination, 'app', flecks);
-  await build(destination);
-};
-
 (async () => {
-  const flecks = await Flecks.bootstrap();
-  try {
-    await create(flecks);
-  }
-  catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(error.message);
-    process.exitCode = 1;
-  }
+  program.argument('<app>', 'name of the app to create');
+  program.addOption(
+    new Option('--package-manager <binary>', 'package manager binary')
+      .choices(['npm', 'bun', 'yarn'])
+      .default('npm'),
+  );
+  program.action(async (app, {packageManager}) => {
+    const flecks = await Flecks.bootstrap({
+      config: {
+        '@flecks/core': {},
+        '@flecks/core/server': {packageManager},
+        '@flecks/create-app': {},
+        '@flecks/fleck': {},
+      },
+    });
+    try {
+      const {errors} = validate(app);
+      if (errors) {
+        throw new Error(`@flecks/create-app: invalid app name: ${errors.join(', ')}`);
+      }
+      const destination = join(FLECKS_CORE_ROOT, app);
+      if (!app.startsWith('@')) {
+        app = `@${app}/monorepo`;
+      }
+      if (!await testDestination(destination)) {
+        const error = new Error(
+          `@flecks/create-app: destination '${destination} already exists: aborting`,
+        );
+        error.code = 129;
+        throw error;
+      }
+      const fileTree = await move(app, join(__dirname, 'template'), 'app', flecks);
+      fileTree.pipe(
+        'build/flecks.yml',
+        transform((chunk, encoding, done, stream) => {
+          const yml = loadYml(chunk);
+          yml['@flecks/core/server'] = {packageManager};
+          stream.push(dumpYml(yml, {sortKeys: true}));
+          done();
+        }),
+      );
+      // Write the tree.
+      await fileTree.writeTo(destination);
+      await build(packageManager, destination);
+    }
+    catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error);
+    }
+    });
+  await program.parseAsync(process.argv);
 })();
diff --git a/packages/create-app/src/move.js b/packages/create-app/src/move.js
@@ -3,11 +3,14 @@ import {
 } from 'fs/promises';
 import {basename, dirname, join} from 'path';
 
-import {JsonStream, transform} from '@flecks/core/server';
+import {
+  JsonStream,
+  transform,
+} from '@flecks/core/server';
 
 import FileTree from './tree';
 
-const testDestination = async (destination) => {
+export const testDestination = async (destination) => {
   try {
     await stat(destination);
     return false;
@@ -20,14 +23,7 @@ const testDestination = async (destination) => {
   }
 };
 
-export default async (name, source, destination, type, flecks) => {
-  if (!await testDestination(destination)) {
-    const error = new Error(
-      `@flecks/create-fleck: destination '${destination} already exists: aborting`,
-    );
-    error.code = 129;
-    throw error;
-  }
+export default async (name, source, type, flecks) => {
   const fileTree = await FileTree.loadFrom(source);
   // Renamed to avoid conflicts.
   const {files} = fileTree;
@@ -56,6 +52,5 @@ export default async (name, source, destination, type, flecks) => {
     .forEach((path) => {
       fileTree.pipe(path, new JsonStream.PrettyPrint());
     });
-  // Write the tree.
-  await fileTree.writeTo(destination);
+  return fileTree;
 };
diff --git a/packages/create-app/src/server.js b/packages/create-app/src/server.js
@@ -1,5 +1,5 @@
 export {default as validate} from 'validate-npm-package-name';
 
 export {default as build} from './build';
-export {default as move} from './move';
+export {default as move, testDestination} from './move';
 export {default as FileTree} from './tree';
diff --git a/packages/create-fleck/package.json b/packages/create-fleck/package.json
@@ -27,8 +27,7 @@
   ],
   "dependencies": {
     "@flecks/core": "^2.0.3",
-    "@flecks/create-app": "^2.0.3",
-    "@inquirer/prompts": "^3.3.0"
+    "@flecks/create-app": "^2.0.3"
   },
   "devDependencies": {
     "@flecks/fleck": "^2.0.3"