happy 0.13.4 → 1.0.1

package/index.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 
-const atocha = require("atocha");
-const listr = require("listr");
-const meow = require("meow");
-const {
+import listr from "listr";
+import meow from "meow";
+import {
   analyze,
   build,
   lint,
@@ -12,7 +11,7 @@ const {
   push,
   save,
   test,
-} = require("./src/index.js");
+} from "./src/index.js";
 
 const { flags, input } = meow(
   `
@@ -45,6 +44,7 @@ const { flags, input } = meow(
     ✔ Uploading changes
 `,
   {
+    importMeta: import.meta,
     flags: {
       now: {
         type: "boolean",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy",
-  "version": "0.13.4",
+  "version": "1.0.1",
   "description": "Happy simplifies your day-to-day git workflow",
   "author": "Francisco Presencia <public@francisco.io> (https://francisco.io/)",
   "funding": {
@@ -23,11 +23,12 @@
     "happy": "index.js"
   },
   "main": "index.js",
+  "type": "module",
   "dependencies": {
-    "atocha": "^1.2.0",
+    "atocha": "^2.0.0",
     "cross-env": "^7.0.2",
-    "files": "^1.0.0",
+    "files": "^2.2.2",
     "listr": "^0.14.3",
-    "meow": "^5.0.0"
+    "meow": "^11.0.0"
   }
 }

package/src/analyze.js

@@ -1,8 +1,7 @@
 // Analyze the project and find the right script for each thing
-const cmd = require("atocha");
-const { exists, read } = require("files");
+import { exists, read } from "files";
 
-module.exports = async (ctx) => {
+export default async (ctx) => {
   if (!(await exists("package.json"))) return {};
   const pkg = await read("package.json");
   return { pkg: JSON.parse(pkg) };

package/src/build.js

@@ -1,14 +1,11 @@
-const cmd = require("atocha");
-const { read } = require("files");
-const { stderrok } = require("./helpers");
+import cmd from "atocha";
+import { stderrok } from "./helpers.js";
 
-let test = "jest";
-
-module.exports = (cli) => ({
+export default (cli) => ({
   title: "Building project",
   skip: async (ctx) => {
     if (!ctx.pkg) return true;
     if (!ctx.pkg.scripts.build) return true;
   },
-  task: async (ctx) => cmd("npm run build").catch(stderrok),
+  task: async () => cmd("npm run build").catch(stderrok),
 });

package/src/helpers.js

@@ -1,5 +1,5 @@
 // Accept these errors
-exports.wtf = (err) => {
+export const wtf = (err) => {
   if (/branch\s+master\s+-> FETCH_HEAD/.test(err.message)) return;
   if (/master -> master/.test(err.message)) return;
   if (/Everything up-to-date/.test(err.message)) return;
@@ -7,7 +7,7 @@ exports.wtf = (err) => {
 };
 
 // Only throw if the error is not 0
-exports.stderrok = (error) => {
+export const stderrok = (error) => {
   // 0 or undefined should be ignored
   if (!error.code) return;
   throw error;

package/src/index.js

@@ -1,19 +1,10 @@
-const analyze = require("./analyze.js");
-const build = require("./build.js");
-const lint = require("./lint.js");
-const publish = require("./publish.js");
-const pull = require("./pull.js");
-const push = require("./push.js");
-const save = require("./save.js");
-const test = require("./test.js");
+import analyze from "./analyze.js";
+import build from "./build.js";
+import lint from "./lint.js";
+import publish from "./publish.js";
+import pull from "./pull.js";
+import push from "./push.js";
+import save from "./save.js";
+import test from "./test.js";
 
-module.exports = {
-  analyze,
-  build,
-  lint,
-  publish,
-  pull,
-  push,
-  save,
-  test,
-};
+export { analyze, build, lint, publish, pull, push, save, test };

package/src/lint.js

@@ -1,10 +1,9 @@
-const cmd = require("atocha");
-const { read } = require("files");
-const { stderrok } = require("./helpers");
+import cmd from "atocha";
+import { stderrok } from "./helpers.js";
 
 const ci = "export CI=true || set CI=true&&";
 
-module.exports = (cli) => ({
+export default (cli) => ({
   title: "Linting",
   skip: async (ctx) => {
     if (!ctx.pkg) return true;

package/src/publish.js

@@ -1,9 +1,8 @@
-const cmd = require("atocha");
-const { read } = require("files");
+import cmd from "atocha";
 
-module.exports = (cli) => ({
+export default (cli) => ({
   title: "Publish to npm",
-  skip: async (ctx) => {
+  skip: async () => {
     if (!cli.flags.publish) return true;
     // 5.0.0
     if (!/^\d+\.\d+\.\d+$/.test(await cmd(`np --version`))) {
@@ -11,7 +10,6 @@ module.exports = (cli) => ({
     }
     return false;
   },
-  task: async (ctx) => {
-    await cmd(`np ${cli.flags.publish} --yolo --no-release-draft`);
-  },
+  task: async () =>
+    await cmd(`np ${cli.flags.publish} --yolo --no-release-draft`),
 });

package/src/pull.js

@@ -1,7 +1,7 @@
-const cmd = require("atocha");
-const { wtf } = require("./helpers");
+import cmd from "atocha";
+import { wtf } from "./helpers.js";
 
-module.exports = (cli) => ({
+export default (cli) => ({
   title: "Downloading latest",
   skip: async () => {
     const status = await cmd(`git status`);

package/src/push.js

@@ -1,7 +1,7 @@
-const cmd = require("atocha");
-const { wtf } = require("./helpers");
+import cmd from "atocha";
+import { wtf } from "./helpers.js";
 
-module.exports = (cli) => ({
+export default (cli) => ({
   title: "Uploading changes",
   skip: async () => {
     const status = await cmd(`git status`);

package/src/save.js

@@ -1,11 +1,10 @@
-const cmd = require("atocha");
-const meow = require("meow");
-const { stderrok } = require("./helpers");
+import cmd from "atocha";
+import { stderrok } from "./helpers.js";
 
 // ISO 8601 without milliseconds (which is still ISO 8601)
 const time = () => new Date().toISOString().replace(/\.[0-9]{3}/, "");
 
-module.exports = (cli) => ({
+export default (cli) => ({
   title: "Saving changes",
   skip: async () => {
     const status = await cmd(`git status`);

package/src/test.js

@@ -1,10 +1,9 @@
-const cmd = require("atocha");
-const { read } = require("files");
-const { stderrok } = require("./helpers");
+import cmd from "atocha";
+import { stderrok } from "./helpers.js";
 
 const ci = "export CI=true || set CI=true&&";
 
-module.exports = (cli) => ({
+export default (cli) => ({
   title: "Testing project",
   skip: async (ctx) => {
     if (!ctx.pkg) return true;