From 1438c47f9e9b6d98af2d68cbc3ff76b5e6e35295 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 11 Apr 2018 14:22:45 -0700
Subject: [PATCH 01/10] Copy `polymer-2.x` template to `polymer-3.x`.

---
 .../element/templates/polymer-3.x/.gitignore  |  1 +
 .../element/templates/polymer-3.x/README.md   | 21 ++++++++
 .../templates/polymer-3.x/_element.html       | 36 +++++++++++++
 .../element/templates/polymer-3.x/bower.json  | 17 ++++++
 .../templates/polymer-3.x/demo/index.html     | 30 +++++++++++
 .../element/templates/polymer-3.x/index.html  | 16 ++++++
 .../templates/polymer-3.x/polymer.json        |  7 +++
 .../polymer-3.x/test/_element_test.html       | 52 +++++++++++++++++++
 .../templates/polymer-3.x/test/index.html     | 18 +++++++
 9 files changed, 198 insertions(+)
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/.gitignore
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/README.md
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/_element.html
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/bower.json
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/demo/index.html
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/index.html
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/polymer.json
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/test/index.html

diff --git a/packages/cli/src/init/element/templates/polymer-3.x/.gitignore b/packages/cli/src/init/element/templates/polymer-3.x/.gitignore
new file mode 100644
index 000000000..fbe05fc93
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/.gitignore
@@ -0,0 +1 @@
+bower_components/
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/README.md b/packages/cli/src/init/element/templates/polymer-3.x/README.md
new file mode 100644
index 000000000..3747f775a
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/README.md
@@ -0,0 +1,21 @@
+# \<<%= name %>\>
+
+<%= description %>
+
+## Install the Polymer-CLI
+
+First, make sure you have the [Polymer CLI](https://www.npmjs.com/package/polymer-cli) installed. Then run `polymer serve` to serve your element locally.
+
+## Viewing Your Element
+
+```
+$ polymer serve
+```
+
+## Running Tests
+
+```
+$ polymer test
+```
+
+Your application is already set up to be tested via [web-component-tester](https://github.com/Polymer/web-component-tester). Run `polymer test` to run your application's test suite locally.
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/_element.html b/packages/cli/src/init/element/templates/polymer-3.x/_element.html
new file mode 100644
index 000000000..a4a6fc7a0
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/_element.html
@@ -0,0 +1,36 @@
+<link rel="import" href="../polymer/polymer-element.html">
+
+<dom-module id="<%= name %>">
+  <template>
+    <style>
+      :host {
+        display: block;
+      }
+    </style>
+    <h2>Hello [[prop1]]!</h2>
+  </template>
+
+  <script>
+    /**
+     * `<%= name %>`
+     * <%= description %>
+     *
+     * @customElement
+     * @polymer
+     * @demo demo/index.html
+     */
+    class <%= elementClassName %> extends Polymer.Element {
+      static get is() { return '<%= name %>'; }
+      static get properties() {
+        return {
+          prop1: {
+            type: String,
+            value: '<%= name %>'
+          }
+        };
+      }
+    }
+
+    window.customElements.define(<%= elementClassName %>.is, <%= elementClassName %>);
+  </script>
+</dom-module>
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/bower.json b/packages/cli/src/init/element/templates/polymer-3.x/bower.json
new file mode 100644
index 000000000..a60ba3ca0
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/bower.json
@@ -0,0 +1,17 @@
+{
+  "name": "<%= name %>",
+<% if (description) { -%>  "description": "<%= description %>",
+<% } -%>
+  "main": "<%= name %>.html",
+  "dependencies": {
+    "polymer": "Polymer/polymer#^2.0.0"
+  },
+  "devDependencies": {
+    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
+    "web-component-tester": "Polymer/web-component-tester#^6.0.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
+  },
+  "resolutions": {
+    "polymer": "^2.0.0"
+  }
+}
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html b/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html
new file mode 100644
index 000000000..5cd210a22
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title><%= name %> demo</title>
+
+    <script src="../../webcomponentsjs/webcomponents-loader.js"></script>
+
+    <link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
+    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="../<%= name %>.html">
+
+    <custom-style>
+      <style is="custom-style" include="demo-pages-shared-styles">
+      </style>
+    </custom-style>
+  </head>
+  <body>
+    <div class="vertical-section-container centered">
+      <h3>Basic <%= name %> demo</h3>
+      <demo-snippet>
+        <template>
+          <<%= name %>></<%= name %>>
+        </template>
+      </demo-snippet>
+    </div>
+  </body>
+</html>
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/index.html b/packages/cli/src/init/element/templates/polymer-3.x/index.html
new file mode 100644
index 000000000..47a86412a
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="refresh" content="0;url=demo/" />
+    <title><%= name %></title>
+  </head>
+  <body>
+    <!--
+        ELEMENT API DOCUMENTATION SUPPORT COMING SOON
+        Visit demo/index.html to see live examples of your element running.
+        This page will automatically redirect you there when run in the browser
+        with `polymer serve`.
+      -->
+  </body>
+</html>
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/polymer.json b/packages/cli/src/init/element/templates/polymer-3.x/polymer.json
new file mode 100644
index 000000000..2bd10b64a
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/polymer.json
@@ -0,0 +1,7 @@
+{
+  "lint": {
+    "rules": [
+      "polymer-2"
+    ]
+  }
+}
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html b/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html
new file mode 100644
index 000000000..94e3905f8
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">
+
+    <title><%= name %> test</title>
+
+    <script src="../../webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../web-component-tester/browser.js"></script>
+
+    <link rel="import" href="../<%= name %>.html">
+  </head>
+  <body>
+
+    <test-fixture id="BasicTestFixture">
+      <template>
+        <<%= name %>></<%= name %>>
+      </template>
+    </test-fixture>
+
+    <test-fixture id="ChangedPropertyTestFixture">
+      <template>
+        <<%= name %> prop1="new-prop1"></<%= name %>>
+      </template>
+    </test-fixture>
+
+    <script>
+      suite('<%= name %>', () => {
+
+        test('instantiating the element with default properties works', () => {
+          const element = fixture('BasicTestFixture');
+          assert.equal(element.prop1, '<%= name %>');
+          const elementShadowRoot = element.shadowRoot;
+          const elementHeader = elementShadowRoot.querySelector('h2');
+          assert.equal(elementHeader.innerHTML, 'Hello <%= name %>!');
+        });
+
+        test('setting a property on the element works', () => {
+          // Create a test fixture
+          const element = fixture('ChangedPropertyTestFixture');
+          assert.equal(element.prop1, 'new-prop1');
+          const elementShadowRoot = element.shadowRoot;
+          const elementHeader = elementShadowRoot.querySelector('h2');
+          assert.equal(elementHeader.innerHTML, 'Hello new-prop1!');
+        });
+
+      });
+    </script>
+
+  </body>
+</html>
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/test/index.html b/packages/cli/src/init/element/templates/polymer-3.x/test/index.html
new file mode 100644
index 000000000..a7a4d7fe9
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/test/index.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+
+    <script src="../../webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../../web-component-tester/browser.js"></script>
+  </head>
+  <body>
+    <script>
+      // Load and run all tests (.html, .js):
+      WCT.loadSuites([
+        '<%= name %>_test.html'
+      ]);
+    </script>
+
+</body></html>

From d3f365aadc939babae5e399e509472a7336e120c Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 11 Apr 2018 14:39:37 -0700
Subject: [PATCH 02/10] Update `init` and associated polymer-3.x template.

---
 packages/cli/src/init/element/element.ts      | 40 ++++++++++++++++++-
 .../element/templates/polymer-3.x/.gitignore  |  2 +-
 .../templates/polymer-3.x/_element.html       | 36 -----------------
 .../element/templates/polymer-3.x/_element.js | 32 +++++++++++++++
 .../element/templates/polymer-3.x/bower.json  | 17 --------
 .../templates/polymer-3.x/demo/index.html     |  8 ++--
 .../element/templates/polymer-3.x/index.html  |  1 -
 .../templates/polymer-3.x/package.json        | 14 +++++++
 .../templates/polymer-3.x/polymer.json        |  7 +---
 .../polymer-3.x/test/_element_test.html       |  8 ++--
 .../templates/polymer-3.x/test/index.html     |  7 ++--
 packages/cli/src/init/init.ts                 |  5 +++
 12 files changed, 104 insertions(+), 73 deletions(-)
 delete mode 100644 packages/cli/src/init/element/templates/polymer-3.x/_element.html
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/_element.js
 delete mode 100644 packages/cli/src/init/element/templates/polymer-3.x/bower.json
 create mode 100644 packages/cli/src/init/element/templates/polymer-3.x/package.json

diff --git a/packages/cli/src/init/element/element.ts b/packages/cli/src/init/element/element.ts
index a137a2c69..eaed3abd5 100644
--- a/packages/cli/src/init/element/element.ts
+++ b/packages/cli/src/init/element/element.ts
@@ -27,7 +27,7 @@ const logger = logging.getLogger('init');
  */
 export function createElementGenerator(templateName: string):
     (typeof Generator) {
-  return class ElementGenerator extends Generator {
+  class ElementGenerator extends Generator {
     props: any;
 
     constructor(args: string|string[], options: any) {
@@ -119,4 +119,42 @@ export function createElementGenerator(templateName: string):
           'Check out your new project README for information about what to do next.\n');
     }
   };
+
+  class Polymer3ElementGenerator extends ElementGenerator {
+    // TODO(bicknellr): Why doesn't this inherit properly? Because `async` is
+    // compiled out?
+    async prompting() {
+      return super.prompting();
+    }
+
+    writing() {
+      const name = this.props.name;
+
+      this.fs.copyTpl(
+          `${this.templatePath()}/**/?(.)!(_)*`,
+          this.destinationPath(),
+          this.props);
+
+      this.fs.copyTpl(
+          this.templatePath('_element.js'), `${name}.js`, this.props);
+
+      this.fs.copyTpl(
+          this.templatePath('test/_element_test.html'),
+          `test/${name}_test.html`,
+          this.props);
+
+      this.fs.copyTpl(
+          this.templatePath('test/index.html'), `test/index.html`, this.props);
+
+      this.fs.copyTpl(
+          this.templatePath('.gitignore'), '.gitignore', this.props);
+    }
+  }
+
+  switch (templateName) {
+    case "polymer-3.x":
+      return Polymer3ElementGenerator;
+    default:
+      return ElementGenerator;
+  }
 }
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/.gitignore b/packages/cli/src/init/element/templates/polymer-3.x/.gitignore
index fbe05fc93..2ccbe4656 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/.gitignore
+++ b/packages/cli/src/init/element/templates/polymer-3.x/.gitignore
@@ -1 +1 @@
-bower_components/
+/node_modules/
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/_element.html b/packages/cli/src/init/element/templates/polymer-3.x/_element.html
deleted file mode 100644
index a4a6fc7a0..000000000
--- a/packages/cli/src/init/element/templates/polymer-3.x/_element.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<link rel="import" href="../polymer/polymer-element.html">
-
-<dom-module id="<%= name %>">
-  <template>
-    <style>
-      :host {
-        display: block;
-      }
-    </style>
-    <h2>Hello [[prop1]]!</h2>
-  </template>
-
-  <script>
-    /**
-     * `<%= name %>`
-     * <%= description %>
-     *
-     * @customElement
-     * @polymer
-     * @demo demo/index.html
-     */
-    class <%= elementClassName %> extends Polymer.Element {
-      static get is() { return '<%= name %>'; }
-      static get properties() {
-        return {
-          prop1: {
-            type: String,
-            value: '<%= name %>'
-          }
-        };
-      }
-    }
-
-    window.customElements.define(<%= elementClassName %>.is, <%= elementClassName %>);
-  </script>
-</dom-module>
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/_element.js b/packages/cli/src/init/element/templates/polymer-3.x/_element.js
new file mode 100644
index 000000000..905951528
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/_element.js
@@ -0,0 +1,32 @@
+import { PolymerElement } from "@polymer/polymer/polymer-element.js";
+
+/**
+ * `<%= name %>`
+ * <%= description %>
+ *
+ * @customElement
+ * @polymer
+ * @demo demo/index.html
+ */
+class <%= elementClassName %> extends PolymerElement {
+  static get template() {
+    return `
+      <style>
+        :host {
+          display: block;
+        }
+      </style>
+      <h2>Hello [[prop1]]!</h2>
+    `;
+  }
+  static get properties() {
+    return {
+      prop1: {
+        type: String,
+        value: '<%= name %>'
+      }
+    };
+  }
+}
+
+window.customElements.define('<%= name %>', <%= elementClassName %>);
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/bower.json b/packages/cli/src/init/element/templates/polymer-3.x/bower.json
deleted file mode 100644
index a60ba3ca0..000000000
--- a/packages/cli/src/init/element/templates/polymer-3.x/bower.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "<%= name %>",
-<% if (description) { -%>  "description": "<%= description %>",
-<% } -%>
-  "main": "<%= name %>.html",
-  "dependencies": {
-    "polymer": "Polymer/polymer#^2.0.0"
-  },
-  "devDependencies": {
-    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
-    "web-component-tester": "Polymer/web-component-tester#^6.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
-  },
-  "resolutions": {
-    "polymer": "^2.0.0"
-  }
-}
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html b/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html
index 5cd210a22..52aad76a8 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html
+++ b/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html
@@ -6,11 +6,11 @@
 
     <title><%= name %> demo</title>
 
-    <script src="../../webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
 
-    <link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="../<%= name %>.html">
+    <script type="module" src="../node_modules/@polymer/iron-demo-helpers/demo-pages-shared-styles.js"></script>
+    <script type="module" src="../node_modules/@polymer/iron-demo-helpers/demo-snippet.js"></script>
+    <script type="module" src="../<%= name %>.js"></script>
 
     <custom-style>
       <style is="custom-style" include="demo-pages-shared-styles">
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/index.html b/packages/cli/src/init/element/templates/polymer-3.x/index.html
index 47a86412a..8b634c863 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/index.html
+++ b/packages/cli/src/init/element/templates/polymer-3.x/index.html
@@ -7,7 +7,6 @@
   </head>
   <body>
     <!--
-        ELEMENT API DOCUMENTATION SUPPORT COMING SOON
         Visit demo/index.html to see live examples of your element running.
         This page will automatically redirect you there when run in the browser
         with `polymer serve`.
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/package.json b/packages/cli/src/init/element/templates/polymer-3.x/package.json
new file mode 100644
index 000000000..43f90a506
--- /dev/null
+++ b/packages/cli/src/init/element/templates/polymer-3.x/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "<%= name %>",
+<% if (description) { -%>  "description": "<%= description %>",
+<% } -%>
+  "main": "<%= name %>.js",
+  "dependencies": {
+    "@polymer/polymer": "^3.0.0-pre.12"
+  },
+  "devDependencies": {
+    "@polymer/iron-demo-helpers": "^3.0.0-pre.12",
+    "@webcomponents/webcomponentsjs": "^1.0.0",
+    "wct-browser-legacy": "^0.0.1-pre.11"
+  }
+}
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/polymer.json b/packages/cli/src/init/element/templates/polymer-3.x/polymer.json
index 2bd10b64a..2470bb7a4 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/polymer.json
+++ b/packages/cli/src/init/element/templates/polymer-3.x/polymer.json
@@ -1,7 +1,4 @@
 {
-  "lint": {
-    "rules": [
-      "polymer-2"
-    ]
-  }
+  "npm": true,
+  "moduleResolution": "node"
 }
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html b/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html
index 94e3905f8..a336e8c04 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html
+++ b/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html
@@ -6,10 +6,10 @@
 
     <title><%= name %> test</title>
 
-    <script src="../../webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="../../web-component-tester/browser.js"></script>
+    <script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
+    <script src="../node_modules/wct-browser-legacy/browser.js"></script>
 
-    <link rel="import" href="../<%= name %>.html">
+    <script type="module" src="../<%= name %>.js"></script>
   </head>
   <body>
 
@@ -25,7 +25,7 @@
       </template>
     </test-fixture>
 
-    <script>
+    <script type="module">
       suite('<%= name %>', () => {
 
         test('instantiating the element with default properties works', () => {
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/test/index.html b/packages/cli/src/init/element/templates/polymer-3.x/test/index.html
index a7a4d7fe9..7cae6a094 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/test/index.html
+++ b/packages/cli/src/init/element/templates/polymer-3.x/test/index.html
@@ -4,8 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
 
-    <script src="../../webcomponentsjs/webcomponents-loader.js"></script>
-    <script src="../../web-component-tester/browser.js"></script>
+    <script src="../node_modules/wct-browser-legacy/browser.js"></script>
   </head>
   <body>
     <script>
@@ -14,5 +13,5 @@
         '<%= name %>_test.html'
       ]);
     </script>
-
-</body></html>
+  </body>
+</html>
diff --git a/packages/cli/src/init/init.ts b/packages/cli/src/init/init.ts
index ab1274fe6..f50399f58 100644
--- a/packages/cli/src/init/init.ts
+++ b/packages/cli/src/init/init.ts
@@ -39,6 +39,11 @@ interface GeneratorInfo {
 }
 
 const localGenerators: {[name: string]: GeneratorInfo} = {
+  'polymer-3-element': {
+    id: 'polymer-init-polymer-3-element:app',
+    description: 'A simple Polymer 3.0 element template',
+    generator: createElementGenerator('polymer-3.x'),
+  },
   'polymer-2-element': {
     id: 'polymer-init-polymer-2-element:app',
     description: 'A simple Polymer 2.0 element template',

From 5d116f7bea44ae3e798e62f2348d2eb584ba96f3 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 11 Apr 2018 16:49:20 -0700
Subject: [PATCH 03/10] Update `README.md`.

---
 packages/cli/src/init/element/templates/polymer-3.x/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/init/element/templates/polymer-3.x/README.md b/packages/cli/src/init/element/templates/polymer-3.x/README.md
index 3747f775a..6de431292 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/README.md
+++ b/packages/cli/src/init/element/templates/polymer-3.x/README.md
@@ -4,7 +4,7 @@
 
 ## Install the Polymer-CLI
 
-First, make sure you have the [Polymer CLI](https://www.npmjs.com/package/polymer-cli) installed. Then run `polymer serve` to serve your element locally.
+First, make sure you have the [Polymer CLI](https://www.npmjs.com/package/polymer-cli) and npm (packaged with [Node.js](https://nodejs.org)) installed. Run `npm install` to install your element's dependencies, then run `polymer serve` to serve your element locally.
 
 ## Viewing Your Element
 

From 5e3f0690941b06555be460b943a5dc8af4a26210 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Wed, 11 Apr 2018 16:51:51 -0700
Subject: [PATCH 04/10] Format, excluding broken changes due to templating.

---
 packages/cli/src/init/element/element.ts                    | 2 +-
 .../cli/src/init/element/templates/polymer-3.x/_element.js  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/init/element/element.ts b/packages/cli/src/init/element/element.ts
index eaed3abd5..e3c062b67 100644
--- a/packages/cli/src/init/element/element.ts
+++ b/packages/cli/src/init/element/element.ts
@@ -152,7 +152,7 @@ export function createElementGenerator(templateName: string):
   }
 
   switch (templateName) {
-    case "polymer-3.x":
+    case 'polymer-3.x':
       return Polymer3ElementGenerator;
     default:
       return ElementGenerator;
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/_element.js b/packages/cli/src/init/element/templates/polymer-3.x/_element.js
index 905951528..64dae6bd1 100644
--- a/packages/cli/src/init/element/templates/polymer-3.x/_element.js
+++ b/packages/cli/src/init/element/templates/polymer-3.x/_element.js
@@ -1,4 +1,4 @@
-import { PolymerElement } from "@polymer/polymer/polymer-element.js";
+import {PolymerElement} from '@polymer/polymer/polymer-element.js';
 
 /**
  * `<%= name %>`
@@ -23,8 +23,8 @@ class <%= elementClassName %> extends PolymerElement {
     return {
       prop1: {
         type: String,
-        value: '<%= name %>'
-      }
+        value: '<%= name %>',
+      },
     };
   }
 }

From 1e1439c08cde4c955817595e21e9a8629dc4e337 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Thu, 12 Apr 2018 15:46:18 -0700
Subject: [PATCH 05/10] Move templates to a folder in the package root so that
 they aren't checked by depcheck.

---
 packages/cli/gulpfile.js                                      | 3 +++
 packages/cli/src/init/application/application.ts              | 4 ++--
 packages/cli/src/init/element/element.ts                      | 2 +-
 .../application}/polymer-1.x/.gitignore                       | 0
 .../templates => templates/application}/polymer-1.x/README.md | 0
 .../application}/polymer-1.x/bower.json                       | 0
 .../application}/polymer-1.x/index.html                       | 0
 .../application}/polymer-1.x/manifest.json                    | 0
 .../application}/polymer-1.x/polymer.json                     | 0
 .../application}/polymer-1.x/src/_element/_element.html       | 0
 .../application}/polymer-1.x/test/_element/_element_test.html | 0
 .../application}/polymer-2.x/.gitignore                       | 0
 .../templates => templates/application}/polymer-2.x/README.md | 0
 .../application}/polymer-2.x/bower.json                       | 0
 .../application}/polymer-2.x/index.html                       | 0
 .../application}/polymer-2.x/manifest.json                    | 0
 .../application}/polymer-2.x/polymer.json                     | 0
 .../application}/polymer-2.x/src/_element/_element.html       | 0
 .../application}/polymer-2.x/test/_element/_element_test.html | 0
 .../templates => templates/element}/polymer-1.x/.gitignore    | 0
 .../templates => templates/element}/polymer-1.x/README.md     | 0
 .../templates => templates/element}/polymer-1.x/_element.html | 0
 .../templates => templates/element}/polymer-1.x/bower.json    | 0
 .../element}/polymer-1.x/demo/index.html                      | 0
 .../templates => templates/element}/polymer-1.x/index.html    | 0
 .../templates => templates/element}/polymer-1.x/polymer.json  | 0
 .../element}/polymer-1.x/test/_element_test.html              | 0
 .../element}/polymer-1.x/test/index.html                      | 0
 .../templates => templates/element}/polymer-2.x/.gitignore    | 0
 .../templates => templates/element}/polymer-2.x/README.md     | 0
 .../templates => templates/element}/polymer-2.x/_element.html | 0
 .../templates => templates/element}/polymer-2.x/bower.json    | 0
 .../element}/polymer-2.x/demo/index.html                      | 0
 .../templates => templates/element}/polymer-2.x/index.html    | 0
 .../templates => templates/element}/polymer-2.x/polymer.json  | 0
 .../element}/polymer-2.x/test/_element_test.html              | 0
 .../element}/polymer-2.x/test/index.html                      | 0
 .../templates => templates/element}/polymer-3.x/.gitignore    | 0
 .../templates => templates/element}/polymer-3.x/README.md     | 0
 .../templates => templates/element}/polymer-3.x/_element.js   | 0
 .../element}/polymer-3.x/demo/index.html                      | 0
 .../templates => templates/element}/polymer-3.x/index.html    | 0
 .../templates => templates/element}/polymer-3.x/package.json  | 0
 .../templates => templates/element}/polymer-3.x/polymer.json  | 0
 .../element}/polymer-3.x/test/_element_test.html              | 0
 .../element}/polymer-3.x/test/index.html                      | 0
 46 files changed, 6 insertions(+), 3 deletions(-)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/.gitignore (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/README.md (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/bower.json (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/index.html (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/manifest.json (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/polymer.json (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/src/_element/_element.html (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-1.x/test/_element/_element_test.html (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/.gitignore (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/README.md (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/bower.json (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/index.html (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/manifest.json (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/polymer.json (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/src/_element/_element.html (100%)
 rename packages/cli/{src/init/application/templates => templates/application}/polymer-2.x/test/_element/_element_test.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/.gitignore (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/README.md (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/_element.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/bower.json (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/demo/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/polymer.json (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/test/_element_test.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-1.x/test/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/.gitignore (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/README.md (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/_element.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/bower.json (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/demo/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/polymer.json (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/test/_element_test.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-2.x/test/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/.gitignore (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/README.md (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/_element.js (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/demo/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/index.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/package.json (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/polymer.json (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/test/_element_test.html (100%)
 rename packages/cli/{src/init/element/templates => templates/element}/polymer-3.x/test/index.html (100%)

diff --git a/packages/cli/gulpfile.js b/packages/cli/gulpfile.js
index e8d79916f..28a2e82e3 100644
--- a/packages/cli/gulpfile.js
+++ b/packages/cli/gulpfile.js
@@ -81,6 +81,9 @@ gulp.task('depcheck', ['build'], () => {
              'babel-plugin-external-helpers',
              'polymer-bundler',
             ],
+           ignoreDirs: [
+             'templates',
+           ],
          })
       .then((result) => {
         let invalidFiles = Object.keys(result.invalidFiles) || [];
diff --git a/packages/cli/src/init/application/application.ts b/packages/cli/src/init/application/application.ts
index 7927d72fb..d2b898c42 100644
--- a/packages/cli/src/init/application/application.ts
+++ b/packages/cli/src/init/application/application.ts
@@ -28,7 +28,7 @@ export function createApplicationGenerator(templateName: string):
 
     constructor(args: string|string[], options: any) {
       super(args, options);
-      this.sourceRoot(path.join(__dirname, 'templates', templateName));
+      this.sourceRoot(path.join(__dirname, '../../../templates/application', templateName));
     }
 
     // This is necessary to prevent an exception in Yeoman when creating
@@ -116,4 +116,4 @@ export function createApplicationGenerator(templateName: string):
           'Check out your new project README for information about what to do next.\n');
     }
   };
-}
\ No newline at end of file
+}
diff --git a/packages/cli/src/init/element/element.ts b/packages/cli/src/init/element/element.ts
index e3c062b67..73fd84add 100644
--- a/packages/cli/src/init/element/element.ts
+++ b/packages/cli/src/init/element/element.ts
@@ -32,7 +32,7 @@ export function createElementGenerator(templateName: string):
 
     constructor(args: string|string[], options: any) {
       super(args, options);
-      this.sourceRoot(path.join(__dirname, 'templates', templateName));
+      this.sourceRoot(path.join(__dirname, '../../../templates/element', templateName));
     }
 
     // This is necessary to prevent an exception in Yeoman when creating
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/.gitignore b/packages/cli/templates/application/polymer-1.x/.gitignore
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/.gitignore
rename to packages/cli/templates/application/polymer-1.x/.gitignore
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/README.md b/packages/cli/templates/application/polymer-1.x/README.md
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/README.md
rename to packages/cli/templates/application/polymer-1.x/README.md
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/bower.json b/packages/cli/templates/application/polymer-1.x/bower.json
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/bower.json
rename to packages/cli/templates/application/polymer-1.x/bower.json
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/index.html b/packages/cli/templates/application/polymer-1.x/index.html
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/index.html
rename to packages/cli/templates/application/polymer-1.x/index.html
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/manifest.json b/packages/cli/templates/application/polymer-1.x/manifest.json
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/manifest.json
rename to packages/cli/templates/application/polymer-1.x/manifest.json
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/polymer.json b/packages/cli/templates/application/polymer-1.x/polymer.json
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/polymer.json
rename to packages/cli/templates/application/polymer-1.x/polymer.json
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/src/_element/_element.html b/packages/cli/templates/application/polymer-1.x/src/_element/_element.html
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/src/_element/_element.html
rename to packages/cli/templates/application/polymer-1.x/src/_element/_element.html
diff --git a/packages/cli/src/init/application/templates/polymer-1.x/test/_element/_element_test.html b/packages/cli/templates/application/polymer-1.x/test/_element/_element_test.html
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-1.x/test/_element/_element_test.html
rename to packages/cli/templates/application/polymer-1.x/test/_element/_element_test.html
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/.gitignore b/packages/cli/templates/application/polymer-2.x/.gitignore
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/.gitignore
rename to packages/cli/templates/application/polymer-2.x/.gitignore
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/README.md b/packages/cli/templates/application/polymer-2.x/README.md
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/README.md
rename to packages/cli/templates/application/polymer-2.x/README.md
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/bower.json b/packages/cli/templates/application/polymer-2.x/bower.json
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/bower.json
rename to packages/cli/templates/application/polymer-2.x/bower.json
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/index.html b/packages/cli/templates/application/polymer-2.x/index.html
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/index.html
rename to packages/cli/templates/application/polymer-2.x/index.html
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/manifest.json b/packages/cli/templates/application/polymer-2.x/manifest.json
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/manifest.json
rename to packages/cli/templates/application/polymer-2.x/manifest.json
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/polymer.json b/packages/cli/templates/application/polymer-2.x/polymer.json
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/polymer.json
rename to packages/cli/templates/application/polymer-2.x/polymer.json
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/src/_element/_element.html b/packages/cli/templates/application/polymer-2.x/src/_element/_element.html
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/src/_element/_element.html
rename to packages/cli/templates/application/polymer-2.x/src/_element/_element.html
diff --git a/packages/cli/src/init/application/templates/polymer-2.x/test/_element/_element_test.html b/packages/cli/templates/application/polymer-2.x/test/_element/_element_test.html
similarity index 100%
rename from packages/cli/src/init/application/templates/polymer-2.x/test/_element/_element_test.html
rename to packages/cli/templates/application/polymer-2.x/test/_element/_element_test.html
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/.gitignore b/packages/cli/templates/element/polymer-1.x/.gitignore
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/.gitignore
rename to packages/cli/templates/element/polymer-1.x/.gitignore
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/README.md b/packages/cli/templates/element/polymer-1.x/README.md
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/README.md
rename to packages/cli/templates/element/polymer-1.x/README.md
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/_element.html b/packages/cli/templates/element/polymer-1.x/_element.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/_element.html
rename to packages/cli/templates/element/polymer-1.x/_element.html
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/bower.json b/packages/cli/templates/element/polymer-1.x/bower.json
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/bower.json
rename to packages/cli/templates/element/polymer-1.x/bower.json
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/demo/index.html b/packages/cli/templates/element/polymer-1.x/demo/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/demo/index.html
rename to packages/cli/templates/element/polymer-1.x/demo/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/index.html b/packages/cli/templates/element/polymer-1.x/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/index.html
rename to packages/cli/templates/element/polymer-1.x/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/polymer.json b/packages/cli/templates/element/polymer-1.x/polymer.json
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/polymer.json
rename to packages/cli/templates/element/polymer-1.x/polymer.json
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/test/_element_test.html b/packages/cli/templates/element/polymer-1.x/test/_element_test.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/test/_element_test.html
rename to packages/cli/templates/element/polymer-1.x/test/_element_test.html
diff --git a/packages/cli/src/init/element/templates/polymer-1.x/test/index.html b/packages/cli/templates/element/polymer-1.x/test/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-1.x/test/index.html
rename to packages/cli/templates/element/polymer-1.x/test/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/.gitignore b/packages/cli/templates/element/polymer-2.x/.gitignore
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/.gitignore
rename to packages/cli/templates/element/polymer-2.x/.gitignore
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/README.md b/packages/cli/templates/element/polymer-2.x/README.md
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/README.md
rename to packages/cli/templates/element/polymer-2.x/README.md
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/_element.html b/packages/cli/templates/element/polymer-2.x/_element.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/_element.html
rename to packages/cli/templates/element/polymer-2.x/_element.html
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/bower.json b/packages/cli/templates/element/polymer-2.x/bower.json
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/bower.json
rename to packages/cli/templates/element/polymer-2.x/bower.json
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/demo/index.html b/packages/cli/templates/element/polymer-2.x/demo/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/demo/index.html
rename to packages/cli/templates/element/polymer-2.x/demo/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/index.html b/packages/cli/templates/element/polymer-2.x/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/index.html
rename to packages/cli/templates/element/polymer-2.x/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/polymer.json b/packages/cli/templates/element/polymer-2.x/polymer.json
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/polymer.json
rename to packages/cli/templates/element/polymer-2.x/polymer.json
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/test/_element_test.html b/packages/cli/templates/element/polymer-2.x/test/_element_test.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/test/_element_test.html
rename to packages/cli/templates/element/polymer-2.x/test/_element_test.html
diff --git a/packages/cli/src/init/element/templates/polymer-2.x/test/index.html b/packages/cli/templates/element/polymer-2.x/test/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-2.x/test/index.html
rename to packages/cli/templates/element/polymer-2.x/test/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/.gitignore b/packages/cli/templates/element/polymer-3.x/.gitignore
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/.gitignore
rename to packages/cli/templates/element/polymer-3.x/.gitignore
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/README.md b/packages/cli/templates/element/polymer-3.x/README.md
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/README.md
rename to packages/cli/templates/element/polymer-3.x/README.md
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/_element.js b/packages/cli/templates/element/polymer-3.x/_element.js
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/_element.js
rename to packages/cli/templates/element/polymer-3.x/_element.js
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/demo/index.html b/packages/cli/templates/element/polymer-3.x/demo/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/demo/index.html
rename to packages/cli/templates/element/polymer-3.x/demo/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/index.html b/packages/cli/templates/element/polymer-3.x/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/index.html
rename to packages/cli/templates/element/polymer-3.x/index.html
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/package.json b/packages/cli/templates/element/polymer-3.x/package.json
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/package.json
rename to packages/cli/templates/element/polymer-3.x/package.json
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/polymer.json b/packages/cli/templates/element/polymer-3.x/polymer.json
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/polymer.json
rename to packages/cli/templates/element/polymer-3.x/polymer.json
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html b/packages/cli/templates/element/polymer-3.x/test/_element_test.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/test/_element_test.html
rename to packages/cli/templates/element/polymer-3.x/test/_element_test.html
diff --git a/packages/cli/src/init/element/templates/polymer-3.x/test/index.html b/packages/cli/templates/element/polymer-3.x/test/index.html
similarity index 100%
rename from packages/cli/src/init/element/templates/polymer-3.x/test/index.html
rename to packages/cli/templates/element/polymer-3.x/test/index.html

From 1a6be11ceed85bb1c657b9ef5dc243cb5fcce409 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Thu, 12 Apr 2018 16:55:41 -0700
Subject: [PATCH 06/10] Install dependencies after writing the template.

---
 packages/cli/src/init/element/element.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/cli/src/init/element/element.ts b/packages/cli/src/init/element/element.ts
index 73fd84add..00487d505 100644
--- a/packages/cli/src/init/element/element.ts
+++ b/packages/cli/src/init/element/element.ts
@@ -149,6 +149,15 @@ export function createElementGenerator(templateName: string):
       this.fs.copyTpl(
           this.templatePath('.gitignore'), '.gitignore', this.props);
     }
+
+    install() {
+      this.log(chalk.bold('\nProject generated!'));
+      this.log('Installing dependencies...');
+      this.installDependencies({
+        bower: false,
+        npm: true,
+      });
+    }
   }
 
   switch (templateName) {

From f9de6b3c32b5b361320dcc5b068511434abe0867 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Thu, 12 Apr 2018 17:38:04 -0700
Subject: [PATCH 07/10] Add an integration test for the Polymer 3 element
 template.

---
 .../src/test/integration/integration_test.ts  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/cli/src/test/integration/integration_test.ts b/packages/cli/src/test/integration/integration_test.ts
index 2ac9d7e84..6980699ca 100644
--- a/packages/cli/src/test/integration/integration_test.ts
+++ b/packages/cli/src/test/integration/integration_test.ts
@@ -16,6 +16,9 @@ import {createApplicationGenerator} from '../../init/application/application';
 import {runCommand} from './run-command';
 import {createElementGenerator} from '../../init/element/element';
 import {createGithubGenerator} from '../../init/github';
+import * as child_process from 'child_process';
+import * as util from 'util';
+const exec = util.promisify(child_process.exec);
 
 // A zero priveledge github token of a nonce account, used for quota.
 const githubToken = '8d8622bf09bb1d85cb411b5e475a35e742a7ce35';
@@ -34,6 +37,24 @@ suite('integration tests', function() {
 
   suite('init templates', () => {
 
+    skipOnWindows('test the Polymer 3.x element template', async () => {
+      const dir =
+          await runGenerator(createElementGenerator('polymer-3.x'))
+              .withPrompts({name: 'my-element'})  // Mock the prompt answers
+              .toPromise();
+      // TODO(bicknellr): Use `polymer install` once it supports installing npm
+      // packages.
+      await exec('npm install', {cwd: dir});
+
+      // TODO(bicknellr): Add this back in when `polymer lint` has a Polymer 3
+      // option.
+      // await runCommand(binPath, ['lint'], {cwd: dir});
+
+      // TODO(bicknellr): Remove the `--module-resolution=node` argument once
+      // `polymer test` passes them in correctly
+      await runCommand(binPath, ['test', '--module-resolution=node'], {cwd: dir});
+    });
+
     skipOnWindows('test the Polymer 1.x application template', async () => {
       const dir = await runGenerator(createApplicationGenerator('polymer-1.x'))
                       .withPrompts({name: 'my-app'})  // Mock the prompt answers

From c556f4bde15eda962f76dd006c510404460fcd41 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Thu, 12 Apr 2018 17:55:03 -0700
Subject: [PATCH 08/10] Update TODOs with issue numbers.

---
 packages/cli/src/test/integration/integration_test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/test/integration/integration_test.ts b/packages/cli/src/test/integration/integration_test.ts
index 6980699ca..4498861f1 100644
--- a/packages/cli/src/test/integration/integration_test.ts
+++ b/packages/cli/src/test/integration/integration_test.ts
@@ -42,15 +42,15 @@ suite('integration tests', function() {
           await runGenerator(createElementGenerator('polymer-3.x'))
               .withPrompts({name: 'my-element'})  // Mock the prompt answers
               .toPromise();
-      // TODO(bicknellr): Use `polymer install` once it supports installing npm
+      // TODO(#118): Use `polymer install` once it supports installing npm
       // packages.
       await exec('npm install', {cwd: dir});
 
-      // TODO(bicknellr): Add this back in when `polymer lint` has a Polymer 3
+      // TODO(#130): Add this back in when `polymer lint` has a Polymer 3
       // option.
       // await runCommand(binPath, ['lint'], {cwd: dir});
 
-      // TODO(bicknellr): Remove the `--module-resolution=node` argument once
+      // TODO(#113): Remove the `--module-resolution=node` argument once
       // `polymer test` passes them in correctly
       await runCommand(binPath, ['test', '--module-resolution=node'], {cwd: dir});
     });

From 1fc67fa30298a372169853d3898473fabaf6fbda Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Thu, 12 Apr 2018 18:38:51 -0700
Subject: [PATCH 09/10] Add comments and explicit pass-through methods because
 of a Yeoman bug.

---
 packages/cli/src/init/element/element.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/init/element/element.ts b/packages/cli/src/init/element/element.ts
index 00487d505..4b8b3ab18 100644
--- a/packages/cli/src/init/element/element.ts
+++ b/packages/cli/src/init/element/element.ts
@@ -121,8 +121,14 @@ export function createElementGenerator(templateName: string):
   };
 
   class Polymer3ElementGenerator extends ElementGenerator {
-    // TODO(bicknellr): Why doesn't this inherit properly? Because `async` is
-    // compiled out?
+    // This is not a no-op: Yeoman only checks the object's prototype's own
+    // properties for methods.
+    initializing() {
+      return super.initializing();
+    }
+
+    // This is not a no-op: Yeoman only checks the object's prototype's own
+    // properties for methods.
     async prompting() {
       return super.prompting();
     }
@@ -158,6 +164,12 @@ export function createElementGenerator(templateName: string):
         npm: true,
       });
     }
+
+    // This is not a no-op: Yeoman only checks the object's prototype's own
+    // properties for methods.
+    end() {
+      return super.end();
+    }
   }
 
   switch (templateName) {

From bdd7977aca5521dbb8953e0d3e75096a9d3176c0 Mon Sep 17 00:00:00 2001
From: Russell Bicknell <bicknellr@google.com>
Date: Fri, 13 Apr 2018 11:34:00 -0700
Subject: [PATCH 10/10] Update pass-through function comments with Yeoman bug
 number.

---
 packages/cli/src/init/element/element.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/init/element/element.ts b/packages/cli/src/init/element/element.ts
index 4b8b3ab18..86b5207d1 100644
--- a/packages/cli/src/init/element/element.ts
+++ b/packages/cli/src/init/element/element.ts
@@ -121,14 +121,16 @@ export function createElementGenerator(templateName: string):
   };
 
   class Polymer3ElementGenerator extends ElementGenerator {
-    // This is not a no-op: Yeoman only checks the object's prototype's own
-    // properties for methods.
+    // TODO(yeoman/generator#1065): This is function not a no-op: Yeoman only
+    // checks the object's prototype's own properties for generator task
+    // methods. http://yeoman.io/authoring/running-context.html
     initializing() {
       return super.initializing();
     }
 
-    // This is not a no-op: Yeoman only checks the object's prototype's own
-    // properties for methods.
+    // TODO(yeoman/generator#1065): This is function not a no-op: Yeoman only
+    // checks the object's prototype's own properties for generator task
+    // methods. http://yeoman.io/authoring/running-context.html
     async prompting() {
       return super.prompting();
     }
@@ -165,8 +167,9 @@ export function createElementGenerator(templateName: string):
       });
     }
 
-    // This is not a no-op: Yeoman only checks the object's prototype's own
-    // properties for methods.
+    // TODO(yeoman/generator#1065): This is function not a no-op: Yeoman only
+    // checks the object's prototype's own properties for generator task
+    // methods. http://yeoman.io/authoring/running-context.html
     end() {
       return super.end();
     }