Skip to content

Commit bf0b3ab

Browse files
committed
Merge branch 'main' into publish-npm
2 parents e513071 + f981ed6 commit bf0b3ab

File tree

180 files changed

+9231
-12696
lines changed

Some content is hidden

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

180 files changed

+9231
-12696
lines changed

.Rbuildignore

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,14 @@
2121
^TODO-promises.md$
2222
^manualtests$
2323
^\.github$
24-
25-
^\.yarn$
2624
^\.vscode$
2725
^\.madgerc$
28-
^\.prettierrc\.yml$
29-
^jest\.config\.js$
3026
^package\.json$
3127
^tsconfig\.json$
32-
^yarn\.lock$
28+
^package-lock\.json$
3329
^node_modules$
3430
^coverage$
3531
^.ignore$
36-
^\.browserslistrc$
37-
^\.eslintrc\.yml$
38-
^\.yarnrc\.yml$
32+
^eslint\.config\.mjs$
3933
^_dev$
34+
^.claude$

.browserslistrc

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

.eslintrc.yml

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

.github/shiny-workflows/routine.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ echo "Updating package.json version to match DESCRIPTION Version"
55
Rscript ./tools/updatePackageJsonVersion.R
66
if [ -n "$(git status --porcelain package.json)" ]
77
then
8-
echo "package.json has changed after running ./tools/updatePackageJsonVersion.R. Re-running 'yarn build'"
9-
yarn build
8+
echo "package.json has changed after running ./tools/updatePackageJsonVersion.R. Re-running 'npm run build'"
9+
npm run build
1010
git add ./inst package.json && git commit -m 'Sync package version (GitHub Actions)' || echo "No package version to commit"
1111
else
1212
echo "No package version difference detected; package.json is current."

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99
branches: [main]
1010
schedule:
11-
- cron: '0 5 * * 1' # every monday
11+
- cron: "0 5 * * 1" # every monday
1212

1313
name: Package checks
1414

@@ -17,7 +17,5 @@ jobs:
1717
uses: rstudio/shiny-workflows/.github/workflows/website.yaml@v1
1818
routine:
1919
uses: rstudio/shiny-workflows/.github/workflows/routine.yaml@v1
20-
with:
21-
node-version: "14.x"
2220
R-CMD-check:
2321
uses: rstudio/shiny-workflows/.github/workflows/R-CMD-check.yaml@v1

.gitignore

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,16 @@
99
shinyapps/
1010
README.html
1111
.*.Rnb.cached
12-
tools/yarn-error.log
12+
/_dev/
13+
.sass_cache_keys
1314

14-
# TypeScript / yarn
15+
# TypeScript
1516
/node_modules/
1617
.cache
17-
.yarn/*
18-
!.yarn/releases
19-
!.yarn/plugins
20-
!.yarn/sdks
21-
!.yarn/versions
22-
.pnp.*
2318
coverage/
2419
madge.svg
2520

2621

2722
# GHA remotes installation
2823
.github/r-depends.rds
24+
.claude/settings.local.json

.vscode/settings.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"search.exclude": {
3-
"**/.yarn": true,
4-
"**/.pnp.*": true
53
},
64
"prettier.prettierPath": "./node_modules/prettier",
75
"typescript.enablePromptUseWorkspaceTsdk": true,

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

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

.yarn/plugins/@yarnpkg/plugin-outdated.cjs

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

.yarn/releases/yarn-3.2.3.cjs

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

0 commit comments

Comments
 (0)