Merge branch 'master' into widget_html

Author: timelyportfolio

inst/templates/input_r.txt

@@ -2,7 +2,6 @@
 #'
 #' <Add Description>
 #'
-#' @importFrom shiny restoreInput
 #' @importFrom reactR createReactShinyInput
 #' @importFrom htmltools htmlDependency tags
 #'

inst/templates/package.json.txt

@@ -9,6 +9,8 @@
     "@babel/core": "^7.2.0",
     "babel-loader": "^8.0.4",
     "@babel/preset-env": "^7.2.0",
-    "@babel/preset-react": "^7.0.0"
+    "@babel/preset-react": "^7.0.0",
+    "css-loader": "^5.0.1",
+    "style-loader": "^2.0.0"
   }
 }

inst/templates/webpack.config.js.txt

@@ -4,7 +4,6 @@ module.exports = {
     mode: 'development',
     entry: path.join(__dirname, 'srcjs', '${name}.jsx'),
     output: {
-        path: path.join(__dirname, 'inst', 'www', '${package}', '${name}'),
         path: path.join(__dirname, '${outputPath}'),
         filename: '${name}.js'
     },
@@ -16,6 +15,11 @@ module.exports = {
                 options: {
                     presets: ['@babel/preset-env', '@babel/preset-react']
                 }
+            },
+            // For CSS so that import "path/style.css"; works
+            {
+                test: /\.css$/,
+                use: ['style-loader', 'css-loader']
             }
         ]
     },

yarn.lock

@@ -3109,9 +3109,9 @@ locate-path@^3.0.0:
     path-exists "^3.0.0"
 
 lodash@^4.17.13, lodash@^4.17.5, lodash@^4.5.0:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 log4js@^3.0.0:
   version "3.0.6"