[now-cli][now-client] (Major) Remove legacy code

examples/nextjs/.gitignore

@@ -20,3 +20,5 @@ yarn-error.log*
 # Environment Variables
 .env
 .env.build
+
+.now

packages/now-cli/package.json

@@ -14,7 +14,6 @@
     "preinstall": "node ./scripts/preinstall.js",
     "test-unit": "nyc ava test/unit.js test/dev-builder.unit.js test/dev-router.unit.js test/dev-server.unit.js --serial --fail-fast --verbose",
     "test-integration": "ava test/integration.js --serial --fail-fast",
-    "test-integration-v1": "ava test/integration-v1.js --serial --fail-fast",
     "test-integration-now-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
     "prepublishOnly": "yarn build",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
@@ -92,12 +91,10 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@zeit/dockerignore": "0.0.5",
     "@zeit/fun": "0.11.2",
     "@zeit/ncc": "0.18.5",
     "@zeit/source-map-support": "0.6.2",
     "ajv": "6.10.2",
-    "alpha-sort": "2.0.1",
     "ansi-escapes": "3.0.0",
     "ansi-regex": "3.0.0",
     "arg": "2.0.0",
@@ -130,8 +127,6 @@
     "get-port": "5.1.1",
     "glob": "7.1.2",
     "http-proxy": "1.17.0",
-    "ignore": "4.0.6",
-    "ini": "1.3.4",
     "inquirer": "7.0.4",
     "is-port-reachable": "3.0.0",
     "is-url": "1.2.2",

packages/now-cli/src/commands/alias/index.js

@@ -1,4 +1,3 @@
-//
 import chalk from 'chalk';
 
 import { handleError } from '../../util/error';
@@ -31,15 +30,11 @@ const help = () => {
     -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
     'DIR'
   )}         Path to the global ${'`.now`'} directory
-    -r ${chalk.bold.underline('RULES_FILE')}, --rules=${chalk.bold.underline(
-    'RULES_FILE'
-  )}   Rules file
     -d, --debug                         Debug mode [off]
     -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
     'TOKEN'
   )}             Login token
     -S, --scope                         Set a custom scope
-    -n, --no-verify                     Don't wait until instance count meets the previous alias constraints
 
   ${chalk.dim('Examples:')}
 
@@ -65,30 +60,14 @@ const help = () => {
       ${chalk.dim('–')} ${chalk.dim(
     'Protocols'
   )} in the URLs are unneeded and ignored.
-
-  ${chalk.gray('–')} Add and modify path based aliases for ${chalk.underline(
-    'zeit.ninja'
-  )}
-
-      ${chalk.cyan(
-        `$ now alias ${chalk.underline('zeit.ninja')} -r ${chalk.underline(
-          'rules.json'
-        )}`
-      )}
-
-      Export effective routing rules
-
-      ${chalk.cyan(
-        `$ now alias ls aliasId --json > ${chalk.underline('rules.json')}`
-      )}
 `);
 };
 
 const COMMAND_CONFIG = {
   default: 'set',
   ls: ['ls', 'list'],
   rm: ['rm', 'remove'],
-  set: ['set']
+  set: ['set'],
 };
 
 export default async function main(ctx) {
@@ -97,12 +76,8 @@ export default async function main(ctx) {
   try {
     argv = getArgs(ctx.argv.slice(2), {
       '--json': Boolean,
-      '--no-verify': Boolean,
-      '--rules': String,
       '--yes': Boolean,
-      '-n': '--no-verify',
-      '-r': '--rules',
-      '-y': '--yes'
+      '-y': '--yes',
     });
   } catch (err) {
     handleError(err);

packages/now-cli/src/commands/alias/ls.js

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import ms from 'ms';
 import plural from 'pluralize';
 import table from 'text-table';
-import Now from '../../util';
+import Now from '../../util/now';
 import Client from '../../util/client.ts';
 import getAliases from '../../util/alias/get-aliases';
 import getScope from '../../util/get-scope.ts';
@@ -36,7 +36,6 @@ export default async function ls(ctx, opts, args, output) {
     throw err;
   }
 
-  // $FlowFixMe
   const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
   const lsStamp = stamp();
   let cancelWait;

packages/now-cli/src/commands/alias/rm.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ms from 'ms';
 import table from 'text-table';
-import Now from '../../util';
+import Now from '../../util/now';
 import cmd from '../../util/output/cmd.ts';
 import Client from '../../util/client.ts';
 import getScope from '../../util/get-scope.ts';
@@ -13,15 +13,18 @@ import { isValidName } from '../../util/is-valid-name';
 import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';
 
 export default async function rm(ctx, opts, args, output) {
-  const { authConfig: { token }, config } = ctx;
+  const {
+    authConfig: { token },
+    config,
+  } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const { '--debug': debugEnabled } = opts;
   const client = new Client({
     apiUrl,
     token,
     currentTeam,
-    debug: debugEnabled
+    debug: debugEnabled,
   });
   let contextName = null;
 
@@ -36,7 +39,6 @@ export default async function rm(ctx, opts, args, output) {
     throw err;
   }
 
-  // $FlowFixMe
   const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
   const [aliasOrId] = args;
 
@@ -70,7 +72,7 @@ export default async function rm(ctx, opts, args, output) {
   }
 
   const removeStamp = stamp();
-  if (!opts['--yes'] && !await confirmAliasRemove(output, alias)) {
+  if (!opts['--yes'] && !(await confirmAliasRemove(output, alias))) {
     output.log('Aborted');
     return 0;
   }
@@ -93,13 +95,13 @@ async function confirmAliasRemove(output, alias) {
       [
         ...(srcUrl ? [srcUrl] : []),
         chalk.underline(alias.alias),
-        chalk.gray(`${ms(new Date() - new Date(alias.created))} ago`)
-      ]
+        chalk.gray(`${ms(new Date() - new Date(alias.created))} ago`),
+      ],
     ],
     {
       align: ['l', 'l', 'r'],
       hsep: ' '.repeat(4),
-      stringLength: strlen
+      stringLength: strlen,
     }
   );