Merge branch 'master' into 2.0-preview-with-prpl-server

Polymer · Oct 2, 2017 · a6a9756 · a6a9756
2 parents a241764 + fe5b4cc
commit a6a9756
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -8,34 +8,22 @@ 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
     bower install
 
 ## Start the development server
 
-    dev_appserver.py .
+    polymer serve
 
 ## Build
 
     polymer build
 
 ## 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/index.html b/index.html
@@ -12,14 +12,15 @@
 <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">
   <meta name="theme-color" content="#000">
   <link rel="manifest" href="manifest.json">
-  <base href="/">
+
   <style>
 
     body {
@@ -69,6 +70,7 @@
 <body>
 
   <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">
 

diff --git a/main.py b/main.py
diff --git 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/*"
   ],

diff --git 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
@@ -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/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',