From 56b9aabc22067e5b5ccc303641ce420c60d7f389 Mon Sep 17 00:00:00 2001 From: Johannes Ewald Date: Wed, 7 Dec 2016 11:44:12 +0100 Subject: [PATCH] Update examples and README to reflect that the json-loader is not required anymore --- README.md | 1 - examples/loader/README.md | 34 +++++++++++----------- examples/loader/enhanced-require.config.js | 7 ----- examples/loader/example.js | 6 ++-- examples/loader/template.md | 4 +-- examples/loader/test.css | 3 ++ examples/loader/test.json | 3 -- examples/loader/webpack.config.js | 4 +-- 8 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 examples/loader/enhanced-require.config.js create mode 100644 examples/loader/test.css delete mode 100644 examples/loader/test.json diff --git a/README.md b/README.md index 936db2f2b79..04dc31d226f 100644 --- a/README.md +++ b/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. diff --git a/examples/loader/README.md b/examples/loader/README.md index 2fddf8f8fc4..b4b101a38b0 100644 --- a/examples/loader/README.md +++ b/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] diff --git a/examples/loader/enhanced-require.config.js b/examples/loader/enhanced-require.config.js deleted file mode 100644 index 2e4fd07fd82..00000000000 --- a/examples/loader/enhanced-require.config.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - module: { - loaders: [ - { test: /\.json$/, loader: "json" } - ] - } -} \ No newline at end of file diff --git a/examples/loader/example.js b/examples/loader/example.js index 281dffb4834..a2456e93fac 100644 --- a/examples/loader/example.js +++ b/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 diff --git a/examples/loader/template.md b/examples/loader/template.md index 89f89253a32..780f47402b2 100644 --- a/examples/loader/template.md +++ b/examples/loader/template.md @@ -16,10 +16,10 @@ {{loader.js}} ``` -# test.json +# test.css ``` javascript -{{test.json}} +{{test.css}} ``` # js/output.js diff --git a/examples/loader/test.css b/examples/loader/test.css new file mode 100644 index 00000000000..98586724fae --- /dev/null +++ b/examples/loader/test.css @@ -0,0 +1,3 @@ +.some-class { + color: hotpink; +} diff --git a/examples/loader/test.json b/examples/loader/test.json deleted file mode 100644 index 9dcb1c17ccd..00000000000 --- a/examples/loader/test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "foobar": 1234 -} \ No newline at end of file diff --git a/examples/loader/webpack.config.js b/examples/loader/webpack.config.js index a67e68aac59..9c2616881f4 100644 --- a/examples/loader/webpack.config.js +++ b/examples/loader/webpack.config.js @@ -1,7 +1,7 @@ module.exports = { module: { loaders: [ - { test: /\.json$/, loader: "json-loader" } + { test: /\.css$/, loader: "css-loader" } ] } -} +};