Skip to content

Commit

Permalink
Merge pull request #39 from react-R/develop
Browse files Browse the repository at this point in the history
update react and core-js
  • Loading branch information
timelyportfolio authored Feb 1, 2020
2 parents b28e138 + 5d4a24d commit 435862c
Show file tree
Hide file tree
Showing 42 changed files with 3,507 additions and 2,034 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
^CRAN-RELEASE$
^node_modules$
^js-tests$
^srcjs$
Expand Down
2 changes: 2 additions & 0 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -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).
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -46,5 +46,5 @@ Suggests:
knitr,
usethis,
jsonlite
RoxygenNote: 6.1.1
RoxygenNote: 7.0.2
VignetteBuilder: knitr
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion R/meta.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#'@keywords internal
react_version <- function(){'16.8.6'}
react_version <- function(){'16.12.0'}
babel_version <- function(){'6.26.0'}
9 changes: 6 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -78,13 +81,13 @@ browsable(
tags$script(
babel_transform('ReactDOM.render(<h1>Powered By React/JSX</h1>,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()
)
)
```

## 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.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -88,8 +91,8 @@ browsable(
tags$script(
babel_transform('ReactDOM.render(<h1>Powered By React/JSX</h1>,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()
)
)
Expand All @@ -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.
160 changes: 160 additions & 0 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 15 additions & 7 deletions docs/CONDUCT.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 435862c

Please sign in to comment.