From dc22b30849960dec26dabc09e6b06092923e0055 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <kozbial@google.com>
Date: Wed, 6 Jan 2021 14:58:28 -0800
Subject: [PATCH] Update demo deploy script and fix gcloudignore file (#4566)

---
 appengine/.gcloudignore              |  4 +---
 appengine/deploy                     | 16 ----------------
 scripts/gulpfiles/appengine_tasks.js | 15 ++++++++++-----
 3 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100755 appengine/deploy

diff --git a/appengine/.gcloudignore b/appengine/.gcloudignore
index 8e8c010a3..844acd4b1 100644
--- a/appengine/.gcloudignore
+++ b/appengine/.gcloudignore
@@ -2,14 +2,12 @@
 .*
 *.soy
 *.komodoproject
-/deploy
+deploy
 /static/appengine/
-/static/closure/
 /static/demos/plane/soy/*.jar
 /static/demos/plane/xlf/
 /static/externs/
 /static/msg/json/
-/static/node_modules/
 /static/scripts/
 /static/typings/
 
diff --git a/appengine/deploy b/appengine/deploy
deleted file mode 100755
index 7fb5e6c0c..000000000
--- a/appengine/deploy
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Script to deploy on GAE.
-
-APP=./app.yaml
-if ! [ -f $APP ] ; then
-   echo $APP not found 1>&2
-   exit 1
-fi
-
-PROJECT=blockly-demo
-VERSION=37
-
-echo 'Beginning deployment...'
-gcloud app deploy --project $PROJECT --version $VERSION --no-promote
-echo 'Deployment finished.'
diff --git a/scripts/gulpfiles/appengine_tasks.js b/scripts/gulpfiles/appengine_tasks.js
index cc22d151c..64d65ba3c 100644
--- a/scripts/gulpfiles/appengine_tasks.js
+++ b/scripts/gulpfiles/appengine_tasks.js
@@ -12,6 +12,7 @@ var gulp = require('gulp');
 
 var fs = require('fs');
 var rimraf = require('rimraf');
+var path = require('path');
 var execSync = require('child_process').execSync;
 
 var packageJson = require('../../package.json');
@@ -45,13 +46,16 @@ function copyStaticSrc(done) {
  * Copies appengine files into deploy directory.
  */
 function copyAppengineSrc() {
-  return gulp.src(['appengine/**/*', 'appengine/.gcloudignore',])
-      .pipe(gulp.dest(demoTmpDir));
+  const appengineSrc = [
+      path.join(demoStaticTmpDir, 'appengine/**/*'),
+      path.join(demoStaticTmpDir, 'appengine/.gcloudignore'),
+  ];
+  return gulp.src(appengineSrc).pipe(gulp.dest(demoTmpDir));
 }
 
 /**
- * Deploys files from tmp directory to appengine to the minor version defined in
- * package.json and then cleans the tmp directory.
+ * Deploys files from tmp directory to appengine to version based on the version
+ * specified in package.json and then cleans the tmp directory.
  */
 function deployAndClean(done) {
   const minorVersion = packageJson.version.split('.')[1];
@@ -76,7 +80,8 @@ function deployAndClean(done) {
  */
 const deployDemos = gulp.series(
     prepareDeployDir,
-    gulp.parallel(copyStaticSrc, copyAppengineSrc),
+    copyStaticSrc,
+    copyAppengineSrc,
     deployAndClean
 );