refactor: tidy up

Author: danielcondemarin

index.js

@@ -56,6 +56,10 @@ class ServerlessNextJsPlugin {
     return userConfig === undefined ? defaults[param] : userConfig;
   }
 
+  getPluginConfigValues(...params) {
+    return params.map(p => this.getPluginConfigValue(p));
+  }
+
   printStackOutput() {
     const awsInfo = this.serverless.pluginManager.getPlugins().find(plugin => {
       return plugin.constructor.name === "AwsInfo";

lib/addCustomStackResources.js

@@ -24,8 +24,7 @@ const normaliseSrc = (staticDir, src) =>
     .join("");
 
 const getStaticRouteProxyResources = async function(bucketName) {
-  const staticDir = this.getPluginConfigValue("staticDir");
-  const routes = this.getPluginConfigValue("routes");
+  const [staticDir, routes] = this.getPluginConfigValues("staticDir", "routes");
 
   if (!staticDir) {
     return {};
@@ -34,6 +33,7 @@ const getStaticRouteProxyResources = async function(bucketName) {
   const baseResource = await loadYml(
     path.join(__dirname, "../resources/api-gw-proxy.yml")
   );
+
   const result = {
     Resources: {}
   };

lib/build.js

@@ -21,9 +21,12 @@ const overrideTargetIfNotServerless = nextConfiguration => {
 module.exports = async function() {
   const pluginBuildDir = this.pluginBuildDir;
   const nextConfigDir = pluginBuildDir.nextConfigDir;
-  const pageConfig = this.getPluginConfigValue("pageConfig");
-  const customHandler = this.getPluginConfigValue("customHandler");
-  const routes = this.getPluginConfigValue("routes");
+
+  const [pageConfig, customHandler, routes] = this.getPluginConfigValues(
+    "pageConfig",
+    "customHandler",
+    "routes"
+  );
 
   logger.log("Started building next app ...");
 
@@ -61,13 +64,10 @@ module.exports = async function() {
 
   await rewritePageHandlers(nextPages, customHandler);
 
-  const service = this.serverless.service;
-
-  this.nextPages = nextPages;
-
   nextPages.forEach(page => {
     const functionName = page.functionName;
-    service.functions[functionName] = page.serverlessFunction[functionName];
+    this.serverless.service.functions[functionName] =
+      page.serverlessFunction[functionName];
   });
 
   this.serverless.service.setFunctionNames();

lib/uploadStaticAssets.js

@@ -6,9 +6,15 @@ module.exports = function() {
 
   let { nextConfiguration, staticAssetsBucket } = this.configuration;
 
-  const bucketNameFromConfig = this.getPluginConfigValue("assetsBucketName");
-  const staticDir = this.getPluginConfigValue("staticDir");
-  const uploadBuildAssets = this.getPluginConfigValue("uploadBuildAssets");
+  const [
+    bucketNameFromConfig,
+    staticDir,
+    uploadBuildAssets
+  ] = this.getPluginConfigValues(
+    "assetsBucketName",
+    "staticDir",
+    "uploadBuildAssets"
+  );
 
   if (bucketNameFromConfig) {
     staticAssetsBucket = bucketNameFromConfig;