change name, config field, readme

yyx990803 · yyx990803 · commit cce5ef6e32e7 · 2016-02-16T22:51:19.000-05:00
diff --git a/README.md b/README.md
@@ -1,4 +1,25 @@
-# html loader for webpack
+# vue-html-loader
+
+> This is a fork of [html-loader](https://github.com/webpack/html-loader) with some modifications for handling Vue templates.
+
+## Config
+
+You can config the loader's behavior by adding an `html` field under `vue` in your webpack config:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ...
+  vue: {
+    html: {
+      // all loader queries can be specified here
+      // also, you can specify options for htmlMinifier here.
+    }
+  }
+}
+```
+
+## Original README below
 
 Exports HTML as string. HTML is minimized when the compiler demands.
 
@@ -87,46 +108,6 @@ require("html?interpolate!./file.html");
 <div>${require('./partials/gallery.html')}</div>
 ```
 
-## Advanced options
-
-If you need to pass [more advanced options](https://github.com/webpack/html-loader/pull/46), especially those which cannot be stringified, you can also define an `htmlLoader`-property on your `webpack.config.js`:
-
-``` javascript
-module.exports = {
-  ...
-  module: {
-    loaders: [
-      {
-        test: /\.html$/,
-        loader: "html"
-      }
-    ]
-  }
-  htmlLoader: {
-  	ignoreCustomFragments: [/\{\{.*?}}/]
-  }
-};
-```
-
-If you need to define two different loader configs, you can also change the config's property name via `html?config=otherHtmlLoaderConfig`:
-
-```javascript
-module.exports = {
-  ...
-  module: {
-    loaders: [
-      {
-        test: /\.html$/,
-        loader: "html?config=otherHtmlLoaderConfig"
-      }
-    ]
-  }
-  otherHtmlLoaderConfig: {
-    ...
-  }
-};
-```
-
 ## License
 
 MIT (http://www.opensource.org/licenses/mit-license.php)
diff --git a/index.js b/index.js
@@ -15,11 +15,8 @@ function randomIdent() {
 
 function getLoaderConfig(context) {
 	var query = loaderUtils.parseQuery(context.query);
-	var configKey = query.config || 'htmlLoader';
-	var config = context.options && context.options.hasOwnProperty(configKey) ? context.options[configKey] : {};
-
+	var config = (context.options && context.options.vue && context.options.vue.html) || {};
 	delete query.config;
-
 	return assign(query, config);
 }
 
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "html-loader",
-  "version": "0.4.3",
-  "author": "Tobias Koppers @sokra",
-  "description": "html loader module for webpack",
+  "name": "vue-html-loader",
+  "version": "1.2.0",
+  "author": "Evan You",
+  "description": "vue template loader for webpack",
   "dependencies": {
     "es6-templates": "^0.2.2",
     "fastparse": "^1.0.0",
@@ -19,7 +19,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:webpack/html-loader.git"
+    "url": "git@github.com:vuejs/vue-html-loader.git"
   },
   "licenses": [
     {
