From 5f18da054e6c5172c6ec88ffe5962f802572cf4f Mon Sep 17 00:00:00 2001
From: Plum-Crazy <na>
Date: Mon, 11 Sep 2017 19:43:34 -0500
Subject: [PATCH] Removing usage of pugjs

---
 config/build/webpack.common.js         | 4 ----
 config/test/webpack.test.js            | 4 ----
 package.json                           | 2 --
 src/app/app.component.html             | 5 +++++
 src/app/app.component.pug              | 3 ---
 src/app/app.component.ts               | 2 +-
 src/app/route/home/home.component.html | 3 +++
 src/app/route/home/home.component.pug  | 2 --
 src/app/route/home/home.component.ts   | 2 +-
 9 files changed, 10 insertions(+), 17 deletions(-)
 create mode 100644 src/app/app.component.html
 delete mode 100644 src/app/app.component.pug
 create mode 100644 src/app/route/home/home.component.html
 delete mode 100644 src/app/route/home/home.component.pug

diff --git a/config/build/webpack.common.js b/config/build/webpack.common.js
index 27e8300..cd6ffb5 100644
--- a/config/build/webpack.common.js
+++ b/config/build/webpack.common.js
@@ -25,10 +25,6 @@ module.exports = {
                 test: /\.html$/,
                 use: 'html-loader'
             },
-            {
-                test: /\.pug$/,
-                use: [ 'raw-loader', 'pug-html-loader' ]
-            },
             {
                 test: /\.scss$/,
                 exclude: /node_modules/,
diff --git a/config/test/webpack.test.js b/config/test/webpack.test.js
index 840809d..b4794df 100644
--- a/config/test/webpack.test.js
+++ b/config/test/webpack.test.js
@@ -19,10 +19,6 @@ module.exports = {
                 test: /\.html$/,
                 use: 'html-loader'
             },
-            {
-                test: /\.pug$/,
-                use: [ 'raw-loader', 'pug-html-loader' ]
-            },
             {
                 test: /\.scss$/,
                 exclude: /node_modules/,
diff --git a/package.json b/package.json
index e6d8f36..aec074c 100644
--- a/package.json
+++ b/package.json
@@ -53,8 +53,6 @@
         "loader-utils": "^1.1.0",
         "node-sass": "^4.5.3",
         "protractor": "~5.1.2",
-        "pug": "^2.0.0-beta12",
-        "pug-html-loader": "^1.1.4",
         "raw-loader": "^0.5.1",
         "reflect-metadata": "^0.1.10",
         "sass-loader": "^6.0.6",
diff --git a/src/app/app.component.html b/src/app/app.component.html
new file mode 100644
index 0000000..475ec4f
--- /dev/null
+++ b/src/app/app.component.html
@@ -0,0 +1,5 @@
+<div class="tyn-app">
+    <main>
+        <router-outlet></router-outlet>
+    </main>
+</div>
\ No newline at end of file
diff --git a/src/app/app.component.pug b/src/app/app.component.pug
deleted file mode 100644
index fb35bb9..0000000
--- a/src/app/app.component.pug
+++ /dev/null
@@ -1,3 +0,0 @@
-div.plumApp
-    main
-        router-outlet
\ No newline at end of file
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ae987ef..cb54144 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewEncapsulation } from "@angular/core";
 
 @Component({
     selector: "tyn-app",
-    template: require("./app.component.pug"),
+    templateUrl: './app.component.html',
     styleUrls: [ "./app.component.scss" ],
     encapsulation: ViewEncapsulation.None
 })
diff --git a/src/app/route/home/home.component.html b/src/app/route/home/home.component.html
new file mode 100644
index 0000000..f1d5477
--- /dev/null
+++ b/src/app/route/home/home.component.html
@@ -0,0 +1,3 @@
+<div class="tyn-home">
+    <p>Hello World!</p>
+</div>
\ No newline at end of file
diff --git a/src/app/route/home/home.component.pug b/src/app/route/home/home.component.pug
deleted file mode 100644
index 3c2533f..0000000
--- a/src/app/route/home/home.component.pug
+++ /dev/null
@@ -1,2 +0,0 @@
-div.plumHome
-    p Hello world!
\ No newline at end of file
diff --git a/src/app/route/home/home.component.ts b/src/app/route/home/home.component.ts
index c9d969b..ded82b7 100644
--- a/src/app/route/home/home.component.ts
+++ b/src/app/route/home/home.component.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
 
 @Component({
     selector: "tyn-home",
-    template: require("./home.component.pug"),
+    templateUrl: './home.component.html',
     styleUrls: [ "./home.component.scss" ]
 })
 export class HomeComponent {