Merge branch 'master' into 2.0-preview

# Conflicts: # .travis.yml # bower.json # package.json # polymer.json
Polymer · Apr 26, 2017 · 0ad0548 · 0ad0548
2 parents 02b3d4b + 7bdbf38
commit 0ad0548
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,18 +2,21 @@ language: node_js
 sudo: required
 dist: trusty
 addons:
-  firefox: latest
+  firefox: "latest"
   apt:
     sources:
       - google-chrome
     packages:
       - google-chrome-stable
 node_js:
-  - 'node'
-  - '6'
-before_script:
-  - npm install -g polymer-cli@next
+  - "node"
+  - "6"
+install:
+  - npm install
+  - npm install -g polymer-cli
   - polymer install
+before_script:
+  - npm run lint
 script:
-  - xvfb-run npm test
+  - xvfb-run npm run test
   - xvfb-run npm run test:integration
diff --git a/README.md b/README.md
@@ -41,6 +41,10 @@ First, install [Polymer CLI](https://github.com/Polymer/polymer-cli) using
 
     npm install -g polymer-cli
 
+Second, install [Bower](https://bower.io/) using [npm](https://www.npmjs.com)
+
+    npm install -g bower
+
 ##### Initialize project from template
 
     mkdir my-app
@@ -87,6 +91,13 @@ against the browsers currently installed on your machine:
 
     polymer test
 
+If running Windows you will need to set the following environment variables:
+
+- LAUNCHPAD_BROWSERS
+- LAUNCHPAD_CHROME
+
+Read More here [daffl/launchpad](https://github.com/daffl/launchpad#environment-variables-impacting-local-browsers-detection)
+
 ### Adding a new view
 
 You can extend the app by adding more views that will be demand-loaded

diff --git a/bower.json b/bower.json
@@ -8,9 +8,7 @@
     "app-layout": "PolymerElements/app-layout#2.0-preview",
     "app-route": "PolymerElements/app-route#2.0-preview",
     "iron-flex-layout": "PolymerElements/iron-flex-layout#2.0-preview",
-    "iron-icon": "PolymerElements/iron-icon#2.0-preview",
     "iron-iconset-svg": "PolymerElements/iron-iconset-svg#2.0-preview",
-    "iron-localstorage": "PolymerElements/iron-localstorage#2.0-preview",
     "iron-media-query": "PolymerElements/iron-media-query#2.0-preview",
     "iron-pages": "PolymerElements/iron-pages#2.0-preview",
     "iron-selector": "PolymerElements/iron-selector#2.0-preview",

diff --git a/index.html b/index.html
@@ -84,6 +84,9 @@
   </head>
   <body>
     <my-app></my-app>
+    <noscript>
+      Please enable JavaScript to view this website.
+    </noscript>
     <!-- Built with love using Polymer Starter Kit -->
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -2,13 +2,14 @@
   "name": "polymer-starter-kit",
   "license": "BSD-3-Clause",
   "devDependencies": {
-    "eslint": "^3.12.0",
-    "eslint-config-google": "^0.7.1",
-    "eslint-plugin-html": "^1.7.0"
+    "eslint": "^3.19.0",
+    "eslint-config-google": "^0.7.0",
+    "eslint-plugin-html": "^2.0.0"
   },
   "scripts": {
-    "lint": "eslint . --ext js,html --ignore-path .gitignore",
-    "test": "npm run lint && polymer test",
+    "lint": "npm run lint:javascript",
+    "lint:javascript": "eslint . --ext js,html --ignore-path .gitignore",
+    "test": "polymer test",
     "test:integration": "polymer build # test that psk builds without error with the CLI"
   }
 }
diff --git a/src/my-icons.html b/src/my-icons.html
@@ -8,7 +8,6 @@
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 
-<link rel="import" href="../bower_components/iron-icon/iron-icon.html">
 <link rel="import" href="../bower_components/iron-iconset-svg/iron-iconset-svg.html">
 
 <iron-iconset-svg name="my-icons" size="24">
@@ -28,4 +27,4 @@
       </g>
     </defs>
   </svg>
-</iron-iconset-svg>
+</iron-iconset-svg>