refactor

Author: cnuss

src/index.ts

@@ -1,11 +1,5 @@
 import ServerlessWebpack from "serverless-webpack";
-import {
-  Options,
-  ReactPluginConfig,
-  Serverless,
-  ServerlessConfig,
-  WebpackPluginConfig,
-} from "./serverless-webpack";
+import { Options, Serverless } from "./serverless-webpack";
 import path from "path";
 
 class ServerlessReact extends ServerlessWebpack {
@@ -14,51 +8,49 @@ class ServerlessReact extends ServerlessWebpack {
   } = {};
 
   constructor(serverless: Serverless, protected options: Options) {
+    console.log("!!! ServerlessReact constructor", serverless, options);
+
     super(serverless, options);
 
     this.serverless = serverless;
     this.options = options;
 
-    this.hooks["before:webpack:validate:validate"] =
-      this.beforeWebpackValidate.bind(this);
+    this.hooks["before:webpack:validate:validate"] = function () {
+      applyWebpackOptions(serverless);
+    };
   }
+}
 
-  beforeWebpackValidate() {
-    const service = this.serverless.service;
-
-    service.custom = service.custom || {};
-
-    if (service.custom.webpack) {
-      throw "serverless-webpack config detected in serverless.yml. serverless-react is not compatible with serverless-webpack.";
-    }
+const applyWebpackOptions = (serverless: Serverless): void => {
+  console.log("!!! applyWebpackOptions", serverless);
+  if (!serverless.service.custom) {
+    serverless.service.custom = {};
+  }
 
-    service.custom.webpack = this.createWebpackPluginConfig(
-      this.serverless.config,
-      service.custom.react || {}
+  if (serverless.service.custom.webpack) {
+    throw new Error(
+      "serverless-webpack config detected in serverless.yml. serverless-react is not compatible with serverless-webpack."
     );
   }
 
-  createWebpackPluginConfig = (
-    serverlessConfig: ServerlessConfig,
-    pluginConfig: ReactPluginConfig
-  ): WebpackPluginConfig => {
-    const webpackConfig =
-      pluginConfig.webpackConfig ||
-      "./node_modules/react-scripts/config/webpack.config.js";
+  const pluginConfig = serverless.service.custom.react || {};
 
-    return {
-      packager: "yarn",
-      webpackConfig: path.join(serverlessConfig.servicePath, webpackConfig),
+  serverless.service.custom.webpack = {
+    packager: "yarn",
+    webpackConfig: path.join(
+      serverless.config.servicePath,
+      pluginConfig.webpackConfig ||
+        "./node_modules/react-scripts/config/webpack.config.js"
+    ),
+    packagePath: `./package.json`,
+    includeModules: {
       packagePath: `./package.json`,
-      includeModules: {
-        packagePath: `./package.json`,
-        nodeModulesRelativeDir: `./node_modules`,
-      },
-      packagerOptions: {
-        lockFile: "./yarn.lock",
-      },
-    };
+      nodeModulesRelativeDir: `./node_modules`,
+    },
+    packagerOptions: {
+      lockFile: "./yarn.lock",
+    },
   };
-}
+};
 
 module.exports = ServerlessReact;

src/serverless-webpack.d.ts

@@ -25,7 +25,7 @@ type ServerlessCustom = {
 
 type ServerlessService = {
   service: string;
-  custom: ServerlessCustom;
+  custom?: ServerlessCustom;
   provider: {
     runtime: string;
     stage: string;