Skip to content

Commit 9cfe09a

Browse files
committed
Merge branch 'develop'
2 parents 24aab2a + ba43de4 commit 9cfe09a

File tree

12 files changed

+137
-5530
lines changed

12 files changed

+137
-5530
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
node_modules/
2-
dist/
3-
spec/test_dist/
1+
node_modules/
2+
dist/
3+
spec/test_dist/
4+
package-lock.json

.npmignore

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
src/
2-
spec/
3-
node_modules/
4-
.vscode/
5-
npm-debug.log
6-
tsconfig.json
7-
.travis.yml
1+
src/
2+
spec/
3+
node_modules/
4+
.vscode/
5+
npm-debug.log
6+
tsconfig.json
7+
.travis.yml

.travis.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1+
os: linux
2+
dist: 'xenial'
13
language: node_js
24
node_js:
35
- "8"
4-
- "9"
5-
- "10"
6-
- "11"
76
- "12"
87

98
env:
9+
# - WEBPACK_VERSION=3 HTML_PLUGIN_VERSION=3
10+
# Webpack 3 and mini-css-extract in tests cause issues
1011
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=3
11-
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=next
12+
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=4
1213

13-
install:
14+
install:
1415
- npm install
1516
- npm install -D webpack@$WEBPACK_VERSION || true
1617
- npm install -D html-webpack-plugin@$HTML_PLUGIN_VERSION || true
1718

18-
script:
19+
script:
1920
- npm test
2021
- npm run build
2122

2223
deploy:
23-
skip_cleanup: true
24+
cleanup: false
2425
on:
2526
repo: swimmadude66/html-webpack-link-type-plugin
26-
node: "8"
27+
node_js: "8"
2728
tags: true
2829
branch: master
29-
if: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=3
30+
condition: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=3
3031
provider: npm
3132
32-
api_key:
33-
secure: "TiQ8LgGsyPcg7IUb2BL4WIAFoL8RNZc6FA8Wj9NgZYMMQsvKHXwH9i1Rd0uGlw/ESB601AI+l3ufq7KOCm0lzKwCljuh4UT9+1N0fTLdlV1m4RXzrbjNZYZO+cAkmQB9BTMcTJcxruOUiwSfRDuYxflpVAAbW+kNpvGVblwgBfbtfmVudKO0/zWvFX1XClNkpyMroMI13bCDjeqK64sLKnlDZHNyp1AgKMtBl0ugc2c2zUK7bRhRT5XgUvfNDaZayMPIJyhv5AZRlFt7o1Vs4fbWY/ni4M1OkgalGt3fImXk+ub17jDMfF8ffoZMoKv6KPMvW+ZFGq+pZErgc27elRf2jSGlSgLpayFn0U0bpG+clfgUphFm+f8P1BhMrMkxkYzmKElTn0uyKScEvHYXzOxVEKWqQVnCarOwaf8fIPeWltQpB/0N2hlk5qoPLwlO64RKItNf8aytsMSbcZ677myx6HHpK6d+Ie8pz6pDH7FdhUufzmwVqPZEYlI2dSK52uOTRNi1C5mBVk1ZsKSSqh3Tgq+FMWpSloFWLpRZnBecD3TWktZvZtcsxfXgF5quuNo3GhPgmB1hl2M4GQ/eHEN1iBxFohp4ZhhsBvR2wdJn0O9SlnikJ5WctXiT4MvtP1PusZMDpnUjkVZRjbiOgVsG7/4kbXp2mmbPTuVGUos="
33+
api_token:
34+
secure: "TiQ8LgGsyPcg7IUb2BL4WIAFoL8RNZc6FA8Wj9NgZYMMQsvKHXwH9i1Rd0uGlw/ESB601AI+l3ufq7KOCm0lzKwCljuh4UT9+1N0fTLdlV1m4RXzrbjNZYZO+cAkmQB9BTMcTJcxruOUiwSfRDuYxflpVAAbW+kNpvGVblwgBfbtfmVudKO0/zWvFX1XClNkpyMroMI13bCDjeqK64sLKnlDZHNyp1AgKMtBl0ugc2c2zUK7bRhRT5XgUvfNDaZayMPIJyhv5AZRlFt7o1Vs4fbWY/ni4M1OkgalGt3fImXk+ub17jDMfF8ffoZMoKv6KPMvW+ZFGq+pZErgc27elRf2jSGlSgLpayFn0U0bpG+clfgUphFm+f8P1BhMrMkxkYzmKElTn0uyKScEvHYXzOxVEKWqQVnCarOwaf8fIPeWltQpB/0N2hlk5qoPLwlO64RKItNf8aytsMSbcZ677myx6HHpK6d+Ie8pz6pDH7FdhUufzmwVqPZEYlI2dSK52uOTRNi1C5mBVk1ZsKSSqh3Tgq+FMWpSloFWLpRZnBecD3TWktZvZtcsxfXgF5quuNo3GhPgmB1hl2M4GQ/eHEN1iBxFohp4ZhhsBvR2wdJn0O9SlnikJ5WctXiT4MvtP1PusZMDpnUjkVZRjbiOgVsG7/4kbXp2mmbPTuVGUos="

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# 1.0.4 Include .d.ts declaration files in package
2+
- Addresses #15
3+
- Remove testcases with Webpack 3 (compatability issues with mini-css-extract-plugin)
4+
15
# 1.0.3 Handle production-mode defaults of webpack
2-
- Added documentation around a potential pitfall when using production-mode webpack.
6+
- Added documentation around a potential pitfall when using production-mode webpack.
37
- Upgraded test dependencies
48
- Fixed peerDependency version syntax
59

@@ -10,4 +14,4 @@ Fixed an issue where non-links were being removed, rather than left alone.
1014
added support for HtmlWebpack Plugin v4's new hooks
1115

1216
# 1.0.0 Initial Releas
13-
Verified that the plugin works with webpack 4 and html-webpack-plugin v3.2
17+
Verified that the plugin works with webpack 4 and html-webpack-plugin v3.2

LICENSE

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
MIT License
2-
3-
Copyright (c) 2018 Steady
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
MIT License
2+
3+
Copyright (c) 2020 Adam Yost
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)