BW-614 #comment changes for cli

milansar · Aug 26, 2019 · ec9eabe · ec9eabe
1 parent 8faf8e2
commit ec9eabe
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/cli.js b/cli.js
@@ -36,7 +36,7 @@ const deployFunctionsCommand = ` ${buildApps} &&
                     setConfig                    
                     firebase deploy -P productVariant-env --only functions &&                         
                     firebase deploy -P productVariant-env --only hosting`;
-
+                  
 const commandList = {
     "run-web":
     {
@@ -74,8 +74,8 @@ const commandList = {
     },
     "run-functions":
     {
-        "command": `${buildApps} && ${compileFunctions} && ${buildSSRServer} 
-        && firebase serve -P productVariant-env  --only functions`,
+        "command": `buildApps ${compileFunctions} && buildSSRServer 
+        firebase serve -P productVariant-env  --only functions`,
         "description": "deploy firebase functions local",
         "options": {
             "productVariant": {
@@ -93,7 +93,40 @@ const commandList = {
                 "choices": env,
                 "default": 'dev',
                 "alias": ['E', 'e']
+            },
+            "buildApps": {
+                "demand": false,
+                "hidden": true,
+                "type": 'string'
+            },
+            "buildSSRServer": {
+                "demand": false,
+                "hidden": true,
+                "type": 'string'
+            },
+            "buildSSR": {
+                "demand": true,
+                "default": false,
+                "type": 'boolean',
+                "description": 'build SSR Functions e.g. true',
+                "alias": ['S', 's']
             }
+        }, 
+        "builder": args => {
+            const buildSSR = args.argv.buildSSR;
+            let buildAppstemp = buildApps;
+            if (buildSSR){    
+                buildAppstemp = buildAppstemp.replace(new RegExp(escapeRegExp('productVariant'), 'g'), args.argv.productVariant );
+                buildAppstemp = buildAppstemp.replace(new RegExp(escapeRegExp('env'), 'g'), args.argv.env );
+            }
+
+            args.options(
+                {
+                    'buildApps': { 'default': buildSSR  ? `${buildAppstemp} &&` : '' },
+                    'buildSSRServer': { 'default': buildSSR ? `${buildSSRServer} &&` : '' }
+                }
+            );
+            replaceVariableInIndex(['trivia', 'trivia-admin'], args.argv.productVariant);
         }
     },
     "deploy-functions":

diff --git a/functions/ssr.ts b/functions/ssr.ts
@@ -5,7 +5,7 @@ const ssrFunction = require('firebase-functions');
 // const server = require('./server');
 
 
-const ngApp = require('./server').default;
+const ngApp = require('./../../dist/server').default;
 
 const runtimeOpts = {
   memory: '512MB'

diff --git a/webpack.server.config.js b/webpack.server.config.js
@@ -11,7 +11,7 @@ module.exports = {
     minimize: false
   },
   output: {
-    path: path.join(__dirname, `functions/server/functions`),
+    path: path.join(__dirname, `functions/dist`),
     library: 'app',
     libraryTarget: 'umd',
     filename: '[name].js'