Merge branch 'master' of https://github.com/AnomalyInnovations/serverless-bundle

Author: jayair

package.json

@@ -31,64 +31,64 @@
   "author": "Jay V <air@live.ca>",
   "license": "MIT",
   "dependencies": {
-    "@babel/core": "^7.13.10",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.13",
-    "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-    "@babel/plugin-transform-runtime": "^7.13.10",
-    "@babel/preset-env": "^7.13.12",
-    "@babel/runtime": "^7.13.10",
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
+    "@babel/core": "^7.17.2",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/runtime": "^7.17.2",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
     "babel-eslint": "^10.0.2",
-    "babel-jest": "^26.5.2",
-    "babel-loader": "^8.2.2",
-    "babel-plugin-source-map-support": "^2.1.1",
-    "chalk": "^4.1.0",
-    "concat-text-webpack-plugin": "^0.1.9",
+    "babel-jest": "^26.6.3",
+    "babel-loader": "^8.2.3",
+    "babel-plugin-source-map-support": "^2.1.3",
+    "chalk": "^4.1.2",
+    "concat-text-webpack-plugin": "^0.2.1",
     "copy-webpack-plugin": "^8.1.1",
-    "core-js": "^3.10.1",
+    "core-js": "^3.21.0",
     "cross-spawn": "^7.0.3",
-    "css-loader": "^5.2.1",
-    "dotenv": "^8.2.0",
-    "esbuild-loader": "^2.12.0",
-    "eslint": "^7.24.0",
+    "css-loader": "^5.2.7",
+    "dotenv": "^8.6.0",
+    "esbuild-loader": "^2.18.0",
+    "eslint": "^7.32.0",
     "eslint-config-strongloop": "^2.1.0",
-    "eslint-webpack-plugin": "^2.5.3",
-    "fast-glob": "^3.2.5",
-    "fork-ts-checker-webpack-plugin": "^6.2.1",
-    "graphql": "^15.5.0",
-    "graphql-tag": "^2.10.3",
+    "eslint-webpack-plugin": "^2.6.0",
+    "fast-glob": "^3.2.11",
+    "fork-ts-checker-webpack-plugin": "^6.5.0",
+    "graphql": "^15.8.0",
+    "graphql-tag": "^2.12.6",
     "ignore-loader": "^0.1.2",
     "import-fresh": "^3.3.0",
-    "isomorphic-style-loader": "^5.1.0",
-    "jest": "^26.5.3",
+    "isomorphic-style-loader": "^5.3.2",
+    "jest": "^26.6.3",
     "pkg-up": "^3.1.0",
-    "raw-loader": "^4.0.1",
-    "regenerator-runtime": "^0.13.2",
-    "resolve": "^1.20.0",
-    "sass": "^1.32.8",
-    "sass-loader": "^11.0.1",
-    "serverless-webpack": "^5.5.4",
-    "source-map-support": "^0.5.19",
-    "ts-jest": "^26.5.5",
-    "ts-loader": "^8.1.0",
-    "tsconfig-paths-webpack-plugin": "^3.5.1",
-    "typescript": "^4.2.4",
-    "webpack": "^5.33.2",
+    "raw-loader": "^4.0.2",
+    "regenerator-runtime": "^0.13.9",
+    "resolve": "^1.22.0",
+    "sass": "^1.49.7",
+    "sass-loader": "^11.1.1",
+    "serverless-webpack": "^5.6.1",
+    "source-map-support": "^0.5.21",
+    "ts-jest": "^26.5.6",
+    "ts-loader": "^8.3.0",
+    "tsconfig-paths-webpack-plugin": "^3.5.2",
+    "typescript": "^4.5.5",
+    "webpack": "^5.68.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-node-externals": "^2.5.2",
     "webpack-permissions-plugin": "^1.0.8"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.24",
     "husky": "^6.0.0",
-    "is-ci": "^3.0.0",
+    "is-ci": "^3.0.1",
     "lerna-changelog": "^1.0.1",
     "lint-staged": "^10.5.4",
-    "prettier": "^2.2.1",
+    "prettier": "^2.5.1",
     "reflect-metadata": "^0.1.13",
-    "serverless": "^2.37.1"
+    "serverless": "^2.72.2"
   },
   "peerDependencies": {
     "serverless": "1 || 2 || 3"

scripts/test.js

@@ -58,7 +58,7 @@ function resolveJestDefaultEnvironment(name) {
   });
 }
 let cleanArgv = [];
-let env = "jsdom";
+let env = "node";
 let next;
 do {
   next = argv.shift();

src/webpack.config.js

@@ -76,19 +76,21 @@ if (
   throw `ERROR: ${config.options.tsConfig} not found.`;
 }
 
+const parsedTsConfig = parseTsConfig();
+
 if (ENABLE_TYPESCRIPT && checkInvalidTsModule()) {
   console.log("serverless-bundle: CommonJS, ES3, or ES5 are not supported");
 }
 
-function checkInvalidTsModule() {
+function parseTsConfig() {
   // Borrowed from
   // https://github.com/formium/tsdx/blob/e84e8d654c8462b8db65a3d395e2a4ba79bf1bd2/src/createRollupConfig.ts#L49-L55
   const tsConfigJSON = ts.readConfigFile(tsConfigPath, ts.sys.readFile).config;
-  const tsCompilerOptions = ts.parseJsonConfigFileContent(
-    tsConfigJSON,
-    ts.sys,
-    "./"
-  ).options;
+  return ts.parseJsonConfigFileContent(tsConfigJSON, ts.sys, "./");
+}
+
+function checkInvalidTsModule() {
+  const tsCompilerOptions = parsedTsConfig.options;
 
   const module = tsCompilerOptions.module;
   const target = tsCompilerOptions.target;
@@ -295,6 +297,9 @@ function plugins() {
     };
 
     if (ENABLE_LINTING) {
+      if (parsedTsConfig.exclude) {
+        tsEslintConfig.ignorePatterns = parsedTsConfig.exclude
+      }
       forkTsCheckerWebpackOptions.eslint = {
         files: path.join(servicePath, "**/*.ts"),
         options: { cwd: servicePath, baseConfig: tsEslintConfig },