Skip to content

Commit 435862c

Browse files
Merge pull request #39 from react-R/develop
update react and core-js
2 parents b28e138 + 5d4a24d commit 435862c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3507
-2034
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
^CRAN-RELEASE$
12
^node_modules$
23
^js-tests$
34
^srcjs$

CRAN-RELEASE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This package was submitted to CRAN on 2019-07-07.
2+
Once it is accepted, delete this file and tag the release (commit b28e138662).

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: reactR
22
Type: Package
33
Title: React Helpers
4-
Version: 0.4.1
5-
Date: 2019-07-03
4+
Version: 0.4.2
5+
Date: 2020-01-23
66
Authors@R: c(
77
person(
88
"Facebook", "Inc"
@@ -46,5 +46,5 @@ Suggests:
4646
knitr,
4747
usethis,
4848
jsonlite
49-
RoxygenNote: 6.1.1
49+
RoxygenNote: 7.0.2
5050
VignetteBuilder: knitr

NEWS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# reactR 0.4.2
2+
3+
* Update react to `16.12.0`
4+
5+
* Update core-js to `2.6.11`
6+
17
# reactR 0.4.1
28

39
* Add support for `shiny::registerInputHandler` in Shiny inputs; [pull 28](https://github.com/react-R/reactR/pull/28)

R/meta.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#'@keywords internal
2-
react_version <- function(){'16.8.6'}
2+
react_version <- function(){'16.12.0'}
33
babel_version <- function(){'6.26.0'}

README.Rmd

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ devtools::install_github("react-R/reactR")
3434

3535
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).
3636

37+
38+
[`reactable`](https://github.com/glin/reactable) is a very well-built `htmlwidget` leveraging this functionality.
39+
3740
## Shiny Outputs and Inputs
3841

3942
`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,13 +81,13 @@ browsable(
7881
tags$script(
7982
babel_transform('ReactDOM.render(<h1>Powered By React/JSX</h1>,document.getElementById("app"))')
8083
),
81-
# add core-js shim first for React in RStudio Viewer
82-
html_dependency_corejs(),
84+
# add core-js shim first for React in older versions of RStudio Viewer
85+
#html_dependency_corejs(),
8386
html_dependency_react()
8487
)
8588
)
8689
```
8790

8891
## Contributing and Code of Conduct
8992

90-
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.
93+
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.

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ reactR](https://react-r.github.io/reactR/articles/intro_htmlwidgets.html).
3838
Also, there are a variety of examples in the [react-R Github
3939
organization](https://github.com/react-R).
4040

41+
[`reactable`](https://github.com/glin/reactable) is a very well-built
42+
`htmlwidget` leveraging this functionality.
43+
4144
## Shiny Outputs and Inputs
4245

4346
`htmlwidgets` built with `reactR` work well in Shiny as outputs. In
@@ -88,8 +91,8 @@ browsable(
8891
tags$script(
8992
babel_transform('ReactDOM.render(<h1>Powered By React/JSX</h1>,document.getElementById("app"))')
9093
),
91-
# add core-js shim first for React in RStudio Viewer
92-
html_dependency_corejs(),
94+
# add core-js shim first for React in older versions of RStudio Viewer
95+
#html_dependency_corejs(),
9396
html_dependency_react()
9497
)
9598
)
@@ -99,5 +102,5 @@ browsable(
99102

100103
We welcome contributors and would love your participation. Please note
101104
that this project is released with a [Contributor Code of
102-
Conduct](CONDUCT.md). By participating in this project you agree to
103-
abide by the terms.
105+
Conduct](https://github.com/react-R/reactR/blob/master/CONDUCT.md). By
106+
participating in this project you agree to abide by the terms.

docs/404.html

Lines changed: 160 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CONDUCT.html

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)