Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

list class #82, hydrate tags in attribs #67, switch to vite/vitest #83

Merged
merged 19 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bd72b36
retail `list` in `reactR::component` class list to #82 to insure `htm…
timelyportfolio Nov 24, 2023
313adfc
add `force = TRUE` for `jsonlite::toJSON` conversion primarily to han…
timelyportfolio Dec 2, 2023
7d457d7
remove webpack and begin replace with vite
timelyportfolio Jan 18, 2024
6812167
change `js` to `cjs` to match vite output
timelyportfolio Jan 18, 2024
8108d52
#67 hydrate attribs that match tag object structure
timelyportfolio Jan 18, 2024
45a9cbf
ignore cran-submission in .Rbuildignore
timelyportfolio Jan 18, 2024
a6e6576
Merge branch 'develop' of https://github.com/react-R/reactR into develop
timelyportfolio Jan 18, 2024
17c868e
remove karma; failed attempt at vitest
timelyportfolio Jan 21, 2024
0ee4ba5
Merge branch 'develop' of https://github.com/react-R/reactR into develop
timelyportfolio Jan 21, 2024
d9f6887
get vitest working
timelyportfolio Jan 21, 2024
3460b16
Merge branch 'develop' of https://github.com/react-R/reactR into develop
timelyportfolio Jan 21, 2024
186b313
remove `yarn.lock` and remove unintentionally added dependencies
timelyportfolio Jan 21, 2024
cbcc325
add dev dependencies for testing
timelyportfolio Jan 21, 2024
e9ae3d0
Merge branch 'develop' of https://github.com/react-R/reactR into develop
timelyportfolio Jan 21, 2024
e004bf8
increment version to `0.6.0` and update DESCRIPTION
timelyportfolio Jan 21, 2024
430a396
make date current since this has taken so long
timelyportfolio Jun 26, 2024
e2e37d7
add `vite.config.js` to `.Rbuildignore`
timelyportfolio Jun 26, 2024
dfc088b
roxygen and pkgdown
timelyportfolio Jun 26, 2024
a037a58
more rbuildignore cleanup
timelyportfolio Jun 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
^CONDUCT\.md$
^README\.Rmd$
^\.Rproj\.user$
^\.travis\.yml$
^buildupdate$
^docs$
^cran-comments\.md$
^karma\.conf\.js$
^logo.svg$
^package\.json$
^webpack\.config\.js$
^yarn\.lock$
^vite\.config\.js$
^package-lock\.json$
^logo\.svg$
^\.github$
^CRAN-SUBMISSION$
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ reactR.Rcheck
reactR_*.tar.gz
*.swp
.DS_Store
inst/www/react-tools/react-tools.js
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: reactR
Type: Package
Title: React Helpers
Version: 0.5.0
Date: 2023-10-01
Version: 0.6.0
Date: 2024-06-26
Authors@R: c(
person(
"Facebook", "Inc"
Expand Down Expand Up @@ -46,5 +46,5 @@ Suggests:
knitr,
usethis,
jsonlite
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
VignetteBuilder: knitr
12 changes: 12 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# reactR 0.6.0

* retain `list` in `reactR::component` classes [#82](https://github.com/react-R/reactR/issues/82)
* 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)
* update build tools to `vite` from `webpack`
* update js testing library from `karma` to `vitest`


# reactR 0.5.0

* Update react to `18.2.0`

# reactR 0.4.4

* Update react to `16.12.0`
Expand Down
4 changes: 2 additions & 2 deletions R/dependencies.R
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ html_dependency_reacttools <- function(){
htmltools::htmlDependency(
name = "reactwidget",
src = "www/react-tools",
version = "1.0.0",
version = "2.0.0",
package = "reactR",
script = c("react-tools.js")
script = c("react-tools.umd.cjs")
)
}

Expand Down
6 changes: 3 additions & 3 deletions R/reacttools.R
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ component <- function(name, varArgs = list()) {
stop("Component name must be specified and start with an upper case character")
}
component <- htmltools::tag(name, varArgs)
structure(component, class = c("reactR_component", oldClass(component)))
structure(component, class = c("reactR_component", oldClass(component), "list"))
}

#' React component builder.
Expand Down Expand Up @@ -145,10 +145,10 @@ createReactShinyInput <- function(inputId,
container(id = inputId, class = class),
htmltools::tags$script(id = sprintf("%s_value", inputId),
type = "application/json",
jsonlite::toJSON(value, auto_unbox = TRUE, null = "null")),
jsonlite::toJSON(value, auto_unbox = TRUE, null = "null", force = TRUE)),
htmltools::tags$script(id = sprintf("%s_configuration", inputId),
type = "application/json",
jsonlite::toJSON(configuration, auto_unbox = TRUE, null = "null")),
jsonlite::toJSON(configuration, auto_unbox = TRUE, null = "null", force = TRUE)),
dependencies
)
}
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/CONDUCT.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/LICENSE-text.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

129 changes: 26 additions & 103 deletions docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading