Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update this fork of the plugin - Resolved conflicts #12

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
ef4f526
Merge remote-tracking branch 'refs/remotes/GoogleChrome/master'
laysent Sep 3, 2017
784b01d
add feature to include all assets
laysent Sep 4, 2017
487f77a
add `fileWhitelist` to include specific files
laysent Sep 4, 2017
cdb459e
Merge remote-tracking branch 'refs/remotes/GoogleChrome/master'
laysent Sep 6, 2017
e19777f
Merge pull request #1 from GoogleChromeLabs/master
toxic-johann Dec 21, 2017
11da208
Merge branch 'master' into master
laysent Jan 13, 2018
748dbfa
update README to point out potential issue
laysent Jan 29, 2018
4ff53e0
Merge branch 'master' of https://github.com/GoogleChromeLabs/preload-…
toxic-johann Feb 7, 2018
cf895ed
[update] add excludeHtmlNames to solve problem mentioned in https://g…
toxic-johann Feb 7, 2018
e29cdd4
Merge pull request #54 from toxic-johann/master
jeffposnick Feb 11, 2018
374ad6f
Fixed all-assets being treated as a real chunk in doesChunkBelongToHT…
alechill Feb 14, 2018
de90ae6
Merge pull request #1 from alechill/master
laysent Feb 18, 2018
99b7f3c
merge from upstream
laysent Feb 18, 2018
aca5288
rename option names
laysent Feb 28, 2018
40a1220
Merge branch 'master' into master
jeffposnick Feb 28, 2018
0f80892
Merge pull request #36 from laysent/master
jeffposnick Feb 28, 2018
f604879
2.3.0
jeffposnick Mar 1, 2018
cee07b9
[update] use chunkGroup in webpack v4 to pass PreloadPlugin preloads …
toxic-johann Mar 3, 2018
3a546f9
[update] pass all three PreloadPlugin preloads or prefetches async ch…
toxic-johann Mar 3, 2018
46dd607
[update] pass some more tests and change one test as require logic ch…
toxic-johann Mar 3, 2018
0e17c6e
[update] pass PreloadPlugin filters chunks
toxic-johann Mar 3, 2018
7eb8803
[update] pass filtering unwanted files
toxic-johann Mar 3, 2018
2605ce4
[update] implement the multiple html function
toxic-johann Mar 4, 2018
fe3e64d
[update] update some test package
toxic-johann Mar 4, 2018
947c2bb
[update] use latest extract-test-webpack-plugin to pass all 17 tests
toxic-johann Mar 4, 2018
2cff0b4
[update] remove jasmin
toxic-johann Mar 6, 2018
81ebc2a
[update] add webpack-v3 logic back
toxic-johann Mar 7, 2018
62b4271
[update] compatiable webpack v3
toxic-johann Mar 8, 2018
798fc67
Merge pull request #57 from toxic-johann/master
jeffposnick Mar 9, 2018
34fd443
Use node 6 as a minimum.
jeffposnick Jun 6, 2018
76fb29e
Use url-parse for node 6 support
jeffposnick Jun 6, 2018
89f6495
Add a runtime check for the HtmlWebpackPlugin
jeffposnick Jun 6, 2018
89438eb
README updates.
jeffposnick Jun 6, 2018
b6c7553
More README link tweaks.
jeffposnick Jun 6, 2018
5daaa8e
3.0.0-beta.1
jeffposnick Jun 6, 2018
23834d7
Some additional tweaks.
jeffposnick Jun 7, 2018
05cdffc
TravisCI config
jeffposnick Jun 7, 2018
6317aab
Better install step
jeffposnick Jun 7, 2018
3c02dde
Merge branch 'master' into v3
jeffposnick Jun 7, 2018
b1f8ec6
More tweaks.
jeffposnick Jun 7, 2018
d80459a
Updating dependencies.
jeffposnick Aug 6, 2018
e58a837
Stop using transform-runtime
jeffposnick Aug 6, 2018
678aae5
Another depecdency update.
jeffposnick Aug 13, 2018
8e1ff45
Package updates and linting.
jeffposnick Oct 3, 2018
72ce0f0
Fix missing polyfills.
jeffposnick Oct 3, 2018
7430a47
WIP.
jeffposnick Oct 25, 2018
c57b0b3
Debugging.
jeffposnick Oct 25, 2018
680620f
Require the same html-webpack-plugin instance
jeffposnick Oct 30, 2018
a7f97bc
Getting closer?
jeffposnick Oct 30, 2018
89c8d42
Tweaks to README
jeffposnick Oct 30, 2018
8bda4ad
Added a package lock.
jeffposnick Oct 31, 2018
7905a9c
Merge pull request #82 from GoogleChromeLabs/html-plugin-updates
jeffposnick Oct 31, 2018
d007cf6
Get html-webpack-plugin instance from compilation.
jeffposnick Oct 31, 2018
52a3595
Modernization
jeffposnick Aug 21, 2019
fa21468
Travis tweak
jeffposnick Aug 21, 2019
5480093
Merge pull request #72 from GoogleChromeLabs/v3
jeffposnick Aug 21, 2019
6ca6ccd
README cleanup
jeffposnick Sep 5, 2019
81e83a2
Remove the demo.
jeffposnick Sep 5, 2019
082beca
Update year.
jeffposnick Sep 5, 2019
e4f4f68
Link to list of as values
jeffposnick Sep 5, 2019
799c757
Support for the media option
jeffposnick Sep 11, 2019
171d8fe
Merge pull request #99 from decrek/master
jeffposnick Oct 1, 2019
f9f846d
Merge branch 'master' into pr/2
Sep 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"plugins": ["@babel/transform-runtime"],
"presets": [
["@babel/preset-env", {
"targets": {
"node": "4.0.0"
}
"node": "8.0.0"
},
}]
]
}
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
language: node_js

node_js:
- "7"
- "6"
- "5"
- "4"
env:
- CXX=g++-4.8
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- 8

install:
- npm ci && cd test/webpack4 && npm ci && cd ../webpack4-htmlplugin4 && npm ci && cd ../..
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2014 Google Inc.
Copyright 2019 Google Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -199,4 +199,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
Loading