chore(nx-serverless): format files

flowaccount · May 23, 2021 · a7cc4c8 · a7cc4c8
1 parent 2589f6e
commit a7cc4c8
Show file tree

Hide file tree

Showing 60 changed files with 970 additions and 995 deletions.
diff --git a/libs/nx-aws-cdk/src/builders/cdk/schema.json b/libs/nx-aws-cdk/src/builders/cdk/schema.json
@@ -67,4 +67,4 @@
     "stackNames",
     "processEnvironmentFile"
   ]
-}
+}
diff --git a/libs/nx-aws-cdk/src/schematics/ec2-instance/schema.json b/libs/nx-aws-cdk/src/schematics/ec2-instance/schema.json
@@ -68,4 +68,4 @@
     "keyName",
     "subnetId"
   ]
-}
+}
diff --git a/libs/nx-aws-cdk/src/schematics/init/schema.json b/libs/nx-aws-cdk/src/schematics/init/schema.json
@@ -21,4 +21,4 @@
     }
   },
   "required": []
-}
+}
diff --git a/libs/nx-aws-cdk/src/schematics/web-app/schema.json b/libs/nx-aws-cdk/src/schematics/web-app/schema.json
@@ -42,8 +42,5 @@
       "default": false
     }
   },
-  "required": [
-    "project",
-    "deploymentTarget"
-  ]
-}
+  "required": ["project", "deploymentTarget"]
+}
diff --git a/libs/nx-serverless/README.md b/libs/nx-serverless/README.md
@@ -167,6 +167,7 @@ nx build myapi # to build the api
 Edit the `env.json` files generated by the schematics. change `SLS_DEBUG` to `true`
 
 ## To ship your assets (html,css,js,img etc)
+
 ```json
    "assets": [
               "apps/app/src/favicon.ico",

diff --git a/libs/nx-serverless/src/builders/build/build.impl.ts b/libs/nx-serverless/src/builders/build/build.impl.ts
@@ -1,20 +1,26 @@
 import { JsonObject } from '@angular-devkit/core';
 import { BuildResult } from '@angular-devkit/build-webpack';
 // import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { BuildBuilderOptions, NormalizedBuildServerlessBuilderOptions, ServerlessEventResult } from '../../utils/types';
-import { tap, map} from 'rxjs/operators'
-
+import {
+  BuildBuilderOptions,
+  NormalizedBuildServerlessBuilderOptions,
+  ServerlessEventResult,
+} from '../../utils/types';
+import { tap, map } from 'rxjs/operators';
+
 import { getNodeWebpackConfig } from '../../utils/node.config';
 import {
   normalizeBuildOptions,
   assignEntriesToFunctionsFromServerless,
-  getSourceRoot
+  getSourceRoot,
 } from '../../utils/normalize';
 import { ServerlessWrapper } from '../../utils/serverless';
 // import { wrapMiddlewareBuildOptions } from '../../utils/middleware';;
 import { resolve } from 'path';
 import { consolidateExcludes } from '../../utils/serverless.config';
-import copyAssetFiles, { copyAssetFilesSync } from '../../utils/copy-asset-files';
+import copyAssetFiles, {
+  copyAssetFilesSync,
+} from '../../utils/copy-asset-files';
 import normalizeAssetOptions from '../../utils/normalize-options';
 import { convertNxExecutor, ExecutorContext, logger } from '@nrwl/devkit';
 import { runWebpack } from '@nrwl/workspace/src/utilities/run-webpack';
@@ -29,56 +35,59 @@ export type ServerlessBuildEvent = BuildResult &
     success: boolean;
   };
 
-  export async function buildExecutor(
+export async function buildExecutor(
   options: JsonObject & BuildServerlessBuilderOptions,
   context: ExecutorContext
 ) {
-    const root = getSourceRoot(context)
-    options = normalizeBuildOptions(options, context.root, root)
-    await ServerlessWrapper.init(options, context).toPromise()
-    options = assignEntriesToFunctionsFromServerless(
-        options,
-        context.root);
-    options.tsConfig = consolidateExcludes(options);
-    options.entry = options.files;
-    const config = (<NormalizedBuildServerlessBuilderOptions>options).webpackConfig.reduce((currentConfig, plugin) => {
-        return require(plugin)(currentConfig, {
-          options,
-          configuration: context.configurationName,
-        });
-      }, getNodeWebpackConfig(options));
-
-    const resultCopy = copyAssetFilesSync(normalizeAssetOptions(options, context))
-    if(!resultCopy.success) {
-      throw new Error(`Error building serverless application ${resultCopy.error}`)
-    }
-
-      logger.info('start compiling webpack');
-      /*
+  const root = getSourceRoot(context);
+  options = normalizeBuildOptions(options, context.root, root);
+  await ServerlessWrapper.init(options, context).toPromise();
+  options = assignEntriesToFunctionsFromServerless(options, context.root);
+  options.tsConfig = consolidateExcludes(options);
+  options.entry = options.files;
+  const config = (<NormalizedBuildServerlessBuilderOptions>(
+    options
+  )).webpackConfig.reduce((currentConfig, plugin) => {
+    return require(plugin)(currentConfig, {
+      options,
+      configuration: context.configurationName,
+    });
+  }, getNodeWebpackConfig(options));
+
+  const resultCopy = copyAssetFilesSync(
+    normalizeAssetOptions(options, context)
+  );
+  if (!resultCopy.success) {
+    throw new Error(
+      `Error building serverless application ${resultCopy.error}`
+    );
+  }
+
+  logger.info('start compiling webpack');
+  /*
       , {
         logging: stats => {
           logger.info(stats.toString(config.stats));
         }
       }*/
-       const iterator = eachValueFrom(
-          runWebpack(config, webpack).pipe(
-            tap((stats) => {
-              console.info(stats.toString(config.stats));
-            }),
-            map((stats) => {
-              return {
-                success: !stats.hasErrors(),
-                outfile: resolve(context.root, options.outputPath),
-                webpackStats: stats.toJson(config.stats),
-                resolverName: 'WebpackDependencyResolver',
-                tsconfig: options.tsConfig
-              } as ServerlessBuildEvent;
-            })
-          )
-        );
-        const event = <ServerlessBuildEvent>(await iterator.next()).value
-        return event
+  const iterator = eachValueFrom(
+    runWebpack(config, webpack).pipe(
+      tap((stats) => {
+        console.info(stats.toString(config.stats));
+      }),
+      map((stats) => {
+        return {
+          success: !stats.hasErrors(),
+          outfile: resolve(context.root, options.outputPath),
+          webpackStats: stats.toJson(config.stats),
+          resolverName: 'WebpackDependencyResolver',
+          tsconfig: options.tsConfig,
+        } as ServerlessBuildEvent;
+      })
+    )
+  );
+  const event = <ServerlessBuildEvent>(await iterator.next()).value;
+  return event;
 }
 export default buildExecutor;
 export const serverlessBuilder = convertNxExecutor(buildExecutor);
-
diff --git a/libs/nx-serverless/src/builders/build/compat.ts b/libs/nx-serverless/src/builders/build/compat.ts
@@ -2,4 +2,4 @@ import { convertNxExecutor } from '@nrwl/devkit';
 
 import { buildExecutor } from './build.impl';
 
-export default convertNxExecutor(buildExecutor);
+export default convertNxExecutor(buildExecutor);
diff --git a/libs/nx-serverless/src/builders/build/schema.json b/libs/nx-serverless/src/builders/build/schema.json
@@ -46,10 +46,7 @@
       "oneOf": [
         {
           "type": "string",
-          "enum": [
-            "none",
-            "all"
-          ]
+          "enum": ["none", "all"]
         },
         {
           "type": "array",
@@ -104,10 +101,7 @@
           }
         },
         "additionalProperties": false,
-        "required": [
-          "replace",
-          "with"
-        ]
+        "required": ["replace", "with"]
       },
       "default": []
     },
@@ -160,16 +154,12 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"
         }
       ]
     }
   }
-}
+}
diff --git a/libs/nx-serverless/src/builders/compile/compat.ts b/libs/nx-serverless/src/builders/compile/compat.ts
@@ -2,4 +2,4 @@ import { convertNxExecutor } from '@nrwl/devkit';
 
 import { compileExecutor } from './compile.impl';
 
-export default convertNxExecutor(compileExecutor);
+export default convertNxExecutor(compileExecutor);
diff --git a/libs/nx-serverless/src/builders/compile/compile.impl.ts b/libs/nx-serverless/src/builders/compile/compile.impl.ts
@@ -1,7 +1,7 @@
 import {
   BuilderContext,
   createBuilder,
-  BuilderOutput
+  BuilderOutput,
 } from '@angular-devkit/architect';
 import { JsonObject } from '@angular-devkit/core';
 import { ServerlessCompileOptions } from '../../utils/types';
@@ -11,7 +11,7 @@ import { switchMap, map, concatMap } from 'rxjs/operators';
 import {
   normalizeBuildOptions,
   assignEntriesToFunctionsFromServerless,
-  getSourceRoot
+  getSourceRoot,
 } from '../../utils/normalize';
 import { ServerlessWrapper } from '../../utils/serverless';
 import { resolve, join } from 'path';
@@ -21,29 +21,26 @@ export type ServerlesCompiledEvent = {
   outfile: string;
 };
 
-
 export async function compileExecutor(
   options: JsonObject & ServerlessCompileOptions,
   context: ExecutorContext
 ) {
-    const root = getSourceRoot(context)
-    options = normalizeBuildOptions(options, context.root, root)
-    await ServerlessWrapper.init(options, context).toPromise()
-    options = assignEntriesToFunctionsFromServerless(
-        options,
-        context.root);
-
-      logger.info('start compiling typescript');
-      const result =  await compileTypeScriptFiles(
-        options,
-        context
-        // libDependencies
-      ).toPromise();
-      return {
-        ...result,
-        outfile: resolve(context.root, options.outputPath),
-        resolverName: 'DependencyCheckResolver',
-        tsconfig: resolve(context.root, options.tsConfig)
-      };
+  const root = getSourceRoot(context);
+  options = normalizeBuildOptions(options, context.root, root);
+  await ServerlessWrapper.init(options, context).toPromise();
+  options = assignEntriesToFunctionsFromServerless(options, context.root);
+
+  logger.info('start compiling typescript');
+  const result = await compileTypeScriptFiles(
+    options,
+    context
+    // libDependencies
+  ).toPromise();
+  return {
+    ...result,
+    outfile: resolve(context.root, options.outputPath),
+    resolverName: 'DependencyCheckResolver',
+    tsconfig: resolve(context.root, options.tsConfig),
+  };
 }
-export default compileExecutor;
+export default compileExecutor;
diff --git a/libs/nx-serverless/src/builders/compile/schema.json b/libs/nx-serverless/src/builders/compile/schema.json
@@ -56,10 +56,7 @@
           }
         },
         "additionalProperties": false,
-        "required": [
-          "replace",
-          "with"
-        ]
+        "required": ["replace", "with"]
       },
       "default": []
     },
@@ -113,16 +110,12 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"
         }
       ]
     }
   }
-}
+}
diff --git a/libs/nx-serverless/src/builders/deploy/compat.ts b/libs/nx-serverless/src/builders/deploy/compat.ts
@@ -2,4 +2,4 @@ import { convertNxExecutor } from '@nrwl/devkit';
 
 import { deployExecutor } from './deploy.impl';
 
-export default convertNxExecutor(deployExecutor);
+export default convertNxExecutor(deployExecutor);