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

Use single copy of static assets. Update jQuery #5823

Merged
merged 4 commits into from Feb 12, 2018

Conversation

carltongibson
Copy link
Collaborator

Closes #5804

I have made the interactive docs use the top-level versions of jQuery and Bootstrap and updated jQuery to (latest) v3.3.1

Note: doesn't update doc theme. I guess we should pull from Mkdocs there.

Needs testing: Can you (yes, you!) give it a run please? Can all of you with CI builds and staging servers that report issues 10 minutes after a release give this a try too? — I'd like to make sure it all still works. Thanks!

@carltongibson carltongibson added this to the 3.8 Release milestone Feb 9, 2018
@rpkilby
Copy link
Member

rpkilby commented Feb 9, 2018

It looks like the bootstrap-theme file for the docs has been removed, which is why the dist build is failing.

@carltongibson
Copy link
Collaborator Author

Ah, handy dist build 😀

OK. I’ll put that back in tomorrow.

@rpkilby
Copy link
Member

rpkilby commented Feb 10, 2018

See, all that packaging related pain and suffering for 3.7.4 was worth it. 😄

@tomchristie
Copy link
Member

Looks good, yup!

@tomchristie tomchristie merged commit 7d0d22f into encode:master Feb 12, 2018
@blueyed
Copy link
Contributor

blueyed commented Feb 20, 2018

Thank you!

However the vulnerability in bootstrap (https://snyk.io/vuln/npm:bootstrap:20160627) is not fixed with this.
It says that it is fixed in versions 3.4.0 and 4.0.0-beta.2, but there does not seem to be a version 3.4.0 indeed. Therefore only version 4 appears to fix it.

@carltongibson
Copy link
Collaborator Author

Upgrading to v4 is not realistic, unless a user land PR comes in.

I read something on this that seemed to suggest a v3.4 would arrive at some point. Any chance you could follow up on the bootstrap issue tracker?

@rpkilby
Copy link
Member

rpkilby commented Feb 21, 2018

I skimmed the bootstrap repo for a v3.4 update, but I don't see any milestones or projects related to this. The only evidence that v3.4 is a possibility is the associated branch. I've asked their slack channel if there any plans, but I'm waiting for a response.

@blueyed
Copy link
Contributor

blueyed commented Feb 21, 2018

@carltongibson

Upgrading to v4 is not realistic, unless a user land PR comes in.

What do you mean exactly, please elaborate on "user land PR".

@carltongibson
Copy link
Collaborator Author

@blueyed 😃

Someone putting in the leg-work to do it.

It's non-trivial. Totally do-able, but an amount of work that we don't have bandwidth for as of now.
Maybe that changes but best option is the above.

@carltongibson carltongibson deleted the 38/update-jquery branch February 21, 2018 19:27
@rpkilby
Copy link
Member

rpkilby commented Feb 21, 2018

I got a response back on the slack channel. Basically, mdo agrees that v3.4 would be nice, but the reality is that developer availability is limited.

I've created a tracking issue here: twbs/bootstrap#25679

@490386Ayan
Copy link

what is the timeline for v.3.4 release? Kindly let me know the time line so we can use it. Since we are already using Bootstrap 3.3.7, so we need it asap. I have got only dev release link. Kindly reply me. Awaiting a positive reply.

@rpkilby
Copy link
Member

rpkilby commented Jun 22, 2018

Hi @490386Ayan. As stated in my previous comment, Bootstrap 3.4 is tracked in twbs/bootstrap/issues/25679. We don't have any association with Bootstrap and have no control over when 3.4 will be released.

pchiquet pushed a commit to pchiquet/django-rest-framework that referenced this pull request Nov 17, 2020
* Move font-awesome to top level.

* Use top-level jQuery & Bootstrap

* Update to jQuery v3.3.1

Compatible with Bootstrap v3.3.7
c.f. twbs/bootstrap#16834 (comment)

* Re-add bootstrap-theme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants