Merge pull request #455 from rich-iannone/v1.0.7-rc

Release DiagrammeR v1.0.7

.Rbuildignore

@@ -2,10 +2,7 @@
 ^\.Rproj\.user$
 .bowerrc
 .*sublime.*
-^\.travis\.yml$
 ^.github$
-^cran-comments\.md$
-^CONDUCT\.md$
 ^revdep$
 ^docs$
 ^README\.Rmd$
@@ -14,3 +11,4 @@
 ^_pkgdown\.yml$
 ^man/figures/.*$
 ^README\.md$
+vignettes

.github/workflows/R-CMD-check.yaml

@@ -1,10 +1,10 @@
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 name: R-CMD-check
 
@@ -18,16 +18,15 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: '3.6'}
-          - {os: macOS-latest, r: '4.0'}
-          - {os: windows-latest, r: '3.6'}
+          - {os: macos-11, r: '4.1'}
           - {os: windows-latest, r: '4.0'}
-          - {os: ubuntu-16.04, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
-          - {os: ubuntu-16.04, r: '4.0', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
+          - {os: windows-latest, r: '4.1'}
+          - {os: ubuntu-latest, r: '3.6'}
+          - {os: ubuntu-latest, r: '4.0'}
+          - {os: ubuntu-latest, r: '4.1'}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
-      RSPM: ${{ matrix.config.rspm }}
 
     steps:
       - uses: actions/checkout@v2
@@ -63,6 +62,9 @@ jobs:
 
       - name: Install dependencies
         run: |
+          if (Sys.info()[["sysname"]] == "Windows") {
+             options(install.packages.compile.from.source = "never")
+          }
           remotes::install_deps(dependencies = TRUE)
           remotes::install_cran("rcmdcheck")
         shell: Rscript {0}
@@ -81,6 +83,6 @@ jobs:
           path: check
 
       - name: Test coverage
-        if: matrix.config.os == 'macOS-latest' && matrix.config.r == '3.6'
+        if: matrix.config.os == 'macOS-latest' && matrix.config.r == '4.0'
         run: covr::codecov()
         shell: Rscript {0}

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: DiagrammeR
 Title: Graph/Network Visualization
-Version: 1.0.6.9000
+Version: 1.0.7
 Authors@R:
     person("Richard", "Iannone", , "riannone@me.com", c("aut", "cre"),
            comment = c(ORCID = "0000-0003-3925-190X"))
@@ -47,6 +47,5 @@ Suggests:
     rmarkdown
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.1.0
-VignetteBuilder: knitr
+RoxygenNote: 7.1.2
 Roxygen: list(markdown = TRUE)

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2018
+YEAR: 2022
 COPYRIGHT HOLDER: Richard Iannone

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2018 Richard Iannone
+Copyright (c) 2022 Richard Iannone
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NEWS.md

@@ -1,4 +1,8 @@
-# DiagrammeR 1.0.6.9000 (Unreleased)
+# DiagrammeR 1.0.7
+
+* Fix malformed CSS selector in `htmlwidgets/grViz.js`
+
+* Only call `replace_na(replace = "")` on character columns
 
 * Added the `envir` argument to the `grViz` and `replace_in_spec` functions.
 

R/DiagrammeR.R

@@ -1,7 +1,7 @@
 #' R + mermaid.js
 #'
 #' Make diagrams in R using \href{https://github.com/mdaines/viz.js}{viz.js} or
-#' \href{https://github.com/knsv/mermaid}{mermaid.js} with infrastructure
+#' \href{https://github.com/mermaid-js/mermaid}{mermaid.js} with infrastructure
 #' provided by \href{http://www.htmlwidgets.org/}{htmlwidgets}.
 #'
 #' @param diagram The diagram in `graphviz` or `mermaid` format, or, a file (as

R/mermaid.R

@@ -1,8 +1,8 @@
 #' R + mermaid.js
 #'
 #' Make diagrams in R using
-#' \href{https://github.com/knsv/mermaid/wiki}{mermaid.js} with infrastructure
-#' provided by \href{http://www.htmlwidgets.org/}{htmlwidgets}.
+#' \href{https://github.com/mermaid-js/mermaid/wiki}{mermaid.js} with
+#' infrastructure provided by \href{http://www.htmlwidgets.org/}{htmlwidgets}.
 #'
 #' @param diagram Diagram in mermaid markdown-like language or file (as a
 #'   connection or file name) containing a diagram specification. If no diagram

_pkgdown.yml

@@ -3,6 +3,11 @@ destination: docs
 home:
   strip_header: true
 
+url: http://visualizers.co/diagrammer/
+
+template:
+  bootstrap: 5
+
 reference:
   - title: External NDF/EDF
     desc: >