Skip to content

Commit 7dccb68

Browse files
Merge pull request #51 from react-R/develop
update react to 17.0.0 and prepare for CRAN
2 parents eef5d04 + 73c1abe commit 7dccb68

Some content is hidden

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

47 files changed

+1420
-396
lines changed

CRAN-RELEASE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +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).
1+
This package was submitted to CRAN on 2021-02-20.
2+
Once it is accepted, delete this file and tag the release (commit e167785db5).

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Package: reactR
22
Type: Package
33
Title: React Helpers
4-
Version: 0.4.3
5-
Date: 2020-07-12
4+
Version: 0.4.4
5+
Date: 2021-02-20
66
Authors@R: c(
77
person(
88
"Facebook", "Inc"
99
, role = c("aut", "cph")
10-
, comment = "React library in lib, https://facebook.github.io/react; see AUTHORS for full list of contributors"
10+
, comment = "React library in lib, https://reactjs.org/; see AUTHORS for full list of contributors"
1111
),
1212
person(
1313
"Michel","Weststrate",
@@ -39,7 +39,7 @@ Encoding: UTF-8
3939
Imports:
4040
htmltools
4141
Suggests:
42-
htmlwidgets (>= 0.6.0),
42+
htmlwidgets (>= 1.5.3),
4343
rmarkdown,
4444
shiny,
4545
V8,

NEWS.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# reactR 0.4.4
2+
3+
* Update react to `16.12.0`
4+
5+
* Add `style-loader` and `css-loader` to webpack config [pull 50](https://github.com/react-R/reactR/pull/50)
6+
7+
* Update to `PACKAGE::widget_html.WIDGETNAME` for new `htmlwidgets` convention [pull 49](https://github.com/react-R/reactR/pull/49)
8+
9+
* Clean up template [pull 45](https://github.com/react-R/reactR/pull/45)
10+
111
# reactR 0.4.3
212

313
* Add element to Shiny input [pull 41](https://github.com/react-R/reactR/pull/41)
@@ -60,7 +70,7 @@
6070

6171
* Update to react `15.5.0`
6272
* Update to babel `6.24.0`
63-
* Add [fluent-ui(fabric)](https://developer.microsoft.com/en-us/fluentui#/get-started#fluent-ui-react) example
73+
* Add fluent-ui(fabric) example
6474
* Build doc site with `pkgdown`
6575

6676
# reactR 0.1.1

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.12.0'}
2+
react_version <- function(){'17.0.0'}
33
babel_version <- function(){'6.26.0'}

R/scaffold_input.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#' R package.
55
#'
66
#' @param name Name of input
7-
#' @param npmPkgs Optional \href{https://npmjs.com/}{NPM} packages upon which
7+
#' @param npmPkgs Optional \href{https://www.npmjs.com/}{NPM} packages upon which
88
#' this input is based which will be used to populate \code{package.json}.
99
#' Should be a named list of names to
10-
#' \href{https://docs.npmjs.com/files/package.json#dependencies}{versions}.
10+
#' \href{https://docs.npmjs.com/files/package.json/}{versions}.
1111
#' @param edit Automatically open the input's source files after creating the
1212
#' scaffolding.
1313
#'

R/scaffold_widget.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#' R package.
55
#'
66
#' @param name Name of widget
7-
#' @param npmPkgs Optional \href{https://npmjs.com/}{NPM} packages upon which
7+
#' @param npmPkgs Optional \href{https://www.npmjs.com/}{NPM} packages upon which
88
#' this widget is based which will be used to populate \code{package.json}.
99
#' Should be a named list of names to
10-
#' \href{https://docs.npmjs.com/files/package.json#dependencies}{versions}.
10+
#' \href{https://docs.npmjs.com/files/package.json/}{versions}.
1111
#' @param edit Automatically open the widget's JavaScript source file after
1212
#' creating the scaffolding.
1313
#'

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ knitr::opts_chunk$set(
1919
[![Travis-CI Build Status](https://travis-ci.org/react-R/reactR.svg?branch=master)](https://travis-ci.org/react-R/reactR)
2020
[![Slack Status](https://reactr-slackin.herokuapp.com/badge.svg)](https://reactr-slackin.herokuapp.com/)
2121

22-
`reactR` provides a set of convenience functions for using [`React`](https://facebook.github.io/react) in `R` with `htmlwidget` constructor templates and local JavaScript dependencies. The `React` ecosystem is rich with components that can enhance `R` web and Shiny apps. `scaffoldReactWidget()` helps build `htmlwidgets` to integrate these `React` components as `R` `htmlwidgets`. `scaffoldReactShinyInput()` does the same for `Shiny` inputs. The local dependency functions are modeled after the `html_dependency_*` functions from RStudio's [`rmarkdown`](https://github.com/rstudio/rmarkdown) package.
22+
`reactR` provides a set of convenience functions for using [`React`](https://reactjs.org/) in `R` with `htmlwidget` constructor templates and local JavaScript dependencies. The `React` ecosystem is rich with components that can enhance `R` web and Shiny apps. `scaffoldReactWidget()` helps build `htmlwidgets` to integrate these `React` components as `R` `htmlwidgets`. `scaffoldReactShinyInput()` does the same for `Shiny` inputs. The local dependency functions are modeled after the `html_dependency_*` functions from RStudio's [`rmarkdown`](https://github.com/rstudio/rmarkdown) package.
2323

2424
## Installation
2525

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ Status](https://travis-ci.org/react-R/reactR.svg?branch=master)](https://travis-
1010
Status](https://reactr-slackin.herokuapp.com/badge.svg)](https://reactr-slackin.herokuapp.com/)
1111

1212
`reactR` provides a set of convenience functions for using
13-
[`React`](https://facebook.github.io/react) in `R` with `htmlwidget`
14-
constructor templates and local JavaScript dependencies. The `React`
15-
ecosystem is rich with components that can enhance `R` web and Shiny
16-
apps. `scaffoldReactWidget()` helps build `htmlwidgets` to integrate
17-
these `React` components as `R` `htmlwidgets`.
18-
`scaffoldReactShinyInput()` does the same for `Shiny` inputs. The local
19-
dependency functions are modeled after the `html_dependency_*` functions
20-
from RStudio’s [`rmarkdown`](https://github.com/rstudio/rmarkdown)
21-
package.
13+
[`React`](https://reactjs.org/) in `R` with `htmlwidget` constructor
14+
templates and local JavaScript dependencies. The `React` ecosystem is
15+
rich with components that can enhance `R` web and Shiny apps.
16+
`scaffoldReactWidget()` helps build `htmlwidgets` to integrate these
17+
`React` components as `R` `htmlwidgets`. `scaffoldReactShinyInput()`
18+
does the same for `Shiny` inputs. The local dependency functions are
19+
modeled after the `html_dependency_*` functions from RStudio’s
20+
[`rmarkdown`](https://github.com/rstudio/rmarkdown) package.
2221

2322
## Installation
2423

cran-comments.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Resubmit to fix new problematic link found in the latest check; not sure why this was not reported in last check
2+
3+
Resubmit 2 to fix last remaining link in check; sorry I missed this one
4+
5+
Resubmit 1 to fix links for CRAN
6+
17
## Test environments
28
* local Windows 10 install, R 3.6.2
39
* rhub check_for_cran

docs/404.html

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

0 commit comments

Comments
 (0)