Merge branch 'develop'

swimmadude66 · Feb 4, 2021 · 558ccb6 · 558ccb6
2 parents 9cfe09a + 609632f
commit 558ccb6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,8 @@ env:
   # Webpack 3 and mini-css-extract in tests cause issues
   - WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=3
   - WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=4
+  - WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=5
+  - WEBPACK_VERSION=5 HTML_PLUGIN_VERSION=5
 
 install:
   - npm install

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.0 Verify support for webpack v5 and html-webpack-plugin v5
+- No changes needed, package.json updated to reflect current dependency versions
+
 # 1.0.4 Include .d.ts declaration files in package
 - Addresses #15
 - Remove testcases with Webpack 3 (compatability issues with mini-css-extract-plugin)

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Adam Yost
+Copyright (c) 2021 Adam Yost
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.MD b/README.MD
@@ -1,4 +1,6 @@
 # Html Webpack Link Type Plugin
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fsteadyapp%2Fhtml-webpack-link-type-plugin.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fsteadyapp%2Fhtml-webpack-link-type-plugin?ref=badge_shield)
+
 _Assigns a mimetype to link tags injected by [Html Webpack Plugin](https://github.com/jantimon/html-webpack-plugin)_
 
 ## Configuration
@@ -58,3 +60,7 @@ plugins: [
 
 ## Testing
 Testing is done via ts-node and mocha. Test files can be found in `/spec`, and will be auto-discovered as long as the file ends in `.spec.ts`. Just run `npm test` after installing to see the tests run.
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fsteadyapp%2Fhtml-webpack-link-type-plugin.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fsteadyapp%2Fhtml-webpack-link-type-plugin?ref=badge_large)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html-webpack-link-type-plugin",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "a plugin for html-webpack-plugin to allow for mimetype tagging of injected links",
   "main": "dist/plugin.js",
   "scripts": {
@@ -18,26 +18,24 @@
   "author": "swimmadude66",
   "license": "MIT",
   "devDependencies": {
-    "@types/chai": "4.1.7",
-    "@types/mocha": "5.2.6",
-    "@types/node": "8.10.29",
-    "@types/rimraf": "2.0.2",
-    "@types/webpack": "4.4.31",
+    "@types/chai": "4.2.14",
+    "@types/mocha": "8.2.0",
+    "@types/node": "12.19.15",
     "chai": "4.2.0",
-    "css-loader": "1.0.0",
-    "html-webpack-plugin": ">=3.2.0 || 4.0.0-beta.1 || 4.0.0-beta.2 || 4.0.0-beta.4 || 4.0.0-beta.5",
-    "mini-css-extract-plugin": "0.6.0",
-    "mocha": "6.1.4",
-    "rimraf": "2.6.3",
-    "ts-node": "8.1.0",
-    "typescript": "3.4.5",
+    "css-loader": "5.0.1",
+    "html-webpack-plugin": ">=3.2.0",
+    "mini-css-extract-plugin": "1.3.5",
+    "mocha": "8.2.1",
+    "rimraf": "3.0.2",
+    "ts-node": "9.1.1",
+    "typescript": "4.1.3",
     "webpack": ">=3.0.0"
   },
   "dependencies": {
     "minimatch": "3.0.4"
   },
   "peerDependencies": {
-    "html-webpack-plugin": ">=3.0.0 || 4.0.0-beta.1 || 4.0.0-beta.2 || 4.0.0-beta.4 || 4.0.0-beta.5",
+    "html-webpack-plugin": ">=3.0.0",
     "webpack": ">=3.0.0"
   },
   "repository": {

diff --git a/spec/index.spec.ts b/spec/index.spec.ts
@@ -73,6 +73,8 @@ function testTypeOverride(err) {
     expect(/src="app\.js"/i.test(htmlContents)).to.be.true;
 }
 
+console.log('\nWEBPACK VERSION', webpack.version,'\n');
+console.log('\nHTML-WEBPACK_PLUGIN VERSION', HtmlWebpackPlugin.version,'\n');
 
 describe('HtmlWebpackLinkTypePlugin Development Mode', () => {