From 83cfbd25e80c8ad5254240c7d7ae3dd8851b5e21 Mon Sep 17 00:00:00 2001 From: Khaled Osman Date: Wed, 30 Oct 2019 17:37:22 +0100 Subject: [PATCH 1/6] feat: aws-nodejs-typescript template improvements --- .../.webpack/dependencies/package.json | 10 +++++ .../.webpack/service/handler.js | 2 + .../.webpack/service/handler.js.map | 1 + .../.webpack/service/package.json | 10 +++++ .../aws-nodejs-typescript/package.json | 10 ++++- .../aws-nodejs-typescript/serverless.yml | 8 +++- .../aws-nodejs-typescript/tsconfig.json | 16 +++++++- .../aws-nodejs-typescript/vscode/launch.json | 19 ++++++++++ .../aws-nodejs-typescript/webpack.config.js | 38 ++++++++++++++++--- 9 files changed, 104 insertions(+), 10 deletions(-) create mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json create mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js create mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map create mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json create mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json new file mode 100644 index 000000000..663af5d16 --- /dev/null +++ b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json @@ -0,0 +1,10 @@ +{ + "name": "haha", + "version": "1.0.0", + "description": "Packaged externals for haha", + "private": true, + "scripts": {}, + "dependencies": { + "source-map-support": "^0.5.10" + } +} diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js new file mode 100644 index 000000000..68a3f8ed0 --- /dev/null +++ b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js @@ -0,0 +1,2 @@ +!function(e,t){for(var r in t)e[r]=t[r]}(exports,function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=0)}([function(e,t,r){"use strict";r.r(t),r.d(t,"hello",(function(){return n}));r(1);const n=async(e,t)=>({statusCode:200,body:JSON.stringify({message:"Go Serverless Webpack (Typescript) v1.0! Your function executed successfully!",input:e},null,2)})},function(e,t){e.exports=require("source-map-support/register")}])); +//# sourceMappingURL=handler.js.map \ No newline at end of file diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map new file mode 100644 index 000000000..1294e86c4 --- /dev/null +++ b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./handler.ts","webpack:///external \"source-map-support/register\""],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","enumerable","get","r","Symbol","toStringTag","value","t","mode","__esModule","ns","create","key","bind","n","object","property","prototype","hasOwnProperty","p","s","hello","async","event","_context","statusCode","body","JSON","stringify","message","input","require"],"mappings":"6DACE,IAAIA,EAAmB,GAGvB,SAASC,EAAoBC,GAG5B,GAAGF,EAAiBE,GACnB,OAAOF,EAAiBE,GAAUC,QAGnC,IAAIC,EAASJ,EAAiBE,GAAY,CACzCG,EAAGH,EACHI,GAAG,EACHH,QAAS,IAUV,OANAI,EAAQL,GAAUM,KAAKJ,EAAOD,QAASC,EAAQA,EAAOD,QAASF,GAG/DG,EAAOE,GAAI,EAGJF,EAAOD,QA0Df,OArDAF,EAAoBQ,EAAIF,EAGxBN,EAAoBS,EAAIV,EAGxBC,EAAoBU,EAAI,SAASR,EAASS,EAAMC,GAC3CZ,EAAoBa,EAAEX,EAASS,IAClCG,OAAOC,eAAeb,EAASS,EAAM,CAAEK,YAAY,EAAMC,IAAKL,KAKhEZ,EAAoBkB,EAAI,SAAShB,GACX,oBAAXiB,QAA0BA,OAAOC,aAC1CN,OAAOC,eAAeb,EAASiB,OAAOC,YAAa,CAAEC,MAAO,WAE7DP,OAAOC,eAAeb,EAAS,aAAc,CAAEmB,OAAO,KAQvDrB,EAAoBsB,EAAI,SAASD,EAAOE,GAEvC,GADU,EAAPA,IAAUF,EAAQrB,EAAoBqB,IAC/B,EAAPE,EAAU,OAAOF,EACpB,GAAW,EAAPE,GAA8B,iBAAVF,GAAsBA,GAASA,EAAMG,WAAY,OAAOH,EAChF,IAAII,EAAKX,OAAOY,OAAO,MAGvB,GAFA1B,EAAoBkB,EAAEO,GACtBX,OAAOC,eAAeU,EAAI,UAAW,CAAET,YAAY,EAAMK,MAAOA,IACtD,EAAPE,GAA4B,iBAATF,EAAmB,IAAI,IAAIM,KAAON,EAAOrB,EAAoBU,EAAEe,EAAIE,EAAK,SAASA,GAAO,OAAON,EAAMM,IAAQC,KAAK,KAAMD,IAC9I,OAAOF,GAIRzB,EAAoB6B,EAAI,SAAS1B,GAChC,IAAIS,EAAST,GAAUA,EAAOqB,WAC7B,WAAwB,OAAOrB,EAAgB,SAC/C,WAA8B,OAAOA,GAEtC,OADAH,EAAoBU,EAAEE,EAAQ,IAAKA,GAC5BA,GAIRZ,EAAoBa,EAAI,SAASiB,EAAQC,GAAY,OAAOjB,OAAOkB,UAAUC,eAAe1B,KAAKuB,EAAQC,IAGzG/B,EAAoBkC,EAAI,GAIjBlC,EAAoBA,EAAoBmC,EAAI,G,+BCjFrD,kDAEO,MAAMC,EAAgCC,MAAOC,EAAOC,KAClD,CACLC,WAAY,IACZC,KAAMC,KAAKC,UAAU,CACnBC,QAAS,gFACTC,MAAOP,GACN,KAAM,M,cCTbnC,EAAOD,QAAU4C,QAAQ","file":"handler.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n","import { APIGatewayProxyHandler } from 'aws-lambda';\nimport 'source-map-support/register';\n\nexport const hello: APIGatewayProxyHandler = async (event, _context) => {\n return {\n statusCode: 200,\n body: JSON.stringify({\n message: 'Go Serverless Webpack (Typescript) v1.0! Your function executed successfully!',\n input: event,\n }, null, 2),\n };\n}\n","module.exports = require(\"source-map-support/register\");"],"sourceRoot":""} \ No newline at end of file diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json new file mode 100644 index 000000000..5c591bd96 --- /dev/null +++ b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json @@ -0,0 +1,10 @@ +{ + "name": "haha", + "version": "1.0.0", + "description": "Packaged externals for haha", + "private": true, + "scripts": {}, + "dependencies": { + "source-map-support": "^0.5.10" + } +} \ No newline at end of file diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json index 002a8fadf..eccc26667 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json +++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json @@ -1,5 +1,5 @@ { - "name": "aws-nodejs-typescript", + "name": "haha", "version": "1.0.0", "description": "Serverless webpack example using Typescript", "main": "handler.js", @@ -12,10 +12,16 @@ "devDependencies": { "@types/aws-lambda": "^8.10.17", "@types/node": "^10.12.18", + "@typescript-eslint/eslint-plugin": "^2.6.0", + "@typescript-eslint/parser": "^2.6.0", + "eslint": "^6.6.0", + "fork-ts-checker-webpack-plugin": "^3.0.1", "serverless-webpack": "^5.2.0", "ts-loader": "^5.3.3", "typescript": "^3.2.4", - "webpack": "^4.29.0" + "webpack": "^4.29.0", + "webpack-cli": "^3.3.9", + "webpack-node-externals": "^1.7.2" }, "author": "The serverless webpack authors (https://github.com/elastic-coders/serverless-webpack)", "license": "MIT" diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml index 35ecb7f7f..aa4509b2a 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml +++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml @@ -1,9 +1,13 @@ service: - name: aws-nodejs-typescript + name: haha # app and org for use with dashboard.serverless.com #app: your-app-name #org: your-org-name +custom: + webpack: + webpackConfig: ./webpack.config.js + includeModules: true # Add the serverless-webpack plugin plugins: - serverless-webpack @@ -11,6 +15,8 @@ plugins: provider: name: aws runtime: nodejs10.x + apiGateway: + minimumCompressionSize: 1024 #Enable gzip compression for responses > 1KB functions: hello: diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json index 7aa5aad6a..34f35c85b 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json +++ b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json @@ -1,6 +1,9 @@ { "compilerOptions": { - "lib": ["es2017"], + "lib": [ + "es2017" + ], + "removeComments": true, "moduleResolution": "node", "noUnusedLocals": true, "noUnusedParameters": true, @@ -8,5 +11,14 @@ "target": "es2017", "outDir": "lib" }, - "exclude": ["node_modules"] + "include": [ + "./**/*.ts" + ], + "exclude": [ + "node_modules/**/*", + ".serverless/**/*", + ".webpack/**/*", + "_warmup/**/*", + ".vscode/**/*" + ] } diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json b/lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json new file mode 100644 index 000000000..fc663b4a1 --- /dev/null +++ b/lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json @@ -0,0 +1,19 @@ +{ + "configurations": [ + { + "name": "Lambda", + "type": "node", + "request": "launch", + "runtimeArgs": [ + "--inspect", + "--debug-port=9229" + ], + "program": "${workspaceFolder}/node_modules/serverless/bin/serverless", + "args": [ + "offline" + ], + "port": 9229, + "console": "integratedTerminal" + } + ] +} diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js index 3fddde6b7..03cff8788 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js +++ b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js @@ -1,23 +1,51 @@ const path = require('path'); const slsw = require('serverless-webpack'); +const nodeExternals = require('webpack-node-externals') +const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin') module.exports = { + context: __dirname, mode: slsw.lib.webpack.isLocal ? 'development' : 'production', entry: slsw.lib.entries, - devtool: 'source-map', + devtool: slsw.lib.webpack.isLocal ? 'cheap-module-eval-source-map' : 'source-map', resolve: { - extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'], + extensions: ['.mjs', '.json', '.ts'], + symlinks: false, + cacheWithContext: false }, output: { libraryTarget: 'commonjs', path: path.join(__dirname, '.webpack'), - filename: '[name].js', + filename: '[name].js' }, target: 'node', + externals: [nodeExternals()], module: { rules: [ // all files with a `.ts` or `.tsx` extension will be handled by `ts-loader` - { test: /\.tsx?$/, loader: 'ts-loader' }, - ], + { + test: /\.(tsx?)$/, + loader: 'ts-loader', + exclude: [ + [ + path.resolve(__dirname, 'node_modules'), + path.resolve(__dirname, '.serverless'), + path.resolve(__dirname, '.webpack') + ] + ], + options: { + transpileOnly: true, + experimentalWatchApi: true + } + } + ] }, + plugins: [ + // new ForkTsCheckerWebpackPlugin({ + // eslint: true, + // eslintOptions: { + // cache: true + // } + // }) + ] }; From cf81bcaca3b91cbf579b2a3b7c6b3f3e0fb7375a Mon Sep 17 00:00:00 2001 From: Khaled Osman Date: Wed, 30 Oct 2019 17:52:22 +0100 Subject: [PATCH 2/6] perf(aws-nodejs-typescript): reuse http connections --- .../create/templates/aws-nodejs-typescript/serverless.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml index aa4509b2a..256755b73 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml +++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml @@ -17,6 +17,8 @@ provider: runtime: nodejs10.x apiGateway: minimumCompressionSize: 1024 #Enable gzip compression for responses > 1KB + environment: + AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1 functions: hello: From 2b526d9eeb234bf6b6fc57d0c749a2c4a9363351 Mon Sep 17 00:00:00 2001 From: Khaled Osman Date: Wed, 30 Oct 2019 17:53:52 +0100 Subject: [PATCH 3/6] delete .webpack folder --- .../.webpack/dependencies/package.json | 10 ---------- .../aws-nodejs-typescript/.webpack/service/handler.js | 2 -- .../.webpack/service/handler.js.map | 1 - .../.webpack/service/package.json | 10 ---------- 4 files changed, 23 deletions(-) delete mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json delete mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js delete mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map delete mode 100644 lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json deleted file mode 100644 index 663af5d16..000000000 --- a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/dependencies/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "haha", - "version": "1.0.0", - "description": "Packaged externals for haha", - "private": true, - "scripts": {}, - "dependencies": { - "source-map-support": "^0.5.10" - } -} diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js deleted file mode 100644 index 68a3f8ed0..000000000 --- a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js +++ /dev/null @@ -1,2 +0,0 @@ -!function(e,t){for(var r in t)e[r]=t[r]}(exports,function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=0)}([function(e,t,r){"use strict";r.r(t),r.d(t,"hello",(function(){return n}));r(1);const n=async(e,t)=>({statusCode:200,body:JSON.stringify({message:"Go Serverless Webpack (Typescript) v1.0! Your function executed successfully!",input:e},null,2)})},function(e,t){e.exports=require("source-map-support/register")}])); -//# sourceMappingURL=handler.js.map \ No newline at end of file diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map deleted file mode 100644 index 1294e86c4..000000000 --- a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/handler.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./handler.ts","webpack:///external \"source-map-support/register\""],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","enumerable","get","r","Symbol","toStringTag","value","t","mode","__esModule","ns","create","key","bind","n","object","property","prototype","hasOwnProperty","p","s","hello","async","event","_context","statusCode","body","JSON","stringify","message","input","require"],"mappings":"6DACE,IAAIA,EAAmB,GAGvB,SAASC,EAAoBC,GAG5B,GAAGF,EAAiBE,GACnB,OAAOF,EAAiBE,GAAUC,QAGnC,IAAIC,EAASJ,EAAiBE,GAAY,CACzCG,EAAGH,EACHI,GAAG,EACHH,QAAS,IAUV,OANAI,EAAQL,GAAUM,KAAKJ,EAAOD,QAASC,EAAQA,EAAOD,QAASF,GAG/DG,EAAOE,GAAI,EAGJF,EAAOD,QA0Df,OArDAF,EAAoBQ,EAAIF,EAGxBN,EAAoBS,EAAIV,EAGxBC,EAAoBU,EAAI,SAASR,EAASS,EAAMC,GAC3CZ,EAAoBa,EAAEX,EAASS,IAClCG,OAAOC,eAAeb,EAASS,EAAM,CAAEK,YAAY,EAAMC,IAAKL,KAKhEZ,EAAoBkB,EAAI,SAAShB,GACX,oBAAXiB,QAA0BA,OAAOC,aAC1CN,OAAOC,eAAeb,EAASiB,OAAOC,YAAa,CAAEC,MAAO,WAE7DP,OAAOC,eAAeb,EAAS,aAAc,CAAEmB,OAAO,KAQvDrB,EAAoBsB,EAAI,SAASD,EAAOE,GAEvC,GADU,EAAPA,IAAUF,EAAQrB,EAAoBqB,IAC/B,EAAPE,EAAU,OAAOF,EACpB,GAAW,EAAPE,GAA8B,iBAAVF,GAAsBA,GAASA,EAAMG,WAAY,OAAOH,EAChF,IAAII,EAAKX,OAAOY,OAAO,MAGvB,GAFA1B,EAAoBkB,EAAEO,GACtBX,OAAOC,eAAeU,EAAI,UAAW,CAAET,YAAY,EAAMK,MAAOA,IACtD,EAAPE,GAA4B,iBAATF,EAAmB,IAAI,IAAIM,KAAON,EAAOrB,EAAoBU,EAAEe,EAAIE,EAAK,SAASA,GAAO,OAAON,EAAMM,IAAQC,KAAK,KAAMD,IAC9I,OAAOF,GAIRzB,EAAoB6B,EAAI,SAAS1B,GAChC,IAAIS,EAAST,GAAUA,EAAOqB,WAC7B,WAAwB,OAAOrB,EAAgB,SAC/C,WAA8B,OAAOA,GAEtC,OADAH,EAAoBU,EAAEE,EAAQ,IAAKA,GAC5BA,GAIRZ,EAAoBa,EAAI,SAASiB,EAAQC,GAAY,OAAOjB,OAAOkB,UAAUC,eAAe1B,KAAKuB,EAAQC,IAGzG/B,EAAoBkC,EAAI,GAIjBlC,EAAoBA,EAAoBmC,EAAI,G,+BCjFrD,kDAEO,MAAMC,EAAgCC,MAAOC,EAAOC,KAClD,CACLC,WAAY,IACZC,KAAMC,KAAKC,UAAU,CACnBC,QAAS,gFACTC,MAAOP,GACN,KAAM,M,cCTbnC,EAAOD,QAAU4C,QAAQ","file":"handler.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n","import { APIGatewayProxyHandler } from 'aws-lambda';\nimport 'source-map-support/register';\n\nexport const hello: APIGatewayProxyHandler = async (event, _context) => {\n return {\n statusCode: 200,\n body: JSON.stringify({\n message: 'Go Serverless Webpack (Typescript) v1.0! Your function executed successfully!',\n input: event,\n }, null, 2),\n };\n}\n","module.exports = require(\"source-map-support/register\");"],"sourceRoot":""} \ No newline at end of file diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json deleted file mode 100644 index 5c591bd96..000000000 --- a/lib/plugins/create/templates/aws-nodejs-typescript/.webpack/service/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "haha", - "version": "1.0.0", - "description": "Packaged externals for haha", - "private": true, - "scripts": {}, - "dependencies": { - "source-map-support": "^0.5.10" - } -} \ No newline at end of file From 23bb2f1ad32aac7c747a52f94e489dee3f0bcb7c Mon Sep 17 00:00:00 2001 From: Khaled Osman Date: Wed, 30 Oct 2019 17:55:54 +0100 Subject: [PATCH 4/6] cleanup --- .../create/templates/aws-nodejs-typescript/package.json | 6 +----- .../create/templates/aws-nodejs-typescript/serverless.yml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json index eccc26667..807729b38 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json +++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json @@ -1,5 +1,5 @@ { - "name": "haha", + "name": "aws-nodejs-typescript", "version": "1.0.0", "description": "Serverless webpack example using Typescript", "main": "handler.js", @@ -12,15 +12,11 @@ "devDependencies": { "@types/aws-lambda": "^8.10.17", "@types/node": "^10.12.18", - "@typescript-eslint/eslint-plugin": "^2.6.0", - "@typescript-eslint/parser": "^2.6.0", - "eslint": "^6.6.0", "fork-ts-checker-webpack-plugin": "^3.0.1", "serverless-webpack": "^5.2.0", "ts-loader": "^5.3.3", "typescript": "^3.2.4", "webpack": "^4.29.0", - "webpack-cli": "^3.3.9", "webpack-node-externals": "^1.7.2" }, "author": "The serverless webpack authors (https://github.com/elastic-coders/serverless-webpack)", diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml index 256755b73..21c0080e1 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml +++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml @@ -1,5 +1,5 @@ service: - name: haha + name: aws-nodejs-typescript # app and org for use with dashboard.serverless.com #app: your-app-name #org: your-org-name From 682c23840b1edb262dd700e0face624a7095c66c Mon Sep 17 00:00:00 2001 From: Khaled Osman Date: Thu, 31 Oct 2019 10:42:08 +0100 Subject: [PATCH 5/6] style: run prettier to fix travis build --- .../aws-nodejs-typescript/tsconfig.json | 8 ++----- .../aws-nodejs-typescript/vscode/launch.json | 9 ++------ .../aws-nodejs-typescript/webpack.config.js | 22 +++++++++---------- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json index 34f35c85b..20f492b54 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json +++ b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json @@ -1,8 +1,6 @@ { "compilerOptions": { - "lib": [ - "es2017" - ], + "lib": ["es2017"], "removeComments": true, "moduleResolution": "node", "noUnusedLocals": true, @@ -11,9 +9,7 @@ "target": "es2017", "outDir": "lib" }, - "include": [ - "./**/*.ts" - ], + "include": ["./**/*.ts"], "exclude": [ "node_modules/**/*", ".serverless/**/*", diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json b/lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json index fc663b4a1..df159c7d1 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json +++ b/lib/plugins/create/templates/aws-nodejs-typescript/vscode/launch.json @@ -4,14 +4,9 @@ "name": "Lambda", "type": "node", "request": "launch", - "runtimeArgs": [ - "--inspect", - "--debug-port=9229" - ], + "runtimeArgs": ["--inspect", "--debug-port=9229"], "program": "${workspaceFolder}/node_modules/serverless/bin/serverless", - "args": [ - "offline" - ], + "args": ["offline"], "port": 9229, "console": "integratedTerminal" } diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js index 03cff8788..168adfeb0 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js +++ b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js @@ -1,7 +1,7 @@ const path = require('path'); const slsw = require('serverless-webpack'); -const nodeExternals = require('webpack-node-externals') -const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin') +const nodeExternals = require('webpack-node-externals'); +const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); module.exports = { context: __dirname, @@ -11,12 +11,12 @@ module.exports = { resolve: { extensions: ['.mjs', '.json', '.ts'], symlinks: false, - cacheWithContext: false + cacheWithContext: false, }, output: { libraryTarget: 'commonjs', path: path.join(__dirname, '.webpack'), - filename: '[name].js' + filename: '[name].js', }, target: 'node', externals: [nodeExternals()], @@ -30,15 +30,15 @@ module.exports = { [ path.resolve(__dirname, 'node_modules'), path.resolve(__dirname, '.serverless'), - path.resolve(__dirname, '.webpack') - ] + path.resolve(__dirname, '.webpack'), + ], ], options: { transpileOnly: true, - experimentalWatchApi: true - } - } - ] + experimentalWatchApi: true, + }, + }, + ], }, plugins: [ // new ForkTsCheckerWebpackPlugin({ @@ -47,5 +47,5 @@ module.exports = { // cache: true // } // }) - ] + ], }; From 14594cd45c41633416398ba4c72ad126ab1fbb3c Mon Sep 17 00:00:00 2001 From: Philipp Muens Date: Thu, 31 Oct 2019 12:07:09 +0100 Subject: [PATCH 6/6] Improve formatting --- .../create/templates/aws-nodejs-typescript/serverless.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml index 21c0080e1..b00954455 100644 --- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml +++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml @@ -8,6 +8,7 @@ custom: webpack: webpackConfig: ./webpack.config.js includeModules: true + # Add the serverless-webpack plugin plugins: - serverless-webpack @@ -16,7 +17,7 @@ provider: name: aws runtime: nodejs10.x apiGateway: - minimumCompressionSize: 1024 #Enable gzip compression for responses > 1KB + minimumCompressionSize: 1024 # Enable gzip compression for responses > 1 KB environment: AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1