Merge branch 'develop'

Author: icelam

README.md

@@ -60,8 +60,8 @@ module.exports = {
   plugins: [
     new HtmlWebpackPlugin(),
     new HtmlInlineScriptPlugin([
-      /runtime~.+[.]js/,
-      /app~.+[.]js/
+      /runtime~.+[.]js$/,
+      /app~.+[.]js$/
     ]),
   ]
 }

docs/publish.md

@@ -0,0 +1,60 @@
+# Publish procedure
+
+## Version 1
+For publishing v1 of the plugin which supports webpack 4, checkout `v1` branch, and run the following commands:
+```bash
+# checkout branch
+git checkout v1
+
+# pull the latest code
+git pull
+
+# make sure dependencies are in correct version
+yarn
+
+# bump package version
+yarn release
+
+# create build
+yarn build
+
+# publish to npm (OTP needed)
+npm publish
+
+# push code and trigger github release creation
+git push
+```
+
+## Version 2
+For publishing v2 of the plugin which supports webpack 5, checkout `develop` branch, and run the following commands:
+```bash
+# checkout branch
+git checkout develop
+
+# pull the latest code
+git pull
+
+# switch to master branch
+git checkout master
+
+# pull the latest code from master
+git pull
+
+# merge code from develop branch
+git merge --no-ff develop
+
+# make sure dependencies are in correct version
+yarn
+
+# bump package version
+yarn release
+
+# create build
+yarn build
+
+# publish to npm (OTP needed)
+npm publish
+
+# push code and trigger github release creation
+git push
+```

package.json

@@ -38,14 +38,13 @@
     "@commitlint/config-conventional": "^12.0.0",
     "@types/html-webpack-plugin": "^3.2.3",
     "@types/jest": "^26.0.20",
-    "@types/webpack-sources": "^2.1.0",
     "@typescript-eslint/eslint-plugin": "^4.0.0",
     "@typescript-eslint/parser": "^4.15.2",
     "eslint": "^7.4.0",
     "eslint-config-airbnb-base": "^14.2.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-jest": "^24.1.5",
-    "husky": "^5.1.2",
+    "husky": "^6.0.0",
     "install-peers-cli": "^2.2.0",
     "jest": "^26.6.3",
     "lint-staged": "^10.2.11",

src/HtmlInlineScriptPlugin.ts

@@ -8,7 +8,7 @@ class HtmlInlineScriptPlugin implements WebpackPluginInstance {
   tests: RegExp[];
 
   constructor(tests?: RegExp[]) {
-    this.tests = tests || [/.+[.]js/];
+    this.tests = tests || [/.+[.]js$/];
   }
 
   isFileNeedsToBeInlined(