Changed to early exit semantics in packaging for google

Author: Frank Schmid

lib/packExternalModules.js

@@ -291,23 +291,25 @@ module.exports = {
         addModulesToPackageJson(prodModules, modulePackage);
         this.serverless.utils.writeFileSync(modulePackageJson, JSON.stringify(modulePackage, null, 2));
 
-        // Copy modules only if not google-cloud-functions
-        // GCF Auto installs the package json
-        if (_.get(this.serverless, 'service.provider.name') !== 'google') {
-          const startCopy = _.now();
-          return BbPromise.fromCallback(callback => fse.copy(path.join(compositeModulePath, 'node_modules'), path.join(modulePath, 'node_modules'), callback))
-          .tap(() => this.options.verbose && this.serverless.cli.log(`Copy modules: ${modulePath} [${_.now() - startCopy} ms]`))
-          .then(() => {
-            // Prune extraneous packages - removes not needed ones
-            const startPrune = _.now();
-            return BbPromise.fromCallback(callback => {
-              childProcess.exec('npm prune', {
-                cwd: modulePath
-              }, callback);
-            })
-            .tap(() => this.options.verbose && this.serverless.cli.log(`Prune: ${modulePath} [${_.now() - startPrune} ms]`));
-          });
+        // GOOGLE: Copy modules only if not google-cloud-functions
+        //         GCF Auto installs the package json
+        if (_.get(this.serverless, 'service.provider.name') === 'google') {
+          return BbPromise.resolve();
         }
+
+        const startCopy = _.now();
+        return BbPromise.fromCallback(callback => fse.copy(path.join(compositeModulePath, 'node_modules'), path.join(modulePath, 'node_modules'), callback))
+        .tap(() => this.options.verbose && this.serverless.cli.log(`Copy modules: ${modulePath} [${_.now() - startCopy} ms]`))
+        .then(() => {
+          // Prune extraneous packages - removes not needed ones
+          const startPrune = _.now();
+          return BbPromise.fromCallback(callback => {
+            childProcess.exec('npm prune', {
+              cwd: modulePath
+            }, callback);
+          })
+          .tap(() => this.options.verbose && this.serverless.cli.log(`Prune: ${modulePath} [${_.now() - startPrune} ms]`));
+        });
       })
       .return();
     });