.editorconfig

@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[test/fixtures/*.html]
+insert_final_newline = false

.github/workflows/nodejs.yml

@@ -0,0 +1,95 @@
+name: html-loader
+
+on:
+  push:
+    branches:
+      - master
+      - next
+  pull_request:
+    branches:
+      - master
+      - next
+
+jobs:
+  lint:
+    name: Lint - ${{ matrix.os }} - Node v${{ matrix.node-version }}
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node-version: [12.x]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Use Node.js ${{ env.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.node-version }}
+
+      - name: Use latest NPM
+        run: sudo npm i -g npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+      # - name: Security audit
+      # run: npm run security
+
+      - name: Check commit message
+        uses: wagoid/commitlint-github-action@v1
+
+  test:
+    name: Test - ${{ matrix.os }} - Node v${{ matrix.node-version }}, Webpack ${{ matrix.webpack-version }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [10.x, 12.x, 14.x]
+        webpack-version: [latest, next]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Setup Git
+        if: matrix.os == 'windows-latest'
+        run: git config --global core.autocrlf input
+
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Use latest NPM on ubuntu/macos
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+        run: sudo npm i -g npm
+
+      - name: Use latest NPM on windows
+        if: matrix.os == 'windows-latest'
+        run: npm i -g npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Install webpack ${{ matrix.webpack-version }}
+        run: npm i webpack@${{ matrix.webpack-version }}
+
+      - name: Run tests for webpack version ${{ matrix.webpack-version }}
+        run: npm run test:coverage -- --ci
+
+      - name: Submit coverage data to codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.2.0](https://github.com/webpack-contrib/html-loader/compare/v1.1.0...v1.2.0) (2020-08-18)
+
+
+### Features
+
+* support SVG tags ([#302](https://github.com/webpack-contrib/html-loader/issues/302)) ([1acd204](https://github.com/webpack-contrib/html-loader/commit/1acd20448dbe976b883597b135bb8ac9e1b71d1a))
+
+
+### Bug Fixes
+
+* do not handle non standard `script` types ([ddad9f2](https://github.com/webpack-contrib/html-loader/commit/ddad9f2d6f5ab75fe2afd247bf55b1646c6e1c31))
+* inline syntax for sources ([#310](https://github.com/webpack-contrib/html-loader/issues/310)) ([c247cfa](https://github.com/webpack-contrib/html-loader/commit/c247cfa9ad66281b28aef5397c8c2d2786f05867))
+* linefeed characters in sources ([#311](https://github.com/webpack-contrib/html-loader/issues/311)) ([b8ee9ee](https://github.com/webpack-contrib/html-loader/commit/b8ee9ee0d60848e84e52fb117c1f3cdc2ebf08d7))
+* minimize is more safely ([#304](https://github.com/webpack-contrib/html-loader/issues/304)) ([03152b1](https://github.com/webpack-contrib/html-loader/commit/03152b1d3b807a287d84302f6a9987ceb22d395c))
+* perf ([#300](https://github.com/webpack-contrib/html-loader/issues/300)) ([d69f259](https://github.com/webpack-contrib/html-loader/commit/d69f259d2a6b4bc9ba9c163fd2d70989c3f3a6ff))
+
 ## [1.1.0](https://github.com/webpack-contrib/html-loader/compare/v1.0.0...v1.1.0) (2020-04-02)
 
 

README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <img width="200" height="200" src="https://worldvectorlogo.com/logos/html5.svg" alt="html-loader">
   <a href="https://github.com/webpack/webpack">
-    <img width="200" height="200" vspace="" hspace="25" src="https://worldvectorlogo.com/logos/webpack.svg" alt="webpack">
+    <img width="200" height="200" vspace="" hspace="25" src="https://webpack.js.org/assets/icon-square-big.svg" alt="webpack">
   </a>
 </div>
 
@@ -484,16 +484,20 @@ Tell `html-loader` to minimize HTML.
 
 The enabled rules for minimizing by default are the following ones:
 
-- `collapseWhitespace`
-- `conservativeCollapse`
-- `keepClosingSlash`
-- `minifyCSS`
-- `minifyJS`
-- `removeAttributeQuotes`
-- `removeComments`
-- `removeScriptTypeAttributes`
-- `removeStyleTypeAttributes`
-- `useShortDoctype`
+```js
+({
+  caseSensitive: true,
+  collapseWhitespace: true,
+  conservativeCollapse: true,
+  keepClosingSlash: true,
+  minifyCSS: true,
+  minifyJS: true,
+  removeComments: true,
+  removeRedundantAttributes: true,
+  removeScriptTypeAttributes: true,
+  removeStyleLinkTypeAttributes: true,
+});
+```
 
 **webpack.config.js**
 
@@ -590,27 +594,30 @@ module.exports = {
 };
 ```
 
+**file.html**
+
 ```html
-<!-- file.html -->
-<img src="image.png" data-src="image2x.png" />
+<img src="image.jpg" data-src="image2x.png" />
 ```
 
+**index.js**
+
 ```js
 require('html-loader!./file.html');
 
-// => '<img src="http://cdn.example.com/49eba9f/a992ca.png" data-src="image2x.png">'
+// => '<img src="http://cdn.example.com/49eba9f/a992ca.jpg" data-src="image2x.png">'
 ```
 
 ```js
-require('html-loader?attributes[]=img:data-src!./file.html');
+require('html-loader?{"attributes":{"list":[{"tag":"img","attribute":"data-src","type":"src"}]}}!./file.html');
 
-// => '<img src="image.png" data-src="data:image/png;base64,..." >'
+// => '<img src="image.jpg" data-src="data:image/png;base64,..." >'
 ```
 
 ```js
-require('html-loader?attributes[]=img:src&attributes[]=img:data-src!./file.html');
+require('html-loader?{"attributes":{"list":[{"tag":"img","attribute":"src","type":"src"},{"tag":"img","attribute":"data-src","type":"src"}]}}!./file.html');
 
-// => '<img src="http://cdn.example.com/49eba9f/a992ca.png" data-src="data:image/png;base64,..." >'
+// => '<img src="http://cdn.example.com/49eba9f/a992ca.jpg" data-src="data:image/png;base64,..." >'
 ```
 
 ```js
@@ -619,12 +626,7 @@ require('html-loader?-attributes!./file.html');
 // => '<img src="image.jpg"  data-src="image2x.png" >'
 ```
 
-> :warning: `-attributes` it is set attributes: false
-
-```html
-'<img src=http://cdn.example.com/49eba9f/a9f92ca.jpg
-data-src=data:image/png;base64,...>'
-```
+> :warning: `-attributes` sets `attributes: false`.
 
 ### Process `script` and `link` tags
 
@@ -694,7 +696,7 @@ module.exports = {
 
 ### 'Root-relative' URLs
 
-With the same configuration as above:
+With the same configuration as in the CDN example:
 
 **file.html**
 
@@ -713,7 +715,7 @@ require('html-loader!./file.html');
 **other-scripts.js**
 
 ```js
-require('html-loader?root=.!./file.html');
+require('html-loader?{"attributes":{"root":"."}}!./file.html');
 
 // => '<img src="http://cdn.example.com/49eba9f/a992ca.jpg">'
 ```
@@ -789,7 +791,7 @@ module.exports = {
         test: /\.hbs$/i,
         loader: 'html-loader',
         options: {
-          preprocessor: () => {
+          preprocessor: (content, loaderContext) => {
             let result;
 
             try {
@@ -855,8 +857,8 @@ Please take a moment to read our contributing guidelines if you haven't yet done
 [node-url]: https://nodejs.org
 [deps]: https://david-dm.org/webpack-contrib/html-loader.svg
 [deps-url]: https://david-dm.org/webpack-contrib/html-loader
-[tests]: https://dev.azure.com/webpack-contrib/html-loader/_apis/build/status/webpack-contrib.html-loader?branchName=master
-[tests-url]: https://dev.azure.com/webpack-contrib/html-loader/_build/latest?definitionId=38&branchName=master
+[tests]: https://github.com/webpack-contrib/html-loader/workflows/html-loader/badge.svg
+[tests-url]: https://github.com/webpack-contrib/html-loader/actions
 [cover]: https://codecov.io/gh/webpack-contrib/html-loader/branch/master/graph/badge.svg
 [cover-url]: https://codecov.io/gh/webpack-contrib/html-loader
 [chat]: https://img.shields.io/badge/gitter-webpack%2Fwebpack-brightgreen.svg