Skip to content

Commit 4029c3e

Browse files
Merge pull request #83 from react-R/develop
`list` class #82, hydrate tags in attribs #67, switch to `vite`/`vitest`
2 parents fb3ba30 + a037a58 commit 4029c3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3706
-7727
lines changed

.Rbuildignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
^CONDUCT\.md$
99
^README\.Rmd$
1010
^\.Rproj\.user$
11-
^\.travis\.yml$
1211
^buildupdate$
1312
^docs$
1413
^cran-comments\.md$
15-
^karma\.conf\.js$
1614
^logo.svg$
1715
^package\.json$
18-
^webpack\.config\.js$
19-
^yarn\.lock$
16+
^vite\.config\.js$
17+
^package-lock\.json$
2018
^logo\.svg$
2119
^\.github$
20+
^CRAN-SUBMISSION$

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ reactR.Rcheck
1010
reactR_*.tar.gz
1111
*.swp
1212
.DS_Store
13+
inst/www/react-tools/react-tools.js

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: reactR
22
Type: Package
33
Title: React Helpers
4-
Version: 0.5.0
5-
Date: 2023-10-01
4+
Version: 0.6.0
5+
Date: 2024-06-26
66
Authors@R: c(
77
person(
88
"Facebook", "Inc"
@@ -46,5 +46,5 @@ Suggests:
4646
knitr,
4747
usethis,
4848
jsonlite
49-
RoxygenNote: 7.2.3
49+
RoxygenNote: 7.3.1
5050
VignetteBuilder: knitr

NEWS.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# reactR 0.6.0
2+
3+
* retain `list` in `reactR::component` classes [#82](https://github.com/react-R/reactR/issues/82)
4+
* hydrate props/attribs that are tags assuming tag-like props/attribs should be slots[#67](https://github.com/react-R/reactR/issues/67) [#61](https://github.com/react-R/reactR/issues/61)
5+
* update build tools to `vite` from `webpack`
6+
* update js testing library from `karma` to `vitest`
7+
8+
9+
# reactR 0.5.0
10+
11+
* Update react to `18.2.0`
12+
113
# reactR 0.4.4
214

315
* Update react to `16.12.0`

R/dependencies.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ html_dependency_reacttools <- function(){
8080
htmltools::htmlDependency(
8181
name = "reactwidget",
8282
src = "www/react-tools",
83-
version = "1.0.0",
83+
version = "2.0.0",
8484
package = "reactR",
85-
script = c("react-tools.js")
85+
script = c("react-tools.umd.cjs")
8686
)
8787
}
8888

R/reacttools.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ component <- function(name, varArgs = list()) {
3232
stop("Component name must be specified and start with an upper case character")
3333
}
3434
component <- htmltools::tag(name, varArgs)
35-
structure(component, class = c("reactR_component", oldClass(component)))
35+
structure(component, class = c("reactR_component", oldClass(component), "list"))
3636
}
3737

3838
#' React component builder.
@@ -145,10 +145,10 @@ createReactShinyInput <- function(inputId,
145145
container(id = inputId, class = class),
146146
htmltools::tags$script(id = sprintf("%s_value", inputId),
147147
type = "application/json",
148-
jsonlite::toJSON(value, auto_unbox = TRUE, null = "null")),
148+
jsonlite::toJSON(value, auto_unbox = TRUE, null = "null", force = TRUE)),
149149
htmltools::tags$script(id = sprintf("%s_configuration", inputId),
150150
type = "application/json",
151-
jsonlite::toJSON(configuration, auto_unbox = TRUE, null = "null")),
151+
jsonlite::toJSON(configuration, auto_unbox = TRUE, null = "null", force = TRUE)),
152152
dependencies
153153
)
154154
}

docs/404.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CONDUCT.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE-text.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/index.html

Lines changed: 26 additions & 103 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)