Merge branch 'release/1.4.0'

Author: SylRob

README.md

@@ -12,6 +12,7 @@ it will help for setting a dev environment.
 scan html content looking for pattern like :
 ```
 <!--#include virtual="/your/path/file.html" -->
+<!--#include file"/your/path/file.html" -->
 ```
 
 if found any :
@@ -50,8 +51,9 @@ module: {
 ### Parameters
 | Parameters       | Type          | Default        | Description   |
 | ---------------- |:-------------:|:--------------:| :------------ |
-| location         | string        |                | http url where the file can be dl ex:'https://mywebsite.com/'   |
+| location         | string        |                | http url where the file can be dl ex:'https://mywebsite.com/'  |
 | localPath        | string        |                | path where the include files could be found ex: path.join(__dirname, '/public') |
-| depthMax         | number        |    4           | how far should the SSI include should look for match within included files (don't touch unless you know what you are doing) |
+| depthMax         | number        |    4           | how far should the SSI include should look for match within included files |
 | disableLocalScan | boolean       |    false       | if you want the script to look only on the `location` url |
 | includesMatcher  | regex         | /&lt;!--\s?#\s?include\s+(?:virtual&#124;file)=&quot;([^&quot;]+)&quot;(?:\s+stub=&quot;(\w+)&quot;)?\s?--&gt;/ | regex of the matching string (don't touch unless you know what you are doing) |
+| defaultCharset   | string        |    utf-8       | force the file reader to convert the file content into a specific charset |

lib/ssi.js

@@ -12,12 +12,13 @@ const fs = require('fs');
  * @param  {number} [param.depthMax=4] how far should the SSI include should look for match withing inluded files
  * @param  {boolean} [param.disableLocalScan=false] if you want the script to look only on the `param.location` url
  * @param  {regex} [param.includesMatcher=/<!--\s?#\s?include\s+(?:virtual|file)="([^"]+)"(?:\s+stub="(\w+)")?\s?-->/] regex of the matching string (don't touch unless you know what you are doing)
- * }
+ * @param  {string} [param.defaultCharset='utf-8'] force the file reader to convert the file content into a specific charset
+ *
  * @return {string} formated HTML with the SSI include files content
  */
 const SSI = function (param) {
   const defaultOptions = {
-    depthMax: 5,
+    depthMax: 4,
     disableLocalScan: false,
     includesMatcher: /<!--\s?#\s?include\s+(?:virtual|file)="([^"]+)"(?:\s+stub="(\w+)")?\s?-->/,
   }
@@ -68,28 +69,27 @@ const SSI = function (param) {
     }
   }
 
-  async function processInclude(part, content, i) {
+  async function processInclude(part, i) {
     const matches = part.match(options.includesMatcher);
     if (!matches) {
-      return content + part;
+      return part;
     }
 
     const ssiString = matches[0];
     const location = matches[1];
 
     const body = await getContent(location);
-    const formatedContent = content + part.replace(ssiString, '');
-    if(i >= options.depthMax) return formatedContent + body;
-    else return await processInclude(body, formatedContent, i + 1);
+    if(i >= options.depthMax) return body;
+    else return await compile(body, i + 1);
   }
 
-  async function compile(content) {
+  async function compile(content, i = 0) {
     let output = [];
     const splitContent = content.split('\n');
     // eslint-disable-next-line
     for (const line of splitContent) {
       const part = line.trim();
-      output += await processInclude(part, '', 0);
+      output += await processInclude(part, i);
     }
 
     return output;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-ssi-include-loader",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Webpack SSI Include Loader",
   "main": "index.js",
   "scripts": {},
@@ -14,8 +14,6 @@
   "dependencies": {
     "chardet": "^1.0.0",
     "iconv-lite": "^0.5.1",
-    "loader-utils": "^2.0.0",
-    "object-assign": "^4.1.1",
     "then-request": "^6.0.2"
   }
 }