Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
swimmadude66 committed Feb 4, 2021
2 parents d7eab47 + 27a63fa commit 0e5f5e6
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules/
dist/

package-lock.json
spec/test_dist
spec/test_dist
package-lock.json
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@ node_js:
- "14"

env:
# - WEBPACK_VERSION=3 HTML_PLUGIN_VERSION=3
- 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:
install:
- npm install
- npm install -D webpack@$WEBPACK_VERSION || true
- npm install -D html-webpack-plugin@$HTML_PLUGIN_VERSION || true

script:
script:
- npm test
- npm run build

Expand All @@ -25,8 +28,8 @@ deploy:
node: "10"
tags: true
branch: master
if: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=3
if: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=4
provider: npm
email: "[email protected]"
api_key:
secure: GufE1aXORf6PuzRKBcNpxWhXnfcttsqCQj12R1npVdDF2njc+2FzgYGUAergyh/gkLlWAgcV7DbF1P4qt4jIFRdqXoUtQTI7N1uH7Ay/TdztPxVYancMXoJG/O4e0R2cnfkTCkzRgJF4P3B/WWK5Mq60lLdROrITLsUIwnNI3R88zHNr8u7yjF0RyidpMwTRw9rOyESGQzcPSO4ft4GK/KKmx2+11YXjS2j0OVXcpB4Ee2NCyxXT2REY93EBI0k4ScJFxTkv7Z7sSguJOUJM7EXB/6gAwXx40p5tBNvQ5kmEIaiPscIVcqPdyj4AMGOU/LmDcHxZiZoIvmSLR5/Y2bs0dtKi0hf/SQnvTOccSNJXlJWEGYURUSbOfcTiuUos2lzoqAZnbU8/FujhzQpmKEc0BkNJds1AJCSBkok5QJAmzj3vvs48sJLqcK9z8ydflHOgPaPT0xlkxcEYJqMbK4il1DZXw6sLCKYYRdkAAj2/eKxbMOEetkn74364z7JZdXpP69ryC0AZJH8yCCDca/hd5K/vgxU41feaKJwbpLQocjORlDroctPIxIDU6vRce7Z8i4QtmJFj8P4mGhmWaF9tvJ4o+3LlJOHQYlmlQLUesypRM0savz2glVI8Zon+k3iJbAhFMTpELqw40sj4lgJUaXe9TVvbGP1PflrRPm8=
secure: GufE1aXORf6PuzRKBcNpxWhXnfcttsqCQj12R1npVdDF2njc+2FzgYGUAergyh/gkLlWAgcV7DbF1P4qt4jIFRdqXoUtQTI7N1uH7Ay/TdztPxVYancMXoJG/O4e0R2cnfkTCkzRgJF4P3B/WWK5Mq60lLdROrITLsUIwnNI3R88zHNr8u7yjF0RyidpMwTRw9rOyESGQzcPSO4ft4GK/KKmx2+11YXjS2j0OVXcpB4Ee2NCyxXT2REY93EBI0k4ScJFxTkv7Z7sSguJOUJM7EXB/6gAwXx40p5tBNvQ5kmEIaiPscIVcqPdyj4AMGOU/LmDcHxZiZoIvmSLR5/Y2bs0dtKi0hf/SQnvTOccSNJXlJWEGYURUSbOfcTiuUos2lzoqAZnbU8/FujhzQpmKEc0BkNJds1AJCSBkok5QJAmzj3vvs48sJLqcK9z8ydflHOgPaPT0xlkxcEYJqMbK4il1DZXw6sLCKYYRdkAAj2/eKxbMOEetkn74364z7JZdXpP69ryC0AZJH8yCCDca/hd5K/vgxU41feaKJwbpLQocjORlDroctPIxIDU6vRce7Z8i4QtmJFj8P4mGhmWaF9tvJ4o+3LlJOHQYlmlQLUesypRM0savz2glVI8Zon+k3iJbAhFMTpELqw40sj4lgJUaXe9TVvbGP1PflrRPm8=
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 1.0.0 - Webpack 5 support
- verify support for webpack5 and html-webpack-plugin 5


# 0.0.2
## Build tool and readme changes
No functional difference, just pinning dependencies and updating readme

# 0.0.1
## Initial Release
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "html-webpack-skip-assets-plugin",
"version": "0.0.2",
"version": "1.0.0",
"description": "a plugin for html-webpack-plugin to skip adding certain output files to the html",
"main": "dist/plugin.js",
"scripts": {
Expand All @@ -20,18 +20,17 @@
"author": "swimmadude66",
"license": "MIT",
"devDependencies": {
"@types/chai": "4.2.11",
"@types/mocha": "7.0.2",
"@types/chai": "4.2.14",
"@types/mocha": "8.2.0",
"@types/node": "13.13.4",
"@types/webpack": "4.41.12",
"chai": "4.2.0",
"css-loader": "3.5.3",
"css-loader": "5.0.1",
"html-webpack-plugin": ">=3.2.0",
"mini-css-extract-plugin": "0.9.0",
"mocha": "7.1.2",
"rimraf": "2.6.3",
"ts-node": "8.9.1",
"typescript": "3.8.3",
"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": {
Expand Down
5 changes: 4 additions & 1 deletion spec/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const webpackDevOptions: webpack.Configuration = {
use: [{
loader: MiniCssExtractPlugin.loader
},{
loader: 'css-loader'
loader: 'css-loader'
}]
}
]
Expand Down Expand Up @@ -75,6 +75,9 @@ function getOutput(): string {
return htmlContents;
}

console.log('\nWEBPACK VERSION', webpack.version,'\n');
console.log('\nHTML-WEBPACK_PLUGIN VERSION', HtmlWebpackPlugin.version,'\n');

describe('HtmlWebpackSkipAssetsPlugin Development Mode', () => {

afterEach((done) => {
Expand Down

0 comments on commit 0e5f5e6

Please sign in to comment.