webpack2, split code across multiple files, use postgres

Author: craiggoldstone

README.md

@@ -7,14 +7,16 @@ To install it (assuming you have serverless configured with AWS):
 `yarn install`
 
 ### For local development:
+> Note: add your database connection details to hello.ts before runing the example
 
-`yarn run dev`
+`yarn build` - compile the project into the `dist` folder.
+`yarn dev` - compile the project then use [serverless-offline](https://github.com/dherault/serverless-offline) to emulate the nodejs lambda execution environment so we can make HTTP requests locally.
 
 Your lambda should be avaliable on `http://localhost:3000` - and example function: `http://localhost:3000/hello`
 
 ### For deployment:
 
-`yarn run deploy`
+`yarn deploy`
 
 
 TODO (PR's are welcome!):

package.json

@@ -4,20 +4,24 @@
   "description": "Serverless webpack example using Typescript",
   "main": "handler.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "serverless offline --location dist",
-    "deploy": "serverless deploy"
+    "build": "webpack --config webpack.config.js",
+    "deploy": "serverless deploy",
+    "dev": "yarn build && serverless offline --location dist",
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "author": "Nicola Peduzzi <[email protected]> (http://nikso.net)",
+  "author": "Craig Snyders <[email protected]>",
   "license": "MIT",
   "devDependencies": {
+    "@types/node": "^7.0.29",
+    "awesome-typescript-loader": "^3.1.3",
+    "aws-lambda": "^0.1.2",
+    "pg": "^6.2.3",
+    "pg-native": "^1.10.1",
     "serverless-offline": "^3.13.5",
-    "serverless-webpack": "^1.0.0-rc.4",
-    "ts-loader": "^2.0.3",
-    "typescript": "^2.3.2",
-    "webpack": "^2.5.1"
+    "typescript": "^2.3.4",
+    "webpack": "^2.6.1"
   },
   "dependencies": {
-    "aws-lambda": "^0.1.2"
+    "@types/pg": "^6.1.41"
   }
 }

serverless.yml

@@ -1,8 +1,6 @@
 service: serverless-webpack-typescript-example
 
-# Add the serverless-webpack plugin
 plugins:
-  - serverless-webpack
   - serverless-offline
 
 provider:

src/handler.ts

@@ -1,8 +1 @@
-import { Context, Callback } from 'aws-lambda';
-
-
-export const hello = (event: any, context: Context, cb: Callback) => {
-  return cb(null,
-    { message: 'Typescript handler works!', event }
-  );
-}
+export * from './hello';

src/hello.ts

@@ -0,0 +1,46 @@
+import { Callback, Context } from 'aws-lambda';
+import { Client } from 'pg';
+
+export const hello = (event: any, context: Context, cb: Callback) => {
+
+  // instantiate our pg client with connection details
+  const client = new Client({
+    user: 'your-username-here',
+    password: 'your-password-here',
+    database: 'your-database-here',
+    host: 'abc.def.your-host.com',
+    ssl: true
+  });
+
+  // connect to db
+  client.connect(function (err) {
+    if (err) throw err;
+
+    const query = `
+        select 
+          *
+        from 
+          yout_table_name
+        ;
+        `;
+
+    // execute a query on our database
+    client.query(query, null, function (err, result) {
+      if (err) throw err;
+
+      // disconnect the client
+      client.end(function (err) {
+        if (err) throw err;
+      });
+
+      // call the lambda callback with our db data and event object
+      cb(null,
+        {
+          dbResponse: result.rows,
+          event
+        }
+      );
+
+    });
+  });
+};

tsconfig.json

@@ -1,13 +1,23 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "module": "commonjs"
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "lib": [
+      "es6"
+    ],
+    "types": [
+      "node"
+    ],
+    "typeRoots": [
+      "node_modules/@types"
+    ]
   },
   "include": [
-      "src/**/*.ts"
+    "src/**/*.ts"
   ],
   "exclude": [
-      "node_modules",
-      "**/*.spec.ts"
+    "dist",
+    "**/*.spec.ts"
   ]
 }

webpack.config.js

@@ -1,39 +1,39 @@
-var path = require('path');
+const path = require('path');
 
-module.exports = {
-  entry: './src/handler.ts',
-  output: {
-    libraryTarget: 'commonjs',
-    path: path.join(__dirname, 'dist'),
-    filename: 'handler.js',
-  },
-  target: 'node',
-  module: {
-    loaders: [{ test: /\.ts(x?)$/, loader: 'ts-loader' }],
-  },
-  resolve: {
-    extensions: ['.ts', '.js', '.tsx', '.jsx', ''],
-  },
+const root = (dir) => {
+  return path.resolve(__dirname, dir);
 };
 
-// When webpack 2 will be supported with serverless-webpack, it'll look like:
-
-// module.exports = {
-//   entry: './src/handler.ts',
-//   output: {
-//     filename: 'handler.js',
-//     path: path.join(__dirname, 'dist'),
-//   },
-//   module: {
-//     rules: [
-//       {
-//         test: /\.tsx?$/,
-//         loader: 'ts-loader',
-//         exclude: /node_modules/,
-//       },
-//     ],
-//   },
-//   resolve: {
-//     extensions: ['.tsx', '.ts', '.js'],
-//   },
-// };
+module.exports = (options) => {
+  return {
+    entry: {
+      'main': './src/handler.ts'
+    },
+    resolve: {
+      extensions: ['.ts', '.js'],
+      modules: [root('node_modules'), root('src')]
+    },
+    target: 'node',
+    module: {
+      rules: [
+        {
+          test: /\.ts$/,
+          use: [
+            {
+              loader: 'awesome-typescript-loader',
+              options: {
+                useCache: false
+              }
+            }
+          ],
+          exclude: [/\.(spec|e2e)\.ts$/]
+        }
+      ]
+    },
+    output: {
+      path: root('dist'),
+      filename: 'handler.js',
+      libraryTarget: 'commonjs'
+    }
+  };
+};