Update examples and README to reflect that the json-loader is not req…

…uired anymore

README.md

@@ -85,7 +85,6 @@ or are automatically applied via regex from your webpack configuration.
 Please see [Using Loaders](https://webpack.github.io/docs/using-loaders.html) for more information.
 
 **basic**
-* [`json`](https://github.com/webpack/json-loader): Loads file as JSON
 * [`raw`](https://github.com/webpack/raw-loader): Loads raw content of a file (as utf-8)
 * [`val`](https://github.com/webpack/val-loader): Executes code as module and consider exports as JavaScript code
 * [`script`](https://github.com/webpack/script-loader): Executes a JavaScript file once in global context (like in script tag), requires are not parsed.

examples/loader/README.md

@@ -4,9 +4,9 @@
 // use our loader
 console.dir(require("./loader!./file"));
 
-// use buildin json loader
-console.dir(require("./test.json")); // default by extension
-console.dir(require("!json!./test.json")); // manual
+// use buildin css loader
+console.dir(require("./test.css")); // default by extension
+console.dir(require("!css-loader!./test.css")); // manual
 ```
 
 # file.js
@@ -23,11 +23,11 @@ module.exports = function(content) {
 }
 ```
 
-# test.json
+# test.css
 
-``` javascript
-{
-	"foobar": 1234
+```css
+.some-class {
+	color: hotpink;
 }
 ```
 
@@ -109,7 +109,7 @@ module.exports = function(content) {
 /* unknown exports provided */
 /* all exports used */
 /*!*******************************************!*\
-  !*** (webpack)/~/json-loader!./test.json ***!
+  !*** (webpack)/~/css-loader!./test.css ***!
   \*******************************************/
 /***/ function(module, exports) {
 
@@ -141,9 +141,9 @@ exports.foo = "bar";
 // use our loader
 console.dir(__webpack_require__(/*! ./loader!./file */ 1));
 
-// use buildin json loader
-console.dir(__webpack_require__(/*! ./test.json */ 0)); // default by extension
-console.dir(__webpack_require__(/*! json!./test.json */ 0)); // manual
+// use buildin css loader
+console.dir(__webpack_require__(/*! ./test.css */ 0)); // default by extension
+console.dir(__webpack_require__(/*! css-loader!./test.css */ 0)); // manual
 
 /***/ }
 /******/ ]);
@@ -172,9 +172,9 @@ output.js  3.39 kB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 278 bytes [entry] [rendered]
     > main [2] ./example.js 
-    [0] (webpack)/~/json-loader!./test.json 37 bytes {0} [built]
-        cjs require !json!./test.json [2] ./example.js 6:12-40
-        cjs require ./test.json [2] ./example.js 5:12-34
+    [0] (webpack)/~/css-loader!./test.css 37 bytes {0} [built]
+        cjs require !css!./test.css [2] ./example.js 6:12-40
+        cjs require ./test.css [2] ./example.js 5:12-34
     [1] ./loader.js!./file.js 41 bytes {0} [built]
         cjs require ./loader!./file [2] ./example.js 2:12-38
     [2] ./example.js 200 bytes {0} [built]
@@ -191,9 +191,9 @@ output.js  638 bytes       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 278 bytes [entry] [rendered]
     > main [2] ./example.js 
-    [0] (webpack)/~/json-loader!./test.json 37 bytes {0} [built]
-        cjs require !json!./test.json [2] ./example.js 6:12-40
-        cjs require ./test.json [2] ./example.js 5:12-34
+    [0] (webpack)/~/css-loader!./test.css 37 bytes {0} [built]
+        cjs require !css-loader!./test.css [2] ./example.js 6:12-40
+        cjs require ./test.css [2] ./example.js 5:12-34
     [1] ./loader.js!./file.js 41 bytes {0} [built]
         cjs require ./loader!./file [2] ./example.js 2:12-38
     [2] ./example.js 200 bytes {0} [built]

examples/loader/example.js

@@ -1,6 +1,6 @@
 // use our loader
 console.dir(require("./loader!./file"));
 
-// use buildin json loader
-console.dir(require("./test.json")); // default by extension
-console.dir(require("!json-loader!./test.json")); // manual
+// use buildin css loader
+console.dir(require("./test.css")); // default by extension
+console.dir(require("!css-loader!./test.css")); // manual

examples/loader/template.md

@@ -16,10 +16,10 @@
 {{loader.js}}
 ```
 
-# test.json
+# test.css
 
 ``` javascript
-{{test.json}}
+{{test.css}}
 ```
 
 # js/output.js

examples/loader/test.css

@@ -0,0 +1,3 @@
+.some-class {
+	color: hotpink;
+}

examples/loader/webpack.config.js

@@ -1,7 +1,7 @@
 module.exports = {
 	module: {
 		loaders: [
-			{ test: /\.json$/, loader: "json-loader" }
+			{ test: /\.css$/, loader: "css-loader" }
 		]
 	}
-}
+};