refactor: code base

packages/cli/lib/bin.mjs

@@ -4,10 +4,10 @@ import * as pack from './cmd/pack.mjs';
 
 new Cheetor('../package.json', import.meta.url)
   .command(pack)
-  .commandSafe('@bring-it/notify/dist/sub.mjs')
-  .commandSafe('@bring-it/npm/dist/sub.mjs')
-  .commandSafe('@bring-it/sample/dist/sub.mjs')
-  .commandSafe('@bring-it/sentry/dist/sub.mjs')
-  .commandSafe('@bring-it/sftp/dist/sub.mjs')
+  .commandSafe('@bring-it/notify')
+  .commandSafe('@bring-it/npm')
+  .commandSafe('@bring-it/sample')
+  .commandSafe('@bring-it/sentry')
+  .commandSafe('@bring-it/sftp')
   .config((cli) => cli.wrap(null))
   .setup();

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/cli",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Common command line interface of 'bring-it'",
   "license": "MIT",
   "author": {

packages/notify/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/notify",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Send releases notifications",
   "license": "MIT",
   "author": {
@@ -27,6 +27,7 @@
   "bugs": {
     "url": "https://github.com/airkro/bring-it/issues"
   },
+  "main": "dist/sub.mjs",
   "files": [
     "dist"
   ],
@@ -40,7 +41,7 @@
     "semver": "^7.5.4"
   },
   "peerDependencies": {
-    "@bring-it/cli": "^0.8.0"
+    "@bring-it/cli": "^0.9.0"
   },
   "engines": {
     "node": "^18.0.0 || ^20.0.0",

packages/npm/.best-shot/config.mjs

@@ -4,7 +4,5 @@ export const config = {
     path: 'dist',
     module: true,
   },
-  entry: {
-    sub: './lib/cmd.mjs',
-  },
+  entry: './src/cmd.mjs',
 };

packages/npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/npm",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Publish npm packages when needed",
   "license": "MIT",
   "author": {
@@ -28,6 +28,7 @@
   "bugs": {
     "url": "https://github.com/airkro/bring-it/issues"
   },
+  "main": "dist/main.mjs",
   "files": [
     "dist"
   ],
@@ -44,7 +45,7 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "peerDependencies": {
-    "@bring-it/cli": "^0.8.0"
+    "@bring-it/cli": "^0.9.0"
   },
   "engines": {
     "node": "^18.0.0 || ^20.0.0",

packages/npm/lib/cmd.mjs → packages/npm/src/cmd.mjs

@@ -19,7 +19,7 @@ export function builder(cli) {
 }
 
 export function handler(io) {
-  import('./npm/action.mjs')
+  import('./lib/action.mjs')
     .then(({ action }) => action(io))
     .catch((error) => {
       process.exitCode = 1;

packages/npm/lib/npm/action.mjs → packages/npm/src/lib/action.mjs

@@ -1,7 +1,7 @@
 import { check } from './check.mjs';
 import { logger } from './logger.mjs';
 import { scan } from './scan.mjs';
-import { execX } from './utils.mjs';
+import { execX, getPackageManager } from './utils.mjs';
 
 export async function action({ preview = false, force = false } = {}) {
   if (!(await check({ force }))) {
@@ -20,7 +20,11 @@ export async function action({ preview = false, force = false } = {}) {
     logger.info("Won't publish in preview mode");
   }
 
-  for (const { dir, name, packageManager } of list) {
+  const packageManager = await getPackageManager().catch(() => 'npm');
+
+  logger.info('Using', packageManager);
+
+  for (const { dir, name } of list) {
     const label = preview ? '[Preview]' : '[Publish]';
 
     logger.task(label, name);

packages/npm/lib/npm/check.mjs → packages/npm/src/lib/check.mjs

@@ -27,7 +27,7 @@ export async function check({ force }) {
       return false;
     }
 
-    if (!(await isGitClean())) {
+    if (!force && !(await isGitClean())) {
       return false;
     }
   } catch (error) {

packages/npm/lib/npm/scan.mjs → packages/npm/src/lib/scan.mjs

@@ -1,33 +1,22 @@
-import { readFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
 
 import { filter } from './filter.mjs';
 import { getFileContentFromLastCommit, getLastCommitFiles } from './git.mjs';
 import { logger } from './logger.mjs';
 import { readNpmToken } from './token.mjs';
-
-function readJSON(file) {
-  return readFile(file, 'utf8')
-    .then((raw) => JSON.parse(raw))
-    .then(
-      ({
-        name,
-        version,
-        private: p = false,
-        engines,
-        publishConfig,
-        packageManager = 'npm',
-      }) => ({
-        pkg: file,
-        dir: dirname(file),
-        name,
-        version,
-        private: p,
-        publishConfig,
-        engines,
-        packageManager: packageManager.split('@')[0],
-      }),
-    )
+import { readJSON } from './utils.mjs';
+
+function readPkg(file) {
+  return readJSON(file)
+    .then(({ name, version, private: p = false, engines, publishConfig }) => ({
+      pkg: file,
+      dir: dirname(file),
+      name,
+      version,
+      private: p,
+      publishConfig,
+      engines,
+    }))
     .catch(() => false);
 }
 
@@ -60,7 +49,7 @@ async function publishReady(list) {
   const io = [];
 
   for (const item of list) {
-    const okay = await readJSON(item);
+    const okay = await readPkg(item);
 
     if (okay && filter(okay)) {
       io.push(okay);
@@ -115,7 +104,7 @@ export async function scan({ force }) {
     const list1 = await getLastCommitFiles({ force });
     const list2 = await publishReady(list1);
     const list3 = force ? list2 : await versionChanged(list2);
-    const list4 = await publishable(list3);
+    const list4 = force ? list3 : await publishable(list3);
     logger.info(
       list4.length > 0 ? list4.length : 'No',
       list4.length === 1 ? 'package' : 'packages',

packages/npm/lib/npm/utils.mjs → packages/npm/src/lib/utils.mjs

@@ -1,3 +1,6 @@
+import { readFile } from 'node:fs/promises';
+import { resolve } from 'node:path';
+
 import { execa } from 'execa';
 
 function exec(exe, args, options) {
@@ -23,3 +26,15 @@ export function Exec(exe, args, options) {
     return stdout?.trim();
   });
 }
+
+export function readJSON(file) {
+  return readFile(file, 'utf8').then((raw) => JSON.parse(raw));
+}
+
+export async function getPackageManager() {
+  const pkg = resolve(process.cwd(), 'package.json');
+
+  return readJSON(pkg).then(
+    ({ packageManager = 'npm' }) => packageManager.split('@')[0],
+  );
+}

packages/sample/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/sample",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Generate code sample files",
   "license": "MIT",
   "author": {
@@ -26,6 +26,7 @@
   "bugs": {
     "url": "https://github.com/airkro/bring-it/issues"
   },
+  "main": "dist/sub.mjs",
   "files": [
     "dist"
   ],
@@ -38,7 +39,7 @@
     "globby": "^14.0.0"
   },
   "peerDependencies": {
-    "@bring-it/cli": "^0.8.0"
+    "@bring-it/cli": "^0.9.0"
   },
   "engines": {
     "node": "^18.0.0 || ^20.0.0"

packages/sentry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/sentry",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Update sentry artifacts",
   "license": "MIT",
   "author": {
@@ -26,6 +26,7 @@
   "bugs": {
     "url": "https://github.com/airkro/bring-it/issues"
   },
+  "main": "dist/sub.mjs",
   "files": [
     "dist"
   ],
@@ -41,7 +42,7 @@
     "@npmcli/promise-spawn": "^7.0.0"
   },
   "peerDependencies": {
-    "@bring-it/cli": "^0.8.0"
+    "@bring-it/cli": "^0.9.0"
   },
   "engines": {
     "node": "^18.0.0 || ^20.0.0"

packages/sftp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/sftp",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "SFTP deployment tool for frontend",
   "license": "MIT",
   "author": {
@@ -27,6 +27,7 @@
   "bugs": {
     "url": "https://github.com/airkro/bring-it/issues"
   },
+  "main": "dist/sub.mjs",
   "files": [
     "dist"
   ],
@@ -49,7 +50,7 @@
     "ssh-config": "^4.4.1"
   },
   "peerDependencies": {
-    "@bring-it/cli": "^0.8.0"
+    "@bring-it/cli": "^0.9.0"
   },
   "engines": {
     "node": "^18.0.0 || ^20.0.0"