From 1a97bb0690eda9bd953eae1bcfdb13f922431b8c Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee@google.com>
Date: Mon, 2 Oct 2017 10:37:33 -0700
Subject: [PATCH 1/4] Remove server-specific stuff; consistency with Shop

---
 README.md             | 20 ++++----------------
 app.yaml              | 35 -----------------------------------
 main.py               | 31 -------------------------------
 polymer.json          |  8 ++++----
 sw-precache-config.js | 15 ++++++++++++---
 5 files changed, 20 insertions(+), 89 deletions(-)
 delete mode 100755 app.yaml
 delete mode 100644 main.py

diff --git a/README.md b/README.md
index e120eb79..19e96b6c 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,7 @@ Install [polymer-cli](https://github.com/Polymer/polymer-cli):
 
     npm install -g polymer-cli
 
-### Google App Engine SDK
-
-Install [Google App Engine SDK](https://cloud.google.com/appengine/downloads)
-
-## Setup
+### Setup
 
     git clone https://github.com/polymer/news.git
     cd news
@@ -20,7 +16,7 @@ Install [Google App Engine SDK](https://cloud.google.com/appengine/downloads)
 
 ## Start the development server
 
-    dev_appserver.py .
+    polymer serve
 
 ## Build
 
@@ -28,14 +24,6 @@ Install [Google App Engine SDK](https://cloud.google.com/appengine/downloads)
 
 ## Test the build
 
-This command serves the `es5-bundled` build version of the app:
-
-    dev_appserver.py build/es5-bundled
-
-This command serves the `es6-unbundled` build version of the app:
-
-    dev_appserver.py build/es6-unbundled
-
-## Deploy to Google App Engine
+Use `polymer serve` to serve a specific build preset of the app. For example:
 
-    gcloud app deploy build/es6-unbundled/app.yaml --project [YOUR_PROJECT_ID]
+    polymer serve build/es5-bundled
diff --git a/app.yaml b/app.yaml
deleted file mode 100755
index 0443ec01..00000000
--- a/app.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-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
diff --git a/main.py b/main.py
deleted file mode 100644
index 4b39b1fb..00000000
--- a/main.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import webapp2
-import re
-
-class MainPage(webapp2.RequestHandler):
-  def get(self, **kwargs):
-    self.response.out.write(open('index.html').read())
-
-class ArticlePage(webapp2.RequestHandler):
-  def get(self, **kwargs):
-    bots = '|'.join([
-        'Googlebot',
-        'bingbot',
-        'msnbot',
-        'facebookexternalhit',
-        'Facebot',
-        'Twitterbot',
-        'Google-Structured-Data-Testing-Tool'
-      ])
-    if re.search(bots, self.request.headers.get('User-Agent'), re.I):
-      self.response.out.write(open('data/articles/' + kwargs['article_id'] + '.html').read())
-    else:
-      self.response.out.write(open('index.html').read())
-
-app = webapp2.WSGIApplication([
-    webapp2.Route('/', handler=MainPage),
-    webapp2.Route('/index.html', handler=MainPage),
-    webapp2.Route('/<page>/<category>', handler=MainPage),
-    webapp2.Route('/<page>/<category>/', handler=MainPage),
-    webapp2.Route('/<page>/<category>/<article_id>', handler=ArticlePage),
-    webapp2.Route('/<page>/<category>/<article_id>/', handler=ArticlePage),
-  ], debug=True)
diff --git a/polymer.json b/polymer.json
index 8ef3675c..d77e23b3 100644
--- a/polymer.json
+++ b/polymer.json
@@ -10,12 +10,9 @@
   "sources": [
     "src/**/*",
     "images/**/*",
-    "data/**/*",
-    "bower.json"
+    "data/**/*"
   ],
   "extraDependencies": [
-    "app.yaml",
-    "main.py",
     "manifest.json",
     "bower_components/webcomponentsjs/*"
   ],
@@ -28,6 +25,9 @@
     },
     {
       "preset": "es6-unbundled"
+    },
+    {
+      "preset": "es6-bundled"
     }
   ]
 }
diff --git a/sw-precache-config.js b/sw-precache-config.js
index b1d4f57e..f3259868 100644
--- a/sw-precache-config.js
+++ b/sw-precache-config.js
@@ -1,10 +1,19 @@
 module.exports = {
   staticFileGlobs: [
-    '/manifest.json',
-    '/bower_components/webcomponentsjs/*.js',
-    '/images/*'
+    'manifest.json',
+    'bower_components/webcomponentsjs/webcomponents-loader.js',
+    'images/*'
   ],
   runtimeCaching: [
+    {
+      urlPattern: /\/bower_components\/webcomponentsjs\/.*.js/,
+      handler: 'fastest',
+      options: {
+        cache: {
+          name: 'webcomponentsjs-polyfills-cache'
+        }
+      }
+    },
     {
       urlPattern: /.*\.(png|jpg|gif|svg)/i,
       handler: 'fastest',

From 887009a2bc0017ed51db3e3f9f667ba5738ec1ff Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee@google.com>
Date: Mon, 2 Oct 2017 11:01:48 -0700
Subject: [PATCH 2/4] relative paths; const

---
 index.html            |  9 +++++----
 src/news-app.html     |  2 +-
 src/news-article.html | 10 +++++-----
 src/news-data.html    |  6 +++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 70d61f97..6954019d 100644
--- a/index.html
+++ b/index.html
@@ -12,13 +12,14 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
+  <base href="/">
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
 
   <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 +71,8 @@
 
   <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">
+  <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+  <link rel="import" href="src/news-app.html">
 
 </body>
 </html>
diff --git a/src/news-app.html b/src/news-app.html
index 49303f88..56734ee5 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', {scope: '/'});
               }
             });
           });
diff --git a/src/news-article.html b/src/news-article.html
index 23c4a0f1..407c8554 100644
--- a/src/news-article.html
+++ b/src/news-article.html
@@ -292,8 +292,8 @@
 
         // Is touchmove mostly horizontal or vertical?
         if (!this._touchDir) {
-          let absX = Math.abs(event.changedTouches[0].clientX - this._startX);
-          let absY = Math.abs(event.changedTouches[0].clientY - this._startY);
+          const absX = Math.abs(event.changedTouches[0].clientX - this._startX);
+          const absY = Math.abs(event.changedTouches[0].clientY - this._startY);
           this._touchDir = absX > absY ? 'x' : 'y';
         }
 
@@ -387,7 +387,7 @@
       }
 
       _swapCurrentArticleCovers(newCover) {
-        let oldCover = this._currentArticleCover;
+        const oldCover = this._currentArticleCover;
         oldCover.classList.remove('fade-in');
         oldCover.classList.add('preview-cover');
 
@@ -437,14 +437,14 @@
 
       _computePreviousArticle(categoryItems, article) {
         if (categoryItems) {
-          let i = categoryItems.indexOf(article);
+          const i = categoryItems.indexOf(article);
           return i > 0 ? categoryItems[i-1] : null;
         }
       }
 
       _computeNextArticle(categoryItems, article) {
         if (categoryItems) {
-          let i = categoryItems.indexOf(article);
+          const i = categoryItems.indexOf(article);
           return (i > -1 && i < categoryItems.length-1) ? categoryItems[i+1] : null;
         }
       }
diff --git a/src/news-data.html b/src/news-data.html
index e62e50b5..59b91d91 100644
--- a/src/news-data.html
+++ b/src/news-data.html
@@ -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 */);
       }
@@ -150,11 +150,11 @@
       }
 
       _getItemHref(item) {
-        return item.id ? '/article/' + this.categoryName + '/' + encodeURIComponent(item.id) : null;
+        return item.id ? 'article/' + this.categoryName + '/' + encodeURIComponent(item.id) : null;
       }
 
       _getItemImage(item) {
-        return item.imgSrc ? '/data/' + item.imgSrc : '';
+        return item.imgSrc ? 'data/' + item.imgSrc : '';
       }
 
       _timeAgo(timestamp) {

From fe5b4cc9c5373e9d535999b18f8fb8ea9647b1bb Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee517@gmail.com>
Date: Mon, 2 Oct 2017 14:40:25 -0700
Subject: [PATCH 3/4] Item view links should always be absolute

---
 src/news-data.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/news-data.html b/src/news-data.html
index 59b91d91..adff9000 100644
--- a/src/news-data.html
+++ b/src/news-data.html
@@ -150,7 +150,7 @@
       }
 
       _getItemHref(item) {
-        return item.id ? 'article/' + this.categoryName + '/' + encodeURIComponent(item.id) : null;
+        return item.id ? '/article/' + this.categoryName + '/' + encodeURIComponent(item.id) : null;
       }
 
       _getItemImage(item) {

From 8cc54b923fa5923f168b74afbc8575aed2c6d54f Mon Sep 17 00:00:00 2001
From: Keanu Lee <keanulee517@gmail.com>
Date: Mon, 2 Oct 2017 14:59:13 -0700
Subject: [PATCH 4/4] Resource URLs should be relative

---
 src/news-data.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/news-data.html b/src/news-data.html
index adff9000..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 */);
       }