Merge pull request #21 from ixartz/esbuild

Migrate serverless-esbuild from serverless-bundle

Author: ixartz

.gitignore

@@ -10,6 +10,7 @@ jspm_packages
 
 # Webpack
 .webpack
+.esbuild
 
 # Output
 dist

.vscode/launch.json

@@ -15,9 +15,7 @@
       "sourceMaps": true,
       "skipFiles": ["<node_internals>/**"],
       "console": "integratedTerminal",
-      "sourceMapPathOverrides": {
-        "webpack:///../../../*": "${workspaceFolder}/*"
-      }
+      "outFiles": ["${workspaceFolder}/.esbuild/.build/**/*.js"]
     }
   ]
 }

package-lock.json

@@ -3,19 +3,22 @@
   "version": "1.0.0",
   "description": "Serverless framework ExpressJS TypeScript",
   "scripts": {
-    "dev:db": "ts-node --esm scripts/database.mts",
+    "dev:db": "ts-node --esm scripts/database.ts",
     "dev:server": "cross-env NODE_ENV=development sls offline start --stage offline",
     "dev": "run-p dev:*",
     "tail-log": "sls logs -f app -t",
-    "deploy-prod": "cross-env NODE_ENV=production sls deploy --stage prod",
+    "deploy:db": "dotenv -e .env.production -c -- ts-node --esm scripts/deployDbProd.ts",
+    "deploy:app": "cross-env NODE_ENV=production sls deploy --stage prod",
+    "deploy-prod": "run-s deploy:*",
     "remove-prod": "cross-env NODE_ENV=production sls remove --stage prod",
-    "clean": "rimraf dist .webpack .serverless",
+    "clean": "rimraf dist .esbuild .serverless",
     "lint": "eslint .",
     "format": "eslint --fix . && prettier '**/*.{json,yaml}' --write --ignore-path .gitignore",
     "check-types": "tsc --noEmit --pretty",
-    "test": "jest",
     "commit": "cz",
+    "test": "jest",
     "test:dev": "start-server-and-test dev http://localhost:4000 'curl --head http://localhost:4000'",
+    "db:push": "prisma db push",
     "prepare": "husky install",
     "postinstall": "prisma generate"
   },
@@ -32,15 +35,18 @@
     "@commitlint/cz-commitlint": "^17.5.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@swc/core": "^1.3.44",
+    "@swc/core": "^1.3.46",
     "@swc/jest": "^0.2.24",
+    "@types/cross-spawn": "^6.0.2",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.0",
     "@types/supertest": "^2.0.12",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/parser": "^5.57.1",
     "commitizen": "^4.3.0",
     "cross-env": "^7.0.3",
+    "cross-spawn": "^7.0.3",
+    "esbuild": "~0.16.17",
     "eslint": "^8.37.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
@@ -51,24 +57,24 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "execa": "^7.1.1",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
-    "lint-staged": "^13.2.0",
-    "mongodb-memory-server": "^8.12.1",
+    "lint-staged": "^13.2.1",
+    "mongodb-memory-server": "^8.12.2",
     "npm-run-all": "^4.1.5",
-    "p-retry": "^5.1.2",
+    "p-retry": "^4.6.2",
     "prettier": "^2.8.7",
     "prisma": "^4.12.0",
     "rimraf": "^4.4.1",
     "semantic-release": "^19.0.5",
-    "serverless": "^3.29.0",
-    "serverless-bundle": "^5.5.0",
+    "serverless": "^3.30.1",
     "serverless-dotenv-plugin": "^6.0.0",
+    "serverless-esbuild": "^1.43.0",
     "serverless-offline": "^12.0.4",
     "start-server-and-test": "^2.0.0",
     "supertest": "^6.3.3",
     "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.2.0",
     "typescript": "^4.9.5"
   },
   "config": {

package.json

@@ -1,7 +1,8 @@
 /* eslint-disable import/no-extraneous-dependencies,no-console */
-import { MongoMemoryReplSet } from "mongodb-memory-server";
-import pRetry from "p-retry";
-import { prismaDbPush } from "./prisma.mjs";
+import { MongoMemoryReplSet } from 'mongodb-memory-server';
+import pRetry from 'p-retry';
+
+import { prismaDbPush } from './prisma';
 
 let mongodb: MongoMemoryReplSet | null = null;
 
@@ -10,27 +11,27 @@ let mongodb: MongoMemoryReplSet | null = null;
     instanceOpts: [
       {
         port: 27017,
-        storageEngine: "wiredTiger",
+        storageEngine: 'wiredTiger',
       },
       {
         port: 27018,
-        storageEngine: "wiredTiger",
+        storageEngine: 'wiredTiger',
       },
     ],
   });
 
   await mongodb.start();
 
-  process.env.MOCK_MONGODB_DATABASE_ENDPOINT = mongodb
+  process.env.DATABASE_URL = mongodb
     .getUri()
-    .replace("/?replicaSet=", `/modernmern?replicaSet=`);
+    .replace('/?replicaSet=', `/modernmern?replicaSet=`);
 
   await pRetry(prismaDbPush, { retries: 5 });
 
   console.log(`MongoDB ready - endpoint: ${mongodb.getUri()}`);
 })();
 
-process.on("SIGINT", () => {
+process.on('SIGINT', () => {
   if (mongodb) {
     mongodb.stop();
   }

scripts/database.mts scripts/database.tsscripts/database.mts renamed to scripts/database.ts

@@ -0,0 +1,5 @@
+import { prismaDbPush } from './prisma';
+
+(async () => {
+  await prismaDbPush();
+})();

scripts/deployDbProd.ts

@@ -0,0 +1,14 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { spawn as spawnCb } from 'cross-spawn';
+import { promisify } from 'util';
+
+const spawn = promisify(spawnCb);
+
+export const prismaDbPush = () => {
+  return spawn('prisma', ['db', 'push'], {
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+    },
+  });
+};

scripts/prisma.mts

@@ -5,25 +5,25 @@ custom:
   # commands. Or falls back to what we have set in the provider section.
   stage: ${opt:stage, 'offline'}
   region: ${opt:region, 'us-east-1'}
-  bundle:
-    linting: false
-    excludeFiles: "**/*.test.ts"
-    externals:
-      - "@prisma/client"
-    copyFiles:
-      - from: "prisma/schema.prisma"
-        to: "./"
-    packagerOptions:
-      scripts:
-        - prisma generate && rimraf node_modules/@prisma/engines/** && rimraf node_modules/prisma/libquery_engine-[^rhel]* && prisma db push
+  prismaEngine:
+    offline: "node_modules/.prisma/client/*.node"
+    staging: "node_modules/.prisma/client/libquery_engine-rhel*"
+    prod: "node_modules/.prisma/client/libquery_engine-rhel*"
+
+  esbuild:
+    platform: "node"
+    target: node16
+    sourcemap: linked
   serverless-offline:
     httpPort: 4000
     noPrependStageInUrl: true
     reloadHandler: true
 
 provider:
   name: aws
-  runtime: nodejs14.x
+  stage: ${self:custom.stage}
+  region: ${self:custom.region}
+  runtime: nodejs16.x
   memorySize: 512
   timeout: 10
   logRetentionInDays: 90
@@ -43,9 +43,13 @@ functions:
           method: "*"
 
 package:
+  patterns:
+    - "!**/*.test.ts"
+    - ${self:custom.prismaEngine.${self:custom.stage}}
+    - "node_modules/.prisma/client/schema.prisma"
   individually: true
 
 plugins:
   - serverless-dotenv-plugin
-  - serverless-bundle
+  - serverless-esbuild
   - serverless-offline

scripts/prisma.ts

@@ -35,5 +35,11 @@
       "@/*": ["./src/*"]
     }
   },
+  "ts-node": {
+    "require": ["tsconfig-paths/register"],
+    "compilerOptions": {
+      "module": "CommonJS"
+    }
+  },
   "exclude": ["./dist/**/*", "./node_modules/**/*"]
 }