Merge pull request #51 from react-R/develop

update react to 17.0.0 and prepare for CRAN
react-R · Feb 22, 2021 · 7dccb68 · 7dccb68
2 parents eef5d04 + 73c1abe
commit 7dccb68
Show file tree

Hide file tree

Showing 47 changed files with 1,420 additions and 396 deletions.
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
@@ -1,2 +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).
+This package was submitted to CRAN on 2021-02-20.
+Once it is accepted, delete this file and tag the release (commit e167785db5).
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,13 +1,13 @@
 Package: reactR
 Type: Package
 Title: React Helpers
-Version: 0.4.3
-Date: 2020-07-12
+Version: 0.4.4
+Date: 2021-02-20
 Authors@R: c(
       person(
         "Facebook", "Inc"
         , role = c("aut", "cph")
-        , comment = "React library in lib, https://facebook.github.io/react; see AUTHORS for full list of contributors"
+        , comment = "React library in lib, https://reactjs.org/; see AUTHORS for full list of contributors"
       ),
       person(
         "Michel","Weststrate",
@@ -39,7 +39,7 @@ Encoding: UTF-8
 Imports:
     htmltools
 Suggests:
-    htmlwidgets (>= 0.6.0),
+    htmlwidgets (>= 1.5.3),
     rmarkdown,
     shiny,
     V8,

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,13 @@
+# reactR 0.4.4
+
+* Update react to `16.12.0`
+
+* Add `style-loader` and `css-loader` to webpack config [pull 50](https://github.com/react-R/reactR/pull/50)
+
+* Update to `PACKAGE::widget_html.WIDGETNAME` for new `htmlwidgets` convention [pull 49](https://github.com/react-R/reactR/pull/49)
+
+* Clean up template [pull 45](https://github.com/react-R/reactR/pull/45)
+
 # reactR 0.4.3
 
 * Add element to Shiny input [pull 41](https://github.com/react-R/reactR/pull/41)
@@ -60,7 +70,7 @@
 
 * Update to react `15.5.0`
 * Update to babel `6.24.0`
-* Add [fluent-ui(fabric)](https://developer.microsoft.com/en-us/fluentui#/get-started#fluent-ui-react) example
+* Add fluent-ui(fabric) example
 * Build doc site with `pkgdown`
 
 # reactR 0.1.1

diff --git a/R/meta.R b/R/meta.R
@@ -1,3 +1,3 @@
 #'@keywords internal
-react_version <- function(){'16.12.0'}
+react_version <- function(){'17.0.0'}
 babel_version <- function(){'6.26.0'}
diff --git a/R/scaffold_input.R b/R/scaffold_input.R
@@ -4,10 +4,10 @@
 #' R package.
 #'
 #' @param name Name of input
-#' @param npmPkgs Optional \href{https://npmjs.com/}{NPM} packages upon which
+#' @param npmPkgs Optional \href{https://www.npmjs.com/}{NPM} packages upon which
 #'   this input is based which will be used to populate \code{package.json}.
 #'   Should be a named list of names to
-#'   \href{https://docs.npmjs.com/files/package.json#dependencies}{versions}.
+#'   \href{https://docs.npmjs.com/files/package.json/}{versions}.
 #' @param edit Automatically open the input's source files after creating the
 #'   scaffolding.
 #'

diff --git a/R/scaffold_widget.R b/R/scaffold_widget.R
@@ -4,10 +4,10 @@
 #' R package.
 #'
 #' @param name Name of widget
-#' @param npmPkgs Optional \href{https://npmjs.com/}{NPM} packages upon which
+#' @param npmPkgs Optional \href{https://www.npmjs.com/}{NPM} packages upon which
 #'   this widget is based which will be used to populate \code{package.json}.
 #'   Should be a named list of names to
-#'   \href{https://docs.npmjs.com/files/package.json#dependencies}{versions}.
+#'   \href{https://docs.npmjs.com/files/package.json/}{versions}.
 #' @param edit Automatically open the widget's JavaScript source file after
 #'   creating the scaffolding.
 #'

diff --git a/README.Rmd b/README.Rmd
@@ -19,7 +19,7 @@ knitr::opts_chunk$set(
 [![Travis-CI Build Status](https://travis-ci.org/react-R/reactR.svg?branch=master)](https://travis-ci.org/react-R/reactR)
 [![Slack Status](https://reactr-slackin.herokuapp.com/badge.svg)](https://reactr-slackin.herokuapp.com/)
 
-`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.
+`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.
 
 ## Installation
 

diff --git a/README.md b/README.md
@@ -10,15 +10,14 @@ Status](https://travis-ci.org/react-R/reactR.svg?branch=master)](https://travis-
 Status](https://reactr-slackin.herokuapp.com/badge.svg)](https://reactr-slackin.herokuapp.com/)
 
 `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.
+[`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.
 
 ## Installation
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,3 +1,9 @@
+Resubmit to fix new problematic link found in the latest check; not sure why this was not reported in last check
+
+Resubmit 2 to fix last remaining link in check; sorry I missed this one
+
+Resubmit 1 to fix links for CRAN
+
 ## Test environments
 * local Windows 10 install, R 3.6.2
 * rhub check_for_cran

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CONDUCT.html b/docs/CONDUCT.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/intro_htmlwidgets.html b/docs/articles/intro_htmlwidgets.html