Fix runtime bundle (#322)

milliHQ · Jun 5, 2022 · 3278214 · 3278214
1 parent f9fcd86
commit 3278214
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 35 deletions.
diff --git a/packages/runtime/build.sh b/packages/runtime/build.sh
@@ -15,6 +15,6 @@ tsc
 # mv dist/dev/index.js dist/dev-server.js
 # rm -rf dist/dev
 
-# ncc build src/index.ts -e @vercel/build-utils -e @now/build-utils -o dist/main
-# mv dist/main/index.js dist/index.js
-# rm -rf dist/main
+ncc build src/index.ts --minify -e @vercel/build-utils -e @now/build-utils -o dist/main
+mv dist/main/index.js dist/index.js
+rm -rf dist/main
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -17,7 +17,6 @@
     "dist"
   ],
   "devDependencies": {
-    "@tsconfig/node12": "^1.0.9",
     "@types/aws-lambda": "*",
     "@types/buffer-crc32": "0.2.0",
     "@types/find-up": "4.0.0",

diff --git a/packages/runtime/src/build-utils.ts b/packages/runtime/src/build-utils.ts
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
@@ -1,15 +1,27 @@
 import {
   BuildOptions,
   Config,
+  createLambda,
+  debug,
+  download,
+  execCommand,
   FileBlob,
   FileFsRef,
   Files,
+  getLambdaOptionsFromFunction,
+  getNodeBinPath,
+  getNodeVersion,
+  getScriptName,
+  getSpawnOptions,
+  glob,
   Meta,
   Lambda,
   NowBuildError,
   PackageJson,
   PrepareCacheOptions,
   Prerender,
+  runNpmInstall,
+  runPackageJsonScript,
 } from '@vercel/build-utils';
 import { Handler, Route, Source } from '@vercel/routing-utils';
 import {
@@ -29,7 +41,6 @@ import path from 'path';
 import resolveFrom from 'resolve-from';
 import semver from 'semver';
 import url from 'url';
-import buildUtils from './build-utils';
 import createServerlessConfig from './create-serverless-config';
 import nextLegacyVersions from './legacy-versions';
 import {
@@ -58,20 +69,6 @@ import {
   syncEnvVars,
   validateEntrypoint,
 } from './utils';
-const {
-  createLambda,
-  debug,
-  download,
-  getLambdaOptionsFromFunction,
-  getNodeVersion,
-  getSpawnOptions,
-  getScriptName,
-  glob,
-  runNpmInstall,
-  runPackageJsonScript,
-  execCommand,
-  getNodeBinPath,
-} = buildUtils;
 
 interface BuildParamsMeta {
   isDev: boolean | undefined;

diff --git a/packages/runtime/src/utils.ts b/packages/runtime/src/utils.ts
@@ -1,4 +1,11 @@
-import { FileFsRef, Files } from '@vercel/build-utils';
+import {
+  FileFsRef,
+  Files,
+  isSymbolicLink,
+  Lambda,
+  NowBuildError,
+  streamToBuffer,
+} from '@vercel/build-utils';
 import { NowHeader, NowRewrite, Route, Source } from '@vercel/routing-utils';
 import { Sema } from 'async-sema';
 import crc32 from 'buffer-crc32';
@@ -8,8 +15,6 @@ import resolveFrom from 'resolve-from';
 import semver from 'semver';
 import { ZipFile } from 'yazl';
 import zlib from 'zlib';
-import buildUtils from './build-utils';
-const { streamToBuffer, Lambda, NowBuildError, isSymbolicLink } = buildUtils;
 
 type stringMap = { [key: string]: string };
 

diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json
@@ -1,10 +1,13 @@
 {
-  "extends": "@tsconfig/node12/tsconfig.json",
   "compilerOptions": {
+    "strict": true,
+    "esModuleInterop": true,
+    "lib": ["esnext"],
+    "target": "es2018",
+    "module": "commonjs",
     "outDir": "dist",
     "sourceMap": false,
-    "declaration": true,
-    "moduleResolution": "node"
+    "declaration": true
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules"]