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

Upgrade jQuery by using the R package jquerylib #2197

Merged
merged 1 commit into from
Aug 6, 2021
Merged

Conversation

yihui
Copy link
Member

@yihui yihui commented Aug 2, 2021

close #1814

@yihui yihui added the next to consider for next release label Aug 2, 2021
Copy link
Member Author

@yihui yihui left a comment

Choose a reason for hiding this comment

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

Since rmarkdown 2.10 just went to CRAN last night, I'm merging this PR early to give us a little more time to test it before we release v2.11.

@yihui yihui added this to the v2.11 milestone Aug 6, 2021
@yihui yihui merged commit cb2e009 into main Aug 6, 2021
@yihui yihui deleted the update-jquery branch August 6, 2021 14:57
version = "1.11.3",
src = pkg_file("rmd/h/jquery"),
script = "jquery.min.js")
jquerylib::jquery_core()
Copy link
Collaborator

@cderv cderv Aug 16, 2021

Choose a reason for hiding this comment

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

@yihui What about already pinning version 3 to prevent any undesired future change if/when jquerylib changes its default ?

-jquerylib::jquery_core()
+jquerylib::jquery_core(major_version = 3)

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess jquerylib won't change the version here suddenly (Carson will probably notify us), but I can definitely see the value of being a little conservative by pinning the version. To make it easier for ourselves to test future versions of jQuery, we can use an option to specify the version and default it to 3, e.g.,

jquerylib::jquery_core(major_version = getOption('rmarkdown.jquery.version', 3))

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh I like the option ! I don't have this habits but this is great to have some config flag around for us to use.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess jquerylib won't change the version here suddenly (Carson will probably notify us), but I can definitely see the value of being a little conservative by pinning the version.

And yes I agree. I just see not harm and probably some benefit of being conservative for such things.

yihui added a commit that referenced this pull request Aug 16, 2021
jonathan-g added a commit to jonathan-g/rmarkdown that referenced this pull request Aug 17, 2021
jonathan-g added a commit to jonathan-g/rmarkdown that referenced this pull request Aug 17, 2021
* rstudio-main:
  pin the jquery version to 3: rstudio#2197 (comment)
clrpackages pushed a commit to clearlinux-pkgs/R-rmarkdown that referenced this pull request Sep 16, 2021
…n 2.11

Christophe Dervieux (2):
      Mark result of citeproc conversion as UTF-8 (#2202)
      Bump version

Garrick Aden-Buie (1):
      Prerender shiny rmd in separate environment (#2203)

Yihui Xie (9):
      start the next version
      close #1814: upgrade jquery by using the R package jquerylib, which currently ships jquery 3.x by default (#2197)
      pin the jquery version to 3: rstudio/rmarkdown#2197 (comment)
      fix yihui/xaringan#331: respect relative paths in parent directories in the `css` argument of `html_document()`
      use sass::output_template() instead of storing a copy in rmarkdown
      export convert_ipynb() per suggestion of @acircleda
      roxygenize and bump version
      https://rmarkdown.rstudio.com/authoring_bibliographies_and_citations.html -> https://pandoc.org/MANUAL.html#citations
      CRAN release v2.11

christophe dervieux (1):
      Add a specific dirname for sass caching
jonathan-g added a commit to jonathan-g/rmarkdown that referenced this pull request Sep 17, 2021
Merge branch 'jg-tree-fix' into jg-devel

# By Yihui Xie (9) and others
# Via Jonathan Gilligan (3) and Yihui Xie (1)
* jg-tree-fix:
  import bslib (rstudio#2154)
  CRAN release v2.11
  https://rmarkdown.rstudio.com/authoring_bibliographies_and_citations.html -> https://pandoc.org/MANUAL.html#citations
  Add a specific dirname for sass caching
  roxygenize and bump version
  export convert_ipynb() per suggestion of @acircleda
  use sass::output_template() instead of storing a copy in rmarkdown
  fix yihui/xaringan#331: respect relative paths in parent directories in the `css` argument of `html_document()`
  Bump version
  Prerender shiny rmd in separate environment (rstudio#2203)
  Mark result of citeproc conversion as UTF-8 (rstudio#2202)
  Fixed conflicts with rstudio main version.
  Update documentation for html_document.
  Add self (JG) as a contributor in DESCRIPTION.
  Resolve conflicts with new updates to RStudio main branch.
  pin the jquery version to 3: rstudio#2197 (comment)

# Conflicts:
#	DESCRIPTION
#	NEWS.md
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
next to consider for next release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update jQuery or apply the fix?
2 participants