[go][node][python][ruby] Remove @now/build-utils backwards compat hack (#6603)

`@now/build-utils` has not been published in a long time, so let's remove this logic.

packages/go/build-utils.ts

@@ -1,10 +0,0 @@
-let buildUtils: typeof import('@vercel/build-utils');
-
-try {
-  buildUtils = require('@vercel/build-utils');
-} catch (e) {
-  // Fallback for older CLI versions
-  buildUtils = require('@now/build-utils');
-}
-
-export default buildUtils;

packages/go/build.js

@@ -12,16 +12,7 @@ async function main() {
   // Build with `ncc`
   await execa(
     'ncc',
-    [
+    ['build', 'index.ts', '-e', '@vercel/build-utils', '-o', outDir],
-      'build',
-      'index.ts',
-      '-e',
-      '@vercel/build-utils',
-      '-e',
-      '@now/build-utils',
-      '-o',
-      outDir,
-    ],
     {
       stdio: 'inherit',
     }

packages/go/go-helpers.ts

@@ -3,9 +3,8 @@ import execa from 'execa';
 import fetch from 'node-fetch';
 import { mkdirp, pathExists, readFile } from 'fs-extra';
 import { join } from 'path';
-import buildUtils from './build-utils';
 import stringArgv from 'string-argv';
-const { debug } = buildUtils;
+import { debug } from '@vercel/build-utils';
 const versionMap = new Map([
   ['1.16', '1.16'],
   ['1.15', '1.15.8'],

packages/go/index.ts

@@ -20,17 +20,13 @@ import {
   PrepareCacheOptions,
   StartDevServerOptions,
   StartDevServerResult,
-} from '@vercel/build-utils';
-import buildUtils from './build-utils';
-
-const {
   glob,
   download,
   createLambda,
   getWriteableDirectory,
   shouldServe,
   debug,
-} = buildUtils;
+} from '@vercel/build-utils';
 
 const TMP = tmpdir();
 

packages/node/build.js

@@ -53,8 +53,6 @@ async function main() {
       '@vercel/node-bridge',
       '-e',
       '@vercel/build-utils',
-      '-e',
-      '@now/build-utils',
       '-o',
       helpersDir,
     ],
@@ -74,8 +72,6 @@ async function main() {
       '@vercel/node-bridge',
       '-e',
       '@vercel/build-utils',
-      '-e',
-      '@now/build-utils',
       '-o',
       sourceMapSupportDir,
     ],
@@ -98,8 +94,6 @@ async function main() {
       '-e',
       '@vercel/build-utils',
       '-e',
-      '@now/build-utils',
-      '-e',
       'typescript',
       '-o',
       mainDir,

packages/node/src/build-utils.ts

@@ -1,10 +0,0 @@
-let buildUtils: typeof import('@vercel/build-utils');
-
-try {
-  buildUtils = require('@vercel/build-utils');
-} catch (e) {
-  // Fallback for older CLI versions
-  buildUtils = require('@now/build-utils');
-}
-
-export default buildUtils;

packages/node/src/index.ts

@@ -20,7 +20,6 @@ import {
 import mkdirp from 'mkdirp-promise';
 import once from '@tootallnate/once';
 import { nodeFileTrace } from '@vercel/nft';
-import buildUtils from './build-utils';
 import {
   File,
   Files,
@@ -30,8 +29,6 @@ import {
   Config,
   StartDevServerOptions,
   StartDevServerResult,
-} from '@vercel/build-utils';
-const {
   glob,
   download,
   FileBlob,
@@ -45,7 +42,7 @@ const {
   debug,
   isSymbolicLink,
   walkParentDirs,
-} = buildUtils;
+} from '@vercel/build-utils';
 
 // @ts-ignore - copied to the `dist` output as-is
 import { makeVercelLauncher, makeAwsLauncher } from './launcher.js';

packages/node/src/typescript.ts

@@ -1,7 +1,6 @@
-import { relative, basename, resolve, dirname } from 'path';
 import _ts from 'typescript';
-import buildUtils from './build-utils';
+import { NowBuildError } from '@vercel/build-utils';
-const { NowBuildError } = buildUtils;
+import { relative, basename, resolve, dirname } from 'path';
 
 /*
  * Fork of TS-Node - https://github.com/TypeStrong/ts-node

packages/python/build.js

@@ -16,8 +16,6 @@ async function main() {
       join(__dirname, 'src/index.ts'),
       '-e',
       '@vercel/build-utils',
-      '-e',
-      '@now/build-utils',
       '-o',
       outDir,
     ],

packages/python/src/build-utils.ts

@@ -1,10 +0,0 @@
-let buildUtils: typeof import('@vercel/build-utils');
-
-try {
-  buildUtils = require('@vercel/build-utils');
-} catch (e) {
-  // Fallback for older CLI versions
-  buildUtils = require('@now/build-utils');
-}
-
-export default buildUtils;

packages/python/src/index.ts

@@ -4,16 +4,16 @@ import fs from 'fs';
 import { promisify } from 'util';
 const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);
-import buildUtils from './build-utils';
+import {
-import { GlobOptions, BuildOptions } from '@vercel/build-utils';
+  GlobOptions,
-const {
+  BuildOptions,
   getWriteableDirectory,
   download,
   glob,
   createLambda,
   shouldServe,
   debug,
-} = buildUtils;
+} from '@vercel/build-utils';
 import { installRequirement, installRequirementsFile } from './install';
 
 async function pipenvConvert(cmd: string, srcDir: string) {

packages/python/src/install.ts

@@ -1,7 +1,5 @@
 import execa from 'execa';
-import { Meta } from '@vercel/build-utils';
+import { Meta, debug } from '@vercel/build-utils';
-import buildUtils from './build-utils';
-const { debug } = buildUtils;
 const pipPath = 'pip3';
 
 const makeDependencyCheckCode = (dependency: string) => `

packages/ruby/build-utils.ts

@@ -1,10 +0,0 @@
-let buildUtils: typeof import('@vercel/build-utils');
-
-try {
-  buildUtils = require('@vercel/build-utils');
-} catch (e) {
-  // Fallback for older CLI versions
-  buildUtils = require('@now/build-utils');
-}
-
-export default buildUtils;

packages/ruby/build.js

@@ -16,8 +16,6 @@ async function main() {
       join(__dirname, 'index.ts'),
       '-e',
       '@vercel/build-utils',
-      '-e',
-      '@now/build-utils',
       '-o',
       outDir,
     ],

packages/ruby/index.ts

@@ -8,16 +8,15 @@ import {
   readFile,
   writeFile,
 } from 'fs-extra';
-import buildUtils from './build-utils';
+import {
-import { BuildOptions } from '@vercel/build-utils';
+  BuildOptions,
-const {
   download,
   getWriteableDirectory,
   glob,
   createLambda,
   debug,
   walkParentDirs,
-} = buildUtils;
+} from '@vercel/build-utils';
 import { installBundler } from './install-ruby';
 
 async function matchPaths(

packages/ruby/install-ruby.ts

@@ -1,9 +1,7 @@
 import { join } from 'path';
 import { intersects } from 'semver';
 import execa from 'execa';
-import buildUtils from './build-utils';
+import { Meta, NodeVersion, debug, NowBuildError } from '@vercel/build-utils';
-import { Meta, NodeVersion } from '@vercel/build-utils';
-const { debug, NowBuildError } = buildUtils;
 
 interface RubyVersion extends NodeVersion {
   minor: number;
@@ -29,11 +27,7 @@ function getRubyPath(meta: Meta, gemfileContents: string) {
       .split('\n')
       .find(line => line.startsWith('ruby'));
     if (line) {
-      const strVersion = line
+      const strVersion = line.slice(4).trim().slice(1, -1).replace('~>', '');
-        .slice(4)
-        .trim()
-        .slice(1, -1)
-        .replace('~>', '');
       const found = allOptions.some(o => {
         // The array is already in order so return the first
         // match which will be the newest version.
@@ -44,8 +38,7 @@ function getRubyPath(meta: Meta, gemfileContents: string) {
         throw new NowBuildError({
           code: 'RUBY_INVALID_VERSION',
           message: 'Found `Gemfile` with invalid Ruby version: `' + line + '`.',
-          link:
+          link: 'https://vercel.com/docs/runtimes#official-runtimes/ruby/ruby-version',
-            'https://vercel.com/docs/runtimes#official-runtimes/ruby/ruby-version',
         });
       }
     }