Merge pull request #3 from serverless-stack/v1-migration

Update SST to V1
sst · May 24, 2022 · c3595c1 · c3595c1
2 parents 0c39320 + 4ee722d
commit c3595c1
Show file tree

Hide file tree

Showing 41 changed files with 34,840 additions and 42,875 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules
 
 # testing
 /coverage

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ We create a [note taking app](https://demo.serverless-stack.com) from scratch. U
 This repo is a full-stack serverless app built with [SST](https://github.com/serverless-stack/serverless-stack).
 
 - The `stacks/` directory defines our AWS infrastructure using AWS CDK.
-- The `src/` directory contains the Lambda functions that power the CRUD API.
+- The `backend/` directory contains the Lambda functions that power the CRUD API.
 - The `frontend/` directory contains the React app.
 
 It's a single-page React app powered by a serverless CRUD API. We also cover how add user authentication, handle file uploads, and process credit card payments with Stripe.
@@ -24,7 +24,7 @@ $ git clone https://github.com/serverless-stack/demo-notes-app
 
 Install dependencies.
 
-``` bash
+```bash
 $ npm install
 ```
 
@@ -34,36 +34,36 @@ This project refers to a `.env.local` file with a secret that we are not checkin
 
 Start the [Live Lambda Dev Environment](https://docs.serverless-stack.com/live-lambda-development).
 
-``` bash
+```bash
 $ npx sst start
 ```
 
 Install dependencies for the frontend React app.
 
-``` bash
+```bash
 $ cd frontend
 $ npm install
 ```
 
 Start the React local dev environment from the `frontend/` dir.
 
-``` bash
+```bash
 $ npm start
 ```
 
 #### Running Tests
 
 From the project root.
 
-``` bash
-$ npx sst test
+```bash
+$ npm test
 ```
 
 #### Deploying to Prod
 
 Run this in the project root to deploy it to prod.
 
-``` bash
+```bash
 $ npx sst deploy
 ```
 

diff --git a/src/billing.js → backend/functions/billing.js b/src/billing.js → backend/functions/billing.js
@@ -1,6 +1,6 @@
 import Stripe from "stripe";
-import handler from "./util/handler";
-import { calculateCost } from "./util/cost";
+import handler from "../util/handler";
+import { calculateCost } from "../util/cost";
 
 export const main = handler(async (event) => {
   const { storage, source } = JSON.parse(event.body);

diff --git a/src/create.js → backend/functions/create.js b/src/create.js → backend/functions/create.js
@@ -1,6 +1,6 @@
 import * as uuid from "uuid";
-import handler from "./util/handler";
-import dynamoDb from "./util/dynamodb";
+import handler from "../util/handler";
+import dynamoDb from "../util/dynamodb";
 
 export const main = handler(async (event) => {
   const data = JSON.parse(event.body);

diff --git a/src/delete.js → backend/functions/delete.js b/src/delete.js → backend/functions/delete.js
@@ -1,5 +1,5 @@
-import handler from "./util/handler";
-import dynamoDb from "./util/dynamodb";
+import handler from "../util/handler";
+import dynamoDb from "../util/dynamodb";
 
 export const main = handler(async (event) => {
   const params = {

diff --git a/src/get.js → backend/functions/get.js b/src/get.js → backend/functions/get.js
@@ -1,5 +1,5 @@
-import handler from "./util/handler";
-import dynamoDb from "./util/dynamodb";
+import handler from "../util/handler";
+import dynamoDb from "../util/dynamodb";
 
 export const main = handler(async (event) => {
   const params = {

diff --git a/src/list.js → backend/functions/list.js b/src/list.js → backend/functions/list.js
@@ -1,5 +1,5 @@
-import handler from "./util/handler";
-import dynamoDb from "./util/dynamodb";
+import handler from "../util/handler";
+import dynamoDb from "../util/dynamodb";
 
 export const main = handler(async (event) => {
   const params = {

diff --git a/src/update.js → backend/functions/update.js b/src/update.js → backend/functions/update.js
@@ -1,5 +1,5 @@
-import handler from "./util/handler";
-import dynamoDb from "./util/dynamodb";
+import handler from "../util/handler";
+import dynamoDb from "../util/dynamodb";
 
 export const main = handler(async (event) => {
   const data = JSON.parse(event.body);

diff --git a/backend/package.json b/backend/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "@demo-notes-app/backend",
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {},
+  "dependencies": {
+    "aws-sdk": "^2.1138.0",
+    "stripe": "^9.1.0",
+    "uuid": "^8.3.2"
+  },
+  "devDependencies": {
+    "@types/aws-lambda": "^8.10.97"
+  }
+}
diff --git a/test/cost.test.js → backend/test/cost.test.js b/test/cost.test.js → backend/test/cost.test.js
@@ -1,4 +1,5 @@
-import { calculateCost } from "../src/util/cost";
+import { expect, test } from "vitest";
+import { calculateCost } from "../util/cost";
 
 test("Lowest tier", () => {
   const storage = 10;

diff --git a/src/util/cost.js → backend/util/cost.js b/src/util/cost.js → backend/util/cost.js
diff --git a/src/util/debug.js → backend/util/debug.js b/src/util/debug.js → backend/util/debug.js
@@ -4,7 +4,7 @@ import AWS from "aws-sdk";
 let logs;
 
 // Log AWS SDK calls
-AWS.config.logger = { log: debug };
+AWS.config.logger = debug;
 
 export default function debug() {
   logs.push({

diff --git a/src/util/dynamodb.js → backend/util/dynamodb.js b/src/util/dynamodb.js → backend/util/dynamodb.js
diff --git a/src/util/handler.js → backend/util/handler.js b/src/util/handler.js → backend/util/handler.js
diff --git a/frontend/.env b/frontend/.env
diff --git a/frontend/README.md b/frontend/README.md
@@ -9,10 +9,10 @@ In the project directory, you can run:
 ### `npm start`
 
 Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
 
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
+The page will reload when you make changes.\
+You may also see any lint errors in the console.
 
 ### `npm test`
 
@@ -31,13 +31,13 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
 
 ### `npm run eject`
 
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+**Note: this is a one-way operation. Once you `eject`, you can't go back!**
 
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
 
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
 
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
 
 ## Learn More