Merge branch 'master' into docs-wording-improvements

Author: mikesir87

.dockerignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+app/Dockerfile

.gitignore

@@ -1 +1,2 @@
 node_modules
+app/Dockerfile

Dockerfile

@@ -5,21 +5,20 @@ WORKDIR /app
 COPY requirements.txt .
 RUN pip install -r requirements.txt
 
-FROM node:12-alpine AS app-base
+FROM node:18-alpine AS app-base
 WORKDIR /app
 COPY app/package.json app/yarn.lock ./
 COPY app/spec ./spec
 COPY app/src ./src
 
 # Run tests to validate app
 FROM app-base AS test
-RUN apk add --no-cache python3 g++ make
 RUN yarn install
 RUN yarn test
 
 # Clear out the node_modules and create the zip
 FROM app-base AS app-zip-creator
-COPY app/package.json app/yarn.lock ./
+COPY --from=test /app/package.json /app/yarn.lock ./
 COPY app/spec ./spec
 COPY app/src ./src
 RUN apk add zip && \

README.md

@@ -31,13 +31,14 @@ This project has a `docker-compose.yml` file, which will start the mkdocs applic
 local machine and help you see changes instantly.
 
 ```bash
-docker-compose up
+docker compose up
 ```
 
 ## Contributing
 
 If you find typos or other issues with the tutorial, feel free to create a PR and suggest fixes!
 
-If you have ideas on how to make the tutorial better want to suggest adding new content, please open an issue first before working on your idea. While we love input, we want to keep the tutorial scoped to new-comers.
+If you have ideas on how to make the tutorial better or want to suggest adding new content, please open an 
+issue first before working on your idea. While we love input, we want to keep the tutorial scoped to new-comers.
 As such, we may reject ideas for more advanced requests and don't want you to lose any work you might
 have done. So, ask first and we'll gladly hear your thoughts!

app/package.json

@@ -9,11 +9,11 @@
     "dev": "nodemon src/index.js"
   },
   "dependencies": {
-    "express": "^4.17.1",
-    "mysql": "^2.17.1",
-    "sqlite3": "^5.0.0",
-    "uuid": "^3.3.3",
-    "wait-port": "^0.2.2"
+    "express": "^4.18.2",
+    "mysql2": "^2.3.3",
+    "sqlite3": "^5.1.2",
+    "uuid": "^9.0.0",
+    "wait-port": "^1.0.4"
   },
   "resolutions": {
     "ansi-regex": "5.0.1"
@@ -26,8 +26,8 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "jest": "^27.2.5",
-    "nodemon": "^2.0.13",
-    "prettier": "^1.18.2"
+    "jest": "^29.3.1",
+    "nodemon": "^2.0.20",
+    "prettier": "^2.7.1"
   }
 }

app/spec/routes/addItem.spec.js

@@ -1,9 +1,9 @@
 const db = require('../../src/persistence');
 const addItem = require('../../src/routes/addItem');
 const ITEM = { id: 12345 };
-const uuid = require('uuid/v4');
+const {v4 : uuid} = require('uuid');
 
-jest.mock('uuid/v4', () => jest.fn());
+jest.mock('uuid', () => ({ v4: jest.fn() }));
 
 jest.mock('../../src/persistence', () => ({
     removeItem: jest.fn(),

app/src/persistence/mysql.js

@@ -1,6 +1,6 @@
 const waitPort = require('wait-port');
 const fs = require('fs');
-const mysql = require('mysql');
+const mysql = require('mysql2');
 
 const {
     MYSQL_HOST: HOST,
@@ -29,11 +29,12 @@ async function init() {
         user,
         password,
         database,
+        charset: 'utf8mb4',
     });
 
     return new Promise((acc, rej) => {
         pool.query(
-            'CREATE TABLE IF NOT EXISTS todo_items (id varchar(36), name varchar(255), completed boolean)',
+            'CREATE TABLE IF NOT EXISTS todo_items (id varchar(36), name varchar(255), completed boolean) DEFAULT CHARSET utf8mb4',
             err => {
                 if (err) return rej(err);
 

app/src/routes/addItem.js

@@ -1,5 +1,5 @@
 const db = require('../persistence');
-const uuid = require('uuid/v4');
+const {v4 : uuid} = require('uuid');
 
 module.exports = async (req, res) => {
     const item = {