Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
swimmadude66 committed Nov 18, 2020
2 parents 24aab2a + ba43de4 commit 9cfe09a
Show file tree
Hide file tree
Showing 12 changed files with 137 additions and 5,530 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules/
dist/
spec/test_dist/
node_modules/
dist/
spec/test_dist/
package-lock.json
14 changes: 7 additions & 7 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
src/
spec/
node_modules/
.vscode/
npm-debug.log
tsconfig.json
.travis.yml
src/
spec/
node_modules/
.vscode/
npm-debug.log
tsconfig.json
.travis.yml
23 changes: 12 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
os: linux
dist: 'xenial'
language: node_js
node_js:
- "8"
- "9"
- "10"
- "11"
- "12"

env:
# - WEBPACK_VERSION=3 HTML_PLUGIN_VERSION=3
# Webpack 3 and mini-css-extract in tests cause issues
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=3
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=next
- WEBPACK_VERSION=4 HTML_PLUGIN_VERSION=4

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

deploy:
skip_cleanup: true
cleanup: false
on:
repo: swimmadude66/html-webpack-link-type-plugin
node: "8"
node_js: "8"
tags: true
branch: master
if: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=3
condition: env(WEBPACK_VERSION)=4 AND env(HTML_PLUGIN_VERSION)=3
provider: npm
email: "swimmadude66@gmail.com"
api_key:
secure: "TiQ8LgGsyPcg7IUb2BL4WIAFoL8RNZc6FA8Wj9NgZYMMQsvKHXwH9i1Rd0uGlw/ESB601AI+l3ufq7KOCm0lzKwCljuh4UT9+1N0fTLdlV1m4RXzrbjNZYZO+cAkmQB9BTMcTJcxruOUiwSfRDuYxflpVAAbW+kNpvGVblwgBfbtfmVudKO0/zWvFX1XClNkpyMroMI13bCDjeqK64sLKnlDZHNyp1AgKMtBl0ugc2c2zUK7bRhRT5XgUvfNDaZayMPIJyhv5AZRlFt7o1Vs4fbWY/ni4M1OkgalGt3fImXk+ub17jDMfF8ffoZMoKv6KPMvW+ZFGq+pZErgc27elRf2jSGlSgLpayFn0U0bpG+clfgUphFm+f8P1BhMrMkxkYzmKElTn0uyKScEvHYXzOxVEKWqQVnCarOwaf8fIPeWltQpB/0N2hlk5qoPLwlO64RKItNf8aytsMSbcZ677myx6HHpK6d+Ie8pz6pDH7FdhUufzmwVqPZEYlI2dSK52uOTRNi1C5mBVk1ZsKSSqh3Tgq+FMWpSloFWLpRZnBecD3TWktZvZtcsxfXgF5quuNo3GhPgmB1hl2M4GQ/eHEN1iBxFohp4ZhhsBvR2wdJn0O9SlnikJ5WctXiT4MvtP1PusZMDpnUjkVZRjbiOgVsG7/4kbXp2mmbPTuVGUos="
api_token:
secure: "TiQ8LgGsyPcg7IUb2BL4WIAFoL8RNZc6FA8Wj9NgZYMMQsvKHXwH9i1Rd0uGlw/ESB601AI+l3ufq7KOCm0lzKwCljuh4UT9+1N0fTLdlV1m4RXzrbjNZYZO+cAkmQB9BTMcTJcxruOUiwSfRDuYxflpVAAbW+kNpvGVblwgBfbtfmVudKO0/zWvFX1XClNkpyMroMI13bCDjeqK64sLKnlDZHNyp1AgKMtBl0ugc2c2zUK7bRhRT5XgUvfNDaZayMPIJyhv5AZRlFt7o1Vs4fbWY/ni4M1OkgalGt3fImXk+ub17jDMfF8ffoZMoKv6KPMvW+ZFGq+pZErgc27elRf2jSGlSgLpayFn0U0bpG+clfgUphFm+f8P1BhMrMkxkYzmKElTn0uyKScEvHYXzOxVEKWqQVnCarOwaf8fIPeWltQpB/0N2hlk5qoPLwlO64RKItNf8aytsMSbcZ677myx6HHpK6d+Ie8pz6pDH7FdhUufzmwVqPZEYlI2dSK52uOTRNi1C5mBVk1ZsKSSqh3Tgq+FMWpSloFWLpRZnBecD3TWktZvZtcsxfXgF5quuNo3GhPgmB1hl2M4GQ/eHEN1iBxFohp4ZhhsBvR2wdJn0O9SlnikJ5WctXiT4MvtP1PusZMDpnUjkVZRjbiOgVsG7/4kbXp2mmbPTuVGUos="
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# 1.0.4 Include .d.ts declaration files in package
- Addresses #15
- Remove testcases with Webpack 3 (compatability issues with mini-css-extract-plugin)

# 1.0.3 Handle production-mode defaults of webpack
- Added documentation around a potential pitfall when using production-mode webpack.
- Added documentation around a potential pitfall when using production-mode webpack.
- Upgraded test dependencies
- Fixed peerDependency version syntax

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

# 1.0.0 Initial Releas
Verified that the plugin works with webpack 4 and html-webpack-plugin v3.2
Verified that the plugin works with webpack 4 and html-webpack-plugin v3.2
42 changes: 21 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MIT License

Copyright (c) 2018 Steady

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
MIT License
Copyright (c) 2020 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
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit 9cfe09a

Please sign in to comment.