Skip to content

Commit ce67fa5

Browse files
authored
Merge pull request #961 from ThinkR-open/dev
2 parents 7a9debb + 1e79e54 commit ce67fa5

Some content is hidden

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

83 files changed

+2406
-1381
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
^Meta$
2323
^\.github$
2424
^revdep$
25+
README.html

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: [main, master]
6+
pull_request:
7+
branches: [main, master]
8+
9+
name: R-CMD-check
10+
11+
jobs:
12+
R-CMD-check:
13+
runs-on: ${{ matrix.config.os }}
14+
15+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
16+
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
config:
21+
- {os: macos-latest, r: 'release'}
22+
- {os: windows-latest, r: 'release'}
23+
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
24+
- {os: ubuntu-latest, r: 'release'}
25+
- {os: ubuntu-latest, r: 'oldrel-1'}
26+
27+
env:
28+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
29+
R_KEEP_PKG_SOURCE: yes
30+
31+
steps:
32+
- uses: actions/checkout@v3
33+
34+
- uses: r-lib/actions/setup-pandoc@v2
35+
36+
- uses: r-lib/actions/setup-r@v2
37+
with:
38+
r-version: ${{ matrix.config.r }}
39+
http-user-agent: ${{ matrix.config.http-user-agent }}
40+
use-public-rspm: true
41+
42+
- uses: r-lib/actions/setup-r-dependencies@v2
43+
with:
44+
extra-packages: any::rcmdcheck
45+
needs: check
46+
47+
- uses: r-lib/actions/check-r-package@v2
48+
with:
49+
upload-snapshots: true

.github/workflows/check-standard.yaml

Lines changed: 0 additions & 112 deletions
This file was deleted.

DESCRIPTION

Lines changed: 27 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,42 @@
11
Package: golem
22
Title: A Framework for Robust Shiny Applications
3-
Version: 0.3.5.9001
4-
Authors@R:
5-
c(person(given = "Colin",
6-
family = "Fay",
7-
role = c("cre", "aut"),
8-
email = "contact@colinfay.me",
9-
comment = c(ORCID = "0000-0001-7343-1846")),
10-
person(given = "Vincent",
11-
family = "Guyader",
12-
role = "aut",
13-
email = "vincent@thinkr.fr",
14-
comment = c(ORCID = "0000-0003-0671-9270", "previous maintainer")),
15-
person(given = "Sébastien",
16-
family = "Rochette",
17-
role = "aut",
18-
email = "sebastien@thinkr.fr",
19-
comment = c(ORCID = "0000-0002-1565-9313")),
20-
person(given = "Cervan",
21-
family = "Girard",
22-
role = "aut",
23-
email = "cervan@thinkr.fr",
24-
comment = c(ORCID = "0000-0002-4816-4624")),
25-
person(given = "Novica",
26-
family = "Nakov",
27-
role = "ctb",
28-
email = "nnovica@gmail.com"),
29-
person(given = "David",
30-
family = "Granjon",
31-
role = "ctb",
32-
email = "dgranjon@ymail.com"),
33-
person(given = "Arthur",
34-
family = "Bréant",
35-
role = "ctb",
36-
email = "arthur@thinkr.fr"),
37-
person(given = "Antoine",
38-
family = "Languillaume",
39-
role = "ctb",
40-
email = "antoine@thinkr.fr"),
41-
person(given = "ThinkR",
42-
role = "cph"))
3+
Version: 0.4.0
4+
Authors@R: c(
5+
person("Colin", "Fay", , "contact@colinfay.me", role = c("cre", "aut"),
6+
comment = c(ORCID = "0000-0001-7343-1846")),
7+
person("Vincent", "Guyader", , "vincent@thinkr.fr", role = "aut",
8+
comment = c(ORCID = "0000-0003-0671-9270", "previous maintainer")),
9+
person("Sébastien", "Rochette", , "sebastien@thinkr.fr", role = "aut",
10+
comment = c(ORCID = "0000-0002-1565-9313")),
11+
person("Cervan", "Girard", , "cervan@thinkr.fr", role = "aut",
12+
comment = c(ORCID = "0000-0002-4816-4624")),
13+
person("Novica", "Nakov", , "nnovica@gmail.com", role = "ctb"),
14+
person("David", "Granjon", , "dgranjon@ymail.com", role = "ctb"),
15+
person("Arthur", "Bréant", , "arthur@thinkr.fr", role = "ctb"),
16+
person("Antoine", "Languillaume", , "antoine@thinkr.fr", role = "ctb"),
17+
person("ThinkR", role = "cph")
18+
)
4319
Description: An opinionated framework for building a production-ready
4420
'Shiny' application. This package contains a series of tools for
4521
building a robust 'Shiny' application from start to finish.
4622
License: MIT + file LICENSE
4723
URL: https://github.com/ThinkR-open/golem
4824
BugReports: https://github.com/ThinkR-open/golem/issues
49-
Depends:
25+
Depends:
5026
R (>= 3.0)
51-
Imports:
27+
Imports:
5228
attempt (>= 0.3.0),
53-
cli (>= 2.0.0),
5429
config,
55-
crayon,
56-
desc,
5730
here,
58-
fs,
5931
htmltools,
6032
rlang (>= 1.0.0),
61-
rstudioapi,
6233
shiny (>= 1.5.0),
63-
usethis (>= 1.6.0),
6434
utils,
6535
yaml
6636
Suggests:
6737
covr,
38+
cli (>= 2.0.0),
39+
crayon,
6840
devtools,
6941
dockerfiler (>= 0.2.0),
7042
knitr,
@@ -83,11 +55,15 @@ Suggests:
8355
tools,
8456
withr,
8557
attachment (>= 0.2.5),
86-
renv
87-
VignetteBuilder:
58+
renv,
59+
usethis (>= 1.6.0),
60+
fs,
61+
rstudioapi,
62+
desc
63+
VignetteBuilder:
8864
knitr
8965
Config/testthat/edition: 3
9066
Encoding: UTF-8
9167
Language: en-US
9268
Roxygen: list(markdown = TRUE)
93-
RoxygenNote: 7.2.1
69+
RoxygenNote: 7.2.3

NAMESPACE

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export(invoke_js)
5252
export(is_running)
5353
export(js_handler_template)
5454
export(js_template)
55+
export(maintenance_page)
5556
export(make_dev)
5657
export(message_dev)
5758
export(module_template)
@@ -91,33 +92,13 @@ importFrom(attempt,is_try_error)
9192
importFrom(attempt,stop_if)
9293
importFrom(attempt,stop_if_not)
9394
importFrom(attempt,without_warning)
94-
importFrom(cli,cat_bullet)
95-
importFrom(cli,cat_line)
96-
importFrom(cli,cat_rule)
97-
importFrom(cli,cli_alert_info)
9895
importFrom(config,get)
99-
importFrom(desc,desc_get_deps)
100-
importFrom(desc,description)
10196
importFrom(htmltools,htmlDependency)
102-
importFrom(rstudioapi,documentSaveAll)
103-
importFrom(rstudioapi,getSourceEditorContext)
104-
importFrom(rstudioapi,hasFun)
105-
importFrom(rstudioapi,isAvailable)
106-
importFrom(rstudioapi,modifyRange)
107-
importFrom(rstudioapi,navigateToFile)
108-
importFrom(rstudioapi,openProject)
109-
importFrom(rstudioapi,sourceMarkers)
11097
importFrom(shiny,addResourcePath)
11198
importFrom(shiny,getShinyOption)
99+
importFrom(shiny,htmlTemplate)
112100
importFrom(shiny,includeScript)
113101
importFrom(shiny,tags)
114-
importFrom(usethis,create_project)
115-
importFrom(usethis,proj_set)
116-
importFrom(usethis,use_build_ignore)
117-
importFrom(usethis,use_latest_dependencies)
118-
importFrom(usethis,use_package)
119-
importFrom(usethis,use_spell_check)
120-
importFrom(usethis,use_testthat)
121102
importFrom(utils,capture.output)
122103
importFrom(utils,file.edit)
123104
importFrom(utils,getFromNamespace)

0 commit comments

Comments
 (0)