From cb2746595118d0342a90a4b69c2cc001fe892f00 Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Tue, 26 Sep 2017 13:29:01 -0700
Subject: [PATCH 1/7] make prpl-server changes

---
 app.yaml           | 39 ++++-----------------------------------
 index.html         |  9 +++++----
 package.json       | 14 ++++++++++++++
 polymer.json       |  6 ++----
 src/news-app.html  |  2 +-
 src/news-data.html |  6 +++---
 6 files changed, 29 insertions(+), 47 deletions(-)
 create mode 100644 package.json

diff --git a/app.yaml b/app.yaml
index 0443ec01..2ff73be6 100755
--- a/app.yaml
+++ b/app.yaml
@@ -1,35 +1,4 @@
-runtime: python27
-api_version: 1
-threadsafe: true
-
-handlers:
-- url: /bower_components
-  static_dir: bower_components
-  secure: always
-
-- url: /data
-  static_dir: data
-  secure: always
-  application_readable: true
-
-- url: /images
-  static_dir: images
-  secure: always
-
-- url: /src
-  static_dir: src
-  secure: always
-
-- url: /service-worker.js
-  static_files: service-worker.js
-  upload: service-worker.js
-  secure: always
-
-- url: /manifest.json
-  static_files: manifest.json
-  upload: manifest.json
-  secure: always
-
-- url: /.*
-  script: main.app
-  secure: always
+runtime: nodejs
+env: flex
+automatic_scaling:
+  min_num_instances: 1
diff --git a/index.html b/index.html
index 70d61f97..279d74bb 100644
--- a/index.html
+++ b/index.html
@@ -16,9 +16,9 @@
 
   <title>NEWS</title>
 
-  <link rel="shortcut icon" sizes="32x32" href="/images/news-icon-32.png">
+  <link rel="shortcut icon" sizes="32x32" href="images/news-icon-32.png">
   <meta name="theme-color" content="#000">
-  <link rel="manifest" href="/manifest.json">
+  <link rel="manifest" href="manifest.json">
 
   <style>
 
@@ -70,8 +70,9 @@
 
   <news-app unresolved app-title="NEWS">NEWS</news-app>
 
-  <script src="/bower_components/webcomponentsjs/webcomponents-loader.js"></script>
-  <link rel="import" href="/src/news-app.html">
+  <base href="/">
+  <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+  <link rel="import" href="src/news-app.html">
 
 </body>
 </html>
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..64ff3d07
--- /dev/null
+++ b/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "news",
+  "private": true,
+  "scripts": {
+    "start": "prpl-server --root build/ --host 0.0.0.0 --https-redirect",
+    "deploy": "polymer build && gcloud app deploy --project polymer-news"
+  },
+  "engines": {
+    "node": ">=6.0.0"
+  },
+  "dependencies": {
+    "prpl-server": "^0.10.1"
+  }
+ }
diff --git a/polymer.json b/polymer.json
index 8ef3675c..cd79499e 100644
--- a/polymer.json
+++ b/polymer.json
@@ -24,10 +24,8 @@
   },
   "builds": [
     {
-      "preset": "es5-bundled"
-    },
-    {
-      "preset": "es6-unbundled"
+      "preset": "es6-bundled",
+      "basePath": true
     }
   ]
 }
diff --git a/src/news-app.html b/src/news-app.html
index 49303f88..33093d51 100644
--- a/src/news-app.html
+++ b/src/news-app.html
@@ -284,7 +284,7 @@
 
               // Load pre-caching Service Worker
               if ('serviceWorker' in navigator) {
-                navigator.serviceWorker.register('/service-worker.js');
+                navigator.serviceWorker.register('service-worker.js');
               }
             });
           });
diff --git a/src/news-data.html b/src/news-data.html
index e62e50b5..6e407ccd 100644
--- a/src/news-data.html
+++ b/src/news-data.html
@@ -97,7 +97,7 @@
           this._setFailure(false);
           return;
         }
-        this._fetch('/data/articles/' + article.id + '.html',
+        this._fetch('data/articles/' + article.id + '.html',
           (response) => { this.set('article.html', this._formatHTML(response)); },
           1 /* attempts */, true /* isRaw */);
       }
@@ -118,7 +118,7 @@
           this._setFailure(false);
           return;
         }
-        this._fetch('/data/' + category.name + '.json',
+        this._fetch('data/' + category.name + '.json',
           (response) => { this.set('category.items', this._parseCategoryItems(response)); },
           attempts || 1 /* attempts */);
       }
@@ -154,7 +154,7 @@
       }
 
       _getItemImage(item) {
-        return item.imgSrc ? '/data/' + item.imgSrc : '';
+        return item.imgSrc ? 'data/' + item.imgSrc : '';
       }
 
       _timeAgo(timestamp) {

From 0972fac5d914183a5e513ffecf2039a5b7c42e28 Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Tue, 26 Sep 2017 14:05:26 -0700
Subject: [PATCH 2/7] update polymer.json

---
 polymer.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/polymer.json b/polymer.json
index cd79499e..faeca3c2 100644
--- a/polymer.json
+++ b/polymer.json
@@ -23,9 +23,17 @@
     "rules": ["polymer-2-hybrid"]
   },
   "builds": [
+    {
+      "preset": "es5-unbundled",
+      "basePath": true
+    },
     {
       "preset": "es6-bundled",
       "basePath": true
+    },
+    {
+      "preset": "es6-unbundled",
+      "basePath": true
     }
   ]
 }

From 4e3ef307bc80e09b89e50450c61c5d20a0749db7 Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Wed, 27 Sep 2017 11:46:20 -0700
Subject: [PATCH 3/7] add entrypoint push script

---
 scripts/add_routes_to_push_manifest.js | 61 ++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 scripts/add_routes_to_push_manifest.js

diff --git a/scripts/add_routes_to_push_manifest.js b/scripts/add_routes_to_push_manifest.js
new file mode 100644
index 00000000..a885bd52
--- /dev/null
+++ b/scripts/add_routes_to_push_manifest.js
@@ -0,0 +1,61 @@
+/**
+ * Usage:
+ *   node scripts/add_routes_to_push_manifest.js
+ */
+
+const fs = require('fs');
+const pushManifestPath = 'build/es6-unbundled/push-manifest.json';
+const pushManifest = require(`../${pushManifestPath}`);
+const newManifest = {};
+
+const navigateRequestPreloads = {
+  "bower_components/webcomponentsjs/webcomponents-loader.js": {
+    "type": "script",
+    "weight": 1
+  }
+};
+
+let homePage = Object.assign({
+    "src/news-app.html": {
+      "type": "document",
+      "weight": 1
+    },
+    "src/news-list.html": {
+      "type": "document",
+      "weight": 1
+    }
+  },
+  pushManifest['/'],
+  pushManifest['/list/.*'],
+  pushManifest['src/news-app.html'],
+  pushManifest['src/news-list.html'],
+  navigateRequestPreloads);
+newManifest['/'] = newManifest['/list/.*'] = homePage;
+
+newManifest['/article/.*'] = Object.assign({
+    "src/news-app.html": {
+      "type": "document",
+      "weight": 1
+    },
+    "src/news-article.html": {
+      "type": "document",
+      "weight": 1
+    }
+  },
+  pushManifest['/article/.*'],
+  pushManifest['src/news-app.html'],
+  pushManifest['src/news-article.html'],
+  navigateRequestPreloads);
+
+// HACK(keanulee): need to dedup already pushed assets -
+// https://github.com/Polymer/polymer-build/issues/260
+const dedupedLazyResourcesAssets = {};
+const lazyResourcesAssets = pushManifest['src/lazy-resources.html'];
+Object.keys(lazyResourcesAssets).forEach((asset) => {
+  if (!newManifest['/'][asset]) {
+    dedupedLazyResourcesAssets[asset] = lazyResourcesAssets[asset];
+  }
+});
+newManifest['src/lazy-resources.html'] = dedupedLazyResourcesAssets;
+
+fs.writeFileSync(pushManifestPath, JSON.stringify(newManifest, null, 2));

From 254ad7ce78da0804dc2d7b8b453f6e3dd364a778 Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Thu, 28 Sep 2017 15:12:02 -0700
Subject: [PATCH 4/7] ie11, always a grumpers

---
 index.html   | 4 +---
 polymer.json | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 279d74bb..2933bb84 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
   <link rel="shortcut icon" sizes="32x32" href="images/news-icon-32.png">
   <meta name="theme-color" content="#000">
   <link rel="manifest" href="manifest.json">
-
+  <base href="/">
   <style>
 
     body {
@@ -69,8 +69,6 @@
 <body>
 
   <news-app unresolved app-title="NEWS">NEWS</news-app>
-
-  <base href="/">
   <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
   <link rel="import" href="src/news-app.html">
 
diff --git a/polymer.json b/polymer.json
index faeca3c2..59bc0fb3 100644
--- a/polymer.json
+++ b/polymer.json
@@ -24,7 +24,7 @@
   },
   "builds": [
     {
-      "preset": "es5-unbundled",
+      "preset": "es5-bundled",
       "basePath": true
     },
     {

From a24176472ade2ab1bdfac80e0e499b53549e957d Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Thu, 28 Sep 2017 15:12:15 -0700
Subject: [PATCH 5/7] fix deploy script

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 64ff3d07..901d472b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "start": "prpl-server --root build/ --host 0.0.0.0 --https-redirect",
-    "deploy": "polymer build && gcloud app deploy --project polymer-news"
+    "deploy": "polymer build && node scripts/add_routes_to_push_manifest.js && gcloud app deploy --project polymer-news"
   },
   "engines": {
     "node": ">=6.0.0"

From fff20343d69788a0371bec10d0216b72735b1c39 Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee@google.com>
Date: Mon, 16 Oct 2017 16:04:14 -0700
Subject: [PATCH 6/7] Add --bot-proxy to rendertron

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 901d472b..09a485bf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "news",
   "private": true,
   "scripts": {
-    "start": "prpl-server --root build/ --host 0.0.0.0 --https-redirect",
+    "start": "prpl-server --root build/ --host 0.0.0.0 --https-redirect --bot-proxy https://render-tron.appspot.com/render",
     "deploy": "polymer build && node scripts/add_routes_to_push_manifest.js && gcloud app deploy --project polymer-news"
   },
   "engines": {

From 0c481553d8c87469c84d0045c416d96f78bce835 Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee@google.com>
Date: Mon, 23 Oct 2017 16:42:38 -0700
Subject: [PATCH 7/7] Bump prpl-server version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 09a485bf..06c30e87 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,6 @@
     "node": ">=6.0.0"
   },
   "dependencies": {
-    "prpl-server": "^0.10.1"
+    "prpl-server": "^0.11.0"
   }
  }