fix(nx-serverless): fix dependencies and replacing dist folder in server.ts

fix npm dependencies for nx-serverless when publishing
Fix how server.ts dist folder is replace for
it to work with serverless deployment and universal shematics in angular

BREAKING CHANGE:
renamed application to api-serverless for node-typescript apps

Author: wickstargazer

libs/nx-serverless/.npmignore

@@ -1,6 +1,6 @@
 **/*.spec.*
 *.ts
-tsconfig.json
+# tsconfig.json
 .*
 .
 *.tgz

libs/nx-serverless/package.json

@@ -1,16 +1,43 @@
 {
   "name": "@flowaccount/nx-serverless",
-  "version": "0.4.0",
+  "version": "0.4.5",
   "main": "src/index.js",
+  "description": "Serverless schematics for nx workspace",
+  "keywords": [
+    "Serverless Framework",
+    "Serverless",
+    "Angular Universal Deploy",
+    "Node Typescipt",
+    "Workspace",
+    "Nx",
+    "Monorepo"
+  ],
   "schematics": "./collection.json",
   "builders": "./builders.json",
+  "license": "MIT",
   "peerDependencies": {
     "@nguniversal/express-engine": "^9.0.1",
     "express": "^4.17.1",
     "@nrwl/workspace": "^9.0.1",
     "@nrwl/node": "^9.0.1"
   },
-  "devDependencies": {},
+  "dependencies": {
+    "@nrwl/workspace": "9.0.1",
+    "dotenv": "6.2.0",
+    "dotenv-json": "^1.0.0",
+    "serverless": "^1.59.3",
+    "serverless-webpack": "5.3.1",
+    "copy-webpack-plugin": "5.1.1",
+    "license-webpack-plugin": "2.1.2",
+    "circular-dependency-plugin": "^5.0.2",
+    "fork-ts-checker-webpack-plugin": "^3.1.1",
+    "tsconfig-paths-webpack-plugin": "^3.2.0",
+    "webpack": "4.41.2",
+    "webpack-merge": "4.2.1",
+    "webpack-dev-server": "3.9.0",
+    "webpack-node-externals": "1.7.2",
+    "depcheck": "0.9.2"
+  },
   "repository": {
     "type": "git",
     "url": "ssh://git@github.com/flowaccount/nx-plugins.git"

libs/nx-serverless/src/schematics/angular-universal/application.spec.ts

@@ -163,9 +163,15 @@ describe('app', () => {
         tree,
         'apps/my-app/tsconfig.serverless.json'
       );
-      expect(tsconfig.compilerOptions.types).toContain('node');
 
+      expect(tsconfig.compilerOptions.types).toContain('node');
       expect(tsconfig.files).toEqual(['handler.ts']);
+      const servertsContent = tree.readContent('apps/my-app/server.ts');
+      expect(
+        servertsContent.indexOf(
+          "environment.production ? join(process.cwd(), './browser') : join(process.cwd(), 'dist/my-app/browser')"
+        ) > -1
+      );
     });
   });
 

libs/nx-serverless/src/schematics/angular-universal/application.ts

@@ -148,7 +148,7 @@ function updateServerTsFile(options: NormalizedSchema): Rule {
     host.overwrite(
       modulePath,
       moduleSource.replace(
-        `join(process.cwd(), 'dist/${options.appProjectRoot}')`,
+        `join(process.cwd(), 'dist/${options.project}/browser')`,
         `environment.production ? join(process.cwd(), './browser') : join(process.cwd(), 'dist/${options.appProjectRoot}/browser')`
       )
     );
@@ -233,8 +233,8 @@ export default function(schema: Schema): Rule {
           })
         : noop(),
       addAppFiles(options),
-      options.addUniversal ? updateServerTsFile(options) : noop(),
       addServerlessYMLFile(options),
+      options.addUniversal ? updateServerTsFile(options) : noop(),
       updateWorkspaceJson(options)
     ])(host, context);
   };

libs/nx-serverless/src/schematics/init/init.spec.ts

@@ -11,7 +11,7 @@ fdescribe('init', () => {
     tree = createEmptyWorkspace(tree);
   });
 
-  it('should add dependencies for non-universal', async () => {
+  it('should add dependencies for node apis', async () => {
     const result = await runSchematic('init', { universalApp: false }, tree);
     const packageJson = readJsonInTree(result, 'package.json');
     expect(
@@ -39,7 +39,11 @@ fdescribe('init', () => {
     expect(
       packageJson.devDependencies['serverless-apigw-binary']
     ).toBeDefined();
+    expect(
+      packageJson.devDependencies['@types/aws-serverless-express']
+    ).toBeDefined();
     expect(packageJson.dependencies['aws-serverless-express']).toBeDefined();
+    expect(packageJson.dependencies['express']).toBeDefined();
   });
 
   //   describe('defaultCollection', () => {

libs/nx-serverless/src/schematics/init/init.ts

@@ -19,7 +19,8 @@ import {
   serverlessOfflineVersion,
   awsTypeLambdaVersion,
   awsServerlessExpressVersion,
-  serverlessApigwBinaryVersion
+  serverlessApigwBinaryVersion,
+  expressVersion
 } from '../../utils/versions';
 
 function addDependencies(universal: boolean): Rule {
@@ -32,6 +33,7 @@ function addDependencies(universal: boolean): Rule {
     };
     if (universal) {
       dependencies['aws-serverless-express'] = awsServerlessExpressVersion;
+      dependencies['express'] = expressVersion;
       devDependencies[
         '@types/aws-serverless-express'
       ] = awsServerlessExpressVersion;

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

@@ -69,7 +69,9 @@ export class ServerlessWrapper {
                 `Environment vairbales set according to ${options.processEnvironmentFile}`
               );
             } else {
-              context.logger.error('No env.json found! no environment will be set!');
+              context.logger.error(
+                'No env.json found! no environment will be set!'
+              );
             }
           } catch (e) {
             context.logger.error(e);

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

@@ -6,3 +6,4 @@ export const awsSdkVersion = '*';
 export const awsTypeLambdaVersion = '^8.10.40';
 export const awsServerlessExpressVersion = '^3.3.2';
 export const serverlessApigwBinaryVersion = '^0.4.4';
+export const expressVersion = '^4.17.1';