fix(nx-serverless): fixed deploy not working. Both deploy and deploy …

…function works now

libs/aws-cdk-core/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@flowaccount/aws-cdk-core",
   "version": "1.0.0-beta.8"
-}
+}

libs/aws-cdk-stack/package.json

@@ -12,4 +12,4 @@
     "@aws-cdk/aws-elasticsearch": "~1.121.0",
     "@aws-cdk/aws-lambda-event-sources": "~1.121.0"
   }
-}
+}

libs/nx-aws-cdk/package.json

@@ -28,4 +28,4 @@
     "type": "git",
     "url": "https://github.com/flowaccount/nx-plugins/tree/master/libs/nx-aws-cdk"
   }
-}
+}

libs/nx-serverless/README.md

@@ -39,11 +39,11 @@ Simplify any workflow that can be abstracted into one command using the same con
 
 ### Frameworks Schematics
 
-| Framework Name                          | AWS                | Azure      | GCP        |
-| --------------------------------------- | ------------------ | ---------- | ---------- |
-| Node-Typescript (Webpack)               | :white_check_mark: | :calendar: | :calendar: |
-:white_check_mark: | :calendar: | :calendar: |
-| Express-js (Typescript-compiler)        | :white_check_mark: | :calendar: | :calendar: |
+| Framework Name                   | AWS                | Azure      | GCP        |
+| -------------------------------- | ------------------ | ---------- | ---------- |
+| Node-Typescript (Webpack)        | :white_check_mark: | :calendar: | :calendar: |
+| :white_check_mark:               | :calendar:         | :calendar: |
+| Express-js (Typescript-compiler) | :white_check_mark: | :calendar: | :calendar: |
 
 ### Serverless Framework Commands
 

libs/nx-serverless/package.json

@@ -57,4 +57,4 @@
     "test": "yarn nx test nx-serverless"
   },
   "author": "Wickstargazer"
-}
+}

libs/nx-serverless/src/builders/deploy/deploy.impl.ts

@@ -82,7 +82,7 @@ export async function deployExecutor(
   if (!prepResult.success) {
     throw new Error(`There was an error with the build. ${prepResult.error}`);
   }
-  
+
   await makeDistFileReadyForPackaging(options);
   const extraArgs = [];
   const commands = [];

libs/nx-serverless/src/utils/serverless.ts

@@ -117,9 +117,13 @@ export class ServerlessWrapper {
         configuration: configurationInput,
         serviceDir: buildOptions.servicePath,
         configurationFilename: 'serverless.yml',
-      }
-      if(deployOptions && deployOptions.function && deployOptions.function != '') {
-        serverlessConfig.servicePath = getPackagePath(deployOptions)
+      };
+      if (
+        deployOptions &&
+        deployOptions.function &&
+        deployOptions.function != ''
+      ) {
+        serverlessConfig.servicePath = getPackagePath(deployOptions);
       }
       this.serverless$ = new Serverless(serverlessConfig);
       // if (componentsV2.runningComponents()) return () => componentsV2.runComponents();
@@ -163,18 +167,24 @@ export class ServerlessWrapper {
   }
 }
 
-function getPackagePath(deployOptions: 
-  | (JsonObject & ServerlessDeployBuilderOptions)
-  | (JsonObject & ServerlessSlsBuilderOptions)) {
-  let packagePath = ""
-    if (!deployOptions.serverlessPackagePath &&
-    deployOptions.location.indexOf('dist/') > -1) {
-    packagePath = deployOptions.location.replace('dist/', 'dist/.serverlessPackages/');
-  }
-  else if (deployOptions.serverlessPackagePath) {
+function getPackagePath(
+  deployOptions:
+    | (JsonObject & ServerlessDeployBuilderOptions)
+    | (JsonObject & ServerlessSlsBuilderOptions)
+) {
+  let packagePath = '';
+  if (
+    !deployOptions.serverlessPackagePath &&
+    deployOptions.location.indexOf('dist/') > -1
+  ) {
+    packagePath = deployOptions.location.replace(
+      'dist/',
+      'dist/.serverlessPackages/'
+    );
+  } else if (deployOptions.serverlessPackagePath) {
     packagePath = deployOptions.serverlessPackagePath;
-  } 
-  return packagePath
+  }
+  return packagePath;
 }
 
 export function getExecArgv(
@@ -200,7 +210,7 @@ export async function runServerlessCommand(
   // review: Change options from location to outputpath?\
   let args = getExecArgv(options);
   const serviceDir = ServerlessWrapper.serverless.serviceDir;
-  if (extraArgs) { 
+  if (extraArgs) {
     args = args.concat(extraArgs);
   }
   logger.info('running serverless commands');
@@ -210,11 +220,11 @@ export async function runServerlessCommand(
   };
   ServerlessWrapper.serverless.isTelemetryReportedExternally = true;
   try {
-    const packagePath = getPackagePath(options)
-    logger.debug(`Serverless service path is ${packagePath}`)
-    ServerlessWrapper.serverless.serviceDir = packagePath
+    const packagePath = getPackagePath(options);
+    logger.debug(`Serverless service path is ${packagePath}`);
+    ServerlessWrapper.serverless.serviceDir = packagePath;
     await ServerlessWrapper.serverless.run();
-    ServerlessWrapper.serverless.serviceDir = serviceDir
+    ServerlessWrapper.serverless.serviceDir = serviceDir;
   } catch (ex) {
     throw new Error(`There was an error with the build. ${ex}.`);
   }
@@ -226,7 +236,7 @@ export async function makeDistFileReadyForPackaging(
     | (JsonObject & ServerlessSlsBuilderOptions)
 ): Promise<void> {
   let readyToPackaged: BuilderOutput = null;
-  options.serverlessPackagePath =  getPackagePath(options);
+  options.serverlessPackagePath = getPackagePath(options);
   readyToPackaged = await copyBuildOutputToBePackaged(options);
   if (readyToPackaged == null) {
     throw new Error(

libs/scully-plugin-angular-delay/package.json

@@ -26,4 +26,4 @@
   ],
   "author": "Wickstargazer",
   "license": "MIT"
-}
+}

libs/scully-plugin-google-analytics/package.json

@@ -25,4 +25,4 @@
   ],
   "author": "Wickstargazer",
   "license": "MIT"
-}
+}

libs/scully-plugin-lazy-load-picture-tag/package.json

@@ -27,4 +27,4 @@
   ],
   "author": "Wickstargazer",
   "license": "MIT"
-}
+}

package.json

@@ -127,4 +127,4 @@
       "pre-push": "yarn checkcommit && yarn format:check"
     }
   }
-}
+}