diff --git a/.Rbuildignore b/.Rbuildignore index ab987bf..67f8cf3 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,3 +1,4 @@ +^CRAN-RELEASE$ ^node_modules$ ^js-tests$ ^srcjs$ diff --git a/CRAN-RELEASE b/CRAN-RELEASE new file mode 100644 index 0000000..d2a8495 --- /dev/null +++ b/CRAN-RELEASE @@ -0,0 +1,2 @@ +This package was submitted to CRAN on 2019-07-07. +Once it is accepted, delete this file and tag the release (commit b28e138662). diff --git a/DESCRIPTION b/DESCRIPTION index 874dc9a..371ca52 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: reactR Type: Package Title: React Helpers -Version: 0.4.1 -Date: 2019-07-03 +Version: 0.4.2 +Date: 2020-01-23 Authors@R: c( person( "Facebook", "Inc" @@ -46,5 +46,5 @@ Suggests: knitr, usethis, jsonlite -RoxygenNote: 6.1.1 +RoxygenNote: 7.0.2 VignetteBuilder: knitr diff --git a/NEWS.md b/NEWS.md index c5abfa6..5e3eda6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# reactR 0.4.2 + +* Update react to `16.12.0` + +* Update core-js to `2.6.11` + # reactR 0.4.1 * Add support for `shiny::registerInputHandler` in Shiny inputs; [pull 28](https://github.com/react-R/reactR/pull/28) diff --git a/R/meta.R b/R/meta.R index 2e4cf97..9736104 100644 --- a/R/meta.R +++ b/R/meta.R @@ -1,3 +1,3 @@ #'@keywords internal -react_version <- function(){'16.8.6'} +react_version <- function(){'16.12.0'} babel_version <- function(){'6.26.0'} \ No newline at end of file diff --git a/README.Rmd b/README.Rmd index a9171ca..ee8ae1d 100644 --- a/README.Rmd +++ b/README.Rmd @@ -34,6 +34,9 @@ devtools::install_github("react-R/reactR") To wrap a `React` component as an `htmlwidget`, please see the tutorial [htmlwidgets with reactR](https://react-r.github.io/reactR/articles/intro_htmlwidgets.html). Also, there are a variety of examples in the [react-R Github organization](https://github.com/react-R). + +[`reactable`](https://github.com/glin/reactable) is a very well-built `htmlwidget` leveraging this functionality. + ## Shiny Outputs and Inputs `htmlwidgets` built with `reactR` work well in Shiny as outputs. In version `0.4.0` Alan Dipert has added the ability to easily create React-based official `Shiny` inputs with helpers and scaffolds. Please see the [tutorial](https://react-r.github.io/reactR/articles/intro_inputs.html) for more details. @@ -78,8 +81,8 @@ browsable( tags$script( babel_transform('ReactDOM.render(

Powered By React/JSX

,document.getElementById("app"))') ), - # add core-js shim first for React in RStudio Viewer - html_dependency_corejs(), + # add core-js shim first for React in older versions of RStudio Viewer + #html_dependency_corejs(), html_dependency_react() ) ) @@ -87,4 +90,4 @@ browsable( ## Contributing and Code of Conduct -We welcome contributors and would love your participation. Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by the terms. +We welcome contributors and would love your participation. Please note that this project is released with a [Contributor Code of Conduct](https://github.com/react-R/reactR/blob/master/CONDUCT.md). By participating in this project you agree to abide by the terms. diff --git a/README.md b/README.md index 29e6dcd..7e60227 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,9 @@ reactR](https://react-r.github.io/reactR/articles/intro_htmlwidgets.html). Also, there are a variety of examples in the [react-R Github organization](https://github.com/react-R). +[`reactable`](https://github.com/glin/reactable) is a very well-built +`htmlwidget` leveraging this functionality. + ## Shiny Outputs and Inputs `htmlwidgets` built with `reactR` work well in Shiny as outputs. In @@ -88,8 +91,8 @@ browsable( tags$script( babel_transform('ReactDOM.render(

Powered By React/JSX

,document.getElementById("app"))') ), - # add core-js shim first for React in RStudio Viewer - html_dependency_corejs(), + # add core-js shim first for React in older versions of RStudio Viewer + #html_dependency_corejs(), html_dependency_react() ) ) @@ -99,5 +102,5 @@ browsable( We welcome contributors and would love your participation. Please note that this project is released with a [Contributor Code of -Conduct](CONDUCT.md). By participating in this project you agree to -abide by the terms. +Conduct](https://github.com/react-R/reactR/blob/master/CONDUCT.md). By +participating in this project you agree to abide by the terms. diff --git a/docs/404.html b/docs/404.html new file mode 100644 index 0000000..5eda575 --- /dev/null +++ b/docs/404.html @@ -0,0 +1,160 @@ + + + + + + + + +Page not found (404) • reactR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ +
+
+ + +Content not found. Please use links in the navbar. + +
+ +
+ + + + +
+ + + + + + + + diff --git a/docs/CONDUCT.html b/docs/CONDUCT.html index 50425ad..0fa4bad 100644 --- a/docs/CONDUCT.html +++ b/docs/CONDUCT.html @@ -23,13 +23,15 @@ - + + - - + + + @@ -51,6 +53,7 @@ + @@ -67,7 +70,7 @@ reactR - 0.4.1 + 0.4.2 @@ -75,7 +78,7 @@