From efa557f89dffd3fd9de3c555bd50f89a4d703f95 Mon Sep 17 00:00:00 2001
From: HutchGrant <h.g.utchinson@gmail.com>
Date: Sat, 11 Jul 2020 20:36:58 -0400
Subject: [PATCH 1/7] task: replace MYROUTES with <routes></routes>

---
 packages/cli/src/lifecycles/scaffold.js                       | 2 +-
 packages/cli/src/templates/app-template.js                    | 2 +-
 .../src/templates/app-template.js                             | 2 +-
 www/pages/docs/layouts.md                                     | 4 ++--
 www/templates/app-template.js                                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/lifecycles/scaffold.js b/packages/cli/src/lifecycles/scaffold.js
index f2145e4d6..a5930e91d 100644
--- a/packages/cli/src/lifecycles/scaffold.js
+++ b/packages/cli/src/lifecycles/scaffold.js
@@ -84,7 +84,7 @@ const writeRoutes = async(compilation) => {
           ></lit-route>`;
       });
 
-      const result = data.toString().replace(/MYROUTES/g, routes.join(''));
+      const result = data.toString().replace(/<routes><\/routes>/g, routes.join(''));
       // Create app directory so that app-template relative imports are correct
       const appDir = path.join(compilation.context.scratchDir, 'app');
 
diff --git a/packages/cli/src/templates/app-template.js b/packages/cli/src/templates/app-template.js
index 1016c49aa..2ba40093b 100644
--- a/packages/cli/src/templates/app-template.js
+++ b/packages/cli/src/templates/app-template.js
@@ -92,7 +92,7 @@ class AppComponent extends LitElement {
 
   render() {
     return html`
-        MYROUTES
+        <routes></routes>
         <lit-route><h1>404 Not found</h1></lit-route>
     `;
   }
diff --git a/packages/cli/test/cases/build.default.workspace-template-app/src/templates/app-template.js b/packages/cli/test/cases/build.default.workspace-template-app/src/templates/app-template.js
index ce3d2d4be..a6d95f671 100644
--- a/packages/cli/test/cases/build.default.workspace-template-app/src/templates/app-template.js
+++ b/packages/cli/test/cases/build.default.workspace-template-app/src/templates/app-template.js
@@ -40,7 +40,7 @@ class AppComponent extends LitElement {
 
   render() {
     return html`
-        MYROUTES
+        <routes></routes>
         <p id="custom-app-template">My Custom App Template</p>
     `;
   }
diff --git a/www/pages/docs/layouts.md b/www/pages/docs/layouts.md
index 1d10e4623..76245ecdc 100644
--- a/www/pages/docs/layouts.md
+++ b/www/pages/docs/layouts.md
@@ -87,13 +87,13 @@ import '../index/index.js';
 // Finally we can connect to our store and define our component.
 connectRouter(store);
 
-// Add the MY-ROUTES(without dash) predefined hook. This is where all your routes will be loaded.
+// Add the <routes>-</routes>(without the dash) predefined hook. This is where all your routes will be loaded.
 // You may also opt to define a custom 404 route here.
 // You must define the app-template with the element name eve-app
 class AppComponent extends LitElement {
   render() {
     return html\`
-      MYROUTES
+      <routes></routes>
       <lit-route><h1>404 Not found</h1></lit-route>
     \`;
   }
diff --git a/www/templates/app-template.js b/www/templates/app-template.js
index 39ed1cdd1..053c4e978 100644
--- a/www/templates/app-template.js
+++ b/www/templates/app-template.js
@@ -105,7 +105,7 @@ class AppComponent extends LitElement {
       <div class='gwd-wrapper'>
         <eve-header></eve-header>
         <div class="gwd-content-outlet">
-          MYROUTES
+          <routes></routes>
         </div>
         <lit-route><h1>404 Not found</h1></lit-route>
         <eve-footer></eve-footer>

From f0e6f4f6f8f6ada5ddf7ab9741f4489344343c2a Mon Sep 17 00:00:00 2001
From: HutchGrant <h.g.utchinson@gmail.com>
Date: Sat, 11 Jul 2020 20:57:01 -0400
Subject: [PATCH 2/7] task: remove need for MDIMPORT

---
 packages/cli/src/lifecycles/scaffold.js     | 11 +++++++----
 packages/cli/src/templates/page-template.js |  1 -
 www/pages/docs/layouts.md                   |  6 ------
 www/templates/home-template.js              |  2 --
 www/templates/page-template.js              |  2 --
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/packages/cli/src/lifecycles/scaffold.js b/packages/cli/src/lifecycles/scaffold.js
index a5930e91d..53fa7af01 100644
--- a/packages/cli/src/lifecycles/scaffold.js
+++ b/packages/cli/src/lifecycles/scaffold.js
@@ -10,11 +10,14 @@ const writePageComponentsFromTemplate = async (compilation) => {
           : path.join(context.templatesDir, `${file.template}-template.js`);
 
         const templateData = await fs.readFile(pageTemplatePath, 'utf8');
-
-        let result = templateData.toString().replace(/entry/g, `wc-md-${file.label}`);
-
+        let result = templateData.toString().replace(/entry/g, `wc-md-${file.label}`)
+        ;
+        const litElementStr = "'lit-element';";
+        let litElementIndex = result.lastIndexOf(litElementStr);
+        litElementIndex = litElementIndex + litElementStr.length;
+        
+        result = `${result.slice(0, litElementIndex)}\nimport '${file.mdFile}';${result.slice(litElementIndex)}`;
         result = result.replace(/page-template/g, `eve-${file.label}`);
-        result = result.replace(/MDIMPORT;/, `import '${file.mdFile}';`);
 
         resolve(result);
       } catch (err) {
diff --git a/packages/cli/src/templates/page-template.js b/packages/cli/src/templates/page-template.js
index 77bc375f2..894fa40e0 100644
--- a/packages/cli/src/templates/page-template.js
+++ b/packages/cli/src/templates/page-template.js
@@ -1,5 +1,4 @@
 import { html, LitElement } from 'lit-element';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
   render() {
diff --git a/www/pages/docs/layouts.md b/www/pages/docs/layouts.md
index 76245ecdc..f489a572b 100644
--- a/www/pages/docs/layouts.md
+++ b/www/pages/docs/layouts.md
@@ -41,12 +41,6 @@ customElements.define('page-template', PageTemplate);
 #### Template Hooks
 A number of hook variables are defined that tell greenwood to do different things
 
-```js
-MDIMPORT;
-```
-
-`MDIMPORT;` Tells Greenwood to import a markdown file into this component.  But we also have to define where the compiled markdown element(page) will be placed within our page-template.  Hence below within our `render()` method you will see the `<entry></entry>` element. That defines exactly where to place it.
-
 
 ```js
 METAIMPORT;
diff --git a/www/templates/home-template.js b/www/templates/home-template.js
index 377afb284..8cc5fa899 100644
--- a/www/templates/home-template.js
+++ b/www/templates/home-template.js
@@ -8,8 +8,6 @@ import '@evergreen-wc/eve-container';
 import '../styles/theme.css';
 import homeCss from '../styles/home.css';
 
-MDIMPORT;
-
 class HomeTemplate extends LitElement {
 
   render() {
diff --git a/www/templates/page-template.js b/www/templates/page-template.js
index 936cfb99c..b5d2d0fc9 100644
--- a/www/templates/page-template.js
+++ b/www/templates/page-template.js
@@ -5,8 +5,6 @@ import '../components/scroll/scroll';
 import pageCss from '../styles/page.css';
 import '../styles/theme.css';
 
-MDIMPORT;
-
 class PageTemplate extends LitElement {
 
   static get properties() {

From 9d55980ddcf14fd8d0decd9d7364b64175377f4d Mon Sep 17 00:00:00 2001
From: HutchGrant <h.g.utchinson@gmail.com>
Date: Sat, 11 Jul 2020 21:10:54 -0400
Subject: [PATCH 3/7] docs: remove references to predefined vars MDIMPORT and
 MYROUTES

---
 www/pages/docs/layouts.md | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/www/pages/docs/layouts.md b/www/pages/docs/layouts.md
index f489a572b..f114219e1 100644
--- a/www/pages/docs/layouts.md
+++ b/www/pages/docs/layouts.md
@@ -13,13 +13,12 @@ Greenwood has two types of templates:
 
 
 ### Page Template
-In order to make a page template, you need to create a `LitElement` based custom element that contains a number of pre-defined variables, elements, and imports. You need to do this in a file within your _templates/_ directory named _<type>-template.js_.
+In order to make a page template, you need to create a `LitElement` based custom element that contains a predefined `<entry></entry>` element. The `<entry></entry>` element is where your markdown page content will be placed once compiled. You need to do this in a file within your _templates/_ directory named _<type>-template.js_.
 
-Here is an example `page-template.js` (the [default](https://github.com/ProjectEvergreen/greenwood/blob/master/packages/cli/templates/page-template.js) one included with Greenwood).  You can just copy / paste this to start your own page template.
+Here is an example `page-template.js` (the [default](https://github.com/ProjectEvergreen/greenwood/blob/master/packages/cli/templates/page-template.js) one included with Greenwood which is the default page-template.js if no other is defined).  You can just copy / paste this to start your own page template.
 
 ```js
 import { html, LitElement } from 'lit-element';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
   render() {
@@ -38,26 +37,13 @@ customElements.define('page-template', PageTemplate);
 
 > **Note**: the filename must be in the format `<label>-templates.js` and the `customElements` name must be `page-template`.
 
-#### Template Hooks
-A number of hook variables are defined that tell greenwood to do different things
-
-
-```js
-METAIMPORT;
-METADATA;
-```
-
-`METAIMPORT;` and `METADATA;` hook variables import the default greenwood meta component and data which handles all your configured meta data.  You can then render this component within the `render()` method using the `METAELEMENT` variable hook.
-
-The complete example can be found in the [greenwood source](https://github.com/ProjectEvergreen/greenwood/blob/master/packages/cli/templates/page-template.js) which is the default page-template.js if no other is defined.
-
 With a completed page-template.js present in your `src/templates/` folder you can define which page uses it via front-matter at the top of any markdown file.  See [Front Matter Docs](/docs/front-matter#define-template) for more information.  Simply including a file named `page-template.js` will overwrite the greenwood default template for all markdown files, without needing to declare the template at the top of markdown file.
 
 ### App Template
 
 In order to make an app template, you need to create a `LitElement` component that contains a number of pre-defined variables, elements, and imports. You need to do this in a file called  your _<workspace>templates/app-template.js_.
 
-First, we need our app template to use routes, by default greenwood uses [**lit-redux-router**](https://github.com/fernandopasik/lit-redux-router).
+First, we need our app template to use routes, by default greenwood uses [**lit-redux-router**](https://github.com/fernandopasik/lit-redux-router). To do this we define a `<routes></routes>` element in our app-template.js where our routes will be placed when compiled.
 
 Here is Greenwood's app-template, which you can copy / paste as a starting point for your own custom app template, _though it is recommended to let Greenwood manage this for you_.
 

From 11610516d2bb1f9ff7782346c20da833aa0cd2f5 Mon Sep 17 00:00:00 2001
From: HutchGrant <h.g.utchinson@gmail.com>
Date: Sat, 11 Jul 2020 21:16:46 -0400
Subject: [PATCH 4/7] fix: remove all test/doc references to MDIMPORT

---
 .../cases/build.config.theme/src/templates/page-template.js   | 1 -
 .../src/templates/blog-template.js                            | 2 --
 .../cases/build.data.graph/src/templates/blog-template.js     | 2 --
 .../cases/build.data.graph/src/templates/page-template.js     | 2 --
 .../src/templates/blog-template.js                            | 2 --
 .../src/templates/page-template.js                            | 2 --
 .../src/templates/page-template.js                            | 1 -
 .../src/templates/page-template.js                            | 1 -
 www/pages/docs/css-and-images.md                              | 4 ----
 www/pages/getting-started/branding.md                         | 4 ----
 www/pages/getting-started/creating-content.md                 | 2 --
 www/pages/getting-started/key-concepts.md                     | 1 -
 12 files changed, 24 deletions(-)

diff --git a/packages/cli/test/cases/build.config.theme/src/templates/page-template.js b/packages/cli/test/cases/build.config.theme/src/templates/page-template.js
index 1641d9481..e2306013f 100644
--- a/packages/cli/test/cases/build.config.theme/src/templates/page-template.js
+++ b/packages/cli/test/cases/build.config.theme/src/templates/page-template.js
@@ -1,6 +1,5 @@
 import { html, LitElement } from 'lit-element';
 import '../styles/my-brand.css';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
   render() {
diff --git a/packages/cli/test/cases/build.data.graph-custom-frontmatter/src/templates/blog-template.js b/packages/cli/test/cases/build.data.graph-custom-frontmatter/src/templates/blog-template.js
index 28ce6074a..87ff4086d 100644
--- a/packages/cli/test/cases/build.data.graph-custom-frontmatter/src/templates/blog-template.js
+++ b/packages/cli/test/cases/build.data.graph-custom-frontmatter/src/templates/blog-template.js
@@ -2,8 +2,6 @@ import { html, LitElement } from 'lit-element';
 import client from '@greenwood/cli/data/client';
 import gql from 'graphql-tag';
 
-MDIMPORT;
-
 class BlogTemplate extends LitElement {
 
   static get properties() {
diff --git a/packages/cli/test/cases/build.data.graph/src/templates/blog-template.js b/packages/cli/test/cases/build.data.graph/src/templates/blog-template.js
index ef42d041f..682b78d23 100644
--- a/packages/cli/test/cases/build.data.graph/src/templates/blog-template.js
+++ b/packages/cli/test/cases/build.data.graph/src/templates/blog-template.js
@@ -3,8 +3,6 @@ import client from '@greenwood/cli/data/client';
 import ChildrenQuery from '@greenwood/cli/data/queries/children';
 import '../components/header';
 
-MDIMPORT;
-
 class BlogTemplate extends LitElement {
 
   static get properties() {
diff --git a/packages/cli/test/cases/build.data.graph/src/templates/page-template.js b/packages/cli/test/cases/build.data.graph/src/templates/page-template.js
index bc70f14bb..88022b8a1 100644
--- a/packages/cli/test/cases/build.data.graph/src/templates/page-template.js
+++ b/packages/cli/test/cases/build.data.graph/src/templates/page-template.js
@@ -1,8 +1,6 @@
 import { html, LitElement } from 'lit-element';
 import '../components/header';
 
-MDIMPORT;
-
 class PageTemplate extends LitElement {
 
   constructor() {
diff --git a/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/blog-template.js b/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/blog-template.js
index 21e910acb..d21cfd5eb 100644
--- a/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/blog-template.js
+++ b/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/blog-template.js
@@ -2,8 +2,6 @@ import { html, LitElement } from 'lit-element';
 import '../components/footer';
 import '../components/header';
 
-MDIMPORT;
-
 class BlogTemplate extends LitElement {
 
   constructor() {
diff --git a/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/page-template.js b/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/page-template.js
index de36af971..3bb9c1b8c 100644
--- a/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/page-template.js
+++ b/packages/cli/test/cases/build.default.workspace-getting-started/src/templates/page-template.js
@@ -3,8 +3,6 @@ import '../components/footer';
 import '../components/header';
 import '../styles/theme.css';
 
-MDIMPORT;
-
 class PageTemplate extends LitElement {
 
   constructor() {
diff --git a/packages/cli/test/cases/build.default.workspace-template-page-style/src/templates/page-template.js b/packages/cli/test/cases/build.default.workspace-template-page-style/src/templates/page-template.js
index 9ccad35e0..00c45ce62 100644
--- a/packages/cli/test/cases/build.default.workspace-template-page-style/src/templates/page-template.js
+++ b/packages/cli/test/cases/build.default.workspace-template-page-style/src/templates/page-template.js
@@ -1,7 +1,6 @@
 import { html, LitElement } from 'lit-element';
 import '../styles/theme.css';
 import css from '../styles/style.css';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
   render() {
diff --git a/packages/cli/test/cases/build.default.workspace-template-page/src/templates/page-template.js b/packages/cli/test/cases/build.default.workspace-template-page/src/templates/page-template.js
index 394bf5808..1e0d17ae8 100644
--- a/packages/cli/test/cases/build.default.workspace-template-page/src/templates/page-template.js
+++ b/packages/cli/test/cases/build.default.workspace-template-page/src/templates/page-template.js
@@ -1,5 +1,4 @@
 import { html, LitElement } from 'lit-element';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
   render() {
diff --git a/www/pages/docs/css-and-images.md b/www/pages/docs/css-and-images.md
index 719d036c4..8b005e1d5 100644
--- a/www/pages/docs/css-and-images.md
+++ b/www/pages/docs/css-and-images.md
@@ -38,8 +38,6 @@ The below is an example of using _theme.css_ to load a Google font and apply a g
 import { html, LitElement } from 'lit-element';
 import '../styles/theme.css';
 
-MDIMPORT;
-
 class PageTemplate extends LitElement {
 
   constructor() {
@@ -62,8 +60,6 @@ For any of your components and page templates, it is recommended to use the [Sha
 import { html, LitElement } from 'lit-element';
 import pageTemplateCss '../styles/page-template.css';  // if you like your CSS-in-JS
 
-MDIMPORT;
-
 class PageTemplate extends LitElement {
 
   constructor() {
diff --git a/www/pages/getting-started/branding.md b/www/pages/getting-started/branding.md
index 1a4729757..687c11b4c 100644
--- a/www/pages/getting-started/branding.md
+++ b/www/pages/getting-started/branding.md
@@ -52,8 +52,6 @@ Now we can use it in both our templates, like so:
 import { html, LitElement } from 'lit-element';
 import '../components/header'; // import our custom element
 
-MDIMPORT;
-
 class PageTemplate extends LitElement {
 
   constructor() {
@@ -107,8 +105,6 @@ import { html, LitElement } from 'lit-element';
 import '../components/header';
 import '../styles/theme.css'; // add this line
 
-MDIMPORT;
-
 class PageTemplate extends LitElement {
 
   ...
diff --git a/www/pages/getting-started/creating-content.md b/www/pages/getting-started/creating-content.md
index 402821842..272edc8df 100644
--- a/www/pages/getting-started/creating-content.md
+++ b/www/pages/getting-started/creating-content.md
@@ -49,7 +49,6 @@ Neat!  But naturally you're here to learn how to make your own site, and this is
 For this template, create a _page-template.js_ in a directory located at _src/templates/_ (make the _templates/_ directory if it doesn't exist) and include this code in it:
 ```javascript
 import { html, LitElement } from 'lit-element';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
 
@@ -77,7 +76,6 @@ We just made a template for our home page, but for our blog posts, we're going t
 Create a _blog-template.js_ in _src/templates/_ and include this code in it.
 ```javascript
 import { html, LitElement } from 'lit-element';
-MDIMPORT;
 
 class BlogTemplate extends LitElement {
 
diff --git a/www/pages/getting-started/key-concepts.md b/www/pages/getting-started/key-concepts.md
index 81ec0d9ae..22b7c51af 100644
--- a/www/pages/getting-started/key-concepts.md
+++ b/www/pages/getting-started/key-concepts.md
@@ -50,7 +50,6 @@ So using the project structure we setup previously, adding your own custom page
 For reference, here's what the default page template included by Greenwood looks like (using `LitElement`).
 ```javascript
 import { html, LitElement } from 'lit-element';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
   render() {

From e3ef6216d6d5d7ae8f85e88399af78bdf00e7678 Mon Sep 17 00:00:00 2001
From: HutchGrant <h.g.utchinson@gmail.com>
Date: Sat, 11 Jul 2020 21:17:33 -0400
Subject: [PATCH 5/7] fix: remove additional ref to MDIMPORT

---
 .../src/templates/page-template.js                               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/cli/test/cases/build.default.workspace-user-directory-mapping/src/templates/page-template.js b/packages/cli/test/cases/build.default.workspace-user-directory-mapping/src/templates/page-template.js
index d08a451ba..0db79707e 100644
--- a/packages/cli/test/cases/build.default.workspace-user-directory-mapping/src/templates/page-template.js
+++ b/packages/cli/test/cases/build.default.workspace-user-directory-mapping/src/templates/page-template.js
@@ -1,6 +1,5 @@
 import { html, LitElement } from 'lit-element';
 import '../components/header/header';
-MDIMPORT;
 
 class PageTemplate extends LitElement {
   render() {

From 5a6553ee36ef79188c807f0acdd598bbd361690b Mon Sep 17 00:00:00 2001
From: hutchgrant <grant@hutchdev.ca>
Date: Mon, 20 Jul 2020 21:26:36 -0400
Subject: [PATCH 6/7] fix: move mdimport to start of file

---
 packages/cli/src/lifecycles/scaffold.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/lifecycles/scaffold.js b/packages/cli/src/lifecycles/scaffold.js
index 53fa7af01..43db787ee 100644
--- a/packages/cli/src/lifecycles/scaffold.js
+++ b/packages/cli/src/lifecycles/scaffold.js
@@ -10,13 +10,9 @@ const writePageComponentsFromTemplate = async (compilation) => {
           : path.join(context.templatesDir, `${file.template}-template.js`);
 
         const templateData = await fs.readFile(pageTemplatePath, 'utf8');
-        let result = templateData.toString().replace(/entry/g, `wc-md-${file.label}`)
-        ;
-        const litElementStr = "'lit-element';";
-        let litElementIndex = result.lastIndexOf(litElementStr);
-        litElementIndex = litElementIndex + litElementStr.length;
+        let result = templateData.toString().replace(/entry/g, `wc-md-${file.label}`);
         
-        result = `${result.slice(0, litElementIndex)}\nimport '${file.mdFile}';${result.slice(litElementIndex)}`;
+        result = `import '${file.mdFile}';\n${result}`;
         result = result.replace(/page-template/g, `eve-${file.label}`);
 
         resolve(result);

From c06e0929254da5f68faf35c7361939532c42f9d0 Mon Sep 17 00:00:00 2001
From: hutchgrant <grant@hutchdev.ca>
Date: Mon, 20 Jul 2020 22:31:39 -0400
Subject: [PATCH 7/7] fix: test template example

---
 .../test/cases/build.data.graph/src/templates/post-template.js  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/cli/test/cases/build.data.graph/src/templates/post-template.js b/packages/cli/test/cases/build.data.graph/src/templates/post-template.js
index a47886df3..6dc53b8d1 100644
--- a/packages/cli/test/cases/build.data.graph/src/templates/post-template.js
+++ b/packages/cli/test/cases/build.data.graph/src/templates/post-template.js
@@ -3,8 +3,6 @@ import gql from 'graphql-tag';
 import { html, LitElement } from 'lit-element';
 import '../components/header';
 
-MDIMPORT;
-
 class PostTemplate extends LitElement {
 
   static get properties() {