adding in the s3 package, finishing up the CLI

.d.ts

@@ -1,4 +1,5 @@
 declare module '@serverless/core' {
+  import { Credentials } from 'aws-sdk';
   export class Component {
     load(modulePath: string, moduleName?: string): any;
     save(): void;
@@ -21,13 +22,30 @@ declare module '@serverless/core' {
 
   type Utils = {
     dirExists(path: string): boolean;
+    fileExists(path: string): boolean;
     hashFile(path: string): string;
     isArchivePath(path: string): boolean;
     sleep(time: number): void;
-  };
+    readFileIfExists(path: string): Promise<any>;
-  type Credentials = {
+    randomId(): string;
-    accessKeyId: string;
+    readFile(path: string): Promise<any>;
-    secretAccessKey: string;
+    writeFile(contextStatePath: string, state: Record<string, unknown>): Promise<any>;
-    sessionToken?: string;
   };
 }
+
+declare module 's3-stream-upload' {
+  import { S3 } from 'aws-sdk';
+
+  export default function (s3: S3, options: UploadStreamOptions): NodeJS.WritableStream;
+}
+
+declare module 'prettyoutput' {
+  export default function (data: any, options?: any, indent?: number): string;
+}
+
+type UploadStreamOptions = {
+  Bucket?: string;
+  Key?: string;
+  ContentType?: string;
+  CacheControl?: string;
+};

cli/deploy.ts

@@ -1,60 +0,0 @@
-#!/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

@@ -20,12 +20,10 @@
     "publish": "lerna publish --conventional-commits",
     "prepublishOnly": "yarn test",
     "prerelease": "lerna publish --conventional-commits --conventional-prerelease",
-    "graduate": "lerna publish --conventional-commits --conventional-graduate",
+    "graduate": "lerna publish --conventional-commits --conventional-graduate"
-    "prepare": "yarn build-self",
-    "build-self": "tsc -p tsconfig.build.json"
   },
   "bin": {
-    "next-deploy": "./dist/deploy.js"
+    "next-deploy": "./packages/cli/dist/index.js"
   },
   "repository": {
     "type": "git",
@@ -49,15 +47,17 @@
     "@types/fs-extra": "^9.0.1",
     "@types/jest": "^26.0.4",
     "@types/klaw": "^3.0.1",
+    "@types/klaw-sync": "^6.0.0",
     "@types/mime-types": "^2.1.0",
-    "@types/node": "^14.0.18",
+    "@types/node": "^14.0.20",
     "@types/path-to-regexp": "^1.7.0",
-    "@types/ramda": "^0.27.7",
+    "@types/ramda": "^0.27.10",
     "@types/react": "^16.9.41",
     "@types/react-dom": "^16.9.8",
-    "@types/webpack": "^4.41.20",
+    "@types/webpack": "^4.41.21",
     "@typescript-eslint/eslint-plugin": "^3.6.0",
     "@typescript-eslint/parser": "^3.6.0",
+    "aws-sdk": "^2.712.0",
     "eslint": "^7.4.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",

packages/aws-cloudfront/__tests__/cache-behavior-options.test.ts

@@ -3,7 +3,7 @@ import { createComponent } from './test-utils';
 import { mockCreateDistribution, mockCreateDistributionPromise } from 'aws-sdk';
 import CloudFrontComponent from '../serverless';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 describe('Input origin as a custom url', () => {
   let component: CloudFrontComponent;

packages/aws-cloudfront/__tests__/cache-invalidation.test.ts

@@ -1,7 +1,7 @@
 import { CloudFront, mockCreateInvalidation } from 'aws-sdk';
 import createInvalidation, { ALL_FILES_PATH } from '../src/lib/createInvalidation';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 const invalidate = (options = {}): Promise<CloudFront.CreateInvalidationResult> => {
   return createInvalidation({

packages/aws-cloudfront/__tests__/custom-url-origin.test.ts

@@ -9,7 +9,7 @@ import {
 } from 'aws-sdk';
 import CloudFrontComponent from '../serverless';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 describe('Input origin as a custom url', () => {
   let component: CloudFrontComponent;

packages/aws-cloudfront/__tests__/general-options.test.ts

@@ -9,7 +9,7 @@ import {
 } from 'aws-sdk';
 import CloudFrontComponent from '../serverless';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 describe('General options propagation', () => {
   let component: CloudFrontComponent;

packages/aws-cloudfront/__tests__/lambda-at-edge.test.ts

@@ -3,7 +3,7 @@ import { createComponent, assertHasCacheBehavior } from './test-utils';
 import { mockCreateDistribution, mockCreateDistributionPromise } from 'aws-sdk';
 import CloudFrontComponent from '../serverless';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 describe('Input origin as a custom url', () => {
   let component: CloudFrontComponent;

packages/aws-cloudfront/__tests__/origin-with-path-pattern.test.ts

@@ -9,7 +9,7 @@ import {
 } from 'aws-sdk';
 import CloudFrontComponent from '../serverless';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 describe('Input origin with path pattern', () => {
   let component: CloudFrontComponent;

packages/aws-cloudfront/__tests__/s3-origin.test.ts

@@ -11,7 +11,7 @@ import CloudFrontComponent from '../serverless';
 
 import { createComponent, assertHasOrigin } from './test-utils';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 describe('S3 origins', () => {
   let component: CloudFrontComponent;

packages/aws-cloudfront/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@serverless/core": "^1.1.2",
-    "aws-sdk": "^2.709.0",
+    "aws-sdk": "^2.712.0",
     "ramda": "^0.27.0"
   },
   "devDependencies": {

packages/aws-cloudfront/src/component.ts

@@ -1,4 +1,4 @@
-import { CloudFront, S3 } from 'aws-sdk';
+import { CloudFront, S3, Credentials } from 'aws-sdk';
 import { equals } from 'ramda';
 import { Component } from '@serverless/core';
 
@@ -8,7 +8,7 @@ import {
   updateCloudFrontDistribution,
   deleteCloudFrontDistribution,
 } from './lib';
-import { Credentials, CloudFrontInputs } from '../types';
+import { CloudFrontInputs } from '../types';
 
 class CloudFrontComponent extends Component {
   static createInvalidation({
@@ -23,7 +23,7 @@ class CloudFrontComponent extends Component {
     return createInvalidation({ credentials, distributionId, paths });
   }
 
-  async default(inputs: CloudFrontInputs): Promise<any> {
+  async default(inputs: CloudFrontInputs): Promise<Record<string, any>> {
     this.context.status('Deploying');
 
     inputs.region = inputs.region || 'us-east-1';

packages/aws-cloudfront/src/lib/createInvalidation.ts

@@ -1,6 +1,4 @@
-import { CloudFront } from 'aws-sdk';
+import { CloudFront, Credentials } from 'aws-sdk';
-
-import { Credentials } from '../../types';
 
 export const ALL_FILES_PATH = '/*';
 

packages/aws-cloudfront/src/lib/index.ts

@@ -32,7 +32,11 @@ export const createCloudFrontDistribution = async (
   cf: CloudFront,
   s3: S3,
   inputs: CloudFrontInputs
-) => {
+): Promise<{
+  id?: string;
+  arn?: string;
+  url?: string;
+}> => {
   let originAccessIdentityId;
   let s3CanonicalUserId;
 
@@ -82,7 +86,11 @@ export const updateCloudFrontDistribution = async (
   s3: S3,
   distributionId: string,
   inputs: CloudFrontInputs
-) => {
+): Promise<{
+  id?: string;
+  arn?: string;
+  url?: string;
+}> => {
   const distributionConfigResponse = await cf
     .getDistributionConfig({ Id: distributionId })
     .promise();
@@ -113,7 +121,7 @@ export const updateCloudFrontDistribution = async (
     Id: distributionId,
     IfMatch: distributionConfigResponse.ETag,
     DistributionConfig: {
-      CallerReference: distributionConfigResponse.DistributionConfig.CallerReference,
+      ...distributionConfigResponse.DistributionConfig,
       Enabled: inputs.enabled as boolean,
       Comment: inputs.comment as string,
       DefaultCacheBehavior: getDefaultCacheBehavior(Origins.Items[0].Id, inputs.defaults),
@@ -147,11 +155,8 @@ const disableCloudFrontDistribution = async (cf: CloudFront, distributionId: str
     Id: distributionId,
     IfMatch: distributionConfigResponse.ETag,
     DistributionConfig: {
-      CallerReference: distributionConfigResponse.DistributionConfig.CallerReference,
+      ...distributionConfigResponse.DistributionConfig,
       Enabled: false,
-      Comment: distributionConfigResponse.DistributionConfig.Comment,
-      DefaultCacheBehavior: distributionConfigResponse.DistributionConfig.DefaultCacheBehavior,
-      Origins: distributionConfigResponse.DistributionConfig.Origins,
     },
   };
 
@@ -164,7 +169,10 @@ const disableCloudFrontDistribution = async (cf: CloudFront, distributionId: str
   };
 };
 
-export const deleteCloudFrontDistribution = async (cf: CloudFront, distributionId: string) => {
+export const deleteCloudFrontDistribution = async (
+  cf: CloudFront,
+  distributionId: string
+): Promise<void> => {
   try {
     const res = await cf.getDistributionConfig({ Id: distributionId }).promise();
 

packages/aws-cloudfront/types.d.ts

@@ -23,12 +23,6 @@ type Origin = {
   pathPatterns?: Record<string, PathPatternConfig>;
 };
 
-type Credentials = {
-  accessKeyId: string;
-  secretAccessKey: string;
-  sessionToken?: string;
-};
-
 type Forward = {
   cookies?: string[];
   queryString?: string;

packages/aws-cloudfront/yarn.lock

@@ -37,10 +37,10 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-aws-sdk@^2.709.0:
+aws-sdk@^2.712.0:
-  version "2.709.0"
+  version "2.712.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.709.0.tgz#33b0c0fe8b9420c65610545394be047ac2d93c8f"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.712.0.tgz#828d6ef7556f4b5098c880469ff72195a83f9d66"
-  integrity sha512-F3sKXsCiutj9RglVXdqb/XJ3Ko3G+pX081Nf1YjVJpLydwE2v16FGxrLqE5pqyWMDeUf5nZHnBoMuOYD8ip+Kw==
+  integrity sha512-C3SLWanFydoWJwtKNi73BG9uB6UzrUuECaAiplOEVBltO/R4sBsHWhwTBuxS02eTNdRrgulu19bJ5RWt+OuXiA==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"

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

@@ -2,7 +2,7 @@ import fse from 'fs-extra';
 import path from 'path';
 
 import { mockDomain } from '@next-deploy/aws-domain';
-import { mockS3 } from '@serverless/aws-s3';
+import { mockS3 } from '@next-deploy/aws-s3';
 import { mockUpload } from 'aws-sdk';
 import { mockLambda, mockLambdaPublish } from '@next-deploy/aws-lambda';
 import { mockCloudFront } from '@next-deploy/aws-cloudfront';
@@ -464,7 +464,7 @@ describe('Custom inputs', () => {
     [undefined, {}],
     // empty input
     [{}, {}],
-    // ignores origin-request and origin-response triggers as they're reserved by serverless-next.js
+    // ignores origin-request and origin-response triggers as they're reserved by us
     [
       {
         defaults: {

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

@@ -1,7 +1,7 @@
 import fse from 'fs-extra';
 import path from 'path';
 
-const BUILD_DIR = '.serverless_nextjs';
+import { BUILD_DIR } from '../src/component';
 
 export const cleanupFixtureDirectory = (fixtureDir: string) => (): Promise<void> => {
   return fse.remove(path.join(fixtureDir, BUILD_DIR));

packages/aws-component/package.json

@@ -9,13 +9,12 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "@serverless/aws-s3": "^4.2.0",
     "@serverless/core": "^1.1.2",
     "@next-deploy/aws-cloudfront": "link:../aws-cloudfront",
     "@next-deploy/aws-domain": "link:../aws-domain",
     "@next-deploy/aws-lambda": "link:../aws-lambda",
     "@next-deploy/aws-lambda-builder": "link:../aws-lambda-builder",
-    "@next-deploy/aws-s3-utils": "link:../aws-s3-utils",
+    "@next-deploy/aws-s3": "link:../aws-s3",
     "fs-extra": "^9.0.1"
   },
   "devDependencies": {

packages/aws-component/src/component.ts

@@ -3,7 +3,7 @@ import { exists, readJSON } from 'fs-extra';
 import { resolve, join } from 'path';
 
 import Builder from '@next-deploy/aws-lambda-builder';
-import { uploadStaticAssets } from '@next-deploy/aws-s3-utils';
+import { uploadStaticAssets } from '@next-deploy/aws-s3';
 import AwsCloudFront from '@next-deploy/aws-cloudfront';
 import { getDomains } from './utils';
 import {
@@ -14,8 +14,9 @@ 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 BUILD_DIR = '.next-deploy-tmp';
-export const API_LAMBDA_CODE_DIR = '.serverless_nextjs/api-lambda';
+export const DEFAULT_LAMBDA_CODE_DIR = '.next-deploy-tmp/default-lambda';
+export const API_LAMBDA_CODE_DIR = '.next-deploy-tmp/api-lambda';
 
 class AwsComponent extends Component {
   async default(
@@ -33,7 +34,7 @@ class AwsComponent extends Component {
   }
 
   readDefaultBuildManifest(nextConfigPath: string): Promise<BuildManifest> {
-    return readJSON(join(nextConfigPath, '.serverless_nextjs/default-lambda/manifest.json'));
+    return readJSON(join(nextConfigPath, `${DEFAULT_LAMBDA_CODE_DIR}/manifest.json`));
   }
 
   validatePathPatterns(pathPatterns: string[], buildManifest: BuildManifest): void {
@@ -117,7 +118,7 @@ class AwsComponent extends Component {
   async readApiBuildManifest(
     nextConfigPath: string
   ): Promise<undefined | OriginRequestApiHandlerManifest> {
-    const path = join(nextConfigPath, '.serverless_nextjs/api-lambda/manifest.json');
+    const path = join(nextConfigPath, `${API_LAMBDA_CODE_DIR}/manifest.json`);
 
     // @ts-ignore
     return (await exists(path)) ? readJSON(path) : Promise.resolve(undefined);
@@ -138,7 +139,7 @@ class AwsComponent extends Component {
     };
 
     if (buildConfig.enabled) {
-      const builder = new Builder(nextConfigPath, join(nextConfigPath, '.serverless_nextjs'), {
+      const builder = new Builder(nextConfigPath, join(nextConfigPath, BUILD_DIR), {
         cmd: buildConfig.cmd,
         cwd: buildConfig.cwd,
         args: buildConfig.args,
@@ -166,7 +167,7 @@ class AwsComponent extends Component {
     ]);
 
     const [bucket, cloudFront, defaultEdgeLambda, apiEdgeLambda] = await Promise.all([
-      this.load('@serverless/aws-s3'),
+      this.load('@next-deploy/aws-s3'),
       this.load('@next-deploy/aws-cloudfront'),
       this.load('@next-deploy/aws-lambda', 'defaultEdgeLambda'),
       this.load('@next-deploy/aws-lambda', 'apiEdgeLambda'),
@@ -370,7 +371,7 @@ class AwsComponent extends Component {
     };
 
     // make sure that origin-response is not set.
-    // this is reserved for serverless-next.js usage
+    // this is reserved for our usage
     const defaultLambdaAtEdgeConfig = {
       ...(defaultCloudfrontInputs['lambda@edge'] || {}),
     };
@@ -427,7 +428,7 @@ class AwsComponent extends Component {
 
   async remove(): Promise<void> {
     const [bucket, cloudfront, domain] = await Promise.all([
-      this.load('@serverless/aws-s3'),
+      this.load('@next-deploy/aws-s3'),
       this.load('@next-deploy/aws-cloudfront'),
       this.load('@next-deploy/aws-domain'),
     ]);

packages/aws-component/types.d.ts

@@ -1,4 +1,4 @@
-import { PublicDirectoryCache } from '@next-deploy/aws-s3-utils/types';
+import { PublicDirectoryCache } from '@next-deploy/aws-s3/types';
 import { CloudFrontInputs } from '@next-deploy/aws-cloudfront/types';
 
 type AwsComponentInputs = {

packages/aws-component/yarn.lock

@@ -1024,7 +1024,7 @@
   version "0.0.0"
   uid ""
 
-"@next-deploy/aws-s3-utils@link:../aws-s3-utils":
+"@next-deploy/aws-s3@link:../aws-s3":
   version "0.0.0"
   uid ""
 
@@ -1670,7 +1670,7 @@ 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-sdk@^2.387.0, aws-sdk@^2.488.0, aws-sdk@^2.709.0:
+aws-sdk@^2.387.0, aws-sdk@^2.488.0:
   version "2.709.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.709.0.tgz#33b0c0fe8b9420c65610545394be047ac2d93c8f"
   integrity sha512-F3sKXsCiutj9RglVXdqb/XJ3Ko3G+pX081Nf1YjVJpLydwE2v16FGxrLqE5pqyWMDeUf5nZHnBoMuOYD8ip+Kw==
@@ -1685,6 +1685,21 @@ aws-sdk@^2.387.0, aws-sdk@^2.488.0, aws-sdk@^2.709.0:
     uuid "3.3.2"
     xml2js "0.4.19"
 
+aws-sdk@^2.712.0:
+  version "2.712.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.712.0.tgz#828d6ef7556f4b5098c880469ff72195a83f9d66"
+  integrity sha512-C3SLWanFydoWJwtKNi73BG9uB6UzrUuECaAiplOEVBltO/R4sBsHWhwTBuxS02eTNdRrgulu19bJ5RWt+OuXiA==
+  dependencies:
+    buffer "4.9.2"
+    events "1.1.1"
+    ieee754 "1.1.13"
+    jmespath "0.15.0"
+    querystring "0.2.0"
+    sax "1.2.1"
+    url "0.10.3"
+    uuid "3.3.2"
+    xml2js "0.4.19"
+
 babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"

packages/aws-domain/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@serverless/core": "^1.1.2",
-    "aws-sdk": "^2.709.0"
+    "aws-sdk": "^2.712.0"
   },
   "devDependencies": {
     "typescript": "^3.9.6"

packages/aws-domain/src/component.ts

@@ -16,7 +16,7 @@ import {
 import { AwsDomainInputs } from '../types';
 
 class DomainComponent extends Component {
-  async default(inputs: AwsDomainInputs) {
+  async default(inputs: AwsDomainInputs): Promise<{ domains: string[] }> {
     this.context.status('Deploying');
 
     this.context.debug(`Starting Domain component deployment.`);

packages/aws-domain/src/utils.ts

@@ -1,9 +1,9 @@
-import { Route53, ACM, CloudFront } from 'aws-sdk';
+import { Route53, ACM, CloudFront, Credentials } from 'aws-sdk';
 import { utils } from '@serverless/core';
 
 import { PathPatternConfig } from '@next-deploy/aws-cloudfront/types';
 import { DomainType } from '@next-deploy/aws-component/types';
-import { AwsDomainInputs, Credentials, SubDomain } from '../types';
+import { AwsDomainInputs, SubDomain } from '../types';
 
 const DEFAULT_MINIMUM_PROTOCOL_VERSION = 'TLSv1.2_2018';
 const HOSTED_ZONE_ID = 'Z2FDTNDATAQYW2'; // this is a constant that you can get from here https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
@@ -12,7 +12,10 @@ const HOSTED_ZONE_ID = 'Z2FDTNDATAQYW2'; // this is a constant that you can get
  * Get Clients
  * - Gets AWS SDK clients to use within this Component
  */
-export const getClients = (credentials: Credentials, region = 'us-east-1') => {
+export const getClients = (
+  credentials: Credentials,
+  region = 'us-east-1'
+): { route53: Route53; acm: ACM; cf: CloudFront } => {
   const route53 = new Route53({
     credentials,
     region,
@@ -143,7 +146,7 @@ export const getCertificateArnByDomain = async (
  * Create Certificate
  * - Creates an AWS ACM Certificate for the specified domain
  */
-export const createCertificate = async (acm: ACM, domain: string) => {
+export const createCertificate = async (acm: ACM, domain: string): Promise<string | undefined> => {
   const wildcardSubDomain = `*.${domain}`;
 
   const params = {
@@ -381,11 +384,7 @@ export const addDomainToCloudfrontDistribution = async (
     IfMatch: distributionConfigResponse.ETag,
     Id: subdomain.distributionId,
     DistributionConfig: {
-      CallerReference: distributionConfigResponse.DistributionConfig.CallerReference,
+      ...distributionConfigResponse.DistributionConfig,
-      Comment: distributionConfigResponse.DistributionConfig.Comment,
-      DefaultCacheBehavior: distributionConfigResponse.DistributionConfig.DefaultCacheBehavior,
-      Enabled: distributionConfigResponse.DistributionConfig.Enabled,
-      Origins: distributionConfigResponse.DistributionConfig.Origins,
       Aliases: {
         Quantity: 1,
         Items: [subdomain.domain],
@@ -443,11 +442,7 @@ export const removeDomainFromCloudFrontDistribution = async (
     Id: subdomain.distributionId,
     IfMatch: distributionConfigResponse.ETag,
     DistributionConfig: {
-      CallerReference: distributionConfigResponse.DistributionConfig.CallerReference,
+      ...distributionConfigResponse.DistributionConfig,
-      Comment: distributionConfigResponse.DistributionConfig.Comment,
-      DefaultCacheBehavior: distributionConfigResponse.DistributionConfig.DefaultCacheBehavior,
-      Enabled: distributionConfigResponse.DistributionConfig.Enabled,
-      Origins: distributionConfigResponse.DistributionConfig.Origins,
       Aliases: {
         Quantity: 0,
         Items: [],

packages/aws-domain/types.d.ts

@@ -18,10 +18,4 @@ type SubDomain = {
   type: SubDomainType;
 };
 
-type Credentials = {
-  accessKeyId: string;
-  secretAccessKey: string;
-  sessionToken?: string;
-};
-
 type SubDomainType = 'awsCloudFront' | 'awsS3Website' | 'awsApiGateway' | 'awsAppSync';

packages/aws-domain/yarn.lock

@@ -32,10 +32,10 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-aws-sdk@^2.709.0:
+aws-sdk@^2.712.0:
-  version "2.709.0"
+  version "2.712.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.709.0.tgz#33b0c0fe8b9420c65610545394be047ac2d93c8f"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.712.0.tgz#828d6ef7556f4b5098c880469ff72195a83f9d66"
-  integrity sha512-F3sKXsCiutj9RglVXdqb/XJ3Ko3G+pX081Nf1YjVJpLydwE2v16FGxrLqE5pqyWMDeUf5nZHnBoMuOYD8ip+Kw==
+  integrity sha512-C3SLWanFydoWJwtKNi73BG9uB6UzrUuECaAiplOEVBltO/R4sBsHWhwTBuxS02eTNdRrgulu19bJ5RWt+OuXiA==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"

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

@@ -141,11 +141,11 @@ class Builder {
     return Promise.all([
       ...copyTraces,
       fse.copy(
-        require.resolve('aws-lambda-builder/dist/default-handler.js'),
+        require.resolve('@next-deploy/aws-lambda-builder/dist/default-handler.js'),
         join(this.outputDir, DEFAULT_LAMBDA_CODE_DIR, 'index.js')
       ),
       fse.copy(
-        require.resolve('aws-lambda-builder/dist/compat.js'),
+        require.resolve('@next-deploy/aws-lambda-builder/dist/compat.js'),
         join(this.outputDir, DEFAULT_LAMBDA_CODE_DIR, 'compat.js')
       ),
       fse.writeJson(join(this.outputDir, DEFAULT_LAMBDA_CODE_DIR, 'manifest.json'), buildManifest),
@@ -188,11 +188,11 @@ class Builder {
     return Promise.all([
       ...copyTraces,
       fse.copy(
-        require.resolve('aws-lambda-builder/dist/api-handler.js'),
+        require.resolve('@next-deploy/aws-lambda-builder/dist/api-handler.js'),
         join(this.outputDir, API_LAMBDA_CODE_DIR, 'index.js')
       ),
       fse.copy(
-        require.resolve('aws-lambda-builder/dist/compat.js'),
+        require.resolve('@next-deploy/aws-lambda-builder/dist/compat.js'),
         join(this.outputDir, API_LAMBDA_CODE_DIR, 'compat.js')
       ),
       fse.copy(

packages/aws-lambda/__tests__/publishVersion.test.ts

@@ -9,7 +9,7 @@ import {
 
 import { createComponent, createTmpDir } from './test-utils';
 
-jest.mock('aws-sdk', () => require('../__mocks__/aws-sdk.mock'));
+jest.mock('aws-sdk', () => require('./aws-sdk.mock'));
 
 const mockIamRole = jest.fn();
 jest.mock('@serverless/aws-iam-role', () =>

packages/aws-lambda/src/utils.ts

@@ -161,7 +161,7 @@ export const updateLambdaCode = async ({
   lambda: Lambda;
   name: string;
   zipPath: string;
-  bucket: any;
+  bucket: string;
 }): Promise<string | undefined> => {
   const functionCodeParams: Lambda.Types.UpdateFunctionCodeRequest = {
     FunctionName: name,