typing improvements, adding a new scope to packages, starting on the next-deploy CLI

cli/deploy.ts

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+
+import fs from 'fs-extra';
+import path from 'path';
+
+import AwsComponent from '@next-deploy/aws-component';
+
+const SUPPORTED_ENGINES = [
+  {
+    type: 'aws',
+    component: '@next-deploy/aws-component',
+  },
+];
+const DEFAULT_ENGINE = 'aws';
+const DEPLOY_CONFIG_NAME = 'deploy.config.js';
+
+(async () => {
+  const deployConfigPath = path.join(process.cwd(), DEPLOY_CONFIG_NAME);
+  const configPathExists = fs.existsSync(deployConfigPath);
+
+  if (!configPathExists) {
+    fs.writeFileSync(deployConfigPath, getDefaultConfigData());
+  }
+
+  const {
+    debug = false,
+    engine = DEFAULT_ENGINE,
+    ...componentOptions
+  }: BaseDeploymentOptions = await import(deployConfigPath);
+  const engineIndex = SUPPORTED_ENGINES.findIndex(({ type }) => type === engine);
+
+  if (engineIndex === -1) {
+    throw new Error(
+      `Engine ${engine} is unsupported. Pick one of: ${SUPPORTED_ENGINES.map(
+        ({ type }) => type
+      ).join(',')}.`
+    );
+  }
+
+  const EngineComponent = await import(SUPPORTED_ENGINES[engineIndex].component);
+  const engineComponent = new EngineComponent.default();
+
+  if (engine === 'aws') {
+    await (engineComponent as AwsComponent).default(componentOptions);
+  }
+})();
+
+function getDefaultConfigData(): string {
+  return `// for configurable options visit: https://github.com/nidratech/next-deploy#options
+module.exports = {
+  // prints helpful output during deployment
+  debug: false,
+};
+`;
+}
+
+type BaseDeploymentOptions = {
+  engine?: 'aws';
+  debug?: boolean;
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "next-deploy",
   "version": "0.0.1",
-  "description": "Effortlessly deploy your Next.js application.",
+  "description": "Effortless deployment for Next.js apps.",
   "author": "Nidratech Ltd. <egor@nidratech.com>",
   "main": "index.js",
   "keywords": [
@@ -9,16 +9,23 @@
     "deploy",
     "serverless",
     "nextjs",
-    "lambda"
+    "lambda",
+    "cloudfront",
+    "edge"
   ],
   "scripts": {
     "test": "jest --runInBand",
     "build": "lerna exec -- yarn",
     "test:watch": "yarn test --watch --collect-coverage=false",
     "publish": "lerna publish --conventional-commits",
+    "prepublishOnly": "yarn test",
     "prerelease": "lerna publish --conventional-commits --conventional-prerelease",
     "graduate": "lerna publish --conventional-commits --conventional-graduate",
-    "lint": "eslint ."
+    "prepare": "yarn build-self",
+    "build-self": "tsc -p tsconfig.build.json"
+  },
+  "bin": {
+    "next-deploy": "./dist/deploy.js"
   },
   "repository": {
     "type": "git",
@@ -33,22 +40,24 @@
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/preset-env": "^7.10.4",
     "@babel/preset-typescript": "^7.10.4",
+    "@next-deploy/aws-cloudfront": "link:./packages/aws-cloudfront",
+    "@next-deploy/aws-component": "link:./packages/aws-component",
+    "@next-deploy/aws-lambda-builder": "link:./packages/aws-lambda-builder",
     "@types/archiver": "^3.1.0",
-    "@types/aws-lambda": "^8.10.57",
+    "@types/aws-lambda": "^8.10.58",
     "@types/execa": "^2.0.0",
     "@types/fs-extra": "^9.0.1",
-    "@types/jest": "^26.0.3",
+    "@types/jest": "^26.0.4",
     "@types/klaw": "^3.0.1",
     "@types/mime-types": "^2.1.0",
-    "@types/node": "^14.0.14",
+    "@types/node": "^14.0.18",
     "@types/path-to-regexp": "^1.7.0",
     "@types/ramda": "^0.27.7",
     "@types/react": "^16.9.41",
     "@types/react-dom": "^16.9.8",
-    "@types/webpack": "^4.41.18",
+    "@types/webpack": "^4.41.20",
-    "@typescript-eslint/eslint-plugin": "^3.5.0",
+    "@typescript-eslint/eslint-plugin": "^3.6.0",
-    "@typescript-eslint/parser": "^3.5.0",
+    "@typescript-eslint/parser": "^3.6.0",
-    "aws-lambda-builder": "link:./packages/aws-lambda-builder",
     "eslint": "^7.4.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
@@ -57,7 +66,8 @@
     "jest-when": "^2.7.2",
     "lerna": "^3.22.1",
     "lint-staged": "^10.2.11",
-    "prettier": "^2.0.5"
+    "prettier": "^2.0.5",
+    "typescript": "^3.9.6"
   },
   "husky": {
     "hooks": {

packages/aws-cloudfront/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "aws-cloudfront",
+  "name": "@next-deploy/aws-cloudfront",
   "version": "1.0.0",
   "license": "MIT",
   "main": "serverless.js",

packages/aws-cloudfront/src/component.ts

@@ -19,11 +19,11 @@ class CloudFrontComponent extends Component {
     credentials: Credentials;
     distributionId: string;
     paths?: string[];
-  }) {
+  }): Promise<CloudFront.CreateInvalidationResult> {
-    createInvalidation({ credentials, distributionId, paths });
+    return createInvalidation({ credentials, distributionId, paths });
   }
 
-  async default(inputs: CloudFrontInputs) {
+  async default(inputs: CloudFrontInputs): Promise<any> {
     this.context.status('Deploying');
 
     inputs.region = inputs.region || 'us-east-1';
@@ -72,7 +72,7 @@ class CloudFrontComponent extends Component {
     return this.state;
   }
 
-  async remove() {
+  async remove(): Promise<void> {
     this.context.status('Removing');
 
     if (!this.state.id) {
@@ -90,7 +90,6 @@ class CloudFrontComponent extends Component {
     await this.save();
 
     this.context.debug(`CloudFront distribution was successfully removed.`);
-    return {};
   }
 }
 

packages/aws-cloudfront/types.d.ts

@@ -19,8 +19,8 @@ type PathPatternConfig = {
 
 type Origin = {
   url: string;
-  private: boolean;
+  private?: boolean;
-  pathPatterns: Record<string, PathPatternConfig>;
+  pathPatterns?: Record<string, PathPatternConfig>;
 };
 
 type Credentials = {

packages/aws-component/__tests__/custom-inputs.test.ts

@@ -1,11 +1,11 @@
 import fse from 'fs-extra';
 import path from 'path';
 
-import { mockDomain } from 'aws-domain';
+import { mockDomain } from '@next-deploy/aws-domain';
 import { mockS3 } from '@serverless/aws-s3';
 import { mockUpload } from 'aws-sdk';
-import { mockLambda, mockLambdaPublish } from 'aws-lambda';
+import { mockLambda, mockLambdaPublish } from '@next-deploy/aws-lambda';
-import { mockCloudFront } from 'aws-cloudfront';
+import { mockCloudFront } from '@next-deploy/aws-cloudfront';
 
 import NextjsComponent, { DEFAULT_LAMBDA_CODE_DIR, API_LAMBDA_CODE_DIR } from '../src/component';
 import { getDomains } from '../src/utils';

packages/aws-component/__tests__/deploy.test.ts

@@ -2,8 +2,8 @@ import path from 'path';
 import fse from 'fs-extra';
 import { mockS3 } from '@serverless/aws-s3';
 
-import { mockCloudFront, mockCreateInvalidation } from 'aws-cloudfront';
+import { mockCloudFront, mockCreateInvalidation } from '@next-deploy/aws-cloudfront';
-import { mockLambda, mockLambdaPublish } from 'aws-lambda';
+import { mockLambda, mockLambdaPublish } from '@next-deploy/aws-lambda';
 import NextjsComponent, { DEFAULT_LAMBDA_CODE_DIR, API_LAMBDA_CODE_DIR } from '../src/component';
 import { cleanupFixtureDirectory } from './test-utils';
 

packages/aws-component/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "aws-component",
+  "name": "@next-deploy/aws-component",
   "version": "1.0.0",
   "license": "MIT",
   "main": "serverless.js",
@@ -11,11 +11,11 @@
   "dependencies": {
     "@serverless/aws-s3": "^4.2.0",
     "@serverless/core": "^1.1.2",
-    "aws-cloudfront": "link:../aws-cloudfront",
+    "@next-deploy/aws-cloudfront": "link:../aws-cloudfront",
-    "aws-domain": "link:../aws-domain",
+    "@next-deploy/aws-domain": "link:../aws-domain",
-    "aws-lambda": "link:../aws-lambda",
+    "@next-deploy/aws-lambda": "link:../aws-lambda",
-    "aws-lambda-builder": "link:../aws-lambda-builder",
+    "@next-deploy/aws-lambda-builder": "link:../aws-lambda-builder",
-    "aws-s3-utils": "link:../aws-s3-utils",
+    "@next-deploy/aws-s3-utils": "link:../aws-s3-utils",
     "fs-extra": "^9.0.1"
   },
   "devDependencies": {

packages/aws-component/src/component.ts

@@ -2,18 +2,28 @@ import { Component } from '@serverless/core';
 import { exists, readJSON } from 'fs-extra';
 import { resolve, join } from 'path';
 
-import Builder from 'aws-lambda-builder';
+import Builder from '@next-deploy/aws-lambda-builder';
-import { OriginRequestDefaultHandlerManifest as BuildManifest } from 'aws-lambda-builder/types';
+import { uploadStaticAssets } from '@next-deploy/aws-s3-utils';
-import { uploadStaticAssets } from 'aws-s3-utils';
+import AwsCloudFront from '@next-deploy/aws-cloudfront';
-import AwsCloudFront from 'aws-cloudfront';
 import { getDomains } from './utils';
+import {
+  OriginRequestDefaultHandlerManifest as BuildManifest,
+  OriginRequestApiHandlerManifest,
+} from '@next-deploy/aws-lambda-builder/types';
+import { PathPatternConfig } from '@next-deploy/aws-cloudfront/types';
+import { Origin } from '@next-deploy/aws-cloudfront/types';
 import { BuildOptions, AwsComponentInputs, LambdaType, LambdaInput } from '../types';
 
 export const DEFAULT_LAMBDA_CODE_DIR = '.serverless_nextjs/default-lambda';
 export const API_LAMBDA_CODE_DIR = '.serverless_nextjs/api-lambda';
 
 class AwsComponent extends Component {
-  async default(inputs: AwsComponentInputs = {}): Promise<any> {
+  async default(
+    inputs: AwsComponentInputs = {}
+  ): Promise<{
+    appUrl: string;
+    bucketName: string;
+  }> {
     // @ts-ignore
     if (inputs.build !== false) {
       await this.build(inputs);
@@ -22,7 +32,7 @@ class AwsComponent extends Component {
     return this.deploy(inputs);
   }
 
-  readDefaultBuildManifest(nextConfigPath: string): Promise<any> {
+  readDefaultBuildManifest(nextConfigPath: string): Promise<BuildManifest> {
     return readJSON(join(nextConfigPath, '.serverless_nextjs/default-lambda/manifest.json'));
   }
 
@@ -104,7 +114,9 @@ class AwsComponent extends Component {
     }
   }
 
-  async readApiBuildManifest(nextConfigPath: string): Promise<any> {
+  async readApiBuildManifest(
+    nextConfigPath: string
+  ): Promise<undefined | OriginRequestApiHandlerManifest> {
     const path = join(nextConfigPath, '.serverless_nextjs/api-lambda/manifest.json');
 
     // @ts-ignore
@@ -146,7 +158,7 @@ class AwsComponent extends Component {
 
     const nextStaticPath = inputs.nextStaticDir ? resolve(inputs.nextStaticDir) : nextConfigPath;
 
-    const customCloudFrontConfig = inputs.cloudfront || {};
+    const customCloudFrontConfig: Record<string, any> = inputs.cloudfront || {};
 
     const [defaultBuildManifest, apiBuildManifest] = await Promise.all([
       this.readDefaultBuildManifest(nextConfigPath),
@@ -155,9 +167,9 @@ class AwsComponent extends Component {
 
     const [bucket, cloudFront, defaultEdgeLambda, apiEdgeLambda] = await Promise.all([
       this.load('@serverless/aws-s3'),
-      this.load('aws-cloudfront'),
+      this.load('@next-deploy/aws-cloudfront'),
-      this.load('aws-lambda', 'defaultEdgeLambda'),
+      this.load('@next-deploy/aws-lambda', 'defaultEdgeLambda'),
-      this.load('aws-lambda', 'apiEdgeLambda'),
+      this.load('@next-deploy/aws-lambda', 'apiEdgeLambda'),
     ]);
 
     const bucketOutputs = await bucket({
@@ -174,18 +186,12 @@ class AwsComponent extends Component {
       publicDirectoryCache: inputs.publicDirectoryCache,
     });
 
-    defaultBuildManifest.cloudFrontOrigins = {
-      staticOrigin: {
-        domainName: `${bucketOutputs.name}.s3.amazonaws.com`,
-      },
-    };
-
     const bucketUrl = `http://${bucketOutputs.name}.s3.amazonaws.com`;
 
     // If origin is relative path then prepend the bucketUrl
     // e.g. /path => http://bucket.s3.aws.com/path
-    const expandRelativeUrls = (origin: string | Record<string, unknown>) => {
+    const expandRelativeUrls = (origin: string | Origin): string | Origin => {
-      const originUrl = typeof origin === 'string' ? origin : (origin.url as string);
+      const originUrl = typeof origin === 'string' ? origin : origin.url;
       const fullOriginUrl = originUrl.charAt(0) === '/' ? `${bucketUrl}${originUrl}` : originUrl;
 
       if (typeof origin === 'string') {
@@ -199,7 +205,7 @@ class AwsComponent extends Component {
     };
 
     // parse origins from inputs
-    let inputOrigins: any[] = [];
+    let inputOrigins: any = [];
     if (inputs.cloudfront && inputs.cloudfront.origins) {
       const origins = inputs.cloudfront.origins as string[];
       inputOrigins = origins.map(expandRelativeUrls);
@@ -311,12 +317,11 @@ class AwsComponent extends Component {
 
     const defaultEdgeLambdaPublishOutputs = await defaultEdgeLambda.publishVersion();
 
-    let defaultCloudfrontInputs;
+    let defaultCloudfrontInputs = {} as Partial<PathPatternConfig>;
+
     if (inputs.cloudfront && inputs.cloudfront.defaults) {
       defaultCloudfrontInputs = inputs.cloudfront.defaults;
       delete inputs.cloudfront.defaults;
-    } else {
-      defaultCloudfrontInputs = {};
     }
 
     // validate that the custom config paths match generated paths in the manifest
@@ -401,7 +406,7 @@ class AwsComponent extends Component {
     const { domain, subdomain } = getDomains(inputs.domain);
 
     if (domain && subdomain) {
-      const domainComponent = await this.load('aws-domain');
+      const domainComponent = await this.load('@next-deploy/aws-domain');
       const domainOutputs = await domainComponent({
         privateZone: false,
         domain,
@@ -423,8 +428,8 @@ class AwsComponent extends Component {
   async remove(): Promise<void> {
     const [bucket, cloudfront, domain] = await Promise.all([
       this.load('@serverless/aws-s3'),
-      this.load('aws-cloudfront'),
+      this.load('@next-deploy/aws-cloudfront'),
-      this.load('aws-domain'),
+      this.load('@next-deploy/aws-domain'),
     ]);
 
     await Promise.all([bucket.remove(), cloudfront.remove(), domain.remove()]);

packages/aws-component/types.d.ts

@@ -1,4 +1,5 @@
-import { PublicDirectoryCache } from 'aws-s3-utils/types';
+import { PublicDirectoryCache } from '@next-deploy/aws-s3-utils/types';
+import { CloudFrontInputs } from '@next-deploy/aws-cloudfront/types';
 
 type AwsComponentInputs = {
   build?: BuildOptions; // TODO: figure out a way to properly type this as "BuildOptions | boolean" doesn't work correctly
@@ -15,11 +16,9 @@ type AwsComponentInputs = {
   policy?: string;
   domain?: string | string[];
   domainType?: DomainType;
-  cloudfront?: CloudfrontOptions;
+  cloudfront?: CloudFrontInputs;
 };
 
-type CloudfrontOptions = Record<string, any>;
-
 type DomainType = 'www' | 'apex' | 'both';
 
 type BuildOptions = {

packages/aws-component/yarn.lock

@@ -1008,6 +1008,26 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
+"@next-deploy/aws-cloudfront@link:../aws-cloudfront":
+  version "0.0.0"
+  uid ""
+
+"@next-deploy/aws-domain@link:../aws-domain":
+  version "0.0.0"
+  uid ""
+
+"@next-deploy/aws-lambda-builder@link:../aws-lambda-builder":
+  version "0.0.0"
+  uid ""
+
+"@next-deploy/aws-lambda@link:../aws-lambda":
+  version "0.0.0"
+  uid ""
+
+"@next-deploy/aws-s3-utils@link:../aws-s3-utils":
+  version "0.0.0"
+  uid ""
+
 "@next/react-dev-overlay@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-9.4.4.tgz#4ae03ac839ff022b3ce5c695bd24b179d4ef459d"
@@ -1650,30 +1670,6 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-"aws-cloudfront@link:../aws-cloudfront":
-  version "0.0.0"
-  uid ""
-
-"aws-component@link:.":
-  version "0.0.0"
-  uid ""
-
-"aws-domain@link:../aws-domain":
-  version "0.0.0"
-  uid ""
-
-"aws-lambda-builder@link:../aws-lambda-builder":
-  version "0.0.0"
-  uid ""
-
-"aws-lambda@link:../aws-lambda":
-  version "0.0.0"
-  uid ""
-
-"aws-s3-utils@link:../aws-s3-utils":
-  version "0.0.0"
-  uid ""
-
 aws-sdk@^2.387.0, aws-sdk@^2.488.0, aws-sdk@^2.709.0:
   version "2.709.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.709.0.tgz#33b0c0fe8b9420c65610545394be047ac2d93c8f"

packages/aws-domain/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "aws-domain",
+  "name": "@next-deploy/aws-domain",
   "version": "1.0.0",
   "license": "MIT",
   "main": "serverless.js",
@@ -10,7 +10,6 @@
   },
   "dependencies": {
     "@serverless/core": "^1.1.2",
-    "aws-component": "link:../aws-component",
     "aws-sdk": "^2.709.0"
   },
   "devDependencies": {

packages/aws-domain/src/component.ts

@@ -151,7 +151,7 @@ class DomainComponent extends Component {
     return outputs;
   }
 
-  async remove() {
+  async remove(): Promise<void> {
     this.context.status('Deploying');
 
     if (!this.state.domain) {
@@ -193,8 +193,6 @@ class DomainComponent extends Component {
     }
     this.state = {};
     await this.save();
-
-    return {};
   }
 }
 

packages/aws-domain/src/utils.ts

@@ -1,7 +1,8 @@
 import { Route53, ACM, CloudFront } from 'aws-sdk';
 import { utils } from '@serverless/core';
 
-import { DomainType } from 'aws-component/types';
+import { PathPatternConfig } from '@next-deploy/aws-cloudfront/types';
+import { DomainType } from '@next-deploy/aws-component/types';
 import { AwsDomainInputs, Credentials, SubDomain } from '../types';
 
 const DEFAULT_MINIMUM_PROTOCOL_VERSION = 'TLSv1.2_2018';
@@ -68,7 +69,7 @@ export const getDomainHostedZoneId = async (
   route53: Route53,
   domain: string,
   privateZone: boolean
-) => {
+): Promise<string> => {
   const hostedZonesRes = await route53.listHostedZonesByName().promise();
 
   const hostedZone = hostedZonesRes.HostedZones.find(
@@ -89,7 +90,10 @@ export const getDomainHostedZoneId = async (
  * Describe Certificate By Arn
  * - Describe an AWS ACM Certificate by its ARN
  */
-export const describeCertificateByArn = async (acm: ACM, certificateArn: string) => {
+export const describeCertificateByArn = async (
+  acm: ACM,
+  certificateArn: string
+): Promise<ACM.CertificateDetail | null> => {
   const certificate = await acm.describeCertificate({ CertificateArn: certificateArn }).promise();
   return certificate && certificate.Certificate ? certificate.Certificate : null;
 };
@@ -98,7 +102,10 @@ export const describeCertificateByArn = async (acm: ACM, certificateArn: string)
  * Get Certificate Arn By Domain
  * - Gets an AWS ACM Certificate by a specified domain or return null
  */
-export const getCertificateArnByDomain = async (acm: ACM, domain: string) => {
+export const getCertificateArnByDomain = async (
+  acm: ACM,
+  domain: string
+): Promise<string | null> => {
   const listRes = await acm.listCertificates().promise();
 
   if (!listRes.CertificateSummaryList) {
@@ -160,10 +167,9 @@ export const validateCertificate = async (
   certificate: ACM.CertificateDetail,
   domain: string,
   domainHostedZoneId: string
-) => {
+): Promise<void> => {
   let readinessCheckCount = 16;
   let statusCheckCount = 16;
-  let validationResourceRecord: ACM.ResourceRecord;
 
   /**
    * Check Readiness
@@ -197,7 +203,7 @@ export const validateCertificate = async (
     return await checkReadiness();
   };
 
-  validationResourceRecord = await checkReadiness();
+  const validationResourceRecord = await checkReadiness();
 
   const checkRecordsParams = {
     HostedZoneId: domainHostedZoneId,
@@ -320,7 +326,7 @@ export const removeCloudFrontDomainDnsRecords = async (
   domain: string,
   domainHostedZoneId: string,
   distributionUrl: string
-) => {
+): Promise<void> => {
   const params = {
     HostedZoneId: domainHostedZoneId,
     ChangeBatch: {
@@ -357,8 +363,12 @@ export const addDomainToCloudfrontDistribution = async (
   subdomain: SubDomain,
   certificateArn: string,
   domainType: DomainType,
-  defaultCloudfrontInputs: any
+  defaultCloudfrontInputs: Partial<PathPatternConfig>
-) => {
+): Promise<{
+  id?: string;
+  arn?: string;
+  url?: string;
+}> => {
   const distributionConfigResponse = await cf
     .getDistributionConfig({ Id: subdomain.distributionId })
     .promise();
@@ -416,7 +426,11 @@ export const addDomainToCloudfrontDistribution = async (
 export const removeDomainFromCloudFrontDistribution = async (
   cf: CloudFront,
   subdomain: SubDomain
-) => {
+): Promise<{
+  id?: string;
+  arn?: string;
+  url?: string;
+}> => {
   const distributionConfigResponse = await cf
     .getDistributionConfig({ Id: subdomain.distributionId })
     .promise();

packages/aws-domain/types.d.ts

@@ -1,11 +1,12 @@
-import { DomainType } from 'aws-component/types';
+import { DomainType } from '@next-deploy/aws-component/types';
+import { PathPatternConfig } from '@next-deploy/aws-cloudfront/types';
 
 type AwsDomainInputs = {
   domain: string;
   region?: string;
   privateZone?: boolean;
   domainType?: DomainType;
-  defaultCloudfrontInputs?: any;
+  defaultCloudfrontInputs?: Partial<PathPatternConfig>;
   subdomains: SubDomain[];
 };
 

packages/aws-lambda-builder/__tests__/integration/serverless-trace-with-dynamic-import/serverless-trace-with-dynamic-import.test.ts

@@ -36,7 +36,7 @@ describe('Serverless Trace With Dynamic Import', () => {
     expect(nodeModules).toEqual(['@sls-next', 'next']);
 
     const slsNextNodeModules = await readdir(path.join(outputDir, 'api-lambda/node_modules'));
-    expect(slsNextNodeModules).toContain('next-aws-cloudfront');
+    expect(slsNextNodeModules).toContain('@next-deploy/aws-lambda-builder');
   });
 
   it('copies dynamic chunk to default lambda artifact', async () => {

packages/aws-lambda-builder/__tests__/test-utils.ts

@@ -1,6 +1,5 @@
 import path from 'path';
 import { remove } from 'fs-extra';
-import { CloudFrontOrigin } from 'aws-lambda';
 import { OriginRequestEvent } from '../types';
 
 export const cleanupDir = (dir: string): Promise<void> => {

packages/aws-lambda-builder/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "aws-lambda-builder",
+  "name": "@next-deploy/aws-lambda-builder",
   "version": "1.0.0",
   "license": "MIT",
   "main": "dist/index.js",

packages/aws-lambda-builder/src/builder.ts

@@ -114,8 +114,6 @@ class Builder {
   }
 
   async buildDefaultLambda(buildManifest: OriginRequestDefaultHandlerManifest): Promise<void[]> {
-    let copyTraces: Promise<void>[] = [];
-
     const ignoreAppAndDocumentPages = (page: string): boolean => {
       const basename = path.basename(page);
       return basename !== '_app.js' && basename !== '_document.js';
@@ -134,7 +132,11 @@ class Builder {
       base: process.cwd(),
     });
 
-    copyTraces = this.copyLambdaHandlerDependencies(fileList, reasons, DEFAULT_LAMBDA_CODE_DIR);
+    const copyTraces = this.copyLambdaHandlerDependencies(
+      fileList,
+      reasons,
+      DEFAULT_LAMBDA_CODE_DIR
+    );
 
     return Promise.all([
       ...copyTraces,

packages/aws-lambda-builder/src/compat.ts

@@ -198,7 +198,7 @@ const handler = ({
     return true;
   };
 
-  let gz = isGzipSupported(headers);
+  const gz = isGzipSupported(headers);
 
   const responsePromise = new Promise<CloudFrontResultResponse>((resolve) => {
     res.end = (text: any) => {

packages/aws-lambda-builder/src/lib/createServerlessConfig.ts

@@ -1,6 +1,8 @@
 import fs from 'fs-extra';
 import path from 'path';
 
+import { CreateServerlessConfigResult } from '../../types';
+
 function getCustomData(importName: string, target: string): string {
   return `
 module.exports = function(...args) {
@@ -32,10 +34,6 @@ function getDefaultData(target: string): string {
   return `module.exports = { target: '${target}' };`;
 }
 
-type CreateServerlessConfigResult = {
-  restoreUserConfig: () => Promise<void>;
-};
-
 export default async function createServerlessConfig(
   workPath: string,
   entryPath: string

packages/aws-lambda-builder/src/lib/getAllFilesInDirectory.ts

@@ -4,7 +4,7 @@ import path from 'path';
 const getAllFilesRecursively = (dirPath: string, arrayOfFiles: string[]): string[] => {
   const files = fs.readdirSync(dirPath);
 
-  files.forEach(function (file) {
+  files.forEach((file) => {
     if (fs.statSync(dirPath + path.sep + file).isDirectory()) {
       arrayOfFiles = getAllFilesRecursively(path.join(dirPath, file), arrayOfFiles);
     } else {

packages/aws-lambda-builder/types.d.ts

@@ -73,3 +73,7 @@ type BuildOptions = {
   cwd?: string;
   cmd?: string;
 };
+
+type CreateServerlessConfigResult = {
+  restoreUserConfig: () => Promise<void>;
+};

packages/aws-lambda/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "aws-lambda",
+  "name": "@next-deploy/aws-lambda",
   "version": "1.0.0",
   "license": "MIT",
   "main": "serverless.js",

packages/aws-s3-utils/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "aws-s3-utils",
+  "name": "@next-deploy/aws-s3-utils",
   "version": "1.0.0",
   "license": "MIT",
   "main": "dist/index.js",

tsconfig.build.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": false,
+    "removeComments": true,
+    "outDir": "dist"
+  },
+  "include": ["./cli/", ".d.ts"]
+}

tsconfig.json

@@ -3,7 +3,7 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "declaration": true,
-    "target": "ES2015",
+    "target": "ES2018",
     "module": "CommonJS",
     "moduleResolution": "node",
     "sourceMap": true,