Merge remote-tracking branch 'origin' into input-binding

Author: alandipert

.Rbuildignore

@@ -1,20 +1,19 @@
-^Meta$
-^doc$
+^node_modules$
+^js-tests$
+^srcjs$
+^pkgdown$
+^assets$
 ^.*\.Rproj$
 ^CONDUCT\.md$
 ^README\.Rmd$
 ^\.Rproj\.user$
 ^\.travis\.yml$
-^assets
-^build
-^docs
-^js-tests
-^node_modules
-^pkgdown
-^srcjs
+^build$
+^docs$
 ^cran-comments\.md$
 ^karma\.conf\.js$
 ^logo.svg$
 ^package\.json$
-^webpack.config.js$
+^webpack\.config\.js$
 ^yarn\.lock$
+^logo\.svg$

NEWS.md

@@ -1,7 +1,11 @@
 # reactR 0.3.1
 
-* Add `usethis` dependency
+* Update react and react-dom to 16.8.1
+* Add `usethis` R dependency
 * Ignore node_modules in `.Rbuildignore` and `.gitignore`
+* Set `{modules:false}` in `babel_transform` to avoid `"use strict"`; [pull 15](https://github.com/react-R/reactR/pull/15)
+* Use webpack to build `react-tools.js`; [pull 16](https://github.com/react-R/reactR/pull/16)
+* Attach component to the htmlwidget
 
 # reactR 0.3.0
 

R/meta.R

@@ -1,3 +1,3 @@
 #'@keywords internal
-react_version <- function(){'16.7.0'}
+react_version <- function(){'16.8.1'}
 babel_version <- function(){'6.26.0'}

R/reacttools.R

@@ -77,7 +77,7 @@ React <- structure(
 #' Prepare data that represents a single-element character vector, a React
 #' component, or an htmltools tag for sending to the client.
 #'
-#' Tag lists as returned by \code{\link[htmltools]{tagList}} are not currently
+#' Tag lists as returned by \code{htmltools tagList} are not currently
 #' supported.
 #'
 #' @param tag character vector or React component or

inst/templates/widget_r.txt

@@ -38,7 +38,7 @@ ${name} <- function(message, width = NULL, height = NULL, elementId = NULL) {
 #' @name ${name}-shiny
 #'
 #' @export
-${name}Output <- function(outputId, width = '100%%', height = '400px'){
+${name}Output <- function(outputId, width = '100%', height = '400px'){
   htmlwidgets::shinyWidgetOutput(outputId, '${name}', width, height, package = '${package}')
 }
 
@@ -57,6 +57,6 @@ ${name}_html <- function(id, style, class, ...) {
     reactR::html_dependency_corejs(),
     reactR::html_dependency_react(),
     reactR::html_dependency_reacttools(),
-    htmltools::tags$div(id = id, class = class)
+    htmltools::tags$div(id = id, class = class, style = style)
   )
 }

inst/www/react/react-dom.min.js

@@ -1,23 +1,23 @@
 {
     "devDependencies": {
+        "@babel/core": "^7.2.2",
+        "@babel/preset-env": "^7.3.1",
+        "@babel/preset-react": "^7.0.0",
+        "@rgrove/parse-xml": "^1.1.1",
+        "babel-loader": "^8.0.5",
         "chai": "^4.2.0",
         "karma": "^3.1.4",
         "karma-chai": "^0.1.0",
         "karma-chrome-launcher": "^2.2.0",
         "karma-mocha": "^1.3.0",
-        "karma-webpack": "^4.0.0-rc.6",
         "karma-source-map-support": "^1.3.0",
+        "karma-webpack": "^4.0.0-rc.6",
         "mocha": "^5.2.0",
-        "react": "^16.7.0",
-        "react-dom": "^16.7.0",
+        "react": "^16.8.1",
+        "react-dom": "^16.8.1",
+        "react-html-parser": "^2.0.2",
         "webpack": "^4.27.1",
-        "webpack-cli": "^3.1.2",
-        "@babel/core": "^7.2.2",
-        "babel-loader": "^8.0.5",
-        "@babel/preset-env": "^7.3.1",
-        "@babel/preset-react": "^7.0.0",
-        "@rgrove/parse-xml": "^1.1.1",
-        "react-html-parser": "^2.0.2"
+        "webpack-cli": "^3.1.2"
     },
     "scripts": {
         "test": "karma start --single-run --browsers ChromeHeadless karma.conf.js"

inst/www/react/react.min.js

@@ -2954,7 +2954,7 @@ log4js@^3.0.0:
     rfdc "^1.1.2"
     streamroller "0.7.0"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
+loose-envify@^1.0.0, loose-envify@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -3629,12 +3629,12 @@ promise-inflight@^1.0.1:
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 prop-types@^15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
-  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
+  version "15.7.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.1.tgz#2fa61e0a699d428b40320127733ee2931f05d9d1"
+  integrity sha512-f8Lku2z9kERjOCcnDOPm68EBJAO2K00Q5mSgPAUE/gJuBgsYLbVy6owSrtcHj90zt8PvW+z0qaIIgsIhHOa1Qw==
   dependencies:
-    loose-envify "^1.3.1"
     object-assign "^4.1.1"
+    react-is "^16.8.1"
 
 prr@~1.0.1:
   version "1.0.1"
@@ -3775,6 +3775,11 @@ react-html-parser@^2.0.2:
   dependencies:
     htmlparser2 "^3.9.0"
 
+react-is@^16.8.1:
+  version "16.8.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
+  integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==
+
 react@^16.7.0:
   version "16.8.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a"