use html-loader instead of raw-loader

leftstick · May 31, 2016 · 9d7e41c · 9d7e41c
1 parent 3131bf4
commit 9d7e41c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 17 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -60,7 +60,7 @@ var gen = generators.Base.extend({
                 type: 'confirm',
                 name: 'pushState',
                 message: 'Use html5 mode?',
-                default: true
+                default: false
             },
             {
                 type: 'list',

diff --git a/generators/app/templates/js/features/home/controller/HomeController.js b/generators/app/templates/js/features/home/controller/HomeController.js
@@ -6,8 +6,6 @@
  *
  */
 
-import logoUrl from 'img/AngularJS-large.png';
-
 class HomeController {
 
     /*@ngInject*/
@@ -20,7 +18,6 @@ class HomeController {
     }
 
     _init_() {
-        this.logoUrl = logoUrl;
         this.todos = [];
         this.HomeService
             .getInitTodos()

diff --git a/generators/app/templates/js/features/home/partials/home.html b/generators/app/templates/js/features/home/partials/home.html
@@ -1,5 +1,5 @@
 <div id="logo-wrap">
-      <img id="logo" ng-src="{{ home.logoUrl }}">
+      <img id="logo" src="../../../../img/AngularJS-large.png">
       <h1>generator-es6-angular</h1>
 </div>
 

diff --git a/generators/app/templates/package.json_vm b/generators/app/templates/package.json_vm
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "rm -rf build; webpack --config webpack.config.dev.js",
     "release": "rm -rf build; webpack --config webpack.config.prod.js",
-    "start": "webpack-dev-server --content-base build/ --config webpack.config.dev.js --history-api-fallback --open http://localhost:8080/ --hot --inline"
+    "start": "webpack-dev-server --content-base build/ --config webpack.config.dev.js --history-api-fallback --hot --inline"
   },
   "files": [
     "etc",
@@ -22,23 +22,23 @@
   "author": "<%= answers.username %> <% if(answers.email){ %><<%= answers.email %>><% } %>",
   "license": "MIT",
   "dependencies":{
-    "angular": "^1.5.5",
-    "angular-route": "^1.5.5",
+    "angular": "^1.5.6",
+    "angular-route": "^1.5.6",
     "splash-screen": "^3.0.0"
   },
   "devDependencies": {
     "autoprefixer": "^6.3.6",
-    "babel-core": "^6.8.0",
+    "babel-core": "^6.9.0",
     "babel-loader": "^6.2.4",
-    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-es2015": "^6.9.0",
     "css-loader": "^0.23.1",
     "file-loader": "^0.8.5",
-    "html-webpack-plugin": "^2.16.1",
+    "html-webpack-plugin": "^2.19.0",
     "ng-annotate-loader": "^0.1.0",
     "postcss-loader": "^0.9.1",
-    "raw-loader": "^0.5.1",
+    "html-loader": "^0.4.3",
     "style-loader": "^0.13.1",
-    "webpack": "^1.13.0",
+    "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1"
   }
 }
diff --git a/generators/app/templates/webpack.config.dev.js b/generators/app/templates/webpack.config.dev.js
@@ -32,7 +32,7 @@ module.exports = {
             },
             {
                 test: /\.html$/,
-                loader: 'raw'
+                loader: 'html'
             }
         ]
     },

diff --git a/generators/app/templates/webpack.config.prod.js b/generators/app/templates/webpack.config.prod.js
@@ -30,7 +30,7 @@ module.exports = {
             },
             {
                 test: /\.html$/,
-                loader: 'raw'
+                loader: 'html'
             }
         ]
     },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-es6-angular",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "generator-es6-angular",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
   "license": "MIT",
   "dependencies": {
     "date-util": "^1.2.1",
-    "lodash": "^4.12.0",
+    "lodash": "^4.13.1",
     "yeoman-generator": "^0.23.3"
   }
 }