avo 1.6.1 → 2.0.0

package/README.md

@@ -48,7 +48,10 @@ yarn commit
 
 ## How to Create a Release
 
+1. Update the semantic version in `package.json`
+2. Publish the package to npm
+
 ```
-npm run release-it
+npm publish
 ```
 

package/cli.js

@@ -1,35 +1,42 @@
 #!/usr/bin/env node
-const _ = require('lodash');
-const {cyan, gray, red, bold, underline} = require('chalk');
-const dateFns = require('date-fns');
-const fs = require('fs');
-const http = require('http');
-const inquirer = require('inquirer');
-const jwt = require('jsonwebtoken');
-const loadJsonFile = require('load-json-file');
-const logSymbols = require('log-symbols');
-const opn = require('opn');
-const ora = require('ora');
-const path = require('path');
-const pify = require('pify');
-const portfinder = require('portfinder');
-const querystring = require('querystring');
-const request = require('request');
-const report = require('yurnalist');
-const semver = require('semver');
-const updateNotifier = require('update-notifier');
-const url = require('url');
-const util = require('util');
-const uuidv4 = require('uuid/v4');
-const walk = require('ignore-walk');
-const writeFile = require('write');
-const writeJsonFile = require('write-json-file');
-const Configstore = require('configstore');
-const Minimatch = require('minimatch').Minimatch;
-const Inspector = require('node-avo-inspector');
-
-const pkg = require('./package.json');
-const Avo = require('./Avo.js');
+import ora from 'ora';
+import chalk from 'chalk'
+import minimatch from 'minimatch';
+import _ from 'lodash';
+import dateFns from 'date-fns';
+import fs from 'fs';
+import http from 'http';
+import inquirer from 'inquirer';
+import jwt from 'jsonwebtoken';
+import loadJsonFile from 'load-json-file';
+import logSymbols from 'log-symbols';
+import opn from 'opn';
+import path from 'path';
+import pify from 'pify';
+import portfinder from 'portfinder';
+import querystring from 'querystring';
+import request from 'request';
+import report from 'yurnalist';
+import semver from 'semver';
+import updateNotifier from 'update-notifier';
+import url from 'url';
+import util from 'util';
+import {v4 as uuidv4} from 'uuid';
+import walk from 'ignore-walk';
+import writeFile from 'write';
+import writeJsonFile from 'write-json-file';
+import Configstore from 'configstore';
+import Inspector from 'node-avo-inspector';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers'
+import httpShutdown from 'http-shutdown';
+import fuzzypath from 'inquirer-fuzzy-path';
+
+import Avo from './Avo.js';
+const pkg = JSON.parse(fs.readFileSync('./package.json'));
+
+const Minimatch = minimatch.Minimatch;
+const {cyan, gray, red, bold, underline} = chalk;
 
 const customAnalyticsDestination = {
   make: function make(production) {
@@ -65,7 +72,7 @@ Avo.initAvo(
 );
 
 // register inquirer-file-path
-inquirer.registerPrompt('fuzzypath', require('inquirer-fuzzy-path'));
+inquirer.registerPrompt('fuzzypath', fuzzypath);
 
 updateNotifier({pkg: pkg}).notify();
 
@@ -122,12 +129,6 @@ function _request(options, logOptions) {
     qsLog = JSON.stringify(options.qs);
   }
 
-  if (!logOptions.skipRequestBody) {
-    bodyLog = options.body || options.form || '';
-  }
-
-  // logger.debug(">>> HTTP REQUEST", options.method, options.url, qsLog, "\n", bodyLog);
-
   return new Promise(function(resolve, reject) {
     var req = request(options, function(err, response, body) {
       if (err) {
@@ -685,6 +686,7 @@ function codegen(json, result) {
   let targets = result.sources;
   let newJson = Object.assign({}, _.cloneDeep(json), {schema: schema});
   let warnings = result.warnings;
+  let errors = result.errors;
 
   newJson.sources = newJson.sources.map(source => {
     let target = _.find(targets, target => target.id === source.id);
@@ -704,13 +706,17 @@ function codegen(json, result) {
 
   let sourceTasks = targets.map(target => {
     return Promise.all(
-      target.code.map(code => writeFile.promise(code.path, code.content))
+      target.code.map(code => writeFile(code.path, code.content))
     );
   });
 
   let avoJsonTask = writeAvoJson(newJson);
 
   Promise.all(_.concat([avoJsonTask], sourceTasks)).then(() => {
+    if (errors !== undefined && errors !== null && errors !== "") {
+      report.warn(errors + "\n");
+    }
+
     if (warnings !== undefined && warnings !== null && Array.isArray(warnings)) {
       warnings.forEach(warning => {
         report.warn(warning);
@@ -969,11 +975,13 @@ function pull(sourceFilter, json) {
           branchId: json.branch.id,
           sources: _.map(sources, source => {
             return {id: source.id, path: source.path};
-          })
+          }),
+          force: json.force || false
         }
       });
     })
     .then(res => {
+
       cancelWait();
       let result = res.body;
       if (result.ok) {
@@ -1282,7 +1290,7 @@ function status(source, json, argv) {
     });
 }
 
-require('yargs')
+yargs(hideBin(process.argv))
   .usage('$0 command')
   .scriptName('avo')
   .option('v', {
@@ -1655,9 +1663,6 @@ require('yargs')
           report.info(`Currently on branch '${json.branch.name}'`);
           return getSource(argv, json);
         })
-        .then(([source, json]) => {
-          return writeAvoJson(json).then(json => [source, json]);
-        })
         .then(([source, json]) => {
           return status(source, json, argv);
         })
@@ -2140,7 +2145,7 @@ function _loginWithLocalhost(port) {
       _respondWithRedirect(req, res, api.authOrigin + '/auth/cli/error');
     });
 
-    server = require('http-shutdown')(server);
+    server = httpShutdown(server);
 
     server.listen(port, function() {
       report.info(`Visit this URL on any device to login: ${link(authUrl)}`);

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "avo",
-  "version": "1.6.1",
+  "version": "2.0.0",
+  "type": "module",
   "description": "The command-line interface for Avo",
   "author": "Avo (https://www.avo.app)",
   "repository": {
@@ -13,11 +14,9 @@
     "avo": "cli.js"
   },
   "engines": {
-    "node": ">=6"
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
   },
   "scripts": {
-    "commit": "git-cz",
-    "release": "release-it",
     "postinstall": "node cli.js track-install"
   },
   "files": [
@@ -30,36 +29,25 @@
     "date-fns": "1.30.1",
     "http-shutdown": "1.2.0",
     "ignore-walk": "3.0.1",
-    "inquirer": "6.2.0",
+    "inquirer": "8.2",
     "inquirer-fuzzy-path": "2.3.0",
     "jsonwebtoken": "8.4.0",
     "load-json-file": "5.1.0",
-    "lodash": "4.17.19",
+    "lodash": "4.17.21",
     "log-symbols": "2.2.0",
     "minimatch": "3.0.4",
     "node-avo-inspector": "^1.0.1",
     "opn": "5.4.0",
-    "ora": "3.0.0",
+    "ora": "6.0.1",
     "pify": "4.0.1",
-    "portfinder": "1.0.19",
+    "portfinder": "1.0.28",
     "request": "2.88.0",
     "semver": "5.6.0",
-    "update-notifier": "2.5.0",
-    "uuid": "3.3.2",
-    "write": "1.0.3",
+    "update-notifier": "5.1",
+    "uuid": "8.3.2",
+    "write": "2.0.0",
     "write-json-file": "3.0.2",
-    "yargs": "12.0.5",
-    "yurnalist": "1.0.5"
-  },
-  "devDependencies": {
-    "commitizen": "3.0.5",
-    "conventional-changelog-cli": "2.0.11",
-    "cz-conventional-changelog": "2.1.0",
-    "release-it": "8.2.0"
-  },
-  "config": {
-    "commitizen": {
-      "path": "cz-conventional-changelog"
-    }
+    "yargs": "17.2.1",
+    "yurnalist": "2.1.0"
   }
 }

package/CHANGELOG.md

@@ -1,182 +0,0 @@
-## [1.5.1](https://github.com/avohq/avo/compare/1.5.0...1.5.1) (2021-03-16)
-
-* Fix a bug preventing users from being not able to pick a location for their avo.json file
-
-## [1.5.0](https://github.com/avohq/avo/compare/1.4.2...1.5.0) (2021-03-16)
-
-* Rename the master branch to main
-* Update dependencies
-* Faster autocompletion in big projects
-
-## [1.4.2](https://github.com/avohq/avo/compare/1.4.1...1.4.2) (2020-06-10)
-
-
-
-## [1.4.1](https://github.com/avohq/avo/compare/1.4.1-beta.0...1.4.1) (2019-11-20)
-
-
-
-## [1.4.1-beta.0](https://github.com/avohq/avo/compare/1.4.0...1.4.1-beta.0) (2019-11-20)
-
-
-### Bug Fixes
-
-* Fix postinstall crash on Windows ([8b13c83](https://github.com/avohq/avo/commit/8b13c83))
-
-
-
-# [1.4.0](https://github.com/avohq/avo/compare/1.4.0-beta.3...1.4.0) (2019-10-29)
-
-
-
-# [1.4.0-beta.3](https://github.com/avohq/avo/compare/1.4.0-beta.2...1.4.0-beta.3) (2019-10-21)
-
-
-### Bug Fixes
-
-* Updated analytics for merge conflict resolver ([07b0958](https://github.com/avohq/avo/commit/07b0958))
-
-
-
-# [1.4.0-beta.2](https://github.com/avohq/avo/compare/1.4.0-beta.1...1.4.0-beta.2) (2019-10-21)
-
-
-### Bug Fixes
-
-* Fix authentication when resolving merge conflicts ([efda141](https://github.com/avohq/avo/commit/efda141))
-
-
-
-# [1.4.0-beta.1](https://github.com/avohq/avo/compare/1.4.0-beta.0...1.4.0-beta.1) (2019-10-21)
-
-
-
-# [1.4.0-beta.0](https://github.com/avohq/avo/compare/1.3.6...1.4.0-beta.0) (2019-10-21)
-
-
-### Features
-
-* Resolve simple merge conflicts in Avo files automatically ([886cc7f](https://github.com/avohq/avo/commit/886cc7f))
-
-
-
-## [1.3.6](https://github.com/avohq/avo/compare/1.3.5...1.3.6) (2019-08-21)
-
-
-### Bug Fixes
-
-* Request and handle gzipped responses ([c108ccf](https://github.com/avohq/avo/commit/c108ccf))
-
-
-
-## [1.3.5](https://github.com/avohq/avo/compare/1.3.4...1.3.5) (2019-07-01)
-
-
-### Bug Fixes
-
-* Suggest a command if provided command is unknown ([24f9345](https://github.com/avohq/avo/commit/24f9345))
-
-
-
-## [1.3.4](https://github.com/avohq/avo/compare/1.3.3...1.3.4) (2019-07-01)
-
-
-### Bug Fixes
-
-* Fixes issue where switching branch doesn't carry which source is being generated ([f851f0e](https://github.com/avohq/avo/commit/f851f0e))
-
-
-
-## [1.3.3](https://github.com/avohq/avo/compare/1.3.2...1.3.3) (2019-04-05)
-
-
-### Bug Fixes
-
-* Prevent crash if analytics endpoint fails ([a38e608](https://github.com/avohq/avo/commit/a38e608))
-
-
-
-## [1.3.2](https://github.com/avohq/avo/compare/1.3.1...1.3.2) (2019-03-10)
-
-
-### Bug Fixes
-
-* Use object.assign instead of spread syntax ([1b50034](https://github.com/avohq/avo/commit/1b50034))
-
-
-
-## [1.3.1](https://github.com/avohq/avo/compare/1.3.0...1.3.1) (2019-02-26)
-
-
-### Bug Fixes
-
-* Fix module map parsing for multi-line comments ([eb9796b](https://github.com/avohq/avo/commit/eb9796b))
-
-
-
-# [1.3.0](https://github.com/avohq/avo/compare/1.2.4...1.3.0) (2019-02-25)
-
-
-### Features
-
-* Read analytics wrapper module name from source file ([3867652](https://github.com/avohq/avo/commit/3867652))
-
-
-
-## [1.2.4](https://github.com/avohq/avo/compare/1.2.3...1.2.4) (2019-02-18)
-
-
-
-## [1.2.3](https://github.com/avohq/avo/compare/1.2.2...1.2.3) (2019-02-18)
-
-
-
-## [1.2.2](https://github.com/avohq/avo/compare/1.2.1...1.2.2) (2019-02-18)
-
-
-
-## [1.2.1](https://github.com/avohq/avo/compare/1.2.0...1.2.1) (2019-02-17)
-
-
-### Bug Fixes
-
-* Non-destructive changes to sources json when pulling ([171851e](https://github.com/avohq/avo/commit/171851e))
-
-
-
-# [1.2.0](https://github.com/avohq/avo/compare/1.1.2...1.2.0) (2019-02-17)
-
-
-### Features
-
-* avo status with simple linting ([#2](https://github.com/avohq/avo/issues/2)) ([51adb92](https://github.com/avohq/avo/commit/51adb92))
-
-
-
-## [1.1.2](https://github.com/avohq/avo/compare/1.1.1...1.1.2) (2019-02-16)
-
-
-### Bug Fixes
-
-* avo pull source does not pull all sources if it is missing ([80c1048](https://github.com/avohq/avo/commit/80c1048))
-
-
-
-## [1.1.1](https://github.com/avohq/avo/compare/1.1.0...1.1.1) (2019-02-12)
-
-
-
-# [1.1.0](https://github.com/avohq/avo/compare/1.0.1...1.1.0) (2019-02-12)
-
-
-### Features
-
-* Add avo status command ([9d32c1f](https://github.com/avohq/avo/commit/9d32c1f))
-
-
-
-## [1.0.1](https://github.com/avohq/avo/compare/1.0.0...1.0.1) (2019-01-18)
-
-
-
-# 1.0.0 (2019-01-18)