WIP: moving files out of lib and into requisite package directories -…

… renaming file path references where neccessary
patrick-fs · Oct 1, 2020 · d7074a1 · d7074a1
1 parent 0ce3648
commit d7074a1
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 41 deletions.
diff --git a/cdk.json b/cdk.json
@@ -1,5 +1,5 @@
 {
-  "app": "npx ts-node bin/reactshoppe-api.ts",
+  "app": "npx ts-node packages/stack/bin/reactshoppe-api.ts",
   "context": {
     "@aws-cdk/core:enableStackNameDuplicates": "true",
     "aws-cdk:enableDiffNoFail": "true"

diff --git a/lib/functions/package-lock.json b/lib/functions/package-lock.json
diff --git a/lib/functions/package.json b/lib/functions/package.json
diff --git a/lib/functions/checkout.ts → packages/functions/checkout.ts b/lib/functions/checkout.ts → packages/functions/checkout.ts
@@ -1,7 +1,7 @@
 import { APIGatewayProxyEvent } from 'aws-lambda';
 import * as AWS from 'aws-sdk';
 import { v4 as uuidv4 } from 'uuid';
-import { TableNames } from '../reactshoppe-database';
+import { TableNames } from '../reactshoppe-database/reactshoppe-database';
 import { success, failure } from './response';
 
 export default async (event: APIGatewayProxyEvent) => {

diff --git a/lib/functions/index.ts → packages/functions/index.ts b/lib/functions/index.ts → packages/functions/index.ts
diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -6,5 +6,9 @@
   "author": "Patrick Brandt <patrick@fullstory.com>",
   "homepage": "https://github.com/patrick-fs/reactshoppe-api#readme",
   "license": "ISC",
-  "main": "lib/functions.js"
+  "main": "functions.js",
+  "dependencies": {
+    "@types/uuid": "^8.0.0",
+    "uuid": "^8.1.0"
+  }
 }
diff --git a/lib/functions/ping.ts → packages/functions/ping.ts b/lib/functions/ping.ts → packages/functions/ping.ts
diff --git a/lib/functions/response.ts → packages/functions/response.ts b/lib/functions/response.ts → packages/functions/response.ts
diff --git a/lib/reactshoppe-api.ts → packages/reactshoppe-api/reactshoppe-api.ts b/lib/reactshoppe-api.ts → packages/reactshoppe-api/reactshoppe-api.ts
@@ -9,7 +9,7 @@ export class ReactshoppeApi extends core.Construct {
 
     this.handler = new lambda.Function(this, 'ApiHandler', {
       runtime: lambda.Runtime.NODEJS_10_X,
-      code: lambda.Code.fromAsset('./lib/functions'), // this path is relative to the project root
+      code: lambda.Code.fromAsset('./packages/functions'), // this path is relative to the project root
       handler: 'index.main',
     });
 

diff --git a/lib/reactshoppe-database.ts → ...ctshoppe-database/reactshoppe-database.ts b/lib/reactshoppe-database.ts → ...ctshoppe-database/reactshoppe-database.ts
diff --git a/bin/reactshoppe-api.ts → packages/stack/bin/reactshoppe-api.ts b/bin/reactshoppe-api.ts → packages/stack/bin/reactshoppe-api.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import 'source-map-support/register';
 import * as cdk from '@aws-cdk/core';
-import { ReactshoppeApiStack } from '../lib/reactshoppe-api-stack';
+import { ReactshoppeApiStack } from '../reactshoppe-api-stack';
 
 const app = new cdk.App();
 new ReactshoppeApiStack(app, 'ReactshoppeApiStack', { description: 'Simple sample ecommerce service with New Relic' });
diff --git a/lib/reactshoppe-api-stack.ts → packages/stack/reactshoppe-api-stack.ts b/lib/reactshoppe-api-stack.ts → packages/stack/reactshoppe-api-stack.ts
@@ -1,6 +1,6 @@
 import * as cdk from '@aws-cdk/core';
-import { ReactshoppeDatabase } from './reactshoppe-database';
-import { ReactshoppeApi } from './reactshoppe-api';
+import { ReactshoppeDatabase } from '../reactshoppe-database/reactshoppe-database';
+import { ReactshoppeApi } from '../reactshoppe-api/reactshoppe-api';
 
 export class ReactshoppeApiStack extends cdk.Stack {
   constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {

diff --git a/test/reactshoppe-api.test.ts b/test/reactshoppe-api.test.ts
@@ -1,6 +1,6 @@
 import { expect as expectCDK, matchTemplate, MatchStyle } from '@aws-cdk/assert';
 import * as cdk from '@aws-cdk/core';
-import * as ReactshoppeApi from '../lib/reactshoppe-api-stack';
+import * as ReactshoppeApi from '../packages/stack/reactshoppe-api-stack';
 
 test('Empty Stack', () => {
     const app = new cdk.App();