Fix test on rdevel

.Rbuildignore

@@ -13,7 +13,7 @@
 ^package\.json$
 ^node_modules$
 ^data-raw$
-^npm-shrinkwrap\.json$
+^yarn\.lock$
 ^\.Rprofile\.local$
 ^inst/htmlwidgets/lib/.*/.*\.map$
 ^inst/htmlwidgets/plugins/.*/.*\.map$

.lintr

@@ -1,8 +1,11 @@
 linters: with_defaults(
-    camel_case_linter = NULL,
-    line_length_linter = NULL, # line_length_linter(100),
+    object_name_linter = NULL,
+    line_length_linter = NULL,
     commented_code_linter = NULL,
-    object_usage_linter = NULL,
-    NULL
+    object_usage_linter = NULL
+  )
+exclusions: list(
+    "inst/examples/icons.R",
+    "inst/examples/leaflet.R",
+    "inst/examples/legend.R"
   )
-exclusions: list()

.travis.yml

@@ -13,7 +13,33 @@ notifications:
     on_success: change
     on_failure: change
 
-r_github_packages:
-  - jimhester/lintr
-after_success:
-  - Rscript -e 'lintr::lint_package()'
+jobs:
+  include:
+    - name: "R: oldrel"
+      r: oldrel
+
+    - name: "R: release"
+      r: release
+      # TODO fix all lints
+      # r_packages:
+      #   - lintr
+      # after_success:
+      #   - Rscript -e 'lintr::lint_package()'
+
+    - name: "R: devel"
+      r: devel
+
+
+    # - name: "Roxygen check"
+    #   r: release
+    #   r_packages:
+    #     - devtools
+    #     - roxygen2
+    #   script: ./scripts/checkDocsCurrent.sh
+
+    - name: "Javascript check"
+      language: node_js
+      cache: yarn
+      script: ./scripts/checkJSCurrent.sh
+      node_js:
+        - "12"

DESCRIPTION

@@ -57,7 +57,6 @@ Suggests:
     maps,
     sf,
     shiny,
-    testit (>= 0.4),
     rgdal,
     rgeos,
     R6,

README.md

@@ -36,19 +36,34 @@ http://rstudio.github.io/leaflet You may use [Github issues](https://github.com/
 
 ## Development
 
-To make additions or modifications to the JavaScript htmlwidgets binding layer,
-you must use Grunt to build and test. Please make sure Node.js is installed on
-your system, then run:
+`leaflet`'s JavaScript build tools use Node.js, along with [yarn](https://yarnpkg.com/) to manage the JavaScript packages.
 
-```
-npm install -g grunt-cli
-npm install
+Install `yarn` using the [official instructions](https://yarnpkg.com/en/docs/install).
+
+You can test that Node.js and yarn are installed properly by running the following commands:
+
+```bash
+node --version
+yarn --version
 ```
 
-Now you can build/minify/lint/test using `grunt build`, or run in "watch" mode
-by just running `grunt`. JS sources go into `javascript/src` and tests go into
+To make additions or modifications to the JavaScript `htmlwidgets` binding layer,
+you must have all Node.js dependencies installed. Now you can build/minify/lint/test using `yarn build`, or run in "watch" mode
+by just running `yarn watch`. JS sources go into `javascript/src` and tests go into
 `javascript/tests`.
 
+```bash
+# install dependencies
+yarn
+
+# compile
+yarn build
+
+# watch
+yarn watch
+```
+
+
 ## License
 
 This package is licensed to you under the terms of the [GNU General Public