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.

Sign up for GitHub

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

Jump to bottom

Update daterangepicker and add minified build #1380

Merged
merged 3 commits into from May 30, 2020
Merged

Update daterangepicker and add minified build #1380

merged 3 commits into from May 30, 2020

Conversation

XhmikosR
Copy link
Contributor

@XhmikosR XhmikosR commented May 25, 2020 •
edited

By submitting this pull request, I confirm the following: {please fill any appropriate checkboxes, e.g: [X]}

{Please ensure that your pull request is for the 'devel' branch!}

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

Please check out the individual patches.

  1. the update is needed for jQuery 3.x
  2. while at it and since there are no minified builds, I added one myself. I know it's a 3rd-party file, but it's in maintenance mode so there aren't and probably won't be a lot of updates. I could add the needed npm scripts for this, but I'd rather keep it simple without adding extra npm dependencies just for this. I mention the exact commands in my commit message. The CSS savings are negligible, so I can revert the CSS minification. The JS savings are quite big, like ~50% uncompressed
  3. I pushed a patch from my fork with a couple of tweaks. These have all been proposed upstream too, not sure when or if they will be accepted, but we could wait a bit. I can revert this patch if you guys prefer. EDIT: dropped this patch
  4. I pushed a patch to make daterangepicker use the same font as we do everywhere else

daterangepicker changelog: dangrossman/daterangepicker@v3.0.5...v3.1

@XhmikosR XhmikosR added the dependencies Pull requests that update a dependency file label May 25, 2020
@XhmikosR XhmikosR force-pushed the update-daterangepicker branch 3 times, most recently from 4dce2c8 to d6d0247 Compare May 29, 2020 04:42
@XhmikosR XhmikosR marked this pull request as ready for review May 29, 2020 04:42
@XhmikosR XhmikosR force-pushed the update-daterangepicker branch 2 times, most recently from c0281e9 to c17d4a3 Compare May 29, 2020 05:06
@XhmikosR
Copy link
Contributor Author

I dropped my fork patches, but I don't have high hopes those will be merged upstream anytime soon.

@XhmikosR XhmikosR changed the title Update daterangepicker Update daterangepicker and add minfied build May 29, 2020
@XhmikosR XhmikosR added this to the v5.1 milestone May 29, 2020
@XhmikosR XhmikosR changed the title Update daterangepicker and add minfied build Update daterangepicker and add minified build May 29, 2020
PromoFaux
PromoFaux requested changes May 29, 2020
View reviewed changes
Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@XhmikosR, please resolve merge conflicts

@XhmikosR
Update daterangepicker to v3.1.0.
6997122 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
@XhmikosR
Use minified daterangepicker builds.
876e7d8 
The official distribution doesn't include minified files, so just minify the files ourselves.

It's in maintenance mode anyway.

Commands for future reference:

* cleancss --compatibility ie9 -O1 specialComments:0 -o daterangepicker.min.css daterangepicker.css
* terser daterangepicker.js --compress typeofs=false --mangle --source-map url=daterangepicker.min.js.map -o daterangepicker.min.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
@XhmikosR
Make daterangepicker use the same font as everywhere else.
11f621d 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
@XhmikosR XhmikosR requested a review from PromoFaux May 30, 2020 05:35
@PromoFaux PromoFaux merged commit 0fac8a5 into devel May 30, 2020
@PromoFaux PromoFaux deleted the update-daterangepicker branch May 30, 2020 14:34
@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
Merged
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PromoFaux PromoFaux PromoFaux approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
v5.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@XhmikosR @pralor-bot @PromoFaux