Skip to content

Commit 0e5f5e6

Browse files
committed
Merge branch 'develop'
2 parents d7eab47 + 27a63fa commit 0e5f5e6

File tree

6 files changed

+33
-17
lines changed

6 files changed

+33
-17
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ node_modules/
22
dist/
33

44
package-lock.json
5-
spec/test_dist
5+
spec/test_dist
6+
package-lock.json

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ node_js:
66
- "14"
77

88
env:
9+
# - WEBPACK_VERSION=3 HTML_PLUGIN_VERSION=3
910
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=3
1011
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=4
12+
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=5
13+
- WEBPACK_VERSION=5 HTML_PLUGIN_VERSION=5
1114

12-
install:
15+
install:
1316
- npm install
1417
- npm install -D webpack@$WEBPACK_VERSION || true
1518
- npm install -D html-webpack-plugin@$HTML_PLUGIN_VERSION || true
1619

17-
script:
20+
script:
1821
- npm test
1922
- npm run build
2023

@@ -25,8 +28,8 @@ deploy:
2528
node: "10"
2629
tags: true
2730
branch: master
28-
if: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=3
31+
if: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=4
2932
provider: npm
3033
3134
api_key:
32-
secure: GufE1aXORf6PuzRKBcNpxWhXnfcttsqCQj12R1npVdDF2njc+2FzgYGUAergyh/gkLlWAgcV7DbF1P4qt4jIFRdqXoUtQTI7N1uH7Ay/TdztPxVYancMXoJG/O4e0R2cnfkTCkzRgJF4P3B/WWK5Mq60lLdROrITLsUIwnNI3R88zHNr8u7yjF0RyidpMwTRw9rOyESGQzcPSO4ft4GK/KKmx2+11YXjS2j0OVXcpB4Ee2NCyxXT2REY93EBI0k4ScJFxTkv7Z7sSguJOUJM7EXB/6gAwXx40p5tBNvQ5kmEIaiPscIVcqPdyj4AMGOU/LmDcHxZiZoIvmSLR5/Y2bs0dtKi0hf/SQnvTOccSNJXlJWEGYURUSbOfcTiuUos2lzoqAZnbU8/FujhzQpmKEc0BkNJds1AJCSBkok5QJAmzj3vvs48sJLqcK9z8ydflHOgPaPT0xlkxcEYJqMbK4il1DZXw6sLCKYYRdkAAj2/eKxbMOEetkn74364z7JZdXpP69ryC0AZJH8yCCDca/hd5K/vgxU41feaKJwbpLQocjORlDroctPIxIDU6vRce7Z8i4QtmJFj8P4mGhmWaF9tvJ4o+3LlJOHQYlmlQLUesypRM0savz2glVI8Zon+k3iJbAhFMTpELqw40sj4lgJUaXe9TVvbGP1PflrRPm8=
35+
secure: GufE1aXORf6PuzRKBcNpxWhXnfcttsqCQj12R1npVdDF2njc+2FzgYGUAergyh/gkLlWAgcV7DbF1P4qt4jIFRdqXoUtQTI7N1uH7Ay/TdztPxVYancMXoJG/O4e0R2cnfkTCkzRgJF4P3B/WWK5Mq60lLdROrITLsUIwnNI3R88zHNr8u7yjF0RyidpMwTRw9rOyESGQzcPSO4ft4GK/KKmx2+11YXjS2j0OVXcpB4Ee2NCyxXT2REY93EBI0k4ScJFxTkv7Z7sSguJOUJM7EXB/6gAwXx40p5tBNvQ5kmEIaiPscIVcqPdyj4AMGOU/LmDcHxZiZoIvmSLR5/Y2bs0dtKi0hf/SQnvTOccSNJXlJWEGYURUSbOfcTiuUos2lzoqAZnbU8/FujhzQpmKEc0BkNJds1AJCSBkok5QJAmzj3vvs48sJLqcK9z8ydflHOgPaPT0xlkxcEYJqMbK4il1DZXw6sLCKYYRdkAAj2/eKxbMOEetkn74364z7JZdXpP69ryC0AZJH8yCCDca/hd5K/vgxU41feaKJwbpLQocjORlDroctPIxIDU6vRce7Z8i4QtmJFj8P4mGhmWaF9tvJ4o+3LlJOHQYlmlQLUesypRM0savz2glVI8Zon+k3iJbAhFMTpELqw40sj4lgJUaXe9TVvbGP1PflrRPm8=

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# 1.0.0 - Webpack 5 support
2+
- verify support for webpack5 and html-webpack-plugin 5
3+
4+
5+
# 0.0.2
6+
## Build tool and readme changes
7+
No functional difference, just pinning dependencies and updating readme
8+
9+
# 0.0.1
10+
## Initial Release

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Adam Yost
3+
Copyright (c) 2021 Adam Yost
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "html-webpack-skip-assets-plugin",
3-
"version": "0.0.2",
3+
"version": "1.0.0",
44
"description": "a plugin for html-webpack-plugin to skip adding certain output files to the html",
55
"main": "dist/plugin.js",
66
"scripts": {
@@ -20,18 +20,17 @@
2020
"author": "swimmadude66",
2121
"license": "MIT",
2222
"devDependencies": {
23-
"@types/chai": "4.2.11",
24-
"@types/mocha": "7.0.2",
23+
"@types/chai": "4.2.14",
24+
"@types/mocha": "8.2.0",
2525
"@types/node": "13.13.4",
26-
"@types/webpack": "4.41.12",
2726
"chai": "4.2.0",
28-
"css-loader": "3.5.3",
27+
"css-loader": "5.0.1",
2928
"html-webpack-plugin": ">=3.2.0",
30-
"mini-css-extract-plugin": "0.9.0",
31-
"mocha": "7.1.2",
32-
"rimraf": "2.6.3",
33-
"ts-node": "8.9.1",
34-
"typescript": "3.8.3",
29+
"mini-css-extract-plugin": "1.3.5",
30+
"mocha": "8.2.1",
31+
"rimraf": "3.0.2",
32+
"ts-node": "9.1.1",
33+
"typescript": "4.1.3",
3534
"webpack": ">=3.0.0"
3635
},
3736
"dependencies": {

spec/index.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const webpackDevOptions: webpack.Configuration = {
4141
use: [{
4242
loader: MiniCssExtractPlugin.loader
4343
},{
44-
loader: 'css-loader'
44+
loader: 'css-loader'
4545
}]
4646
}
4747
]
@@ -75,6 +75,9 @@ function getOutput(): string {
7575
return htmlContents;
7676
}
7777

78+
console.log('\nWEBPACK VERSION', webpack.version,'\n');
79+
console.log('\nHTML-WEBPACK_PLUGIN VERSION', HtmlWebpackPlugin.version,'\n');
80+
7881
describe('HtmlWebpackSkipAssetsPlugin Development Mode', () => {
7982

8083
afterEach((done) => {

0 commit comments

Comments
 (0)