docs: Update file path usage of spinner_type

all the spinners from https://github.com/n3r4zzurr0/svg-spinners

.Rbuildignore

@@ -21,17 +21,19 @@
 ^TODO-promises.md$
 ^manualtests$
 ^\.github$
+
+^\.yarn$
 ^\.vscode$
 ^\.madgerc$
+^\.prettierrc\.yml$
+^babel\.config\.json$
+^jest\.config\.js$
 ^package\.json$
 ^tsconfig\.json$
-^package-lock\.json$
+^yarn\.lock$
 ^node_modules$
 ^coverage$
 ^.ignore$
-^eslint\.config\.mjs$
-^_dev$
-^.claude$
-^README-npm\.md$
-^CRAN-SUBMISSION$
-^LICENSE\.md$
+^\.browserslistrc$
+^\.eslintrc\.yml$
+^\.yarnrc\.yml$

.browserslistrc

@@ -0,0 +1,8 @@
+# Browsers that we support
+last 2 versions
+not dead
+> 0.2%
+# > 1%
+Firefox ESR
+phantomjs 2.1
+IE 11 # sorry

.eslintrc.yml

@@ -0,0 +1,114 @@
+root: true
+env:
+  browser: true
+  es6: true
+extends:
+  - 'eslint:recommended'
+  - 'plugin:@typescript-eslint/recommended'
+  - 'plugin:jest/recommended'
+  - 'plugin:prettier/recommended'
+  - 'plugin:jest-dom/recommended'
+globals:
+  Atomics: readonly
+  SharedArrayBuffer: readonly
+parser: '@typescript-eslint/parser'
+parserOptions:
+  ecmaVersion: 2018
+  sourceType: module
+  project:
+    - './tsconfig.json'
+ignorePatterns: # mirrors tsconfig.json's exclude
+    - '**/__tests__'
+    - '**/*.d.ts'
+plugins:
+  - '@typescript-eslint'
+  - prettier
+  - jest-dom
+  - unicorn
+rules:
+  "@typescript-eslint/explicit-function-return-type":
+    - off
+  "@typescript-eslint/no-explicit-any":
+    - off
+  "@typescript-eslint/explicit-module-boundary-types":
+    - error
+
+  default-case:
+    - error
+  indent:
+    - error
+    - 2
+    - SwitchCase: 1
+  linebreak-style:
+    - error
+    - unix
+  quotes:
+    - error
+    - double
+    - avoid-escape
+  semi:
+    - error
+    - always
+  dot-location:
+    - error
+    - property
+
+  camelcase:
+    # - error
+    - "off"
+
+  unicorn/filename-case:
+    - error
+    - case: camelCase
+
+  "@typescript-eslint/array-type":
+    - error
+    - default: array-simple
+      readonly: array-simple
+
+  "@typescript-eslint/consistent-indexed-object-style":
+    - error
+    - index-signature
+
+  "@typescript-eslint/sort-type-union-intersection-members":
+    - error
+
+  "@typescript-eslint/consistent-type-imports":
+    - error
+
+  "@typescript-eslint/no-floating-promises":
+    - error
+
+  "@typescript-eslint/naming-convention":
+    - error
+
+    - selector: default
+      format: [camelCase]
+
+    - selector: method
+      modifiers: [private]
+      format: [camelCase]
+      leadingUnderscore: require
+    - selector: method
+      modifiers: [protected]
+      format: [camelCase]
+      leadingUnderscore: require
+
+    - selector: variable
+      format: [camelCase]
+      trailingUnderscore: forbid
+      leadingUnderscore: forbid
+
+    - selector: parameter
+      format: [camelCase]
+      trailingUnderscore: allow
+      leadingUnderscore: forbid
+
+    - selector: [enum, enumMember]
+      format: [PascalCase]
+
+    - selector: typeLike
+      format: [PascalCase]
+      custom:
+        regex: "(t|T)ype$"
+        match: false

.github/ISSUE_TEMPLATE/question.md

@@ -1,7 +1,7 @@
 ---
 name  : Ask a Question
-about : The issue tracker is not for questions -- please ask questions at https://forum.posit.co/tags/shiny.
+about : The issue tracker is not for questions -- please ask questions at https://community.rstudio.com/c/shiny.
 ---
 
-The issue tracker is not for questions. If you have a question, please feel free to ask it on our community site, at https://forum.posit.co/c/shiny.
+The issue tracker is not for questions. If you have a question, please feel free to ask it on our community site, at https://community.rstudio.com/c/shiny.
 

.github/shiny-workflows/routine.sh

@@ -5,8 +5,7 @@ echo "Updating package.json version to match DESCRIPTION Version"
 Rscript ./tools/updatePackageJsonVersion.R
 if [ -n "$(git status --porcelain package.json)" ]
 then
-  echo "package.json has changed after running ./tools/updatePackageJsonVersion.R. Re-running 'npm run build'"
-  npm run build
+  yarn build
   git add ./inst package.json && git commit -m 'Sync package version (GitHub Actions)' || echo "No package version to commit"
 else
   echo "No package version difference detected; package.json is current."

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

@@ -6,9 +6,9 @@ on:
   push:
     branches: [main, rc-**]
   pull_request:
-    branches:
+    branches: [main]
   schedule:
-    - cron: "0 5 * * 1" # every monday
+    - cron: '0 5 * * 1' # every monday
 
 name: Package checks
 
@@ -17,5 +17,7 @@ jobs:
     uses: rstudio/shiny-workflows/.github/workflows/website.yaml@v1
   routine:
     uses: rstudio/shiny-workflows/.github/workflows/routine.yaml@v1
+    with:
+      node-version: "14.x"
   R-CMD-check:
     uses: rstudio/shiny-workflows/.github/workflows/R-CMD-check.yaml@v1

.gitignore

@@ -9,16 +9,20 @@
 shinyapps/
 README.html
 .*.Rnb.cached
-/_dev/
-.sass_cache_keys
+tools/yarn-error.log
 
-# TypeScript
+# TypeScript / yarn
 /node_modules/
 .cache
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
 coverage/
 madge.svg
 
 
 # GHA remotes installation
 .github/r-depends.rds
-.claude/settings.local.json

.vscode/extensions.json

@@ -1,5 +1,6 @@
 {
   "recommendations": [
+    "arcanis.vscode-zipfs",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode"
   ]

.vscode/settings.json

@@ -1,12 +1,13 @@
 {
   "search.exclude": {
+    "**/.yarn": true,
+    "**/.pnp.*": true
   },
   "prettier.prettierPath": "./node_modules/prettier",
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "[r]": {
     "files.trimTrailingWhitespace": true,
     "files.insertFinalNewline": true,
-    "editor.formatOnSave": false,
   },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
@@ -14,10 +15,4 @@
     "files.trimTrailingWhitespace": true,
     "files.insertFinalNewline": true,
   },
-  "[json]": {
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "files.trimTrailingWhitespace": true,
-    "files.insertFinalNewline": true,
-},
 }

.yarnrc.yml

@@ -0,0 +1,10 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
+    spec: "https://github.com/mskelton/yarn-plugin-outdated/raw/main/bundles/@yarnpkg/plugin-outdated.js"
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-3.2.3.cjs
+checksumBehavior: update

DESCRIPTION

@@ -1,132 +1,120 @@
-Type: Package
 Package: shiny
+Type: Package
 Title: Web Application Framework for R
-Version: 1.13.0.9000
+Version: 1.8.1.9001
 Authors@R: c(
-    person("Winston", "Chang", , "winston@posit.co", role = "aut",
-           comment = c(ORCID = "0000-0002-1576-2126")),
-    person("Joe", "Cheng", , "joe@posit.co", role = "aut"),
-    person("JJ", "Allaire", , "jj@posit.co", role = "aut"),
-    person("Carson", "Sievert", , "carson@posit.co", role = c("aut", "cre"),
-           comment = c(ORCID = "0000-0002-4958-2844")),
-    person("Barret", "Schloerke", , "barret@posit.co", role = "aut",
-           comment = c(ORCID = "0000-0001-9986-114X")),
-    person("Garrick", "Aden-Buie", , "garrick@adenbuie.com", role = "aut",
-           comment = c(ORCID = "0000-0002-7111-0077")),
-    person("Yihui", "Xie", , "yihui@posit.co", role = "aut"),
+    person("Winston", "Chang", role = c("aut", "cre"), email = "winston@posit.co", comment = c(ORCID = "0000-0002-1576-2126")),
+    person("Joe", "Cheng", role = "aut", email = "joe@posit.co"),
+    person("JJ", "Allaire", role = "aut", email = "jj@posit.co"),
+    person("Carson", "Sievert", role = "aut", email = "carson@posit.co", comment = c(ORCID = "0000-0002-4958-2844")),
+    person("Barret", "Schloerke", role = "aut", email = "barret@posit.co", comment = c(ORCID = "0000-0001-9986-114X")),
+    person("Yihui", "Xie", role = "aut", email = "yihui@posit.co"),
     person("Jeff", "Allen", role = "aut"),
-    person("Jonathan", "McPherson", , "jonathan@posit.co", role = "aut"),
+    person("Jonathan", "McPherson", role = "aut", email = "jonathan@posit.co"),
     person("Alan", "Dipert", role = "aut"),
     person("Barbara", "Borges", role = "aut"),
-    person("Posit Software, PBC", role = c("cph", "fnd"),
-           comment = c(ROR = "03wc8by49")),
-    person(, "jQuery Foundation", role = "cph",
-           comment = "jQuery library and jQuery UI library"),
-    person(, "jQuery contributors", role = c("ctb", "cph"),
-           comment = "jQuery library; authors listed in inst/www/shared/jquery-AUTHORS.txt"),
-    person(, "jQuery UI contributors", role = c("ctb", "cph"),
-           comment = "jQuery UI library; authors listed in inst/www/shared/jqueryui/AUTHORS.txt"),
+    person("Posit Software, PBC", role = c("cph", "fnd")),
+    person(family = "jQuery Foundation", role = "cph",
+    comment = "jQuery library and jQuery UI library"),
+    person(family = "jQuery contributors", role = c("ctb", "cph"),
+    comment = "jQuery library; authors listed in inst/www/shared/jquery-AUTHORS.txt"),
+    person(family = "jQuery UI contributors", role = c("ctb", "cph"),
+    comment = "jQuery UI library; authors listed in inst/www/shared/jqueryui/AUTHORS.txt"),
     person("Mark", "Otto", role = "ctb",
-           comment = "Bootstrap library"),
+    comment = "Bootstrap library"),
     person("Jacob", "Thornton", role = "ctb",
-           comment = "Bootstrap library"),
-    person(, "Bootstrap contributors", role = "ctb",
-           comment = "Bootstrap library"),
-    person(, "Twitter, Inc", role = "cph",
-           comment = "Bootstrap library"),
+    comment = "Bootstrap library"),
+    person(family = "Bootstrap contributors", role = "ctb",
+    comment = "Bootstrap library"),
+    person(family = "Twitter, Inc", role = "cph",
+    comment = "Bootstrap library"),
     person("Prem Nawaz", "Khan", role = "ctb",
-           comment = "Bootstrap accessibility plugin"),
+    comment = "Bootstrap accessibility plugin"),
     person("Victor", "Tsaran", role = "ctb",
-           comment = "Bootstrap accessibility plugin"),
+    comment = "Bootstrap accessibility plugin"),
     person("Dennis", "Lembree", role = "ctb",
-           comment = "Bootstrap accessibility plugin"),
+    comment = "Bootstrap accessibility plugin"),
     person("Srinivasu", "Chakravarthula", role = "ctb",
-           comment = "Bootstrap accessibility plugin"),
+    comment = "Bootstrap accessibility plugin"),
     person("Cathy", "O'Connor", role = "ctb",
-           comment = "Bootstrap accessibility plugin"),
-    person(, "PayPal, Inc", role = "cph",
-           comment = "Bootstrap accessibility plugin"),
+    comment = "Bootstrap accessibility plugin"),
+    person(family = "PayPal, Inc", role = "cph",
+    comment = "Bootstrap accessibility plugin"),
     person("Stefan", "Petre", role = c("ctb", "cph"),
-           comment = "Bootstrap-datepicker library"),
+    comment = "Bootstrap-datepicker library"),
     person("Andrew", "Rowls", role = c("ctb", "cph"),
-           comment = "Bootstrap-datepicker library"),
+    comment = "Bootstrap-datepicker library"),
     person("Brian", "Reavis", role = c("ctb", "cph"),
-           comment = "selectize.js library"),
+    comment = "selectize.js library"),
     person("Salmen", "Bejaoui", role = c("ctb", "cph"),
-           comment = "selectize-plugin-a11y library"),
+    comment = "selectize-plugin-a11y library"),
     person("Denis", "Ineshin", role = c("ctb", "cph"),
-           comment = "ion.rangeSlider library"),
+    comment = "ion.rangeSlider library"),
     person("Sami", "Samhuri", role = c("ctb", "cph"),
-           comment = "Javascript strftime library"),
-    person(, "SpryMedia Limited", role = c("ctb", "cph"),
-           comment = "DataTables library"),
+    comment = "Javascript strftime library"),
+    person(family = "SpryMedia Limited", role = c("ctb", "cph"),
+    comment = "DataTables library"),
+    person("John", "Fraser", role = c("ctb", "cph"),
+    comment = "showdown.js library"),
+    person("John", "Gruber", role = c("ctb", "cph"),
+    comment = "showdown.js library"),
     person("Ivan", "Sagalaev", role = c("ctb", "cph"),
-           comment = "highlight.js library"),
-    person("R Core Team", role = c("ctb", "cph"),
-           comment = "tar implementation from R")
-  )
+    comment = "highlight.js library"),
+    person(family = "R Core Team", role = c("ctb", "cph"),
+    comment = "tar implementation from R")
+    )
 Description: Makes it incredibly easy to build interactive web
     applications with R. Automatic "reactive" binding between inputs and
     outputs and extensive prebuilt widgets make it possible to build
     beautiful, responsive, and powerful applications with minimal effort.
-License: MIT + file LICENSE
-URL: https://shiny.posit.co/, https://github.com/rstudio/shiny
-BugReports: https://github.com/rstudio/shiny/issues
+License: GPL-3 | file LICENSE
 Depends:
-    methods,
-    R (>= 3.1.2)
+    R (>= 3.0.2),
+    methods
 Imports:
-    bslib (>= 0.6.0),
-    cachem (>= 1.1.0),
-    cli,
-    commonmark (>= 2.0.0),
-    fastmap (>= 1.1.1),
-    fontawesome (>= 0.4.0),
-    glue (>= 1.3.2),
-    grDevices,
-    htmltools (>= 0.5.4),
-    httpuv (>= 1.5.2),
-    jsonlite (>= 0.9.16),
-    later (>= 1.0.0),
-    lifecycle (>= 0.2.0),
-    mime (>= 0.3),
-    otel,
-    promises (>= 1.5.0),
-    R6 (>= 2.0),
-    rlang (>= 0.4.10),
-    sourcetools,
-    tools,
     utils,
+    grDevices,
+    httpuv (>= 1.5.2),
+    mime (>= 0.3),
+    jsonlite (>= 0.9.16),
+    xtable,
+    fontawesome (>= 0.4.0),
+    htmltools (>= 0.5.4),
+    R6 (>= 2.0),
+    sourcetools,
+    later (>= 1.0.0),
+    promises (>= 1.1.0),
+    tools,
+    crayon,
+    rlang (>= 0.4.10),
+    fastmap (>= 1.1.1),
     withr,
-    xtable
+    commonmark (>= 1.7),
+    glue (>= 1.3.2),
+    bslib (>= 0.3.0),
+    cachem,
+    lifecycle (>= 0.2.0)
 Suggests:
-    Cairo (>= 1.5-5),
-    coro (>= 1.1.0),
     datasets,
     DT,
-    dygraphs,
-    future,
-    ggplot2,
+    Cairo (>= 1.5-5),
+    testthat (>= 3.0.0),
     knitr (>= 1.6),
-    magrittr,
     markdown,
-    mirai,
-    otelsdk (>= 0.2.0),
-    ragg,
-    reactlog (>= 1.0.0),
     rmarkdown,
-    sass,
+    ggplot2,
+    reactlog (>= 1.0.0),
+    magrittr,
+    yaml,
+    future,
+    dygraphs,
+    ragg,
     showtext,
-    testthat (>= 3.2.1),
-    watcher,
-    yaml
-Config/Needs/check: shinytest2
-Config/testthat/edition: 3
-Encoding: UTF-8
-Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.3
+    sass
+URL: https://shiny.posit.co/,
+    https://github.com/rstudio/shiny
+BugReports: https://github.com/rstudio/shiny/issues
 Collate:
-    'app-handle.R'
     'globals.R'
     'app-state.R'
     'app_template.R'
@@ -184,15 +172,6 @@ Collate:
     'modal.R'
     'modules.R'
     'notifications.R'
-    'otel-attr-srcref.R'
-    'otel-collect.R'
-    'otel-enable.R'
-    'otel-error.R'
-    'otel-label.R'
-    'otel-reactive-update.R'
-    'otel-session.R'
-    'otel-shiny.R'
-    'otel-with.R'
     'priorityqueue.R'
     'progress.R'
     'react.R'
@@ -220,7 +199,6 @@ Collate:
     'test.R'
     'update-input.R'
     'utils-lang.R'
-    'utils-tags.R'
     'version_bs_date_picker.R'
     'version_ion_range_slider.R'
     'version_jquery.R'
@@ -228,3 +206,10 @@ Collate:
     'version_selectize.R'
     'version_strftime.R'
     'viewer.R'
+RoxygenNote: 7.3.1
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE)
+RdMacros: lifecycle
+Config/testthat/edition: 3
+Config/Needs/check:
+  shinytest2

LICENSE.md

@@ -1,21 +0,0 @@
-# MIT License
-
-Copyright (c) 2025 shiny authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

NAMESPACE

@@ -165,7 +165,6 @@ export(isTruthy)
 export(isolate)
 export(key_missing)
 export(loadSupport)
-export(localOtelCollect)
 export(mainPanel)
 export(makeReactiveBinding)
 export(markRenderFunction)
@@ -217,7 +216,6 @@ export(reactiveVal)
 export(reactiveValues)
 export(reactiveValuesToList)
 export(reactlog)
-export(reactlogAddMark)
 export(reactlogReset)
 export(reactlogShow)
 export(registerInputHandler)
@@ -276,7 +274,6 @@ export(snapshotPreprocessInput)
 export(snapshotPreprocessOutput)
 export(span)
 export(splitLayout)
-export(startApp)
 export(stopApp)
 export(strong)
 export(submitButton)
@@ -331,7 +328,6 @@ export(verticalLayout)
 export(wellPanel)
 export(withLogErrors)
 export(withMathJax)
-export(withOtelCollect)
 export(withProgress)
 export(withReactiveDomain)
 export(withTags)
@@ -390,13 +386,10 @@ importFrom(lifecycle,is_present)
 importFrom(promises,"%...!%")
 importFrom(promises,"%...>%")
 importFrom(promises,as.promise)
-importFrom(promises,hybrid_then)
-importFrom(promises,is.promise)
 importFrom(promises,is.promising)
-importFrom(promises,new_promise_domain)
+importFrom(promises,promise)
 importFrom(promises,promise_reject)
 importFrom(promises,promise_resolve)
-importFrom(promises,with_promise_domain)
 importFrom(rlang,"%||%")
 importFrom(rlang,"fn_body<-")
 importFrom(rlang,"fn_fmls<-")

NEWS.md

@@ -1,284 +1,15 @@
 # shiny (development version)
 
-## New features
-
-* New `startApp()` runs a Shiny app in non-blocking mode, returning a
-  `ShinyAppHandle` object with `stop()`, `status()`, `url()`, and `result()`
-  methods. When a new app is started, any previously running non-blocking app
-  is automatically stopped.
-
-# shiny 1.13.0
-
-## New features
-
-* Shiny now supports interactive breakpoints when used with Ark (e.g. in Positron). (#4352)
-
-## Bug fixes and minor improvements
-
-* Stack traces from render functions (e.g., `renderPlot()`, `renderDataTable()`) now hide internal Shiny rendering pipeline frames, making error messages cleaner and more focused on user code. (#4358)
-
-* Fixed an issue with `actionLink()` that extended the link underline to whitespace around the text. (#4348)
-
-
-# shiny 1.12.1
-
-## New features
-
-* `withOtelCollect()` and `localOtelCollect()` temporarily control
-  OpenTelemetry collection levels during reactive expression creation,
-  allowing you to enable or disable telemetry collection for specific modules
-  or sections of code. (#4333)
-
-## Bug fixes and minor improvements
-
-* OpenTelemetry code attributes now include both the preferred attribute names
-  (`code.file.path`, `code.line.number`, `code.column.number`) and the
-  deprecated names (`code.filepath`, `code.lineno`, `code.column`) to follow
-  OpenTelemetry semantic conventions while maintaining backward compatibility.
-  The deprecated names will be removed in a future release after Logfire
-  supports the preferred names. (#4325)
-
-* `ExtendedTask` now captures the OpenTelemetry recording state at
-  initialization time rather than at invocation time, ensuring consistent span
-  recording behavior regardless of runtime configuration changes. (#4334)
-
-* Timer tests are now skipped on CRAN. (#4327)
-
-# shiny 1.12.0
-
-## OpenTelemetry support
-
-* Shiny now supports [OpenTelemetry](https://opentelemetry.io/) via
-  [`{otel}`](https://otel.r-lib.org/index.html). By default, if
-  `otel::is_tracing_enabled()` returns `TRUE`, then `{shiny}` records all
-  OpenTelemetry spans. See [`{otelsdk}`'s Collecting Telemetry
-  Data](https://otelsdk.r-lib.org/reference/collecting.html) for more details
-  on configuring OpenTelemetry. (#4269, #4300)
-
-* Supported values for `options(shiny.otel.collect)` (or
-  `Sys.getenv("SHINY_OTEL_COLLECT")`):
-  * `"none"` - No Shiny OpenTelemetry tracing.
-  * `"session"` - Adds session start/end spans.
-  * `"reactive_update"` - Spans for any synchronous/asynchronous reactive
-    update. (Includes `"session"` features).
-  * `"reactivity"` - Spans for all reactive expressions. (Includes
-    `"reactive_update"` features).
-  * `"all"` [default] - All Shiny OpenTelemetry tracing. Currently equivalent
-    to `"reactivity"`.
-
-* OpenTelemetry spans are recorded for:
-  * `session_start`: Wraps the calling of the `server()` function. Also
-    contains HTTP request within the attributes.
-  * `session_end`: Wraps the calling of the `onSessionEnded()` handlers.
-  * `reactive_update`: Signals the start of when Shiny knows something is to
-    be calculated. This span ends when there are no more reactive updates
-    (promises or synchronous) to be calculated.
-  * `reactive`, `observe`, `output`: Captures the calculation (including any
-    async promise chains) of a reactive expression (`reactive()`), an observer
-    (`observe()`), or an output render function (`render*()`).
-  * `reactive debounce`, `reactive throttle`: Captures the calculation
-    (including any async promise chains) of a `debounce()`d or `throttle()`d
-    reactive expression.
-  * `reactiveFileReader`, `reactivePoll`: Captures the calculation
-    (including any async promise chains) of a `reactiveFileReader()` or
-    `reactivePoll()`.
-  * `ExtendedTask`: Captures the calculation (including any async promise
-    chains) of an `ExtendedTask`.
-
-* OpenTelemetry Logs are recorded for:
-  * `Set reactiveVal <name>` - When a `reactiveVal()` is set
-  * `Set reactiveValues <name>$<key>` - When a `reactiveValues()` element is
-    set
-  * Fatal or unhandled errors - When an error occurs that causes the session
-    to end, or when an unhandled error occurs in a reactive context. Contains
-    the error within the attributes. To unsanitize the error message being
-    collected, set `options(shiny.otel.sanitize.errors = FALSE)`.
-  * `Set ExtendedTask <name> <value>` - When an `ExtendedTask`'s respective
-    reactive value (e.g., `status`, `value`, and `error`) is set.
-  * `<ExtendedTask name> add to queue` - When an `ExtendedTask` is added to
-    the task queue.
-
-* All OpenTelemetry logs and spans will contain a `session.id` attribute
-  containing the active session ID.
-
-## New features
-
-* `updateActionButton()` and `updateActionLink()` now accept values other than
-  `shiny::icon()` for the `icon` argument (e.g., `fontawesome::fa()`,
-  `bsicons::bs_icon()`, etc). (#4249)
-
-## Bug fixes and minor improvements
-
-* Showcase mode now uses server-side markdown rendering with the
-  `{commonmark}` package, providing support for GitHub Flavored Markdown
-  features (tables, strikethrough, autolinks, task lists). While most existing
-  README.md files should continue to work as expected, some minor rendering
-  differences may occur due to the change in markdown processor. (#4202,
-  #4201)
-
-* `debounce()`, `reactiveFileReader()`, `reactivePoll()`, `reactiveValues()`,
-  and `throttle()` now attempt to retrieve the assigned name for the default
-  label if the srcref is available. If a value cannot easily be produced, a
-  default label is used instead. (#4269, #4300)
-
-* The default label for items described below will now attempt to retrieve the
-  assigned name if the srcref is available. If a value can not easily be
-  produced, a default label will be used instead. This should improve the
-  OpenTelemetry span labels and the reactlog experience. (#4269, #4300)
-  * `reactiveValues()`, `reactivePoll()`, `reactiveFileReader()`, `debounce()`,
-    `throttle()`, `observe()`
-  * Combinations of `bindEvent()` and `reactive()` / `observe()`
-  * Combination of `bindCache()` and `reactive()`
-
-* `updateActionButton()` and `updateActionLink()` now correctly render HTML
-  content passed to the `label` argument. (#4249)
-
-* `updateSelectizeInput()` no longer creates multiple remove buttons when
-  `options = list(plugins="remove_button")` is used. (#4275)
-
-* `dateRangeInput()`/`updateDateRangeInput()` now correctly considers the time
-  zones of date-time objects (POSIXct) passed to the `start`, `end`, `min` and
-  `max` arguments. (thanks @ismirsehregal, #4318)
-
-## Breaking changes
-
-* The return value of `actionButton()` and `actionLink()` now wraps `label`
-  and `icon` in an additional HTML container element. This allows
-  `updateActionButton()` and `updateActionLink()` to distinguish between the
-  `label` and `icon` when making updates, and allows spacing between `label`
-  and `icon` to be more easily customized via CSS.
-
-# shiny 1.11.1
-
-This is a patch release primarily for addressing the bugs introduced in v1.11.0.
-
-## Bug fixes
-
-* Fixed an issue where `InputBinding` implementations that don't pass a value to their `subscribe` callback were no longer notifying Shiny of input changes. (#4243)
-
-* `updateActionButton()` and `updateActionLink()` once again handle `label` updates correctly. (#4245)
-
-# shiny 1.11.0
-
-## Improvements
-
-* When auto-reload is enabled, Shiny now reloads the entire app when support files, like Shiny modules, additional script files, or web assets, change. To enable auto-reload, call `devmode(TRUE)` to enable Shiny's developer mode, or set `options(shiny.autoreload = TRUE)` to specifically enable auto-reload. You can choose which files are watched for changes with the `shiny.autoreload.pattern` option. (#4184)
-
-* When busy indicators are enabled (i.e., `useBusyIndicators()`), Shiny now:
-    * Shows a spinner on recalculating htmlwidgets that have previously rendered an error (including `req()` and `validate()`). (#4172)
-    * Shows a spinner on `tableOutput()`. (#4172)
-    * Places a minimum height on recalculating outputs so that the spinner is always visible. (#4172)
-
-* Shiny now uses `{cli}` instead of `{crayon}` for rich log messages. (thanks @olivroy, #4170)
-
-* `renderPlot()` was updated to accommodate changes in ggplot2 v4.0.0. (#4226)
-
-* When adding the new tab via `insertTab()` or `bslib::nav_insert()`, the underlying JavaScript no longer renders content twice. (#4179)
-
-## New features
-
-* `textInput()`, `textAreaInput()`, `numericInput()` and `passwordInput()` all gain an `updateOn` option. `updateOn = "change"` is the default and previous behavior, where the input value updates immediately whenever the value changes. With `updateOn = "blur"`, the input value will update only when the text input loses focus or when the user presses Enter (or Cmd/Ctrl + Enter for `textAreaInput()`). (#4183)
-
-* `textAreaInput()` gains a `autoresize` option, which automatically resizes the text area to fit its content. (#4210)
-
-* The family of `update*Input()` functions can now render HTML content passed to the `label` argument (e.g., `updateInputText(label = tags$b("New label"))`). (#3996)
-
-* `ExtendedTask` now catches synchronous values and errors and returns them via `$result()`. Previously, the extended task function was required to always return a promise. This change makes it easier to use `ExtendedTask` with a function that may return early or do some synchronous work before returning a promise. (#4225)
-
-* The `callback` argument of Shiny.js' `InputBinding.subscribe()` method gains support for a value of `"event"`. This makes it possible for an input binding to use event priority when updating the value (i.e., send immediately and always resend, even if the value hasn't changed). (#4211)
-
-## Changes
-
-* Shiny no longer suspends input changes when _any_ `<input type="submit">` or `<button type="submit">` is on the page. Instead, it now only suspends when a `submitButton()` is present. If you have reason for creating a submit button from custom HTML, add a CSS class of `shiny-submit-button` to the button. (#4209)
-
-* Shiny's JavaScript assets are now compiled to ES2021 instead of ES5. (#4066)
-
-* Upgraded jQuery from 3.6.0 to 3.7.1. (#3969)
-
-* Updated jQuery UI from 1.13.2 to 1.14.1. (#4175)
-
-## Bug fixes
-
-* The Shiny Client Console (enabled with `shiny::devmode()`) no longer displays duplicate warning or error message. (#4177)
-
-* Synchronous errors that occur inside a `ExtendedTask` no longer stop the session. (#4225)
-
-* Calling `removeModal()` immediately after `showModal()` no longer fails to remove the modal (this would sometimes happen if the remove message was received while the modal was in the process of being revealed). (#4173)
-
-* `runExample("08_html")` now (correctly) requests to 'shiny.min.css', eliminating a network request failure. (#4220)
-
-* `shiny::shinyAppTemplate()` no longer errors without a call to `library(shiny)`. (#3870)
-
-# shiny 1.10.0
-
 ## New features and improvements
 
-* When busy indicators are enabled (i.e., `useBusyIndicators()` is in the UI), Shiny now:
-    * Shows the pulse indicator when dynamic UI elements are recalculating and no other spinners are visible in the app. (#4137)
-    * Makes the pulse indicator slightly smaller by default and improves its appearance to better blend with any background. (#4122)
-
-* Improve collection of deep stack traces (stack traces that are tracked across steps in an async promise chain) with `{coro}` async generators such as `{elmer}` chat streams. Previously, Shiny treated each iteration of an async generator as a distinct deep stack, leading to pathologically long stack traces; now, Shiny only keeps/prints unique deep stack trace, discarding duplicates. (#4156)
-
-* Added an example to the `ExtendedTask` documentation. (@daattali #4087)
-
-## Bug fixes
-
-* Fixed a bug in `conditionalPanel()` that would cause the panel to repeatedly show/hide itself when the provided condition was not boolean. (@kamilzyla, #4127)
-
-* Fixed a bug with `sliderInput()` when used as a range slider that made it impossible to change the slider value when both handles were at the maximum value. (#4131)
-
-* `dateInput()` and `dateRangeInput()` no longer send immediate updates to the server when the user is typing a date input. Instead, it waits until the user presses Enter or clicks out of the field to send the update, avoiding spurious and incorrect date values. Note that an update is still sent immediately when the field is cleared. (#3664)
-
-* Fixed a bug in `onBookmark()` hook that caused elements to not be excluded from URL bookmarking. (#3762)
-
-* Fixed a bug with stack trace capturing that caused reactives with very long async promise chains (hundreds/thousands of steps) to become extremely slow. Chains this long are unlikely to be written by hand, but `{coro}` async generators and `{elmer}` async streaming were easily creating problematically long chains. (#4155)
-
-* Duplicate input and output IDs -- e.g. using `"debug"` for two inputs or two outputs -- or shared IDs -- e.g. using `"debug"` as the `inputId` for an input and an output -- now result in a console warning message, but not an error. When `devmode()` is enabled, an informative message is shown in the Shiny Client Console. We recommend all Shiny devs enable `devmode()` when developing Shiny apps locally. (#4101)
-
-* Updating the choices of a `selectizeInput()` via `updateSelectizeInput()` with `server = TRUE` no longer retains the selected choice as a deselected option if the current value is not part of the new choices. (@dvg-p4 #4142)
-
-* Fixed a bug where stack traces from `observeEvent()` were being stripped of stack frames too aggressively. (#4163)
-
-# shiny 1.9.1
-
-## Bug fixes
-
-* Fixed a bug introduced in v1.9.0 where the boundaries of hover/click/brush regions on plots were being incorrectly scaled when browser zoom was used. (#4111)
-
-# shiny 1.9.0
-
-## New busy indication feature
-
-Add the new `useBusyIndicators()` function to any UI definition to:
-  1. Add a spinner overlay on calculating/recalculating outputs.
-  2. Show a page-level pulsing banner when Shiny is busy calculating something (e.g., a download, side-effect, etc), but no calculating/recalculating outputs are visible.
-
-In a future version of Shiny, busy indication will be enabled by default, so we encourage you to try it out now, provide feedback, and report any issues.
-
-In addition, various properties of the spinners and pulse can be customized with `busyIndicatorOptions()`. For more details, see `?busyIndicatorOptions`. (#4040, #4104)
-
-## New features and improvements
-
-* The client-side TypeScript code for Shiny has been refactored so that the `Shiny` object is now an instance of class `ShinyClass`. (#4063)
-
-* In TypeScript, the `Shiny` object has a new property `initializedPromise`, which is a Promise-like object that can be `await`ed or chained with `.then()`. This Promise-like object corresponds to the `shiny:sessioninitialized` JavaScript event, but is easier to use because it can be used both before and after the events have occurred. (#4063)
-
 * Output bindings now include the `.recalculating` CSS class when they are first bound, up until the first render. This makes it possible/easier to show progress indication when the output is calculating for the first time. (#4039)
 
-* A new `shiny.client_devmode` option controls client-side devmode features, in particular the client-side error console introduced in shiny 1.8.1, independently of the R-side features of `shiny::devmode()`. This usage is primarily intended for automatic use in Shinylive. (#4073)
-
-* Added function `reactlogAddMark()` to programmatically add _mark_ed locations in the reactlog log without the requirement of keyboard bindings during an idle reactive moment. (#4103)
-
 ## Bug fixes
 
 * `downloadButton()` and `downloadLink()` are now disabled up until they are fully initialized. This prevents the user from clicking the button/link before the download is ready. (#4041)
-
 * Output bindings that are removed, invalidated, then inserted again (while invalidated) now correctly include the `.recalculating` CSS class. (#4039)
-
 * Fixed a recent issue with `uiOutput()` and `conditionalPanel()` not properly lower opacity when recalculation (in a Bootstrap 5 context). (#4027)
 
-* Image outputs that were scaled by CSS had certain regions that were unresponsive to hover/click/brush handlers. (#3234)
-
 # shiny 1.8.1.1
 
 * In v1.8.1, shiny.js starting throwing an error when input/output bindings have duplicate IDs. This error is now only thrown when `shiny::devmode(TRUE)` is enabled, so the issue is still made discoverable through the JS error console, but avoids unnecessarily breaking apps that happen to work with duplicate IDs. (#4019)
@@ -291,7 +22,7 @@ In addition, various properties of the spinners and pulse can be customized with
 
 * Added a JavaScript error dialog, reporting errors that previously were only discoverable by opening the browser's devtools open. Since this dialog is mainly useful for debugging and development, it must be enabled with `shiny::devmode()`. (#3931)
 
-* `runExample()` now uses the `{bslib}` package to generate a better looking result. It also gains a `package` argument so that other packages can leverage this same function to run Shiny app examples. For more, see `?runExample`. (#3963, #4005)
+* `runExamples()` now uses the `{bslib}` package to generate a better looking result. It also gains a `package` argument so that other packages can leverage this same function to run Shiny app examples. For more, see `?runExamples`. (#3963, #4005)
 
 * Added `onUnhandledError()` to register a function that will be called when an unhandled error occurs in a Shiny app. Note that this handler doesn't stop the error or prevent the session from closing, but it can be used to log the error or to clean up session-specific resources. (thanks @JohnCoene, #3993)
 
@@ -368,6 +99,7 @@ In addition, various properties of the spinners and pulse can be customized with
 
 * Fixed #3833: When `width` is provided to `textAreaInput()`, we now correctly set the width of the `<textarea>` element. (#3838)
 
+
 # shiny 1.7.4.1
 
 ## Full changelog
@@ -556,7 +288,7 @@ This release focuses on improvements in three main areas:
 
 * Fixed #2951: screen readers correctly announce labels and date formats for `dateInput()` and `dateRangeInput()` widgets. (#2978)
 
-* Closed #2847: `selectInput()` is reasonably accessible for screen readers even when `selectize` option is set to TRUE. To improve `selectize.js` accessibility, we have added [selectize-plugin-a11y](https://github.com/SalmenBejaoui/selectize-plugin-a11y) by default. (#2993)
+* Closed #2847: `selectInput()` is reasonably accessible for screen readers even when `selectize` option is set to TRUE. To improve `selectize.js` accessibility, we have added [selectize-plugin-a11y](https://github.com/SLMNBJ/selectize-plugin-a11y) by default. (#2993)
 
 * Closed #612: Added `alt` argument to `renderPlot()` and `renderCachedPlot()` to specify descriptive texts for `plotOutput()` objects, which is essential for screen readers. By default, alt text is set to the static text, "Plot object," but even dynamic text can be made with reactive function. (#3006, thanks @trafficonese and @leonawicz for the original PR and discussion via #2494)
 
@@ -818,7 +550,7 @@ This release features plot caching, an important new tool for improving performa
 
 ### Minor new features and improvements
 
-* Upgrade FontAwesome from 4.7.0 to 5.3.1 and made `icon` tags browsable, which means they will display in a web browser or RStudio viewer by default (#2186). Note that if your application or library depends on FontAwesome directly using custom CSS, you may need to make some or all of the changes recommended in [Upgrade from Version 4](https://docs-v5.fontawesome.com/web/setup/upgrade-from-v4). Font Awesome icons can also now be used in static R Markdown documents.
+* Upgrade FontAwesome from 4.7.0 to 5.3.1 and made `icon` tags browsable, which means they will display in a web browser or RStudio viewer by default (#2186). Note that if your application or library depends on FontAwesome directly using custom CSS, you may need to make some or all of the changes recommended in [Upgrade from Version 4](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4). Font Awesome icons can also now be used in static R Markdown documents.
 
 * Address #174: Added `datesdisabled` and `daysofweekdisabled` as new parameters to `dateInput()`. This resolves #174 and exposes the underlying arguments of [Bootstrap Datepicker](http://bootstrap-datepicker.readthedocs.io/en/latest/options.html#datesdisabled). `datesdisabled` expects a character vector with values in `yyyy/mm/dd` format and `daysofweekdisabled` expects an integer vector with day interger ids (Sunday=0, Saturday=6). The default value for both is `NULL`, which leaves all days selectable. Thanks, @nathancday! (#2147)
 
@@ -1260,7 +992,7 @@ Shiny can now display notifications on the client browser by using the `showNoti
 <img src="http://shiny.rstudio.com/images/notification.png" alt="notification" width="50%"/>
 </p>
 
-[Here](https://shiny.rstudio.com/articles/notifications.html)'s our article about it, and the [reference documentation](https://shiny.posit.co/r/reference/shiny/latest/shownotification.html).
+[Here](https://shiny.rstudio.com/articles/notifications.html)'s our article about it, and the [reference documentation](https://shiny.rstudio.com/reference/shiny/latest/showNotification.html).
 
 ## Progress indicators
 
@@ -1269,7 +1001,7 @@ If your Shiny app contains computations that take a long time to complete, a pro
 **_Important note_:**
 > If you were already using progress bars and had customized them with your own CSS, you can add the `style = "old"` argument to your `withProgress()` call (or `Progress$new()`). This will result in the same appearance as before. You can also call `shinyOptions(progress.style = "old")` in your app's server function to make all progress indicators use the old styling.
 
-To see new progress bars in action, see [this app](https://gallery.shinyapps.io/085-progress/) in the gallery. You can also learn more about this in [our article](https://shiny.rstudio.com/articles/progress.html) and in the reference documentation (either for the easier [`withProgress` functional API](https://shiny.posit.co/r/reference/shiny/latest/withprogress.html) or the more complicated, but more powerful, [`Progress` object-oriented API](https://shiny.posit.co/r/reference/shiny/latest/progress.html).
+To see new progress bars in action, see [this app](https://gallery.shinyapps.io/085-progress/) in the gallery. You can also learn more about this in [our article](https://shiny.rstudio.com/articles/progress.html) and in the reference documentation (either for the easier [`withProgress` functional API](https://shiny.rstudio.com/reference/shiny/latest/withProgress.html) or the more complicated, but more powerful, [`Progress` object-oriented API](https://shiny.rstudio.com/reference/shiny/latest/Progress.html).
 
 ## Reconnection
 
@@ -1283,7 +1015,7 @@ Shiny has now built-in support for displaying modal dialogs like the one below (
 <img src="http://shiny.rstudio.com/images/modal-dialog.png" alt="modal-dialog" width="50%"/>
 </p>
 
-To learn more about this, read [our article](https://shiny.rstudio.com/articles/modal-dialogs.html) and the [reference documentation](https://shiny.posit.co/r/reference/shiny/latest/modaldialog.html).
+To learn more about this, read [our article](https://shiny.rstudio.com/articles/modal-dialogs.html) and the [reference documentation](https://shiny.rstudio.com/reference/shiny/latest/modalDialog.html).
 
 ## `insertUI` and `removeUI`
 
@@ -1291,7 +1023,7 @@ Sometimes in a Shiny app, arbitrary HTML UI may need to be created on-the-fly in
 
 See [this simple demo app](https://gallery.shinyapps.io/111-insert-ui/) of how one could use `insertUI` and `removeUI` to insert and remove text elements using a queue. Also see [this other app](https://gallery.shinyapps.io/insertUI/) that demonstrates how to insert and remove a few common Shiny input objects. Finally, [this app](https://gallery.shinyapps.io/insertUI-modules/) shows how to dynamically insert modules using `insertUI`.
 
-For more, read [our article](https://shiny.rstudio.com/articles/dynamic-ui.html) about dynamic UI generation and the reference documentation about [`insertUI`](https://shiny.posit.co/r/reference/shiny/latest/insertui.html) and [`removeUI`](https://shiny.posit.co/r/reference/shiny/latest/insertui.html).
+For more, read [our article](https://shiny.rstudio.com/articles/dynamic-ui.html) about dynamic UI generation and the reference documentation about [`insertUI`](https://shiny.rstudio.com/reference/shiny/latest/insertUI.html) and [`removeUI`](https://shiny.rstudio.com/reference/shiny/latest/insertUI.html).
 
 ## Documentation for connecting to an external database
 
@@ -1325,7 +1057,7 @@ There are many more minor features, small improvements, and bug fixes than we ca
       <img src="http://shiny.rstudio.com/images/render-table.png" alt="render-table" width="75%"/>
       </p>
 
-      For more, read our [short article](https://shiny.rstudio.com/articles/render-table.html) about this update, experiment with all the new features in this [demo app](https://gallery.shinyapps.io/109-render-table/), or check out the [reference documentation](https://shiny.posit.co/r/reference/shiny/latest/rendertable.html).
+      For more, read our [short article](https://shiny.rstudio.com/articles/render-table.html) about this update, experiment with all the new features in this [demo app](https://gallery.shinyapps.io/109-render-table/), or check out the [reference documentation](https://shiny.rstudio.com/reference/shiny/latest/renderTable.html).
 
 ## Full changelog
 

R/app-handle.R

@@ -1,73 +0,0 @@
-# Handle returned by startApp()
-ShinyAppHandle <- R6::R6Class("ShinyAppHandle",
-  cloneable = FALSE,
-
-  public = list(
-    initialize = function(appUrl, cleanupFn) {
-      private$appUrl <- appUrl
-      private$cleanupFn <- cleanupFn
-
-      reg.finalizer(self, function(e) {
-        tryCatch(e$stop(), error = function(cnd) NULL)
-      }, onexit = TRUE)
-    },
-
-    stop = function() {
-      if (self$status() != "running") {
-        return(invisible(self))
-      }
-      private$stopped <- TRUE
-      private$captureResult()
-      private$cleanupFn()
-      private$cleanupFn <- NULL
-      invisible(self)
-    },
-
-    url = function() private$appUrl,
-
-    status = function() {
-      if (!private$stopped) {
-        "running"
-      } else if (!is.null(private$resultError)) {
-        "error"
-      } else {
-        "success"
-      }
-    },
-
-    result = function() {
-      if (self$status() == "running") {
-        stop("App is still running. Use status() to check if the app has stopped.")
-      }
-      if (!is.null(private$resultError)) {
-        stop(private$resultError)
-      }
-      private$resultValue
-    },
-
-    print = function(...) {
-      cat("Shiny app handle\n")
-      cat("  URL:   ", private$appUrl, "\n", sep = "")
-      cat("  Status:", self$status(), "\n")
-      invisible(self)
-    }
-  ),
-
-  private = list(
-    appUrl = NULL,
-    cleanupFn = NULL,
-    # Whether this handle has been stopped. Distinct from .globals$stopped
-    # which tracks whether a stop was requested (set by stopApp() or stop()).
-    stopped = FALSE,
-    resultValue = NULL,
-    resultError = NULL,
-
-    captureResult = function() {
-      if (isTRUE(.globals$reterror)) {
-        private$resultError <- .globals$retval
-      } else if (!is.null(.globals$retval)) {
-        private$resultValue <- .globals$retval$value
-      }
-    }
-  )
-)

R/bind-cache.R

@@ -177,7 +177,7 @@ utils::globalVariables(".GenericCallEnv", add = TRUE)
 #'   cache by putting this at the top of your app.R, server.R, or global.R:
 #'
 #'   ```
-#'   shinyOptions(cache = cachem::cache_disk(file.path(dirname(tempdir()), "myapp-cache")))
+#'   shinyOptions(cache = cachem::cache_disk(file.path(dirname(tempdir()), "myapp-cache"))
 #'   ```
 #'
 #'   This will create a subdirectory in your system temp directory named
@@ -231,8 +231,8 @@ utils::globalVariables(".GenericCallEnv", add = TRUE)
 #'   promises, but rather objects provided by the
 #'   \href{https://rstudio.github.io/promises/}{\pkg{promises}}  package, which
 #'   are similar to promises in JavaScript. (See [promises::promise()] for more
-#'   information.) You can also use [mirai::mirai()] or [future::future()]
-#'   objects to run code in a separate process or even on a remote machine.
+#'   information.) You can also use [future::future()] objects to run code in a
+#'   separate process or even on a remote machine.
 #'
 #'   If the value returns a promise, then anything that consumes the cached
 #'   reactive must expect it to return a promise.
@@ -478,12 +478,7 @@ bindCache.default <- function(x, ...) {
 bindCache.reactiveExpr <- function(x, ..., cache = "app") {
   check_dots_unnamed()
 
-  call_srcref <- get_call_srcref(-1)
-  label <- rassignSrcrefToLabel(
-    call_srcref,
-    defaultLabel = exprToLabel(substitute(x), "cachedReactive")
-  )
-
+  label <- exprToLabel(substitute(key), "cachedReactive")
   domain <- reactive_get_domain(x)
 
   # Convert the ... to a function that returns their evaluated values.
@@ -495,37 +490,24 @@ bindCache.reactiveExpr <- function(x, ..., cache = "app") {
   cacheHint <- rlang::hash(extractCacheHint(x))
   valueFunc <- wrapFunctionLabel(valueFunc, "cachedReactiveValueFunc", ..stacktraceon = TRUE)
 
-  x_classes <- class(x)
-  x_otel_attrs <- attr(x, "observable", exact = TRUE)$.otelAttrs
-
   # Don't hold on to the reference for x, so that it can be GC'd
   rm(x)
   # Hacky workaround for issue with `%>%` preventing GC:
   # https://github.com/tidyverse/magrittr/issues/229
-  if (exists(".GenericCallEnv") && exists(".", envir = .GenericCallEnv, inherits = FALSE)) {
-    rm(list = ".", envir = .GenericCallEnv, inherits = FALSE)
+  if (exists(".GenericCallEnv") && exists(".", envir = .GenericCallEnv)) {
+    rm(list = ".", envir = .GenericCallEnv)
   }
 
-  with_no_otel_collect({
-    res <- reactive(label = label, domain = domain, {
-      cache <- resolve_cache_object(cache, domain)
-      hybrid_chain(
-        keyFunc(),
-        generateCacheFun(valueFunc, cache, cacheHint, cacheReadHook = identity, cacheWriteHook = identity)
-      )
-    })
+
+  res <- reactive(label = label, domain = domain, {
+    cache <- resolve_cache_object(cache, domain)
+    hybrid_chain(
+      keyFunc(),
+      generateCacheFun(valueFunc, cache, cacheHint, cacheReadHook = identity, cacheWriteHook = identity)
+    )
   })
 
   class(res) <- c("reactive.cache", class(res))
-
-  local({
-    impl <- attr(res, "observable", exact = TRUE)
-    impl$.otelAttrs <- append_otel_srcref_attrs(x_otel_attrs, call_srcref, fn_name = "bindCache")
-  })
-
-  if (has_otel_collect("reactivity")) {
-    res <- enable_otel_reactive_expr(res)
-  }
   res
 }
 
@@ -552,7 +534,6 @@ bindCache.shiny.render.function <- function(x, ..., cache = "app") {
     )
   }
 
-  # Passes over the otelAttrs from valueFunc to renderFunc
   renderFunc <- addAttributes(renderFunc, renderFunctionAttributes(valueFunc))
   class(renderFunc) <- c("shiny.render.function.cache", class(valueFunc))
   renderFunc
@@ -604,7 +585,7 @@ bindCache.shiny.renderPlot <- function(x, ...,
 
     observe({
       doResizeCheck()
-    }, label = "plot-resize")
+    })
     # TODO: Make sure this observer gets GC'd if output$foo is replaced.
     # Currently, if you reassign output$foo, the observer persists until the
     # session ends. This is generally bad programming practice and should be

R/bind-event.R

@@ -196,58 +196,31 @@ bindEvent.reactiveExpr <- function(x, ..., ignoreNULL = TRUE, ignoreInit = FALSE
   valueFunc <- reactive_get_value_func(x)
   valueFunc <- wrapFunctionLabel(valueFunc, "eventReactiveValueFunc", ..stacktraceon = TRUE)
 
-  call_srcref <- get_call_srcref(-1)
-  if (is.null(label)) {
-    label <- rassignSrcrefToLabel(
-      call_srcref,
-      defaultLabel = as_default_label(sprintf(
-        'bindEvent(%s, %s)',
-        attr(x, "observable", exact = TRUE)$.label,
-        quos_to_label(qs)
-      ))
-    )
-  }
-
-  x_classes <- class(x)
-  x_otel_attrs <- attr(x, "observable", exact = TRUE)$.otelAttrs
+  label <- label %||%
+    sprintf('bindEvent(%s, %s)', attr(x, "observable", exact = TRUE)$.label, quos_to_label(qs))
 
   # Don't hold on to the reference for x, so that it can be GC'd
   rm(x)
 
   initialized <- FALSE
 
-  with_no_otel_collect({
-    res <- reactive(label = label, domain = domain, ..stacktraceon = FALSE, {
-      hybrid_chain(
-        {
-          eventFunc()
-        },
-        function(value) {
-          if (ignoreInit && !initialized) {
-            initialized <<- TRUE
-            req(FALSE)
-          }
-
-          req(!ignoreNULL || !isNullEvent(value))
-
-          isolate(valueFunc())
+  res <- reactive(label = label, domain = domain, ..stacktraceon = FALSE, {
+    hybrid_chain(
+      eventFunc(),
+      function(value) {
+        if (ignoreInit && !initialized) {
+          initialized <<- TRUE
+          req(FALSE)
         }
-      )
-    })
+
+        req(!ignoreNULL || !isNullEvent(value))
+
+        isolate(valueFunc())
+      }
+    )
   })
 
-  class(res) <- c("reactive.event", x_classes)
-
-  local({
-    impl <- attr(res, "observable", exact = TRUE)
-    impl$.otelAttrs <- append_otel_srcref_attrs(x_otel_attrs, call_srcref, fn_name = "bindEvent")
-  })
-
-
-  if (has_otel_collect("reactivity")) {
-    res <- enable_otel_reactive_expr(res)
-  }
-
+  class(res) <- c("reactive.event", class(res))
   res
 }
 
@@ -276,7 +249,6 @@ bindEvent.shiny.render.function <- function(x, ..., ignoreNULL = TRUE, ignoreIni
     )
   }
 
-  # Passes over the otelAttrs from valueFunc to renderFunc
   renderFunc <- addAttributes(renderFunc, renderFunctionAttributes(valueFunc))
   class(renderFunc) <- c("shiny.render.function.event", class(valueFunc))
   renderFunc
@@ -297,17 +269,7 @@ bindEvent.Observer <- function(x, ..., ignoreNULL = TRUE, ignoreInit = FALSE,
 
   # Note that because the observer will already have been logged by this point,
   # this updated label won't show up in the reactlog.
-  if (is.null(label)) {
-    call_srcref <- get_call_srcref(-1)
-    x$.label <- rassignSrcrefToLabel(
-      call_srcref,
-      defaultLabel = as_default_label(
-        sprintf('bindEvent(%s, %s)', x$.label, quos_to_label(qs))
-      )
-    )
-  } else {
-    x$.label <- label
-  }
+  x$.label <- label %||% sprintf('bindEvent(%s, %s)', x$.label, quos_to_label(qs))
 
   initialized <- FALSE
 
@@ -340,13 +302,6 @@ bindEvent.Observer <- function(x, ..., ignoreNULL = TRUE, ignoreInit = FALSE,
   )
 
   class(x) <- c("Observer.event", class(x))
-  call_srcref <- get_call_srcref(-1)
-  x$.otelAttrs <- append_otel_srcref_attrs(x$.otelAttrs, call_srcref, fn_name = "bindEvent")
-
-  if (has_otel_collect("reactivity")) {
-    x <- enable_otel_observe(x)
-  }
-
   invisible(x)
 }
 

R/bookmark-state.R

@@ -99,13 +99,13 @@ saveShinySaveState <- function(state) {
 
 # Encode the state to a URL. This does not save to disk.
 encodeShinySaveState <- function(state) {
+  exclude <- c(state$exclude, "._bookmark_")
+  inputVals <- serializeReactiveValues(state$input, exclude, stateDir = NULL)
+
   # Allow user-supplied onSave function to do things like add state$values.
   if (!is.null(state$onSave))
     isolate(state$onSave(state))
 
-  exclude <- c(state$exclude, "._bookmark_")
-  inputVals <- serializeReactiveValues(state$input, exclude, stateDir = NULL)
-
   inputVals <- vapply(inputVals,
     function(x) toJSON(x, strict_atomic = FALSE),
     character(1),

R/bootstrap.R

@@ -172,10 +172,9 @@ setCurrentTheme <- function(theme) {
 
 #' Register a theme dependency
 #'
-#' This function registers a function that returns an
-#' [htmltools::htmlDependency()] or list of such objects. If
-#' `session$setCurrentTheme()` is called, the function will be re-executed, and
-#' the resulting html dependency will be sent to the client.
+#' This function registers a function that returns an [htmlDependency()] or list
+#' of such objects. If `session$setCurrentTheme()` is called, the function will
+#' be re-executed, and the resulting html dependency will be sent to the client.
 #'
 #' Note that `func` should **not** be an anonymous function, or a function which
 #' is defined within the calling function. This is so that,
@@ -1113,7 +1112,7 @@ plotOutput <- function(outputId, width = "100%", height="400px",
 #' @rdname renderTable
 #' @export
 tableOutput <- function(outputId) {
-  div(id = outputId, class="shiny-html-output shiny-table-output")
+  div(id = outputId, class="shiny-html-output")
 }
 
 dataTableDependency <- list(

R/busy-indicators-spinners.R

@@ -1,4 +1,13 @@
-# Generated by tools/updateSpinnerTypes.R: do not edit by hand
-.busySpinnerTypes <-
-  c("ring", "ring2", "ring3", "bars", "bars2", "bars3", "pulse", 
-  "pulse2", "pulse3", "dots", "dots2", "dots3")
+# Generated by tools/updateSpinners.R: do not edit by hand
+.spinner_types <-
+  c("12-dots-scale-rotate", "180-ring-with-bg", "180-ring", "270-ring-with-bg", 
+  "270-ring", "3-dots-bounce", "3-dots-fade", "3-dots-move", "3-dots-rotate", 
+  "3-dots-scale-middle", "3-dots-scale", "6-dots-rotate", "6-dots-scale-middle", 
+  "6-dots-scale", "8-dots-rotate", "90-ring-with-bg", "90-ring", 
+  "bars-fade", "bars-rotate-fade", "bars-scale-fade", "bars-scale-middle", 
+  "bars-scale", "blocks-scale", "blocks-shuffle-2", "blocks-shuffle-3", 
+  "blocks-wave", "bouncing-ball", "clock", "dot-revolve", "eclipse-half", 
+  "eclipse", "gooey-balls-1", "gooey-balls-2", "pulse-2", "pulse-3", 
+  "pulse-multiple", "pulse-ring", "pulse-rings-2", "pulse-rings-3", 
+  "pulse-rings-multiple", "pulse", "ring-resize", "tadpole", "wifi-fade", 
+  "wifi", "wind-toy")

R/busy-indicators.R

@@ -1,26 +1,18 @@
 #' Enable/disable busy indication
 #'
-#' Busy indicators provide a visual cue to users when the server is busy
-#' calculating outputs or otherwise performing tasks (e.g., producing
-#' downloads). When enabled, a spinner is shown on each
-#' calculating/recalculating output, and a pulsing banner is shown at the top of
-#' the page when the app is otherwise busy. Busy indication is enabled by
-#' default for UI created with \pkg{bslib}, but must be enabled otherwise. To
-#' enable/disable, include the result of this function in anywhere in the app's
-#' UI.
+#' To enable/disable busy indicators, include the result of this function in the
+#' app's UI.
 #'
 #' When both `spinners` and `pulse` are set to `TRUE`, the pulse is
 #' automatically disabled when spinner(s) are active. When both `spinners` and
 #' `pulse` are set to `FALSE`, no busy indication is shown (other than the
 #' graying out of recalculating outputs).
 #'
-#' @param ... Currently ignored.
+#' @param ... Currently ignored (for future expansion).
 #' @param spinners Whether to show a spinner on each calculating/recalculating
 #'   output.
 #' @param pulse Whether to show a pulsing banner at the top of the page when the
 #'   app is busy.
-#' @param fade Whether to fade recalculating outputs. A value of `FALSE` is
-#'   equivalent to `busyIndicatorOptions(fade_opacity=1)`.
 #'
 #' @export
 #' @seealso [busyIndicatorOptions()] for customizing the appearance of the busy
@@ -50,8 +42,7 @@
 #' }
 #'
 #' shinyApp(ui, server)
-useBusyIndicators <- function(..., spinners = TRUE, pulse = TRUE, fade = TRUE) {
-
+useBusyIndicators <- function(..., spinners = TRUE, pulse = TRUE) {
   rlang::check_dots_empty()
 
   attrs <- list("shinyBusySpinners" = spinners, "shinyBusyPulse" = pulse)
@@ -64,59 +55,39 @@ useBusyIndicators <- function(..., spinners = TRUE, pulse = TRUE, fade = TRUE) {
     }
   })
 
+  js <- HTML(paste(js, collapse = "\n"))
+
   # TODO: it'd be nice if htmltools had something like a page_attrs() that allowed us
   # to do this without needing to inject JS into the head.
-  res <- tags$script(HTML(paste(js, collapse = "\n")))
-
-  if (!fade) {
-    res <- tagList(res, fadeOptions(opacity = 1))
-  }
-
-  res
+  tags$script(js)
 }
 
-#' Customize busy indicator options
+#' Customize busy indicator options.
 #'
-#' @description
-#' Shiny automatically includes busy indicators, which more specifically means:
-#'   1. Calculating/recalculating outputs have a spinner overlay.
-#'   2. Outputs fade out/in when recalculating.
-#'   3. When no outputs are calculating/recalculating, but Shiny is busy
-#'     doing something else (e.g., a download, side-effect, etc), a page-level
-#'     pulsing banner is shown.
+#' To customize the appearance of the busy indicators, include the result of
+#' this function in the app's UI.
 #'
-#' This function allows you to customize the appearance of these busy indicators
-#' by including the result of this function inside the app's UI. Note that,
-#' unless `spinner_selector` (or `fade_selector`) is specified, the spinner/fade
-#' customization applies to the parent element. If the customization should
-#' instead apply to the entire page, set `spinner_selector = 'html'` and
-#' `fade_selector = 'html'`.
+#' @param ... Currently ignored (for future expansion).
+#' @param spinner_type The type of spinner to use for the busy indicator. This
+#'   can be any of the spinner types from the `shiny` package.
 #'
-#' @param ... Currently ignored.
-#' @param spinner_type The type of spinner. Pre-bundled types include:
-#'   '`r paste0(.busySpinnerTypes, collapse = "', '")`'.
+#'   Available spinner types include:
+#'   "`r paste0(.spinner_types, collapse = '", "')`".
 #'
-#'   A path to a local SVG file can also be provided. The SVG should adhere to
-#'   the following rules:
-#'   * The SVG itself should contain the animation.
-#'   * It should avoid absolute sizes (the spinner's containing DOM element
-#'     size is set in CSS by `spinner_size`, so it should fill that container).
-#'   * It should avoid setting absolute colors (the spinner's containing DOM element
-#'     color is set in CSS by `spinner_color`, so it should inherit that color).
+#'    Alternatively, you can provide a path to a custom spinner SVG file. There
+#'    are many free spinner SVGs available online, such as those from
+#'    the [svg-spinners](https://github.com/n3r4zzurr0/svg-spinners) repository.
 #' @param spinner_color The color of the spinner. This can be any valid CSS
 #'   color. Defaults to the app's "primary" color if Bootstrap is on the page.
 #' @param spinner_size The size of the spinner. This can be any valid CSS size.
 #' @param spinner_delay The amount of time to wait before showing the spinner.
 #'   This can be any valid CSS time and can be useful for not showing the spinner
 #'   if the computation finishes quickly.
-#' @param spinner_selector A character string containing a CSS selector for
-#'   scoping the spinner customization. The default (`NULL`) will apply the
-#'   spinner customization to the parent element of the spinner.
-#' @param fade_opacity The opacity (a number between 0 and 1) for recalculating
-#'   output. Set to 1 to "disable" the fade.
-#' @param fade_selector A character string containing a CSS selector for
-#'   scoping the spinner customization. The default (`NULL`) will apply the
-#'   spinner customization to the parent element of the spinner.
+#' @param spinner_selector A CSS selector for scoping the spinner customization.
+#'   This can be useful if you want to have different spinners for different
+#'   parts of the app. Defaults to the root document element. Use `NULL` to
+#'   return inline styles for spinner customizations (note that you cannot
+#'   customize both the pulse and the spinner without providing a selector).
 #' @param pulse_background A CSS background definition for the pulse. The
 #'   default uses a
 #'   [linear-gradient](https://developer.mozilla.org/en-US/docs/Web/CSS/gradient/linear-gradient)
@@ -127,63 +98,40 @@ useBusyIndicators <- function(..., spinners = TRUE, pulse = TRUE, fade = TRUE) {
 #'   time.
 #'
 #' @export
-#' @seealso [useBusyIndicators()] to disable/enable busy indicators.
+#' @seealso [useBusyIndicators()] for enabling/disabling busy indicators.
 #' @examplesIf rlang::is_interactive()
 #'
 #' library(bslib)
 #'
-#' card_ui <- function(id, spinner_type = id) {
-#'   card(
-#'     busyIndicatorOptions(spinner_type = spinner_type),
-#'     card_header(paste("Spinner:", spinner_type)),
-#'     plotOutput(shiny::NS(id, "plot"))
-#'   )
-#' }
-#'
-#' card_server <- function(id, simulate = reactive()) {
-#'   moduleServer(
-#'     id = id,
-#'     function(input, output, session) {
-#'       output$plot <- renderPlot({
-#'         Sys.sleep(1)
-#'         simulate()
-#'         plot(x = rnorm(100), y = rnorm(100))
-#'       })
-#'     }
-#'   )
-#' }
-#'
 #' ui <- page_fillable(
 #'   useBusyIndicators(),
-#'   input_task_button("simulate", "Simulate", icon = icon("refresh")),
-#'   layout_columns(
-#'     card_ui("ring"),
-#'     card_ui("bars"),
-#'     card_ui("dots"),
-#'     card_ui("pulse"),
-#'     col_widths = 6
+#'   busyIndicatorOptions(spinner_color = "orange"),
+#'   card(
+#'     card_header(
+#'       "A plot",
+#'       input_task_button("simulate", "Simulate"),
+#'       class = "d-flex justify-content-between align-items-center"
+#'     ),
+#'     plotOutput("p"),
 #'   )
 #' )
 #'
-#' server <- function(input, output, session) {
-#'   simulate <- reactive(input$simulate)
-#'   card_server("ring", simulate)
-#'   card_server("bars", simulate)
-#'   card_server("dots", simulate)
-#'   card_server("pulse", simulate)
+#' server <- function(input, output) {
+#'   output$p <- renderPlot({
+#'     input$simulate
+#'     Sys.sleep(4)
+#'     plot(x = rnorm(100), y = rnorm(100))
+#'   })
 #' }
 #'
 #' shinyApp(ui, server)
-#'
 busyIndicatorOptions <- function(
   ...,
   spinner_type = NULL,
   spinner_color = NULL,
   spinner_size = NULL,
   spinner_delay = NULL,
-  spinner_selector = NULL,
-  fade_opacity = NULL,
-  fade_selector = NULL,
+  spinner_selector = ":root",
   pulse_background = NULL,
   pulse_height = NULL,
   pulse_speed = NULL
@@ -191,80 +139,70 @@ busyIndicatorOptions <- function(
 
   rlang::check_dots_empty()
 
-  res <- tagList(
-    spinnerOptions(
-      type = spinner_type,
-      color = spinner_color,
-      size = spinner_size,
-      delay = spinner_delay,
-      selector = spinner_selector
-    ),
-    fadeOptions(opacity = fade_opacity, selector = fade_selector),
-    pulseOptions(
-      background = pulse_background,
-      height = pulse_height,
-      speed = pulse_speed
-    )
+  pulse_opts <- pulseOptions(
+    background = pulse_background,
+    height = pulse_height,
+    speed = pulse_speed
   )
 
-  bslib::as.card_item(dropNulls(res))
+  spinner_opts <- spinnerOptions(
+    type = spinner_type,
+    color = spinner_color,
+    size = spinner_size,
+    delay = spinner_delay,
+    selector = spinner_selector
+  )
+
+  if (!is.null(spinner_opts) && is.null(spinner_selector)) {
+    if (!is.null(pulse_opts)) {
+      abort(c(
+        "`spinner_selector` must be provided when customizing both the pulse and the spinner.",
+        "i" = "`spinner_selector = NULL` returns inline styles for spinner customizations."
+      ))
+    }
+    return(spinner_opts)
+  }
+
+  dropNulls(tagList(spinner_opts, pulse_opts))
 }
 
-
-spinnerOptions <- function(type = NULL, color = NULL, size = NULL, delay = NULL, selector = NULL) {
-  if (is.null(type) && is.null(color) && is.null(size) && is.null(delay) && is.null(selector)) {
+spinnerOptions <- function(
+  type = NULL,
+  color = NULL,
+  size = NULL,
+  delay = NULL,
+  selector = ":root"
+) {
+  if (is.null(type) && is.null(color) && is.null(size) && is.null(delay)) {
     return(NULL)
   }
 
-  url <- NULL
+  type_is_file <- file.exists(type) && grepl("\\.svg$", type)
   if (!is.null(type)) {
-    stopifnot(is.character(type) && length(type) == 1)
-    if (file.exists(type) && grepl("\\.svg$", type)) {
-      typeRaw <- readBin(type, "raw", n = file.info(type)$size)
-      url <- sprintf("url('data:image/svg+xml;base64,%s')", rawToBase64(typeRaw))
+    if (type_is_file) {
+      stopifnot(file.exists(type) && grepl("\\.svg$", type))
+      typeData <- readBin(type, "raw", n = file.info(type)$size)
+      type_base64 <- rawToBase64(typeData)
+      type <- sprintf("url('data:image/svg+xml;base64,%s')", type_base64)
     } else {
-      type <- rlang::arg_match(type, .busySpinnerTypes)
-      url <- sprintf("url('spinners/%s.svg')", type)
+      type <- rlang::arg_match(type, .spinner_types)
+      type <- sprintf("url('spinners/%s.svg')", type)
     }
   }
 
   # Options controlled via CSS variables.
   css_vars <- htmltools::css(
-    "--shiny-spinner-url" = url,
-    "--shiny-spinner-color" = htmltools::parseCssColors(color),
-    "--shiny-spinner-size" = htmltools::validateCssUnit(size),
-    "--shiny-spinner-delay" = delay
+    `--shiny-spinner-url` = type,
+    `--shiny-spinner-color` = htmltools::parseCssColors(color),
+    `--shiny-spinner-size` = htmltools::validateCssUnit(size),
+    `--shiny-spinner-delay` = delay
   )
 
-  id <- NULL
   if (is.null(selector)) {
-    id <- paste0("spinner-options-", p_randomInt(100, 1000000))
-    selector <- sprintf(":has(> #%s)", id)
+    return(css_vars)
   }
 
-  css <- HTML(paste0(selector, " {", css_vars, "}"))
-
-  tags$style(css, id = id)
-}
-
-fadeOptions <- function(opacity = NULL, selector = NULL) {
-  if (is.null(opacity) && is.null(selector)) {
-    return(NULL)
-  }
-
-  css_vars <- htmltools::css(
-    "--shiny-fade-opacity" = opacity
-  )
-
-  id <- NULL
-  if (is.null(selector)) {
-    id <- paste0("fade-options-", p_randomInt(100, 1000000))
-    selector <- sprintf(":has(> #%s)", id)
-  }
-
-  css <- HTML(paste0(selector, " {", css_vars, "}"))
-
-  tags$style(css, id = id)
+  tags$style(HTML(paste0(selector, " {", css_vars, "}")))
 }
 
 pulseOptions <- function(background = NULL, height = NULL, speed = NULL) {
@@ -272,10 +210,10 @@ pulseOptions <- function(background = NULL, height = NULL, speed = NULL) {
     return(NULL)
   }
 
-  css_vars <- htmltools::css(
-    "--shiny-pulse-background" = background,
-    "--shiny-pulse-height" = htmltools::validateCssUnit(height),
-    "--shiny-pulse-speed" = speed
+  htmltools::css(
+    `--shiny-pulse-background` = background,
+    `--shiny-pulse-height` = htmltools::validateCssUnit(height),
+    `--shiny-pulse-speed` = speed
   )
 
   tags$style(HTML(paste0(":root {", css_vars, "}")))
@@ -288,7 +226,6 @@ busyIndicatorDependency <- function() {
     src = "www/shared/busy-indicators",
     package = "shiny",
     stylesheet = "busy-indicators.css",
-    # TODO-future: In next release make spinners and pulse opt-out
-    # head = as.character(useBusyIndicators())
+    script = "busy-indicators.js"
   )
 }

R/conditions.R

@@ -75,73 +75,13 @@ getCallNames <- function(calls) {
   })
 }
 
-# A stripped down version of getCallNames() that intentionally avoids deparsing expressions.
-# Instead, it leaves expressions to be directly `rlang::hash()` (for de-duplication), which
-# is much faster than deparsing then hashing.
-getCallNamesForHash <- function(calls) {
-  lapply(calls, function(call) {
-    name <- call[[1L]]
-    if (is.function(name)) return("<Anonymous>")
-    if (typeof(name) == "promise") return("<Promise>")
-    name
-  })
-}
-
-# Get the preferred filename from a srcfile object.
-#
-# For user code, prefer the original path (as typed by user, potentially a
-# symlink or relative path) over the normalized absolute path.
-#
-# For package files (under .libPaths()), keep the srcfile$filename because
-# when a package is installed with keep.source.pkgs = TRUE, the original
-# srcfilecopy filename may point to a collated build-time path rather than
-# the real installed package path.
-getSrcfileFilename <- function(srcfile) {
-  if (!is.null(srcfile$original) &&
-      !is.null(srcfile$original$filename) &&
-      !isPackageFile(srcfile$filename)) {
-    srcfile$original$filename
-  } else {
-    srcfile$filename
-  }
-}
-
-# Get the source lines and correct line number from a srcfile + srcref.
-#
-# sourceUTF8() wraps user code with a `#line` directive that remaps line
-# numbers. This means srcref[1] (the remapped line) may not correctly index
-# into the srcfile's $lines. When a #line directive is present, R extends
-# the srcref to 8 elements: [7] and [8] are the original (pre-remap) first
-# and last line numbers in the srcfilecopy's coordinate system.
-#
-# Additionally, when the #line path differs from the srcfilecopy filename
-# (e.g. macOS /tmp -> /private/tmp, or Windows path normalization), R wraps
-# the srcfile in a srcfilealias whose $lines is NULL. In that case, we
-# retrieve lines from the original srcfilecopy via $original.
-getSrcfileLines <- function(srcfile, srcref) {
-  lines <- srcfile$lines
-  line_num <- srcref[1]
-
-  if (is.null(lines) && inherits(srcfile, "srcfilealias")) {
-    lines <- srcfile$original$lines
-  }
-
-  # Use the pre-remap line number when available and different from the
-  # remapped line, indicating a #line directive shifted line numbering.
-  if (isTRUE(length(srcref) >= 7 && srcref[7] != srcref[1])) {
-    line_num <- srcref[7]
-  }
-
-  list(lines = lines, line_num = line_num)
-}
-
 getLocs <- function(calls) {
   vapply(calls, function(call) {
     srcref <- attr(call, "srcref", exact = TRUE)
     if (!is.null(srcref)) {
       srcfile <- attr(srcref, "srcfile", exact = TRUE)
       if (!is.null(srcfile) && !is.null(srcfile$filename)) {
-        loc <- paste0(getSrcfileFilename(srcfile), "#", srcref[[1]])
+        loc <- paste0(srcfile$filename, "#", srcref[[1]])
         return(paste0(" [", loc, "]"))
       }
     }
@@ -149,36 +89,13 @@ getLocs <- function(calls) {
   }, character(1))
 }
 
-# Check if a file path is in an R package library
-isPackageFile <- function(filepath) {
-  if (is.null(filepath) || filepath == "") {
-    return(FALSE)
-  }
-
-  # Normalize paths for comparison
-  filepath <- normalizePath(filepath, winslash = "/", mustWork = FALSE)
-  lib_paths <- normalizePath(.libPaths(), winslash = "/", mustWork = FALSE)
-  # Ensure trailing slash for proper path-boundary matching, otherwise
-  # e.g. "/usr/lib/R" would incorrectly match "/usr/lib/Rcpp/..."
-  lib_paths <- paste0(sub("/$", "", lib_paths), "/")
-
-  # Check if the file is under any library path
-  any(vapply(
-    lib_paths,
-    function(lib) identical(substr(filepath, 1, nchar(lib)), lib),
-    logical(1)
-  ))
-}
-
 getCallCategories <- function(calls) {
   vapply(calls, function(call) {
     srcref <- attr(call, "srcref", exact = TRUE)
     if (!is.null(srcref)) {
       srcfile <- attr(srcref, "srcfile", exact = TRUE)
-      if (!is.null(srcfile) && !is.null(srcfile$filename)) {
-        # Use the absolute path for package detection (srcfile$filename)
-        # rather than the original path which might be relative
-        if (isPackageFile(srcfile$filename)) {
+      if (!is.null(srcfile)) {
+        if (!is.null(srcfile$original)) {
           return("pkg")
         } else {
           return("user")
@@ -205,9 +122,7 @@ getCallCategories <- function(calls) {
 #' @rdname stacktrace
 #' @export
 captureStackTraces <- function(expr) {
-  # Use `promises::` as it shows up in the stack trace
-  promises::with_promise_domain(
-    createStackTracePromiseDomain(),
+  promises::with_promise_domain(createStackTracePromiseDomain(),
     expr
   )
 }
@@ -215,49 +130,11 @@ captureStackTraces <- function(expr) {
 #' @include globals.R
 .globals$deepStack <- NULL
 
-getCallStackDigest <- function(callStack, warn = FALSE) {
-  dg <- attr(callStack, "shiny.stack.digest", exact = TRUE)
-  if (!is.null(dg)) {
-    return(dg)
-  }
-
-  if (isTRUE(warn)) {
-    rlang::warn(
-      "Call stack doesn't have a cached digest; expensively computing one now",
-      .frequency = "once",
-      .frequency_id = "deepstack-uncached-digest-warning"
-    )
-  }
-
-  rlang::hash(getCallNamesForHash(callStack))
-}
-
-saveCallStackDigest <- function(callStack) {
-  attr(callStack, "shiny.stack.digest") <- getCallStackDigest(callStack, warn = FALSE)
-  callStack
-}
-
-# Appends a call stack to a list of call stacks, but only if it's not already
-# in the list. The list is deduplicated by digest; ideally the digests on the
-# list are cached before calling this function (you will get a warning if not).
-appendCallStackWithDedupe <- function(lst, x) {
-  digests <- vapply(lst, getCallStackDigest, character(1), warn = TRUE)
-  xdigest <- getCallStackDigest(x, warn = TRUE)
-  stopifnot(all(nzchar(digests)))
-  stopifnot(length(xdigest) == 1)
-  stopifnot(nzchar(xdigest))
-  if (xdigest %in% digests) {
-    return(lst)
-  } else {
-    return(c(lst, list(x)))
-  }
-}
-
 createStackTracePromiseDomain <- function() {
   # These are actually stateless, we wouldn't have to create a new one each time
   # if we didn't want to. They're pretty cheap though.
 
-  d <- new_promise_domain(
+  d <- promises::new_promise_domain(
     wrapOnFulfilled = function(onFulfilled) {
       force(onFulfilled)
       # Subscription time
@@ -265,14 +142,13 @@ createStackTracePromiseDomain <- function() {
         currentStack <- sys.calls()
         currentParents <- sys.parents()
         attr(currentStack, "parents") <- currentParents
-        currentStack <- saveCallStackDigest(currentStack)
         currentDeepStack <- .globals$deepStack
       }
       function(...) {
         # Fulfill time
         if (deepStacksEnabled()) {
           origDeepStack <- .globals$deepStack
-          .globals$deepStack <- appendCallStackWithDedupe(currentDeepStack, currentStack)
+          .globals$deepStack <- c(currentDeepStack, list(currentStack))
           on.exit(.globals$deepStack <- origDeepStack, add = TRUE)
         }
 
@@ -289,14 +165,13 @@ createStackTracePromiseDomain <- function() {
         currentStack <- sys.calls()
         currentParents <- sys.parents()
         attr(currentStack, "parents") <- currentParents
-        currentStack <- saveCallStackDigest(currentStack)
         currentDeepStack <- .globals$deepStack
       }
       function(...) {
         # Fulfill time
         if (deepStacksEnabled()) {
           origDeepStack <- .globals$deepStack
-          .globals$deepStack <- appendCallStackWithDedupe(currentDeepStack, currentStack)
+          .globals$deepStack <- c(currentDeepStack, list(currentStack))
           on.exit(.globals$deepStack <- origDeepStack, add = TRUE)
         }
 
@@ -324,7 +199,6 @@ doCaptureStack <- function(e) {
     calls <- sys.calls()
     parents <- sys.parents()
     attr(calls, "parents") <- parents
-    calls <- saveCallStackDigest(calls)
     attr(e, "stack.trace") <- calls
   }
   if (deepStacksEnabled()) {
@@ -351,7 +225,7 @@ withLogErrors <- function(expr,
       result <- captureStackTraces(expr)
 
       # Handle expr being an async operation
-      if (is.promise(result)) {
+      if (promises::is.promise(result)) {
         result <- promises::catch(result, function(cond) {
           # Don't print shiny.silent.error (i.e. validation errors)
           if (cnd_inherits(cond, "shiny.silent.error")) {
@@ -407,202 +281,127 @@ printStackTrace <- function(cond,
   full = get_devmode_option("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
 
-  stackTraces <- c(
-    attr(cond, "deep.stack.trace", exact = TRUE),
-    list(attr(cond, "stack.trace", exact = TRUE))
-  )
-
-  # Stripping of stack traces is the one step where the different stack traces
-  # interact. So we need to do this in one go, instead of individually within
-  # printOneStackTrace.
-  if (!full) {
-    stripResults <- stripStackTraces(lapply(stackTraces, getCallNames))
-  } else {
-    # If full is TRUE, we don't want to strip anything
-    stripResults <- rep_len(list(TRUE), length(stackTraces))
-  }
-
-  mapply(
-    seq_along(stackTraces),
-    rev(stackTraces),
-    rev(stripResults),
-    FUN = function(i, trace, stripResult) {
-      if (is.integer(trace)) {
-        noun <- if (trace > 1L) "traces" else "trace"
-        message("[ reached getOption(\"shiny.deepstacktrace\") -- omitted ", trace, " more stack ", noun, " ]")
-      } else {
-        if (i != 1) {
-          message("From earlier call:")
-        }
-        printOneStackTrace(
-          stackTrace = trace,
-          stripResult = stripResult,
-          full = full,
-          offset = offset
-        )
-      }
-      # No mapply return value--we're just printing
-      NULL
-    },
-    SIMPLIFY = FALSE
-  )
-
-  invisible()
-}
-
-printOneStackTrace <- function(stackTrace, stripResult, full, offset) {
-  calls <- offsetSrcrefs(stackTrace, offset = offset)
-  callNames <- getCallNames(stackTrace)
-  parents <- attr(stackTrace, "parents", exact = TRUE)
-
   should_drop <- !full
   should_strip <- !full
   should_prune <- !full
 
-  if (should_drop) {
-    toKeep <- dropTrivialFrames(callNames)
-    calls <- calls[toKeep]
-    callNames <- callNames[toKeep]
-    parents <- parents[toKeep]
-    stripResult <- stripResult[toKeep]
-  }
-
-  toShow <- rep(TRUE, length(callNames))
-  if (should_prune) {
-    toShow <- toShow & pruneStackTrace(parents)
-  }
-  if (should_strip) {
-    toShow <- toShow & stripResult
-  }
-
-  # If we're running in testthat, hide the parts of the stack trace that can
-  # vary based on how testthat was launched. It's critical that this is not
-  # happen at the same time as dropTrivialFrames, which happens before
-  # pruneStackTrace; because dropTrivialTestFrames removes calls from the top
-  # (or bottom? whichever is the oldest?) of the stack, it breaks `parents`
-  # which is based on absolute indices of calls. dropTrivialFrames gets away
-  # with this because it only removes calls from the opposite side of the stack.
-  toShow <- toShow & dropTrivialTestFrames(callNames)
-
-  st <- data.frame(
-    num = rev(which(toShow)),
-    call = rev(callNames[toShow]),
-    loc = rev(getLocs(calls[toShow])),
-    category = rev(getCallCategories(calls[toShow])),
-    stringsAsFactors = FALSE
+  stackTraceCalls <- c(
+    attr(cond, "deep.stack.trace", exact = TRUE),
+    list(attr(cond, "stack.trace", exact = TRUE))
   )
 
-  if (nrow(st) == 0) {
-    message("  [No stack trace available]")
-  } else {
-    width <- floor(log10(max(st$num))) + 1
-    formatted <- paste0(
-      "  ",
-      formatC(st$num, width = width),
-      ": ",
-      mapply(paste0(st$call, st$loc), st$category, FUN = function(name, category) {
-        if (category == "pkg")
-          cli::col_silver(name)
-        else if (category == "user")
-          cli::style_bold(cli::col_blue(name))
-        else
-          cli::col_white(name)
-      }),
-      "\n"
-    )
-    cat(file = stderr(), formatted, sep = "")
+  stackTraceParents <- lapply(stackTraceCalls, attr, which = "parents", exact = TRUE)
+  stackTraceCallNames <- lapply(stackTraceCalls, getCallNames)
+  stackTraceCalls <- lapply(stackTraceCalls, offsetSrcrefs, offset = offset)
+
+  # Use dropTrivialFrames logic to remove trailing bits (.handleSimpleError, h)
+  if (should_drop) {
+    # toKeep is a list of logical vectors, of which elements (stack frames) to keep
+    toKeep <- lapply(stackTraceCallNames, dropTrivialFrames)
+    # We apply the list of logical vector indices to each data structure
+    stackTraceCalls <- mapply(stackTraceCalls, FUN = `[`, toKeep, SIMPLIFY = FALSE)
+    stackTraceCallNames <- mapply(stackTraceCallNames, FUN = `[`, toKeep, SIMPLIFY = FALSE)
+    stackTraceParents <- mapply(stackTraceParents, FUN = `[`, toKeep, SIMPLIFY = FALSE)
   }
 
-  invisible(st)
+  delayedAssign("all_true", {
+    # List of logical vectors that are all TRUE, the same shape as
+    # stackTraceCallNames. Delay the evaluation so we don't create it unless
+    # we need it, but if we need it twice then we don't pay to create it twice.
+    lapply(stackTraceCallNames, function(st) {
+      rep_len(TRUE, length(st))
+    })
+  })
+
+  # stripStackTraces and lapply(stackTraceParents, pruneStackTrace) return lists
+  # of logical vectors. Use mapply(FUN = `&`) to boolean-and each pair of the
+  # logical vectors.
+  toShow <- mapply(
+    if (should_strip) stripStackTraces(stackTraceCallNames) else all_true,
+    if (should_prune) lapply(stackTraceParents, pruneStackTrace) else all_true,
+    FUN = `&`,
+    SIMPLIFY = FALSE
+  )
+
+  dfs <- mapply(seq_along(stackTraceCalls), rev(stackTraceCalls), rev(stackTraceCallNames), rev(toShow), FUN = function(i, calls, nms, index) {
+    st <- data.frame(
+      num = rev(which(index)),
+      call = rev(nms[index]),
+      loc = rev(getLocs(calls[index])),
+      category = rev(getCallCategories(calls[index])),
+      stringsAsFactors = FALSE
+    )
+
+    if (i != 1) {
+      message("From earlier call:")
+    }
+
+    if (nrow(st) == 0) {
+      message("  [No stack trace available]")
+    } else {
+      width <- floor(log10(max(st$num))) + 1
+      formatted <- paste0(
+        "  ",
+        formatC(st$num, width = width),
+        ": ",
+        mapply(paste0(st$call, st$loc), st$category, FUN = function(name, category) {
+          if (category == "pkg")
+            crayon::silver(name)
+          else if (category == "user")
+            crayon::blue$bold(name)
+          else
+            crayon::white(name)
+        }),
+        "\n"
+      )
+      cat(file = stderr(), formatted, sep = "")
+    }
+
+    st
+  }, SIMPLIFY = FALSE)
+
+  invisible()
 }
 
-# Filter stack traces using fence markers to hide internal Shiny frames.
-#
-# `stackTraces` is a list of character vectors (call names), one per "segment".
-# A single synchronous error produces one segment (the immediate call stack).
-# Asynchronous errors (e.g. from promises) produce multiple segments: the deep
-# stack trace segments come first, then the current segment last. Each deep
-# segment may begin with frames that overlap the previous segment; a
-# `..stacktracefloor..` marker delimits this redundant prefix from the active
-# portion.
-#
-# Within the active frames, `..stacktraceon..` / `..stacktraceoff..` markers
-# act as fences. Frames between a matched off/on pair (reading innermost to
-# outermost) are hidden — these are the internal rendering pipeline frames
-# that users don't need to see. The algorithm uses a *reverse clamped cumulative
-# sum* so that an unmatched `..stacktraceoff..` (one with no corresponding
-# inner `..stacktraceon..`) is a no-op, preventing it from hiding user frames.
-# Fence matching works globally across segments so that a `..stacktraceoff..`
-# at the end of one segment can pair with a `..stacktraceon..` at the start
-# of the next.
 stripStackTraces <- function(stackTraces, values = FALSE) {
-  n_segs <- length(stackTraces)
-  if (n_segs == 0L) return(list())
-
-  # Replace NULL segments with empty character vectors
-  stackTraces <- lapply(stackTraces, function(st) st %||% character(0))
-  seg_lengths <- lengths(stackTraces)
-  total <- sum(seg_lengths)
-
-  if (total == 0L) {
-    return(lapply(seg_lengths, function(n) {
-      if (values) character(0) else logical(0)
-    }))
-  }
-
-  # Pre-compute segment boundaries (used in steps 1 and 4)
-  seg_ends <- cumsum(seg_lengths)
-  seg_starts <- c(1L, seg_ends[-n_segs] + 1L)
-
-  # Concatenate all segments into one vector for vectorized operations
-  all <- unlist(stackTraces)
-
-  # 1. Identify prefix elements (at/before last ..stacktracefloor.. in segs 2+)
-  # Prefix elements are always hidden and excluded from fence scoring.
-  is_active <- rep.int(TRUE, total)
-  if (n_segs >= 2L) {
-    for (i in 2:n_segs) {
-      if (seg_lengths[i] == 0L) next
-      seg_idx <- seg_starts[i]:seg_ends[i]
-      floor_pos <- which(all[seg_idx] == "..stacktracefloor..")
-      if (length(floor_pos)) {
-        is_active[seg_idx[seq_len(floor_pos[length(floor_pos)])]] <- FALSE
-      }
+  score <- 1L  # >=1: show, <=0: hide
+  lapply(seq_along(stackTraces), function(i) {
+    res <- stripOneStackTrace(stackTraces[[i]], i != 1, score)
+    score <<- res$score
+    toShow <- as.logical(res$trace)
+    if (values) {
+      as.character(stackTraces[[i]][toShow])
+    } else {
+      as.logical(toShow)
     }
-  }
-
-  # 2. Compute fence scores and marker mask (vectorized across all segments)
-  is_on <- all == "..stacktraceon.."
-  is_off <- all == "..stacktraceoff.."
-  is_marker <- is_on | is_off | (all == "..stacktracefloor..")
-  scores <- integer(total)
-  scores[is_active & is_on] <- 1L
-  scores[is_active & is_off] <- -1L
-
-  # 3. Reverse clamped cumsum across all segments.
-  # Process from innermost (right) to outermost (left). ..stacktraceon.. (+1)
-  # opens a hidden region working outward, ..stacktraceoff.. (-1) closes it.
-  # Clamping at 0 means an unmatched ..stacktraceoff.. (one with no inner
-  # ..stacktraceon..) is a no-op. Prefix elements have score 0 and pass the
-  # running total through unchanged.
-  #
-  # Vectorized via the identity: clamped_cumsum = cumsum - pmin(0, cummin(cumsum))
-  rs <- rev(scores)
-  cs <- cumsum(rs)
-  depth <- rev(cs - pmin.int(0L, cummin(cs)))
-
-  # 4. Compute visibility (vectorized) and split back into segments
-  toShow <- is_active & depth == 0L & !is_marker
-
-  lapply(seq_len(n_segs), function(i) {
-    if (seg_lengths[i] == 0L) {
-      if (values) return(character(0)) else return(logical(0))
-    }
-    idx <- seg_starts[i]:seg_ends[i]
-    if (values) as.character(all[idx[toShow[idx]]]) else toShow[idx]
   })
 }
 
+stripOneStackTrace <- function(stackTrace, truncateFloor, startingScore) {
+  prefix <- logical(0)
+  if (truncateFloor) {
+    indexOfFloor <- utils::tail(which(stackTrace == "..stacktracefloor.."), 1)
+    if (length(indexOfFloor)) {
+      stackTrace <- stackTrace[(indexOfFloor+1L):length(stackTrace)]
+      prefix <- rep_len(FALSE, indexOfFloor)
+    }
+  }
+
+  if (length(stackTrace) == 0) {
+    return(list(score = startingScore, character(0)))
+  }
+
+  score <- rep.int(0L, length(stackTrace))
+  score[stackTrace == "..stacktraceon.."] <- 1L
+  score[stackTrace == "..stacktraceoff.."] <- -1L
+  score <- startingScore + cumsum(score)
+
+  toShow <- score > 0 & !(stackTrace %in% c("..stacktraceon..", "..stacktraceoff..", "..stacktracefloor.."))
+
+
+  list(score = utils::tail(score, 1), trace = c(prefix, toShow))
+}
+
 # Given sys.parents() (which corresponds to sys.calls()), return a logical index
 # that prunes each subtree so that only the final branch remains. The result,
 # when applied to sys.calls(), is a linear list of calls without any "wrapper"
@@ -659,34 +458,6 @@ dropTrivialFrames <- function(callnames) {
   )
 }
 
-dropTrivialTestFrames <- function(callnames) {
-  if (!identical(Sys.getenv("TESTTHAT_IS_SNAPSHOT"), "true")) {
-    return(rep_len(TRUE, length(callnames)))
-  }
-
-  hideable <- callnames %in% c(
-    "test",
-    "devtools::test",
-    "test_check",
-    "testthat::test_check",
-    "test_dir",
-    "testthat::test_dir",
-    "test_file",
-    "testthat::test_file",
-    "test_local",
-    "testthat::test_local"
-  )
-
-  # Remove everything from inception to calling the test
-  # It shouldn't matter how you get there, just that you're finally testing
-  toRemove <- max(which(hideable))
-
-  c(
-    rep_len(FALSE, toRemove),
-    rep_len(TRUE, length(callnames) - toRemove)
-  )
-}
-
 offsetSrcrefs <- function(calls, offset = TRUE) {
   if (offset) {
     srcrefs <- getSrcRefs(calls)

R/devmode.R

@@ -128,12 +128,6 @@ in_devmode <- function() {
     !identical(Sys.getenv("TESTTHAT"), "true")
 }
 
-in_client_devmode <- function() {
-  # Client-side devmode enables client-side only dev features without local
-  # devmode. Currently, the main feature is the client-side error console.
-  isTRUE(getOption("shiny.client_devmode", FALSE))
-}
-
 #' @describeIn devmode Temporarily set Shiny Developer Mode and Developer
 #'   message verbosity
 #' @param code Code to execute with the temporary Dev Mode options set

R/extended-task.R

@@ -41,78 +41,6 @@
 #'   is, a function that quickly returns a promise) and allows even that very
 #'   session to immediately unblock and carry on with other user interactions.
 #'
-#' @section OpenTelemetry Integration:
-#'
-#' When an `ExtendedTask` is created, if OpenTelemetry tracing is enabled for
-#' `"reactivity"` (see [withOtelCollect()]), the `ExtendedTask` will record
-#' spans for each invocation of the task. The tracing level at `invoke()` time
-#' does not affect whether spans are recorded; only the tracing level when
-#' calling `ExtendedTask$new()` matters.
-#'
-#' The OTel span will be named based on the label created from the variable the
-#' `ExtendedTask` is assigned to. If no label can be determined, the span will
-#' be named `<anonymous>`. Similar to other Shiny OpenTelemetry spans, the span
-#' will also include source reference attributes and session ID attributes.
-#'
-#' ```r
-#' withOtelCollect("all", {
-#'   my_task <- ExtendedTask$new(function(...) { ... })
-#' })
-#'
-#' # Span recorded for this invocation: ExtendedTask my_task
-#' my_task$invoke(...)
-#' ```
-#'
-#' @examplesIf rlang::is_interactive() && rlang::is_installed("mirai")
-#' library(shiny)
-#' library(bslib)
-#' library(mirai)
-#'
-#' # Set background processes for running tasks
-#' daemons(1)
-#' # Reset when the app is stopped
-#' onStop(function() daemons(0))
-#'
-#' ui <- page_fluid(
-#'   titlePanel("Extended Task Demo"),
-#'   p(
-#'     'Click the button below to perform a "calculation"',
-#'     "that takes a while to perform."
-#'   ),
-#'   input_task_button("recalculate", "Recalculate"),
-#'   p(textOutput("result"))
-#' )
-#'
-#' server <- function(input, output) {
-#'   rand_task <- ExtendedTask$new(function() {
-#'     mirai(
-#'       {
-#'         # Slow operation goes here
-#'         Sys.sleep(2)
-#'         sample(1:100, 1)
-#'       }
-#'     )
-#'   })
-#'
-#'   # Make button state reflect task.
-#'   # If using R >=4.1, you can do this instead:
-#'   # rand_task <- ExtendedTask$new(...) |> bind_task_button("recalculate")
-#'   bind_task_button(rand_task, "recalculate")
-#'
-#'   observeEvent(input$recalculate, {
-#'     # Invoke the extended in an observer
-#'     rand_task$invoke()
-#'   })
-#'
-#'   output$result <- renderText({
-#'     # React to updated results when the task completes
-#'     number <- rand_task$result()
-#'     paste0("Your number is ", number, ".")
-#'   })
-#' }
-#'
-#' shinyApp(ui, server)
-#'
 #' @export
 ExtendedTask <- R6Class("ExtendedTask", portable = TRUE, cloneable = FALSE,
   public = list(
@@ -124,12 +52,11 @@ ExtendedTask <- R6Class("ExtendedTask", portable = TRUE, cloneable = FALSE,
     #' @param func The long-running operation to execute. This should be an
     #'   asynchronous function, meaning, it should use the
     #'   [\{promises\}](https://rstudio.github.io/promises/) package, most
-    #'   likely in conjunction with the
-    #'   [\{mirai\}](https://mirai.r-lib.org) or
+    #'   likely in conjuction with the
     #'   [\{future\}](https://rstudio.github.io/promises/articles/promises_04_futures.html)
     #'   package. (In short, the return value of `func` should be a
-    #'   [`mirai`][mirai::mirai()], [`Future`][future::future()], `promise`,
-    #'   or something else that [promises::as.promise()] understands.)
+    #'   [`Future`][future::future()] object, or a `promise`, or something else
+    #'   that [promises::as.promise()] understands.)
     #'
     #'   It's also important that this logic does not read from any
     #'   reactive inputs/sources, as inputs may change after the function is
@@ -138,37 +65,10 @@ ExtendedTask <- R6Class("ExtendedTask", portable = TRUE, cloneable = FALSE,
     #'   read reactive inputs and pass them as arguments.
     initialize = function(func) {
       private$func <- func
-
-      # Do not show these private reactive values in otel spans
-      with_no_otel_collect({
-        private$rv_status <- reactiveVal("initial", label = "ExtendedTask$private$status")
-        private$rv_value <- reactiveVal(NULL, label = "ExtendedTask$private$value")
-        private$rv_error <- reactiveVal(NULL, label = "ExtendedTask$private$error")
-      })
-
+      private$rv_status <- reactiveVal("initial")
+      private$rv_value <- reactiveVal(NULL)
+      private$rv_error <- reactiveVal(NULL)
       private$invocation_queue <- fastmap::fastqueue()
-
-      domain <- getDefaultReactiveDomain()
-
-      # Set a label for the reactive values for easier debugging
-      # Go up an extra sys.call() to get the user's call to ExtendedTask$new()
-      # The first sys.call() is to `initialize(...)`
-      call_srcref <- get_call_srcref(-1)
-      label <- rassignSrcrefToLabel(
-        call_srcref,
-        defaultLabel = "<anonymous>"
-      )
-      private$otel_span_label <- otel_span_label_extended_task(label, domain = domain)
-      private$otel_log_label_add_to_queue <- otel_log_label_extended_task_add_to_queue(label, domain = domain)
-
-      private$otel_attrs <- c(
-        otel_srcref_attributes(call_srcref, "ExtendedTask"),
-        otel_session_id_attrs(domain)
-      ) %||% list()
-
-      # Capture this value at init-time, not run-time
-      # This way, the span is only created if otel was enabled at time of creation... just like other spans
-      private$is_recording_otel <- has_otel_collect("reactivity")
     },
     #' @description
     #' Starts executing the long-running operation. If this `ExtendedTask` is
@@ -182,34 +82,14 @@ ExtendedTask <- R6Class("ExtendedTask", portable = TRUE, cloneable = FALSE,
     #'   arguments.
     invoke = function(...) {
       args <- rlang::dots_list(..., .ignore_empty = "none")
-      call <- rlang::caller_call(n = 0)
 
       if (
         isolate(private$rv_status()) == "running" ||
           private$invocation_queue$size() > 0
       ) {
-        otel_log(
-          private$otel_log_add_to_queue_label,
-          severity = "debug",
-          attributes = c(
-            private$otel_attrs,
-            list(
-              queue_size = private$invocation_queue$size() + 1L
-            )
-          )
-        )
-        private$invocation_queue$add(list(args = args, call = call))
+        private$invocation_queue$add(args)
       } else {
-
-        if (private$is_recording_otel) {
-          private$otel_span <- start_otel_span(
-            private$otel_span_label,
-            attributes = private$otel_attrs
-          )
-          otel::local_active_span(private$otel_span)
-        }
-
-        private$do_invoke(args, call = call)
+        private$do_invoke(args)
       }
       invisible(NULL)
     },
@@ -256,7 +136,7 @@ ExtendedTask <- R6Class("ExtendedTask", portable = TRUE, cloneable = FALSE,
     #' invalidation will be ignored.
     result = function() {
       switch (private$rv_status(),
-        running = req(FALSE, cancelOutput = "progress"),
+        running = req(FALSE, cancelOutput="progress"),
         success = if (private$rv_value()$visible) {
           private$rv_value()$value
         } else {
@@ -276,56 +156,44 @@ ExtendedTask <- R6Class("ExtendedTask", portable = TRUE, cloneable = FALSE,
     rv_error = NULL,
     invocation_queue = NULL,
 
-    otel_span_label = NULL,
-    otel_log_label_add_to_queue = NULL,
-    otel_attrs = list(),
-    is_recording_otel = FALSE,
-    otel_span = NULL,
-
-    do_invoke = function(args, call = NULL) {
+    do_invoke = function(args) {
       private$rv_status("running")
       private$rv_value(NULL)
       private$rv_error(NULL)
 
-      p <- promise_resolve(
-        maskReactiveContext(do.call(private$func, args))
-      )
-
-      p <- promises::then(
-        p,
-        onFulfilled = function(value, .visible) {
-          if (is_otel_span(private$otel_span)) {
-
-            private$otel_span$end(status_code = "ok")
-            private$otel_span <- NULL
-          }
-          private$on_success(list(value = value, visible = .visible))
-        },
-        onRejected = function(error) {
-          if (is_otel_span(private$otel_span)) {
-            private$otel_span$end(status_code = "error")
-            private$otel_span <- NULL
-          }
-          private$on_error(error, call = call)
-        }
-      )
-
-      promises::finally(p, onFinally = function() {
-        if (private$invocation_queue$size() > 0) {
-          next_call <- private$invocation_queue$remove()
-          private$do_invoke(next_call$args, next_call$call)
-        }
+      p <- NULL
+      tryCatch({
+        maskReactiveContext({
+          # TODO: Bounce the do.call off of a promise_resolve(), so that the
+          # call to invoke() always returns immediately?
+          result <- do.call(private$func, args)
+          p <- promises::as.promise(result)
+        })
+      }, error = function(e) {
+        private$on_error(e)
       })
 
+      promises::finally(
+        promises::then(p,
+          onFulfilled = function(value, .visible) {
+            private$on_success(list(value=value, visible=.visible))
+          },
+          onRejected = function(error) {
+            private$on_error(error)
+          }
+        ),
+        onFinally = function() {
+          if (private$invocation_queue$size() > 0) {
+            private$do_invoke(private$invocation_queue$remove())
+          }
+        }
+      )
+
+
       invisible(NULL)
     },
 
-    on_error = function(err, call = NULL) {
-      cli::cli_warn(
-        "ERROR: An error occurred when invoking the ExtendedTask.",
-        parent = err,
-        call = call
-      )
+    on_error = function(err) {
       private$rv_status("error")
       private$rv_error(err)
     },

R/globals.R

@@ -25,7 +25,3 @@ on_load_exprs <- list()
 on_load <- function(expr) {
   on_load_exprs[[length(on_load_exprs) + 1]] <<- substitute(expr)
 }
-
-on_load({
-  IS_SHINY_LOCAL_PKG <- exists(".__DEVTOOLS__")
-})

R/graph.R

@@ -1,3 +1,4 @@
+
 # domain is like session
 
 
@@ -19,7 +20,7 @@ reactIdStr <- function(num) {
 #' dependencies and execution in your application.
 #'
 #' To use the reactive log visualizer, start with a fresh R session and
-#' run the command `reactlog::reactlog_enable()`; then launch your
+#' run the command `options(shiny.reactlog=TRUE)`; then launch your
 #' application in the usual way (e.g. using [runApp()]). At
 #' any time you can hit Ctrl+F3 (or for Mac users, Command+F3) in your
 #' web browser to launch the reactive log visualization.
@@ -42,20 +43,16 @@ reactIdStr <- function(num) {
 #' call `reactlogShow()` explicitly.
 #'
 #' For security and performance reasons, do not enable
-#' `options(shiny.reactlog=TRUE)` (or `reactlog::reactlog_enable()`) in
-#' production environments. When the option is enabled, it's possible
-#' for any user of your app to see at least some of the source code of
-#' your reactive expressions and observers. In addition, reactlog
-#' should be considered a memory leak as it will constantly grow and
-#' will never reset until the R session is restarted.
+#' `shiny.reactlog` in production environments. When the option is
+#' enabled, it's possible for any user of your app to see at least some
+#' of the source code of your reactive expressions and observers.
 #'
 #' @name reactlog
 NULL
 
 
-#' @describeIn reactlog Return a list of reactive information.  Can be used in
-#'   conjunction with [reactlog::reactlog_show] to later display the reactlog
-#'   graph.
+#' @describeIn reactlog Return a list of reactive information.  Can be used in conjunction with
+#'   [reactlog::reactlog_show] to later display the reactlog graph.
 #' @export
 reactlog <- function() {
   rLog$asList()
@@ -70,34 +67,12 @@ reactlogShow <- function(time = TRUE) {
   reactlog::reactlog_show(reactlog(), time = time)
 }
 
-#' @describeIn reactlog Resets the entire reactlog stack.  Useful for debugging
-#' and removing all prior reactive history.
+#' @describeIn reactlog Resets the entire reactlog stack.  Useful for debugging and removing all prior reactive history.
 #' @export
 reactlogReset <- function() {
   rLog$reset()
 }
 
-#' @describeIn reactlog Adds "mark" entry into the reactlog stack. This is
-#' useful for programmatically adding a marked entry in the reactlog, rather
-#' than using your keyboard's key combination.
-#'
-#' For example, we can _mark_ the reactlog at the beginning of an
-#' `observeEvent`'s calculation:
-#' ```r
-#' observeEvent(input$my_event_trigger, {
-#'   # Add a mark in the reactlog
-#'   reactlogAddMark()
-#'   # Run your regular event reaction code here...
-#'   ....
-#' })
-#' ```
-#' @param session The Shiny session to assign the mark to. Defaults to the
-#' current session.
-#' @export
-reactlogAddMark <- function(session = getDefaultReactiveDomain()) {
-  rLog$userMark(session)
-}
-
 # called in "/reactlog" middleware
 renderReactlog <- function(sessionToken = NULL, time = TRUE) {
   check_reactlog()
@@ -123,6 +98,7 @@ RLog <- R6Class(
   private = list(
     option = "shiny.reactlog",
     msgOption = "shiny.reactlog.console",
+
     appendEntry = function(domain, logEntry) {
       if (self$isLogging()) {
         sessionToken <- if (is.null(domain)) NULL else domain$token
@@ -137,19 +113,20 @@ RLog <- R6Class(
   public = list(
     msg = "<MessageLogger>",
     logStack = "<Stack>",
+
     noReactIdLabel = "NoCtxReactId",
     noReactId = reactIdStr("NoCtxReactId"),
     dummyReactIdLabel = "DummyReactId",
     dummyReactId = reactIdStr("DummyReactId"),
+
     asList = function() {
       ret <- self$logStack$as_list()
       attr(ret, "version") <- "1"
       ret
     },
+
     ctxIdStr = function(ctxId) {
-      if (is.null(ctxId) || identical(ctxId, "")) {
-        return(NULL)
-      }
+      if (is.null(ctxId) || identical(ctxId, "")) return(NULL)
       paste0("ctx", ctxId)
     },
     namesIdStr = function(reactId) {
@@ -164,6 +141,7 @@ RLog <- R6Class(
     keyIdStr = function(reactId, key) {
       paste0(reactId, "$", key)
     },
+
     valueStr = function(value, n = 200) {
       if (!self$isLogging()) {
         # return a placeholder string to avoid calling str
@@ -173,9 +151,10 @@ RLog <- R6Class(
         # only capture the first level of the object
         utils::capture.output(utils::str(value, max.level = 1))
       })
-      outputTxt <- paste0(output, collapse = "\n")
+      outputTxt <- paste0(output, collapse="\n")
       msg$shortenString(outputTxt, n = n)
     },
+
     initialize = function(rlogOption = "shiny.reactlog", msgOption = "shiny.reactlog.console") {
       private$option <- rlogOption
       private$msgOption <- msgOption
@@ -195,6 +174,7 @@ RLog <- R6Class(
     isLogging = function() {
       isTRUE(getOption(private$option, FALSE))
     },
+
     define = function(reactId, value, label, type, domain) {
       valueStr <- self$valueStr(value)
       if (msg$hasReact(reactId)) {
@@ -225,10 +205,9 @@ RLog <- R6Class(
     defineObserver = function(reactId, label, domain) {
       self$define(reactId, value = NULL, label, "observer", domain)
     },
+
     dependsOn = function(reactId, depOnReactId, ctxId, domain) {
-      if (is.null(reactId)) {
-        return()
-      }
+      if (is.null(reactId)) return()
       ctxId <- ctxIdStr(ctxId)
       msg$log("dependsOn:", msg$reactStr(reactId), " on", msg$reactStr(depOnReactId), msg$ctxStr(ctxId))
       private$appendEntry(domain, list(
@@ -241,6 +220,7 @@ RLog <- R6Class(
     dependsOnKey = function(reactId, depOnReactId, key, ctxId, domain) {
       self$dependsOn(reactId, self$keyIdStr(depOnReactId, key), ctxId, domain)
     },
+
     dependsOnRemove = function(reactId, depOnReactId, ctxId, domain) {
       ctxId <- self$ctxIdStr(ctxId)
       msg$log("dependsOnRemove:", msg$reactStr(reactId), " on", msg$reactStr(depOnReactId), msg$ctxStr(ctxId))
@@ -254,6 +234,7 @@ RLog <- R6Class(
     dependsOnKeyRemove = function(reactId, depOnReactId, key, ctxId, domain) {
       self$dependsOnRemove(reactId, self$keyIdStr(depOnReactId, key), ctxId, domain)
     },
+
     createContext = function(ctxId, label, type, prevCtxId, domain) {
       ctxId <- self$ctxIdStr(ctxId)
       prevCtxId <- self$ctxIdStr(prevCtxId)
@@ -264,9 +245,10 @@ RLog <- R6Class(
         label = msg$shortenString(label),
         type = type,
         prevCtxId = prevCtxId,
-        srcref = as.vector(attr(label, "srcref")), srcfile = attr(label, "srcfile")
+        srcref = as.vector(attr(label, "srcref")), srcfile=attr(label, "srcfile")
       ))
     },
+
     enter = function(reactId, ctxId, type, domain) {
       ctxId <- self$ctxIdStr(ctxId)
       if (identical(type, "isolate")) {
@@ -309,6 +291,7 @@ RLog <- R6Class(
         ))
       }
     },
+
     valueChange = function(reactId, value, domain) {
       valueStr <- self$valueStr(value)
       msg$log("valueChange:", msg$reactStr(reactId), msg$valueStr(valueStr))
@@ -330,6 +313,8 @@ RLog <- R6Class(
     valueChangeKey = function(reactId, key, value, domain) {
       self$valueChange(self$keyIdStr(reactId, key), value, domain)
     },
+
+
     invalidateStart = function(reactId, ctxId, type, domain) {
       ctxId <- self$ctxIdStr(ctxId)
       if (identical(type, "isolate")) {
@@ -372,6 +357,7 @@ RLog <- R6Class(
         ))
       }
     },
+
     invalidateLater = function(reactId, runningCtx, millis, domain) {
       msg$log("invalidateLater: ", millis, "ms", msg$reactStr(reactId), msg$ctxStr(runningCtx))
       private$appendEntry(domain, list(
@@ -381,12 +367,14 @@ RLog <- R6Class(
         millis = millis
       ))
     },
+
     idle = function(domain = NULL) {
       msg$log("idle")
       private$appendEntry(domain, list(
         action = "idle"
       ))
     },
+
     asyncStart = function(domain = NULL) {
       msg$log("asyncStart")
       private$appendEntry(domain, list(
@@ -399,6 +387,7 @@ RLog <- R6Class(
         action = "asyncStop"
       ))
     },
+
     freezeReactiveVal = function(reactId, domain) {
       msg$log("freeze:", msg$reactStr(reactId))
       private$appendEntry(domain, list(
@@ -409,6 +398,7 @@ RLog <- R6Class(
     freezeReactiveKey = function(reactId, key, domain) {
       self$freezeReactiveVal(self$keyIdStr(reactId, key), domain)
     },
+
     thawReactiveVal = function(reactId, domain) {
       msg$log("thaw:", msg$reactStr(reactId))
       private$appendEntry(domain, list(
@@ -419,60 +409,54 @@ RLog <- R6Class(
     thawReactiveKey = function(reactId, key, domain) {
       self$thawReactiveVal(self$keyIdStr(reactId, key), domain)
     },
+
     userMark = function(domain = NULL) {
       msg$log("userMark")
       private$appendEntry(domain, list(
         action = "userMark"
       ))
     }
+
   )
 )
 
-MessageLogger <- R6Class(
+MessageLogger = R6Class(
   "MessageLogger",
   portable = FALSE,
   public = list(
     depth = 0L,
     reactCache = list(),
     option = "shiny.reactlog.console",
+
     initialize = function(option = "shiny.reactlog.console", depth = 0L) {
       if (!missing(depth)) self$depth <- depth
       if (!missing(option)) self$option <- option
     },
+
     isLogging = function() {
       isTRUE(getOption(self$option))
     },
     isNotLogging = function() {
-      !isTRUE(getOption(self$option))
+      ! isTRUE(getOption(self$option))
     },
     depthIncrement = function() {
-      if (self$isNotLogging()) {
-        return(NULL)
-      }
+      if (self$isNotLogging()) return(NULL)
       self$depth <- self$depth + 1L
     },
     depthDecrement = function() {
-      if (self$isNotLogging()) {
-        return(NULL)
-      }
+      if (self$isNotLogging()) return(NULL)
       self$depth <- self$depth - 1L
     },
     hasReact = function(reactId) {
-      if (self$isNotLogging()) {
-        return(FALSE)
-      }
+      if (self$isNotLogging()) return(FALSE)
       !is.null(self$getReact(reactId))
     },
     getReact = function(reactId, force = FALSE) {
-      if (identical(force, FALSE) && self$isNotLogging()) {
-        return(NULL)
-      }
+      if (identical(force, FALSE) && self$isNotLogging()) return(NULL)
       self$reactCache[[reactId]]
     },
     setReact = function(reactObj, force = FALSE) {
-      if (identical(force, FALSE) && self$isNotLogging()) {
-        return(NULL)
-      }
+      if (identical(force, FALSE) && self$isNotLogging()) return(NULL)
       self$reactCache[[reactObj$reactId]] <- reactObj
     },
     shortenString = function(txt, n = 250) {
@@ -491,17 +475,13 @@ MessageLogger <- R6Class(
     },
     valueStr = function(valueStr) {
       paste0(
-        " '", self$shortenString(self$singleLine(valueStr)), "'"
+        " '",  self$shortenString(self$singleLine(valueStr)), "'"
       )
     },
     reactStr = function(reactId) {
-      if (self$isNotLogging()) {
-        return(NULL)
-      }
+      if (self$isNotLogging()) return(NULL)
       reactInfo <- self$getReact(reactId)
-      if (is.null(reactInfo)) {
-        return(" <UNKNOWN_REACTID>")
-      }
+      if (is.null(reactInfo)) return(" <UNKNOWN_REACTID>")
       paste0(
         " ", reactInfo$reactId, ":'", self$shortenString(self$singleLine(reactInfo$label)), "'"
       )
@@ -510,15 +490,11 @@ MessageLogger <- R6Class(
       self$ctxStr(ctxId = NULL, type = type)
     },
     ctxStr = function(ctxId = NULL, type = NULL) {
-      if (self$isNotLogging()) {
-        return(NULL)
-      }
+      if (self$isNotLogging()) return(NULL)
       self$ctxPrevCtxStr(ctxId = ctxId, prevCtxId = NULL, type = type)
     },
     ctxPrevCtxStr = function(ctxId = NULL, prevCtxId = NULL, type = NULL, preCtxIdTxt = " in ") {
-      if (self$isNotLogging()) {
-        return(NULL)
-      }
+      if (self$isNotLogging()) return(NULL)
       paste0(
         if (!is.null(ctxId)) paste0(preCtxIdTxt, ctxId),
         if (!is.null(prevCtxId)) paste0(" from ", prevCtxId),
@@ -526,9 +502,7 @@ MessageLogger <- R6Class(
       )
     },
     log = function(...) {
-      if (self$isNotLogging()) {
-        return(NULL)
-      }
+      if (self$isNotLogging()) return(NULL)
       msg <- paste0(
         paste0(rep("= ", depth), collapse = ""), "- ", paste0(..., collapse = ""),
         collapse = ""

R/imageutils.R

@@ -100,7 +100,7 @@ plotPNG <- function(func, filename=tempfile(fileext='.png'),
 createGraphicsDevicePromiseDomain <- function(which = dev.cur()) {
   force(which)
 
-  new_promise_domain(
+  promises::new_promise_domain(
     wrapOnFulfilled = function(onFulfilled) {
       force(onFulfilled)
       function(...) {

R/input-action.R

@@ -56,25 +56,13 @@ actionButton <- function(inputId, label, icon = NULL, width = NULL,
 
   value <- restoreInput(id = inputId, default = NULL)
 
-  icon <- validateIcon(icon)
-
-  if (!is.null(icon)) {
-    icon <- span(icon, class = "action-icon", .noWS = c("outside", "inside"))
-  }
-
-  if (!is.null(label)) {
-    label <- span(label, class = "action-label", .noWS = c("outside", "inside"))
-  }
-
-  tags$button(
-    id = inputId,
+  tags$button(id=inputId,
     style = css(width = validateCssUnit(width)),
-    type = "button",
-    class = "btn btn-default action-button",
+    type="button",
+    class="btn btn-default action-button",
     `data-val` = value,
     disabled = if (isTRUE(disabled)) NA else NULL,
-    icon, label,
-    .noWS = "inside",
+    list(validateIcon(icon), label),
     ...
   )
 }
@@ -84,41 +72,30 @@ actionButton <- function(inputId, label, icon = NULL, width = NULL,
 actionLink <- function(inputId, label, icon = NULL, ...) {
   value <- restoreInput(id = inputId, default = NULL)
 
-  icon <- validateIcon(icon)
-
-  if (!is.null(icon)) {
-    icon <- span(icon, class = "action-icon", .noWS = c("outside", "inside"))
-  }
-
-  if (!is.null(label)) {
-    label <- span(label, class = "action-label", .noWS = c("outside", "inside"))
-  }
-
-  tags$a(
-    id = inputId,
-    href = "#",
-    class = "action-button action-link",
+  tags$a(id=inputId,
+    href="#",
+    class="action-button",
     `data-val` = value,
-    icon, label,
-    .noWS = "inside",
+    list(validateIcon(icon), label),
     ...
   )
 }
 
 
-# Throw an informative warning if icon isn't html-ish
+# Check that the icon parameter is valid:
+# 1) Check  if the user wants to actually add an icon:
+#    -- if icon=NULL, it means leave the icon unchanged
+#    -- if icon=character(0), it means don't add an icon or, more usefully,
+#       remove the previous icon
+# 2) If so, check that the icon has the right format (this does not check whether
+# it is a *real* icon - currently that would require a massive cross reference
+# with the "font-awesome" and the "glyphicon" libraries)
 validateIcon <- function(icon) {
-  if (length(icon) == 0) {
+  if (is.null(icon) || identical(icon, character(0))) {
     return(icon)
+  } else if (inherits(icon, "shiny.tag") && icon$name == "i") {
+    return(icon)
+  } else {
+    stop("Invalid icon. Use Shiny's 'icon()' function to generate a valid icon")
   }
-  if (!isTagLike(icon)) {
-    rlang::warn(
-      c(
-        "It appears that a non-HTML value was provided to `icon`.",
-        i = "Try using a `shiny::icon()` (or an equivalent) to get an icon."
-      ),
-      class = "shiny-validate-icon"
-    )
-  }
-  icon
 }

R/input-date.R

@@ -153,12 +153,6 @@ datePickerDependency <- function(theme) {
   )
 }
 
-datePickerSass <- function() {
-  sass::sass_file(
-    system_file(package = "shiny", "www/shared/datepicker/scss/build3.scss")
-  )
-}
-
 datePickerCSS <- function(theme) {
   if (!is_bs_theme(theme)) {
     return(htmlDependency(
@@ -170,8 +164,10 @@ datePickerCSS <- function(theme) {
     ))
   }
 
+  scss_file <- system_file(package = "shiny", "www/shared/datepicker/scss/build3.scss")
+
   bslib::bs_dependency(
-    input = datePickerSass(),
+    input = sass::sass_file(scss_file),
     theme = theme,
     name = "bootstrap-datepicker",
     version = version_bs_date_picker,

R/input-numeric.R

@@ -29,36 +29,22 @@
 #' A numeric vector of length 1.
 #'
 #' @export
-numericInput <- function(
-  inputId,
-  label,
-  value,
-  min = NA,
-  max = NA,
-  step = NA,
-  width = NULL,
-  ...,
-  updateOn = c("change", "blur")
-) {
-  rlang::check_dots_empty()
-  updateOn <- rlang::arg_match(updateOn)
+numericInput <- function(inputId, label, value, min = NA, max = NA, step = NA,
+  width = NULL) {
 
   value <- restoreInput(id = inputId, default = value)
 
   # build input tag
-  inputTag <- tags$input(
-    id = inputId,
-    type = "number",
-    class = "shiny-input-number form-control",
-    value = formatNoSci(value),
-    `data-update-on` = updateOn
-  )
-  if (!is.na(min)) inputTag$attribs$min = min
-  if (!is.na(max)) inputTag$attribs$max = max
-  if (!is.na(step)) inputTag$attribs$step = step
+  inputTag <- tags$input(id = inputId, type = "number", class="shiny-input-number form-control",
+                         value = formatNoSci(value))
+  if (!is.na(min))
+    inputTag$attribs$min = min
+  if (!is.na(max))
+    inputTag$attribs$max = max
+  if (!is.na(step))
+    inputTag$attribs$step = step
 
-  div(
-    class = "form-group shiny-input-container",
+  div(class = "form-group shiny-input-container",
     style = css(width = validateCssUnit(width)),
     shinyInputLabel(inputId, label),
     inputTag

R/input-password.R

@@ -30,29 +30,12 @@
 #' shinyApp(ui, server)
 #' }
 #' @export
-passwordInput <- function(
-  inputId,
-  label,
-  value = "",
-  width = NULL,
-  placeholder = NULL,
-  ...,
-  updateOn = c("change", "blur")
-) {
-  rlang::check_dots_empty()
-  updateOn <- rlang::arg_match(updateOn)
-
-  div(
-    class = "form-group shiny-input-container",
+passwordInput <- function(inputId, label, value = "", width = NULL,
+                          placeholder = NULL) {
+  div(class = "form-group shiny-input-container",
     style = css(width = validateCssUnit(width)),
     shinyInputLabel(inputId, label),
-    tags$input(
-      id = inputId,
-      type = "password",
-      class = "shiny-input-password form-control",
-      value = value,
-      placeholder = placeholder,
-      `data-update-on` = updateOn
-    )
+    tags$input(id = inputId, type="password", class="shiny-input-password form-control", value=value,
+               placeholder = placeholder)
   )
 }

R/input-select.R

@@ -241,8 +241,11 @@ selectizeDependencyFunc <- function(theme) {
     return(selectizeStaticDependency(version_selectize))
   }
 
+  selectizeDir <- system_file(package = "shiny", "www/shared/selectize/")
   bs_version <- bslib::theme_version(theme)
-
+  stylesheet <- file.path(
+    selectizeDir, "scss", paste0("selectize.bootstrap", bs_version, ".scss")
+  )
   # It'd be cleaner to ship the JS in a separate, href-based,
   # HTML dependency (which we currently do for other themable widgets),
   # but DT, crosstalk, and maybe other pkgs include selectize JS/CSS
@@ -250,11 +253,10 @@ selectizeDependencyFunc <- function(theme) {
   # name, the JS/CSS would be loaded/included twice, which leads to
   # strange issues, especially since we now include a 3rd party
   # accessibility plugin https://github.com/rstudio/shiny/pull/3153
-  selectizeDir <- system_file(package = "shiny", "www/shared/selectize/")
   script <- file.path(selectizeDir, selectizeScripts())
 
   bslib::bs_dependency(
-    input = selectizeSass(bs_version),
+    input = sass::sass_file(stylesheet),
     theme = theme,
     name = "selectize",
     version = version_selectize,
@@ -263,14 +265,6 @@ selectizeDependencyFunc <- function(theme) {
   )
 }
 
-selectizeSass <- function(bs_version) {
-  selectizeDir <- system_file(package = "shiny", "www/shared/selectize/")
-  stylesheet <- file.path(
-    selectizeDir, "scss", paste0("selectize.bootstrap", bs_version, ".scss")
-  )
-  sass::sass_file(stylesheet)
-}
-
 selectizeStaticDependency <- function(version) {
   htmlDependency(
     "selectize",

R/input-slider.R

@@ -222,15 +222,6 @@ ionRangeSliderDependency <- function() {
   )
 }
 
-ionRangeSliderDependencySass <- function() {
-  list(
-    list(accent = "$component-active-bg"),
-    sass::sass_file(
-      system_file(package = "shiny", "www/shared/ionrangeslider/scss/shiny.scss")
-    )
-  )
-}
-
 ionRangeSliderDependencyCSS <- function(theme) {
   if (!is_bs_theme(theme)) {
     return(htmlDependency(
@@ -243,7 +234,12 @@ ionRangeSliderDependencyCSS <- function(theme) {
   }
 
   bslib::bs_dependency(
-    input = ionRangeSliderDependencySass(),
+    input = list(
+      list(accent = "$component-active-bg"),
+      sass::sass_file(
+        system_file(package = "shiny", "www/shared/ionrangeslider/scss/shiny.scss")
+      )
+    ),
     theme = theme,
     name = "ionRangeSlider",
     version = version_ion_range_slider,

R/input-submit.R

@@ -57,7 +57,7 @@ submitButton <- function(text = "Apply Changes", icon = NULL, width = NULL) {
   div(
     tags$button(
       type="submit",
-      class="btn btn-primary shiny-submit-button",
+      class="btn btn-primary",
       style = css(width = validateCssUnit(width)),
       list(icon, text)
     )

R/input-text.R

@@ -10,14 +10,6 @@
 #' @param placeholder A character string giving the user a hint as to what can
 #'   be entered into the control. Internet Explorer 8 and 9 do not support this
 #'   option.
-#' @param ... Ignored, included to require named arguments and for future
-#'   feature expansion.
-#' @param updateOn A character vector specifying when the input should be
-#'   updated. Options are `"change"` (default) and `"blur"`. Use `"change"` to
-#'   update the input immediately whenever the value changes. Use `"blur"`to
-#'   delay the input update until the input loses focus (the user moves away
-#'   from the input), or when Enter is pressed (or Cmd/Ctrl + Enter for
-#'   [textAreaInput()]).
 #' @return A text input control that can be added to a UI definition.
 #'
 #' @family input elements
@@ -42,31 +34,15 @@
 #' unless `value` is provided.
 #'
 #' @export
-textInput <- function(
-  inputId,
-  label,
-  value = "",
-  width = NULL,
-  placeholder = NULL,
-  ...,
-  updateOn = c("change", "blur")
-) {
-  rlang::check_dots_empty()
-  updateOn <- rlang::arg_match(updateOn)
+textInput <- function(inputId, label, value = "", width = NULL,
+  placeholder = NULL) {
 
   value <- restoreInput(id = inputId, default = value)
 
-  div(
-    class = "form-group shiny-input-container",
+  div(class = "form-group shiny-input-container",
     style = css(width = validateCssUnit(width)),
     shinyInputLabel(inputId, label),
-    tags$input(
-      id = inputId,
-      type = "text",
-      class = "shiny-input-text form-control",
-      value = value,
-      placeholder = placeholder,
-      `data-update-on` = updateOn
-    )
+    tags$input(id = inputId, type="text", class="shiny-input-text form-control", value=value,
+      placeholder = placeholder)
   )
 }

R/input-textarea.R

@@ -16,8 +16,6 @@
 #' @param resize Which directions the textarea box can be resized. Can be one of
 #'   `"both"`, `"none"`, `"vertical"`, and `"horizontal"`. The default, `NULL`,
 #'   will use the client browser's default setting for resizing textareas.
-#' @param autoresize If `TRUE`, the textarea will automatically resize to fit
-#'   the input text.
 #' @return A textarea input control that can be added to a UI definition.
 #'
 #' @family input elements
@@ -43,22 +41,8 @@
 #' unless `value` is provided.
 #'
 #' @export
-textAreaInput <- function(
-  inputId,
-  label,
-  value = "",
-  width = NULL,
-  height = NULL,
-  cols = NULL,
-  rows = NULL,
-  placeholder = NULL,
-  resize = NULL,
-  ...,
-  autoresize = FALSE,
-  updateOn = c("change", "blur")
-) {
-  rlang::check_dots_empty()
-  updateOn <- rlang::arg_match(updateOn)
+textAreaInput <- function(inputId, label, value = "", width = NULL, height = NULL,
+  cols = NULL, rows = NULL, placeholder = NULL, resize = NULL) {
 
   value <- restoreInput(id = inputId, default = value)
 
@@ -66,30 +50,23 @@ textAreaInput <- function(
     resize <- match.arg(resize, c("both", "none", "vertical", "horizontal"))
   }
 
-  classes <- "form-control"
-  if (autoresize) {
-    classes <- c(classes, "textarea-autoresize")
-    if (is.null(rows)) {
-      rows <- 1
-    }
-  }
+  style <- css(
+    # The width is specified on the parent div.
+    width = if (!is.null(width)) "100%",
+    height = validateCssUnit(height),
+    resize = resize
+  )
 
-  div(
-    class = "shiny-input-textarea form-group shiny-input-container",
-    style = css(width = validateCssUnit(width)),
+  div(class = "form-group shiny-input-container",
     shinyInputLabel(inputId, label),
+    style = if (!is.null(width)) paste0("width: ", validateCssUnit(width), ";"),
     tags$textarea(
       id = inputId,
-      class = classes,
+      class = "shiny-input-textarea form-control",
       placeholder = placeholder,
-      style = css(
-        width = if (!is.null(width)) "100%",
-        height = validateCssUnit(height),
-        resize = resize
-      ),
+      style = style,
       rows = rows,
       cols = cols,
-      `data-update-on` = updateOn,
       value
     )
   )

R/mock-session.R

@@ -436,36 +436,34 @@ MockShinySession <- R6Class(
       if (!is.function(func))
         stop(paste("Unexpected", class(func), "output for", name))
 
-      with_no_otel_collect({
-        obs <- observe({
-          # We could just stash the promise, but we get an "unhandled promise error". This bypasses
-          prom <- NULL
-          tryCatch({
-            v <- private$withCurrentOutput(name, func(self, name))
-            if (!is.promise(v)){
-              # Make our sync value into a promise
-              prom <- promise_resolve(v)
-            } else {
-              prom <- v
-            }
-          }, error=function(e){
-            # Error running value()
-            prom <<- promise_reject(e)
-          })
-
-          private$outs[[name]]$promise <- hybrid_chain(
-            prom,
-            function(v){
-              list(val = v, err = NULL)
-            }, catch=function(e){
-              if (
-                !inherits(e, c("shiny.custom.error", "shiny.output.cancel", "shiny.output.progress", "shiny.silent.error"))
-              ) {
-                self$unhandledError(e, close = FALSE)
-              }
-              list(val = NULL, err = e)
-            })
+      obs <- observe({
+        # We could just stash the promise, but we get an "unhandled promise error". This bypasses
+        prom <- NULL
+        tryCatch({
+          v <- private$withCurrentOutput(name, func(self, name))
+          if (!promises::is.promise(v)){
+            # Make our sync value into a promise
+            prom <- promises::promise(function(resolve, reject){ resolve(v) })
+          } else {
+            prom <- v
+          }
+        }, error=function(e){
+          # Error running value()
+          prom <<- promises::promise(function(resolve, reject){ reject(e) })
         })
+
+        private$outs[[name]]$promise <- hybrid_chain(
+          prom,
+          function(v){
+            list(val = v, err = NULL)
+          }, catch=function(e){
+            if (
+              !inherits(e, c("shiny.custom.error", "shiny.output.cancel", "shiny.output.progress", "shiny.silent.error"))
+            ) {
+              self$unhandledError(e, close = FALSE)
+            }
+            list(val = NULL, err = e)
+          })
       })
       private$outs[[name]] <- list(obs = obs, func = func, promise = NULL)
     },
@@ -718,7 +716,7 @@ MockShinySession <- R6Class(
         stop("Nested calls to withCurrentOutput() are not allowed.")
       }
 
-      with_promise_domain(
+      promises::with_promise_domain(
         createVarPromiseDomain(private, "currentOutputName", name),
         expr
       )

R/otel-attr-srcref.R

@@ -1,67 +0,0 @@
-
-
-# Very similar to srcrefFromShinyCall(),
-# however, this works when the function does not have a srcref attr set
-otel_srcref_attributes <- function(srcref, fn_name = NULL) {
-  if (is.function(srcref)) {
-    srcref <- getSrcRefs(srcref)[[1]][[1]]
-  }
-
-  if (is.null(srcref)) {
-    return(NULL)
-  }
-
-  stopifnot(inherits(srcref, "srcref"))
-
-  # Semantic conventions for code: https://opentelemetry.io/docs/specs/semconv/registry/attributes/code/
-  #
-  # Inspiration from https://github.com/r-lib/testthat/pull/2087/files#diff-92de3306849d93d6f7e76c5aaa1b0c037e2d716f72848f8a1c70536e0c8a1564R123-R124
-  srcfile <- attr(srcref, "srcfile")
-  # Prefer the original filename (as user typed it) over the normalized path
-  filename <- getSrcfileFilename(srcfile)
-  dropNulls(list(
-    "code.function.name" = fn_name,
-    # Location attrs
-    "code.file.path" = filename,
-    "code.line.number" = srcref[1],
-    "code.column.number" = srcref[2],
-    # Remove these deprecated location names once Logfire supports the preferred names
-    # https://github.com/pydantic/logfire/issues/1559
-    "code.filepath" = filename,
-    "code.lineno" = srcref[1],
-    "code.column" = srcref[2]
-  ))
-}
-
-#' Get the srcref for the call at the specified stack level
-#'
-#' If you need to go farther back in the `sys.call()` stack, supply a larger
-#' negative number to `which_offset`. The default of 0 gets the immediate
-#' caller. `-1` would get the caller's caller, and so on.
-#' @param which_offset The stack level to get the call from. Defaults to -1 (the
-#'   immediate caller).
-#' @return An srcref object, or NULL if none is found.
-#' @noRd
-get_call_srcref <- function(which_offset = 0) {
-  # Go back one call to account for this function itself
-  call <- sys.call(which_offset - 1)
-
-  srcref <- attr(call, "srcref", exact = TRUE)
-  srcref
-}
-
-
-append_otel_srcref_attrs <- function(attrs, call_srcref, fn_name) {
-  if (is.null(call_srcref)) {
-    return(attrs)
-  }
-
-  srcref_attrs <- otel_srcref_attributes(call_srcref, fn_name)
-  if (is.null(srcref_attrs)) {
-    return(attrs)
-  }
-
-  attrs[names(srcref_attrs)] <- srcref_attrs
-
-  attrs
-}

R/otel-collect.R

@@ -1,55 +0,0 @@
-otel_collect_choices <- c(
-  "none",
-  "session",
-  "reactive_update",
-  "reactivity",
-  "all"
-)
-
-# Check if the collect level is sufficient
-otel_collect_is_enabled <- function(
-  impl_level,
-  # Listen to option and fall back to the env var
-  opt_collect_level = getOption("shiny.otel.collect", Sys.getenv("SHINY_OTEL_COLLECT", "all"))
-) {
-  opt_collect_level <- as_otel_collect(opt_collect_level)
-
-  which(opt_collect_level == otel_collect_choices) >=
-    which(impl_level == otel_collect_choices)
-}
-
-# Check if tracing is enabled and if the collect level is sufficient
-has_otel_collect <- function(collect) {
-  # Only check pkg author input iff loaded with pkgload
-  if (IS_SHINY_LOCAL_PKG) {
-    stopifnot(length(collect) == 1, any(collect == otel_collect_choices))
-  }
-
-  otel_is_tracing_enabled() && otel_collect_is_enabled(collect)
-}
-
-# Run expr with otel collection disabled
-with_no_otel_collect <- function(expr) {
-  withOtelCollect("none", expr)
-}
-
-
-## -- Helpers -----------------------------------------------------
-
-# shiny.otel.collect can be:
-# "none"; To do nothing / fully opt-out
-# "session" for session/start events
-# "reactive_update" (includes "session" features) and reactive_update spans
-# "reactivity" (includes "reactive_update" features) and spans for all reactive things
-# "all" - Anything that Shiny can do. (Currently equivalent to the "reactivity" level)
-
-as_otel_collect <- function(collect = "all") {
-  if (!is.character(collect)) {
-    stop("`collect` must be a character vector.")
-  }
-
-  # Match to collect enum
-  collect <- match.arg(collect, otel_collect_choices, several.ok = FALSE)
-
-  return(collect)
-}

R/otel-enable.R

@@ -1,194 +0,0 @@
-# # Approach
-# Use flags on the reactive object to indicate whether to record OpenTelemetry spans.
-#
-# Cadence:
-# * `$.isRecordingOtel` - Whether to record OpenTelemetry spans for this reactive object
-# * `$.otelLabel` - The label to use for the OpenTelemetry span
-# * `$.otelAttrs` - Additional attributes to add to the OpenTelemetry span
-
-
-#' Add OpenTelemetry for reactivity to an object
-#'
-#' @description
-#'
-#' `enable_otel_*()` methods add OpenTelemetry flags for [reactive()] expressions
-#' and `render*` functions (like [renderText()], [renderTable()], ...).
-#'
-#' Wrapper to creating an active reactive OpenTelemetry span that closes when
-#' the reactive expression is done computing. Typically this is when the
-#' reactive expression finishes (synchronous) or when the returned promise is
-#' done computing (asynchronous).
-
-#' @section Async with OpenTelemetry:
-#'
-#'   With a reactive expression, the key and/or value expression can be
-#'   _asynchronous_. In other words, they can be promises --- not regular R
-#'   promises, but rather objects provided by the
-#'   \href{https://rstudio.github.io/promises/}{\pkg{promises}}  package, which
-#'   are similar to promises in JavaScript. (See [promises::promise()] for more
-#'   information.) You can also use [mirai::mirai()] or [future::future()]
-#'   objects to run code in a separate process or even on a remote machine.
-#'
-#'   When reactive expressions are being calculated in parallel (by having
-#'   another reactive promise compute in the main process), the currently active
-#'   OpenTelemetry span will be dynamically swapped out according to the
-#'   currently active reactive expression. This means that as long as a promise
-#'   was `then()`ed or `catch()`ed with an active OpenTelemetry span, the span
-#'   will be correctly propagated to the next step (and subsequently other
-#'   steps) in the promise chain.
-#'
-#'   While the common case is for a reactive expression to be created
-#'   synchronously, troubles arise when the reactive expression is created
-#'   asynchronously. The span **must** be created before the reactive expression
-#'   is executed, it **must** be active for the duration of the expression, and
-#'   it **must** not be closed until the reactive expression is done executing.
-#'   This is not easily achieved with a single function call, so we provide a
-#'   way to create a reactive expression that is bound to an OpenTelemetry
-#'   span.
-#'
-#' @section Span management and performance:
-#'
-#' Dev note - Barret 2025-10:
-#' Typically, an OpenTelemetry span (`otel_span`) will inherit from the parent
-#' span. This works well and we can think of the hierarchy as a tree. With
-#' `options("shiny.otel.collect" = <value>)`, we are able to control with a sliding
-#' dial how much of the tree we are interested in: "none", "session",
-#' "reactive_update", "reactivity", and finally "all".
-#'
-#' Leveraging this hierarchy, we can avoid creating spans that are not needed.
-#' The act of making a noop span takes on the order of 10microsec. Handling of
-#' the opspan is also in the 10s of microsecond range. We should avoid this when
-#' we **know** that we're not interested in the span.  Therefore, manually
-#' handling spans should be considered for Shiny.
-#'
-#' * Q:
-#'   * But what about app author who want the current span? Is there any
-#'     guarantee that the current span is expected `reactive()` span?
-#' * A:
-#'   * No. The current span is whatever the current span is. If the app author
-#'     wants a specific span, they should create it themselves.
-#' * Proof:
-#'   ```r
-#'   noop <- otel::get_active_span()
-#'   noop$get_context()$get_span_id()
-#'   #> [1] "0000000000000000"
-#'   ignore <- otelsdk::with_otel_record({
-#'     a <- otel::start_local_active_span("a")
-#'     a$get_context()$get_span_id() |> str()
-#'     otel::with_active_span(noop, {
-#'       otel::get_active_span()$get_context()$get_span_id() |> str()
-#'     })
-#'   })
-#'   #> chr "2645e95715841e75"
-#'   #> chr "2645e95715841e75"
-#'   # ## It is reasonable to expect the second id to be `0000000000000000`, but it's not.
-#'   ```
-#'   Therefore, the app author has no guarantee that the current span is the
-#'   span they're expecting. If the app author wants a specific span, they should
-#'   create it themselves and let natural inheritance take over.
-#'
-#' Given this, I will imagine that app authors will set
-#' `options("shiny.otel.collect" = "reactive_update")` as their default behavior.
-#' Enough to know things are happening, but not overwhelming from **everything**
-#' that is reactive.
-#'
-#' To _light up_ a specific area, users can call `withr::with_options(list("shiny.otel.collect" = "all"), { ... })`.
-#'
-#' @param x The object to add caching to.
-#' @param ... Future parameter expansion.
-#' @noRd
-NULL
-
-
-enable_otel_reactive_val <- function(x) {
-
-  impl <- attr(x, ".impl", exact = TRUE)
-  # Set flag for otel logging when setting the value
-  impl$.isRecordingOtel <- TRUE
-
-  class(x) <- c("reactiveVal.otel", class(x))
-
-  x
-}
-
-enable_otel_reactive_values <- function(x) {
-
-  impl <- .subset2(x, "impl")
-  # Set flag for otel logging when setting values
-  impl$.isRecordingOtel <- TRUE
-
-  class(x) <- c("reactivevalues.otel", class(x))
-
-  x
-}
-
-enable_otel_reactive_expr <- function(x) {
-
-  domain <- reactive_get_domain(x)
-
-  impl <- attr(x, "observable", exact = TRUE)
-  impl$.isRecordingOtel <- TRUE
-  # Covers both reactive and reactive.event
-  impl$.otelLabel <- otel_span_label_reactive(x, domain = impl$.domain)
-
-  class(x) <- c("reactiveExpr.otel", class(x))
-
-  x
-}
-
-enable_otel_observe <- function(x) {
-  x$.isRecordingOtel <- TRUE
-  x$.otelLabel <- otel_span_label_observer(x, domain = x$.domain)
-
-  class(x) <- c("Observer.otel", class(x))
-  invisible(x)
-}
-
-
-
-enable_otel_shiny_render_function <- function(x) {
-
-  valueFunc <- force(x)
-  otel_span_label <- NULL
-  otel_span_attrs <- NULL
-
-  renderFunc <- function(...) {
-    # Dynamically determine the span label given the current reactive domain
-    if (is.null(otel_span_label)) {
-      domain <- getDefaultReactiveDomain()
-      otel_span_label <<-
-        otel_span_label_render_function(x, domain = domain)
-      otel_span_attrs <<- c(
-        attr(x, "otelAttrs"),
-        otel_session_id_attrs(domain)
-      )
-    }
-
-    with_otel_span(
-      otel_span_label,
-      {
-        hybrid_then(
-          valueFunc(...),
-          on_failure = set_otel_exception_status_and_throw,
-          # Must save the error object
-          tee = FALSE
-        )
-      },
-      attributes = otel_span_attrs
-    )
-  }
-
-  renderFunc <- addAttributes(renderFunc, renderFunctionAttributes(valueFunc))
-  class(renderFunc) <- c("shiny.render.function.otel", class(valueFunc))
-  renderFunc
-}
-
-
-# ## If we ever expose a S3 function, I'd like to add this method.
-# bindOtel.function <- function(x, ...) {
-#   cli::cli_abort(paste0(
-#     "Don't know how to add OpenTelemetry recording to a plain function. ",
-#     "If this is a {.code render*()} function for Shiny, it may need to be updated. ",
-#     "Please see {.help shiny::bindOtel} for more information."
-#   ))
-# }

R/otel-error.R

@@ -1,56 +0,0 @@
-
-has_seen_otel_exception <- function(cnd) {
-  !is.null(cnd$.shiny_otel_exception)
-}
-
-mark_otel_exception_as_seen <- function(cnd) {
-  cnd$.shiny_otel_exception <- TRUE
-  cnd
-}
-
-set_otel_exception_status_and_throw <- function(cnd) {
-  cnd <- set_otel_exception_status(cnd)
-
-  # Rethrow the (possibly updated) error
-  signalCondition(cnd)
-}
-
-set_otel_exception_status <- function(cnd) {
-  if (inherits(cnd, "shiny.custom.error")) {
-    # No-op
-  } else if (inherits(cnd, "shiny.output.cancel")) {
-    # No-op
-  } else if (inherits(cnd, "shiny.output.progress")) {
-    # No-op
-  } else if (cnd_inherits(cnd, "shiny.silent.error")) {
-    # No-op
-  } else {
-    # Only when an unknown error occurs do we set the span status to error
-    span <- otel::get_active_span()
-
-    # Only record the exception once at the original point of failure,
-    # not every reactive expression that it passes through
-    if (!has_seen_otel_exception(cnd)) {
-      span$record_exception(
-        # Record a sanitized error if sanitization is enabled
-        get_otel_error_obj(cnd)
-      )
-      cnd <- mark_otel_exception_as_seen(cnd)
-    }
-
-    # Record the error status on the span for any context touching this error
-    span$set_status("error")
-  }
-
-  cnd
-}
-
-
-get_otel_error_obj <- function(e) {
-  # Do not expose errors to otel if sanitization is enabled
-  if (getOption("shiny.otel.sanitize.errors", TRUE)) {
-    sanitized_error()
-  } else {
-    e
-  }
-}

R/otel-label.R

@@ -1,198 +0,0 @@
-# observe mymod:<anonymous>
-# observe <anonymous>
-# observe mylabel
-
-# -- Reactives --------------------------------------------------------------
-
-#' OpenTelemetry Label Generation Functions
-#'
-#' Functions for generating formatted labels for OpenTelemetry tracing spans
-#' in Shiny applications. These functions handle module namespacing and
-#' cache/event modifiers for different Shiny reactive constructs.
-#'
-#' @param x The object to generate a label for (reactive, observer, etc.)
-#' @param label Character string label for reactive values
-#' @param key Character string key for reactiveValues operations
-#' @param ... Additional arguments (unused)
-#' @param domain Shiny domain object containing namespace information
-#'
-#' @return Character string formatted for OpenTelemetry span labels
-#' @name otel_label
-#' @noRd
-NULL
-
-otel_span_label_reactive <- function(x, ..., domain) {
-  fn_name <- otel_label_with_modifiers(
-    x,
-    "reactive",
-    cache_class = "reactive.cache",
-    event_class = "reactive.event"
-  )
-
-  label <- attr(x, "observable", exact = TRUE)[[".label"]]
-  otel_span_label <- otel_label_upgrade(label, domain = domain)
-
-  sprintf("%s %s", fn_name, otel_span_label)
-}
-
-otel_span_label_render_function <- function(x, ..., domain) {
-  fn_name <- otel_label_with_modifiers(
-    x,
-    "output",
-    cache_class = "shiny.render.function.cache",
-    event_class = "shiny.render.function.event"
-  )
-
-  label <- getCurrentOutputInfo(session = domain)$name %||% "<unknown>"
-  otel_span_label <- otel_label_upgrade(label, domain = domain)
-
-  sprintf("%s %s", fn_name, otel_span_label)
-}
-
-otel_span_label_observer <- function(x, ..., domain) {
-  fn_name <- otel_label_with_modifiers(
-    x,
-    "observe",
-    cache_class = NULL, # Do not match a cache class here
-    event_class = "Observer.event"
-  )
-
-  otel_span_label <- otel_label_upgrade(x$.label, domain = domain)
-
-  sprintf("%s %s", fn_name, otel_span_label)
-}
-
-# -- Set reactive value(s) ----------------------------------------------------
-
-otel_log_label_set_reactive_val <- function(label, ..., domain) {
-  sprintf(
-    "Set reactiveVal %s",
-    otel_label_upgrade(label, domain = domain)
-  )
-}
-
-otel_log_label_set_reactive_values <- function(label, key, ..., domain) {
-  sprintf(
-    "Set reactiveValues %s$%s",
-    otel_label_upgrade(label, domain = domain),
-    key
-  )
-}
-
-# -- ExtendedTask -------------------------------------------------------------
-
-otel_span_label_extended_task <- function(label, suffix = NULL, ..., domain) {
-  sprintf(
-    "ExtendedTask %s",
-    otel_label_upgrade(label, domain = domain)
-  )
-}
-otel_log_label_extended_task_add_to_queue <- function(label, ..., domain) {
-  sprintf(
-    "ExtendedTask %s add to queue",
-    otel_label_upgrade(label, domain = domain)
-  )
-}
-
-# -- Debounce / Throttle -------------------------------------------------------
-
-otel_label_debounce <- function(label, ..., domain) {
-  sprintf(
-    "debounce %s",
-    otel_label_upgrade(label, domain = domain)
-  )
-}
-
-otel_label_throttle <- function(label, ..., domain) {
-  sprintf(
-    "throttle %s",
-    otel_label_upgrade(label, domain = domain)
-  )
-}
-
-# ---- Reactive Poll / File Reader -----------------------------------------------
-otel_label_reactive_poll <- function(label, ..., domain) {
-  sprintf(
-    "reactivePoll %s",
-    otel_label_upgrade(label, domain = domain)
-  )
-}
-otel_label_reactive_file_reader <- function(label, ..., domain) {
-  sprintf(
-    "reactiveFileReader %s",
-    otel_label_upgrade(label, domain = domain)
-  )
-}
-
-# -- Helpers --------------------------------------------------------------
-
-#' Modify function name based on object class modifiers
-#'
-#' @param x Object to check class of
-#' @param fn_name Base function name
-#' @param cache_class Optional class name that indicates cache operation
-#' @param event_class Optional class name that indicates event operation
-#'
-#' @return Modified function name with "cache" or "event" suffix if applicable
-#' @noRd
-otel_label_with_modifiers <- function(
-  x,
-  fn_name,
-  cache_class = NULL,
-  event_class = NULL
-) {
-  for (x_class in rev(class(x))) {
-    if (!is.null(cache_class) && x_class == cache_class) {
-      fn_name <- sprintf("%s cache", fn_name)
-    } else if (!is.null(event_class) && x_class == event_class) {
-      fn_name <- sprintf("%s event", fn_name)
-    }
-  }
-
-  fn_name
-}
-
-
-#' Upgrade and format OpenTelemetry labels with module namespacing
-#'
-#' Processes labels for OpenTelemetry tracing, replacing default verbose labels
-#' with cleaner alternatives and prepending module namespaces when available.
-#'
-#' @param label Character string label to upgrade
-#' @param ... Additional arguments (unused)
-#' @param domain Shiny domain object containing namespace information
-#'
-#' @return Modified label string with module prefix if applicable
-#' @noRd
-#'
-#' @details
-#' Module prefix examples:
-#' - "" -> ""
-#' - "my-nested-mod-" -> "my-nested-mod"
-otel_label_upgrade <- function(label, ..., domain) {
-  # By default, `observe()` sets the label to `observe(CODE)`
-  # This label is too big and inconsistent.
-  # Replace it with `<anonymous>`
-  # (Similar with `eventReactive()` and `observeEvent()`)
-  if (is_default_label(label) && grepl("(", label, fixed = TRUE)) {
-    label <- "<anonymous>"
-    # label <- sprintf("<anonymous> - %s", label)
-  }
-
-  if (is.null(domain)) {
-    return(label)
-  }
-
-  namespace <- domain$ns("")
-
-  if (!nzchar(namespace)) {
-    return(label)
-  }
-
-  # Remove trailing module separator
-  mod_ns <- sub(sprintf("%s$", ns.sep), "", namespace)
-
-  # Prepend the module name to the label
-  # Ex: `"mymod:x"`
-  sprintf("%s:%s", mod_ns, label)
-}

R/otel-reactive-update.R

@@ -1,114 +0,0 @@
-# * `session$userData[["_otel_span_reactive_update"]]` - The active reactive update span (or `NULL`)
-
-
-#' Start a `reactive_update` OpenTelemetry span and store it
-#'
-#' Used when a reactive expression is updated
-#' Will only start the span iff the otel tracing is enabled
-#' @param ... Ignored
-#' @param domain The reactive domain to associate with the span
-#' @return Invisibly returns.
-#' @seealso `otel_span_reactive_update_teardown()`
-#' @noRd
-otel_span_reactive_update_init <- function(..., domain) {
-
-  if (!has_otel_collect("reactive_update")) return()
-
-  # Ensure cleanup is registered only once per session
-  if (is.null(domain$userData[["_otel_has_reactive_cleanup"]])) {
-    domain$userData[["_otel_has_reactive_cleanup"]] <- TRUE
-
-    # Clean up any dangling reactive spans on an unplanned exit
-    domain$onSessionEnded(function() {
-      otel_span_reactive_update_teardown(domain = domain)
-    })
-  }
-
-  # Safety check
-  if (is_otel_span(domain$userData[["_otel_span_reactive_update"]])) {
-    stop("Reactive update span already exists")
-  }
-
-  domain$userData[["_otel_span_reactive_update"]] <-
-    start_otel_span(
-      "reactive_update",
-      ...,
-      attributes = otel_session_id_attrs(domain)
-    )
-
-  invisible()
-}
-
-#' End a `reactive_update` OpenTelemetry span and remove it from the session
-#' @param ... Ignored
-#' @param domain The reactive domain to associate with the span
-#' @return Invisibly returns.
-#' @seealso `otel_span_reactive_update_init()`
-#' @noRd
-otel_span_reactive_update_teardown <- function(..., domain) {
-  ospan <- domain$userData[["_otel_span_reactive_update"]]
-
-  if (is_otel_span(ospan)) {
-    otel::end_span(ospan)
-    domain$userData[["_otel_span_reactive_update"]] <- NULL
-  }
-
-  invisible()
-}
-
-
-#' Run expr within a `reactive_update` OpenTelemetry span
-#'
-#' Used to wrap the execution of a reactive expression. Will only
-#' require/activate the span iff the otel tracing is enabled
-#' @param expr The expression to executed within the span
-#' @param ... Ignored
-#' @param domain The reactive domain to associate with the span
-#' @noRd
-with_otel_span_reactive_update <- function(expr, ..., domain) {
-  ospan <- domain$userData[["_otel_span_reactive_update"]]
-
-  if (!is_otel_span(ospan)) {
-    return(force(expr))
-  }
-
-  # Given the reactive update span is started before and ended when exec count
-  # is 0, we only need to wrap the expr in the span context
-  otel::with_active_span(ospan, {force(expr)})
-}
-
-
-#' Run expr within `reactive_update` otel span if not already active
-#'
-#' If the reactive update otel span is not already active, run the expression
-#' within the reactive update otel span context. This ensures that nested calls
-#' to reactive expressions do not attempt to re-enter the same span.
-#'
-#' This method is used within Context `run()` and running an Output's observer
-#' implementation
-#' @param expr The expression to executed within the span
-#' @param ... Ignored
-#' @param domain The reactive domain to associate with the span
-#' @noRd
-maybe_with_otel_span_reactive_update <- function(expr, ..., domain) {
-  if (is.null(domain$userData[["_otel_reactive_update_is_active"]])) {
-    domain$userData[["_otel_reactive_update_is_active"]] <- TRUE
-
-    # When the expression is done promising, clear the active flag
-    hybrid_then(
-      {
-        with_otel_span_reactive_update(domain = domain, expr)
-      },
-      on_success = function(value) {
-        domain$userData[["_otel_reactive_update_is_active"]] <- NULL
-      },
-      on_failure = function(e) {
-        domain$userData[["_otel_reactive_update_is_active"]] <- NULL
-      },
-      # Return the value before the callbacks
-      tee = TRUE
-    )
-  } else {
-    expr
-  }
-}

R/otel-session.R

@@ -1,96 +0,0 @@
-# Semantic conventions for session: https://opentelemetry.io/docs/specs/semconv/general/session/
-
-#' Create and use session span and events
-#'
-#' If otel is disabled, the session span and events will not be created,
-#' however the expression will still be evaluated.
-#'
-#' Span: `session_start`, `session_end`
-#' @param expr Expression to evaluate within the session span
-#' @param ... Ignored
-#' @param domain The reactive domain
-#' @noRd
-otel_span_session_start <- function(expr, ..., domain) {
-
-  if (!has_otel_collect("session")) {
-    return(force(expr))
-  }
-
-  # Wrap the server initialization
-  with_otel_span(
-    "session_start",
-    expr,
-    attributes = otel::as_attributes(c(
-      otel_session_id_attrs(domain),
-      otel_session_attrs(domain)
-    ))
-  )
-}
-
-
-otel_span_session_end <- function(expr, ..., domain) {
-  if (!has_otel_collect("session")) {
-    return(force(expr))
-  }
-
-  id_attrs <- otel_session_id_attrs(domain)
-  with_otel_span(
-    "session_end",
-    expr,
-    attributes = id_attrs
-  )
-}
-
-# -- Helpers -------------------------------
-
-
-# Occurs when the websocket connection is established
-otel_session_attrs <- function(domain) {
-  # TODO: Future: Posit Connect integration
-  # > we are still trying to identify all of the information we want to track/expose
-  #
-  # * `POSIT_PRODUCT` (Fallback to RSTUDIO_PRODUCT) for host environment
-  # * `CONNECT_SERVER` envvar to get the `session.address`.
-  # * `CONNECT_CONTENT_GUID` for the consistent app distinguisher
-  # * Maybe `CONNECT_CONTENT_JOB_KEY`?
-  # * Maybe `user.id` to be their user name: https://opentelemetry.io/docs/specs/semconv/registry/attributes/user/
-  attrs <- list(
-    server.path =
-      sub(
-        "/websocket/$", "/",
-        domain[["request"]][["PATH_INFO"]] %||% ""
-      ),
-    server.address = domain[["request"]][["HTTP_HOST"]] %||% "",
-    server.origin = domain[["request"]][["HTTP_ORIGIN"]] %||% "",
-    ## Currently, Shiny does not expose QUERY_STRING when connecting the websocket
-    # so we do not provide it here.
-    # QUERY_STRING = domain[["request"]][["QUERY_STRING"]] %||% "",
-    server.port = domain[["request"]][["SERVER_PORT"]] %||% NA_integer_
-  )
-  # Safely convert SERVER_PORT to integer
-  # If conversion fails, leave as-is (string or empty)
-  # This avoids warnings/errors if SERVER_PORT is not a valid integer
-  server_port <- suppressWarnings(as.integer(attrs$server.port))
-  if (!is.na(server_port)) {
-    attrs$server.port <- server_port
-  }
-
-  attrs
-}
-
-otel_session_id_attrs <- function(domain) {
-  token <- domain$token
-  if (is.null(token)) {
-    return(list())
-  }
-
-  list(
-    # Convention for client-side with session.start and session.end events
-    # https://opentelemetry.io/docs/specs/semconv/general/session/
-    #
-    # Since we are the server, we'll add them as an attribute to _every_ span
-    # within the session as we don't know exactly when they will be called.
-    # Given it's only a single attribute, the cost should be minimal, but it ties every reactive calculation together.
-    session.id = token
-  )
-}

R/otel-shiny.R

@@ -1,127 +0,0 @@
-# Used by otel to identify the tracer and logger for this package
-# https://github.com/r-lib/otel/blob/afc31bc1f4bd177870d44b051ada1d9e4e685346/R/tracer-name.R#L33-L49
-# DO NOT CHANGE THIS VALUE without understanding the implications for existing telemetry data!
-otel_tracer_name <- "co.posit.r-package.shiny"
-
-init_otel <- function() {
-  .globals$otel_tracer <- otel::get_tracer()
-  .globals$otel_is_tracing_enabled <- otel::is_tracing_enabled(.globals$otel_tracer)
-
-  .globals$otel_logger <- otel::get_logger()
-  # .globals$otel_is_logging_enabled <- otel::is_logging_enabled()
-}
-on_load({init_otel()})
-
-#' Run expr within a Shiny OpenTelemetry recording context
-#'
-#' Reset the OpenTelemetry tracer and logger for Shiny.
-#' Used for testing purposes only.
-#' @param expr Expression to evaluate within the recording context
-#' @return The result of evaluating `otelsdk::with_otel_record(expr)` with freshly enabled Shiny otel tracer and logger
-#' @noRd
-with_shiny_otel_record <- function(expr) {
-  # Only use within internal testthat tests
-  stopifnot(testthat__is_testing())
-  withr::defer({ init_otel() })
-
-  otelsdk::with_otel_record({
-    init_otel()
-
-    force(expr)
-  })
-}
-
-#' Check if OpenTelemetry tracing is enabled
-#'
-#' @param tracer The OpenTelemetry tracer to check (default: Shiny otel tracer)
-#' @return `TRUE` if tracing is enabled, `FALSE` otherwise
-#' @noRd
-otel_is_tracing_enabled <- function() {
-  .globals[["otel_is_tracing_enabled"]]
-}
-
-#' Shiny OpenTelemetry logger
-#'
-#' Used for logging OpenTelemetry events via `otel_log()`
-#' @return An OpenTelemetry logger
-#' @noRd
-shiny_otel_logger <- function() {
-  .globals[["otel_logger"]]
-}
-
-
-
-#' Shiny OpenTelemetry tracer
-#'
-#' Used for creating OpenTelemetry spans via `with_otel_span()` and
-#' `start_otel_span()`
-#'
-#' Inspired by httr2:::get_tracer().
-#' @return An OpenTelemetry tracer
-#' @noRd
-shiny_otel_tracer <- function() {
-  .globals[["otel_tracer"]]
-}
-
-
-
-
-#' Create and use a Shiny OpenTelemetry span
-#'
-#' If otel is disabled, the span will not be created,
-#' however the expression will still be evaluated.
-#' @param name Span name
-#' @param expr Expression to evaluate within the span
-#' @param ... Ignored
-#' @param attributes Optional span attributes
-#' @return The result of evaluating `expr`
-#' @noRd
-with_otel_span <- function(name, expr, ..., attributes = NULL) {
-  promises::with_otel_span(name, expr, ..., attributes = attributes, tracer = shiny_otel_tracer())
-}
-
-
-#' Start a Shiny OpenTelemetry span
-#'
-#' @param name Span name
-#' @param ... Additional arguments passed to `otel::start_span()`
-#' @return An OpenTelemetry span
-#' @noRd
-start_otel_span <- function(name, ...) {
-  otel::start_span(name, ..., tracer = shiny_otel_tracer())
-}
-
-
-# # TODO: Set attributes on the current active span
-# # 5. Set attributes on the current active span
-# set_otel_span_attrs(status = 200L)
-
-
-# -- Helpers --------------------------------------------------------------
-
-
-is_otel_span <- function(x) {
-  inherits(x, "otel_span")
-}
-
-testthat__is_testing <- function() {
-  # testthat::is_testing()
-  identical(Sys.getenv("TESTTHAT"), "true")
-}
-
-#' Log a message using the Shiny OpenTelemetry logger
-#'
-#' @param msg The log message
-#' @param ... Additional attributes to add to the log record
-#' @param severity The log severity level (default: "info")
-#' @param logger The OpenTelemetry logger to use (default: Shiny otel logger)
-#' @return Invisibly returns.
-#' @noRd
-otel_log <- function(
-  msg,
-  ...,
-  severity = "info",
-  logger = shiny_otel_logger()
-) {
-  otel::log(msg, ..., severity = severity, logger = logger)
-}

R/otel-with.R

@@ -1,125 +0,0 @@
-#' Temporarily set OpenTelemetry (OTel) collection level
-#'
-#' @description
-#' Control Shiny's OTel collection level for particular reactive expression(s).
-#'
-#' `withOtelCollect()` sets the OpenTelemetry collection level for
-#' the duration of evaluating `expr`. `localOtelCollect()` sets the collection
-#' level for the remainder of the current function scope.
-#'
-#' @details
-#' Note that `"session"` and `"reactive_update"` levels are not permitted as
-#' these are runtime-specific levels that should only be set permanently via
-#' `options(shiny.otel.collect = ...)` or the `SHINY_OTEL_COLLECT` environment
-#' variable, not temporarily during reactive expression creation.
-#'
-#' @section Best practice:
-#'
-#' Best practice is to set the collection level for code that *creates* reactive
-#' expressions, not code that *runs* them. For instance:
-#'
-#' ```r
-#' # Disable telemetry for a reactive expression
-#' withOtelCollect("none", {
-#'   my_reactive <- reactive({ ... })
-#' })
-#'
-#' # Disable telemetry for a render function
-#' withOtelCollect("none", {
-#'   output$my_plot <- renderPlot({ ... })
-#' })
-#'
-#' #' # Disable telemetry for an observer
-#' withOtelCollect("none", {
-#'   observe({ ... }))
-#' })
-#'
-#' # Disable telemetry for an entire module
-#' withOtelCollect("none", {
-#'   my_result <- my_module("my_id")
-#' })
-#' # Use `my_result` as normal here
-#' ```
-#'
-#' NOTE: It's not recommended to pipe existing reactive objects into
-#' `withOtelCollect()` since they won't inherit their intended OTel settings,
-#' leading to confusion.
-#'
-#' @param collect Character string specifying the OpenTelemetry collection level.
-#'   Must be one of the following:
-#'
-#'     * `"none"` - No telemetry data collected
-#'     * `"reactivity"` - Collect reactive execution spans (includes session and
-#'       reactive update events)
-#'     * `"all"` - All available telemetry (currently equivalent to `"reactivity"`)
-#' @param expr Expression to evaluate with the specified collection level
-#'   (for `withOtelCollect()`).
-#' @param envir Environment where the collection level should be set
-#'   (for `localOtelCollect()`). Defaults to the parent frame.
-#'
-#' @return
-#' * `withOtelCollect()` returns the value of `expr`.
-#' * `localOtelCollect()` is called for its side effect and returns the previous
-#'   `collect` value invisibly.
-#'
-#' @seealso See the `shiny.otel.collect` option within [`shinyOptions`]. Setting
-#' this value will globally control OpenTelemetry collection levels.
-#'
-#' @examples
-#' \dontrun{
-#' # Temporarily disable telemetry collection
-#' withOtelCollect("none", {
-#'   # Code here won't generate telemetry
-#'   reactive({ input$x + 1 })
-#' })
-#'
-#' # Collect reactivity telemetry but not other events
-#' withOtelCollect("reactivity", {
-#'   # Reactive execution will be traced
-#'   observe({ print(input$x) })
-#' })
-#'
-#' # Use local variant in a function
-#' my_function <- function() {
-#'   localOtelCollect("none")
-#'   # Rest of function executes without telemetry
-#'   reactive({ input$y * 2 })
-#' }
-#' }
-#'
-#' @rdname withOtelCollect
-#' @export
-withOtelCollect <- function(collect, expr) {
-  collect <- as_otel_collect_with(collect)
-
-  withr::with_options(
-    list(shiny.otel.collect = collect),
-    expr
-  )
-}
-
-#' @rdname withOtelCollect
-#' @export
-localOtelCollect <- function(collect, envir = parent.frame()) {
-  collect <- as_otel_collect_with(collect)
-
-  old <- withr::local_options(
-    list(shiny.otel.collect = collect),
-    .local_envir = envir
-  )
-
-  invisible(old)
-}
-
-# Helper function to validate collect levels for with/local functions
-# Only allows "none", "reactivity", and "all" - not "session" or "reactive_update"
-as_otel_collect_with <- function(collect) {
-  if (!is.character(collect)) {
-    stop("`collect` must be a character vector.")
-  }
-
-  allowed_levels <- c("none", "reactivity", "all")
-  collect <- match.arg(collect, allowed_levels, several.ok = FALSE)
-
-  return(collect)
-}

R/react.R

@@ -16,60 +16,6 @@ processId <- local({
   }
 })
 
-ctx_otel_info_obj <- function(
-  isRecordingOtel = FALSE,
-  otelLabel = "<unknown>",
-  otelAttrs = list()
-) {
-  structure(
-    list(
-      isRecordingOtel = isRecordingOtel,
-      otelLabel = otelLabel,
-      otelAttrs = otelAttrs
-    ),
-    class = "ctx_otel_info"
-  )
-}
-
-with_otel_span_context <- function(otel_info, expr, domain) {
-  if (!otel_is_tracing_enabled()) {
-    return(force(expr))
-  }
-
-  isRecordingOtel <- .subset2(otel_info, "isRecordingOtel")
-  otelLabel <- .subset2(otel_info, "otelLabel")
-  otelAttrs <- .subset2(otel_info, "otelAttrs")
-
-  # Always set the reactive update span as active
-  # This ensures that any spans created within the reactive context
-  # are at least children of the reactive update span
-  maybe_with_otel_span_reactive_update(domain = domain, {
-    if (isRecordingOtel) {
-      with_otel_span(
-        otelLabel,
-        {
-          # Works with both sync and async expressions
-          # Needed for both observer and reactive contexts
-          hybrid_then(
-            expr,
-            on_failure = set_otel_exception_status_and_throw,
-            # Must upgrade the error object
-            tee = FALSE
-          )
-        },
-        # expr,
-        attributes = otelAttrs
-      )
-    } else {
-      force(expr)
-    }
-  })
-
-}
-
-
-
-
 #' @include graph.R
 Context <- R6Class(
   'Context',
@@ -87,14 +33,11 @@ Context <- R6Class(
     .pid = NULL,
     .weak = NULL,
 
-    .otel_info = NULL,
-
     initialize = function(
       domain, label='', type='other', prevId='',
       reactId = rLog$noReactId,
       id = .getReactiveEnvironment()$nextId(), # For dummy context
-      weak = FALSE,
-      otel_info = ctx_otel_info_obj()
+      weak = FALSE
     ) {
       id <<- id
       .label <<- label
@@ -104,27 +47,16 @@ Context <- R6Class(
       .reactType <<- type
       .weak <<- weak
       rLog$createContext(id, label, type, prevId, domain)
-      if (!is.null(otel_info)) {
-        if (IS_SHINY_LOCAL_PKG) {
-          stopifnot(inherits(otel_info, "ctx_otel_info"))
-        }
-        .otel_info <<- otel_info
-      }
     },
     run = function(func) {
       "Run the provided function under this context."
 
-      # Use `promises::` as it shows up in the stack trace
       promises::with_promise_domain(reactivePromiseDomain(), {
         withReactiveDomain(.domain, {
-          with_otel_span_context(.otel_info, domain = .domain, {
-            captureStackTraces({
-              env <- .getReactiveEnvironment()
-              rLog$enter(.reactId, id, .reactType, .domain)
-              on.exit(rLog$exit(.reactId, id, .reactType, .domain), add = TRUE)
-              env$runWith(self, func)
-            })
-          })
+          env <- .getReactiveEnvironment()
+          rLog$enter(.reactId, id, .reactType, .domain)
+          on.exit(rLog$exit(.reactId, id, .reactType, .domain), add = TRUE)
+          env$runWith(self, func)
         })
       })
     },
@@ -291,13 +223,15 @@ wrapForContext <- function(func, ctx) {
 
   function(...) {
     .getReactiveEnvironment()$runWith(ctx, function() {
-      func(...)
+      captureStackTraces(
+        func(...)
+      )
     })
   }
 }
 
 reactivePromiseDomain <- function() {
-  new_promise_domain(
+  promises::new_promise_domain(
     wrapOnFulfilled = function(onFulfilled) {
       force(onFulfilled)
 

R/reactive-domains.R

@@ -45,8 +45,6 @@ createMockDomain <- function() {
   callbacks <- Callbacks$new()
   ended <- FALSE
   domain <- new.env(parent = emptyenv())
-  domain$ns <- function(id) id
-  domain$token <- "mock-domain"
   domain$onEnded <- function(callback) {
     return(callbacks$register(callback))
   }
@@ -97,11 +95,7 @@ getDefaultReactiveDomain <- function() {
 #' @rdname domains
 #' @export
 withReactiveDomain <- function(domain, expr) {
-  # Use `promises::` as it shows up in the stack trace
-  promises::with_promise_domain(
-    createVarPromiseDomain(.globals, "domain", domain),
-    expr
-  )
+  promises::with_promise_domain(createVarPromiseDomain(.globals, "domain", domain), expr)
 }
 
 #

R/reactives.R

@@ -79,26 +79,19 @@ ReactiveVal <- R6Class(
     dependents = NULL
   ),
   public = list(
-    .isRecordingOtel = FALSE, # Needs to be set by Shiny
-    .otelLabel = NULL, # Needs to be set by Shiny
-    .otelAttrs = NULL, # Needs to be set by Shiny
-
     initialize = function(value, label = NULL) {
       reactId <- nextGlobalReactId()
       private$reactId <- reactId
       private$value <- value
       private$label <- label
       private$dependents <- Dependents$new(reactId = private$reactId)
-
-      domain <- getDefaultReactiveDomain()
-      rLog$define(private$reactId, value, private$label, type = "reactiveVal", domain)
-      .otelLabel <<- otel_log_label_set_reactive_val(private$label, domain = domain)
+      rLog$define(private$reactId, value, private$label, type = "reactiveVal", getDefaultReactiveDomain())
     },
     get = function() {
       private$dependents$register()
 
       if (private$frozen)
-      reactiveStop()
+        reactiveStop()
 
       private$value
     },
@@ -106,16 +99,7 @@ ReactiveVal <- R6Class(
       if (identical(private$value, value)) {
         return(invisible(FALSE))
       }
-
-      domain <- getDefaultReactiveDomain()
-      if ((!is.null(domain)) && .isRecordingOtel) {
-        otel_log(
-          .otelLabel,
-          severity = "info",
-          attributes = c(private$.otelAttrs, otel_session_id_attrs(domain))
-        )
-      }
-      rLog$valueChange(private$reactId, value, domain)
+      rLog$valueChange(private$reactId, value, getDefaultReactiveDomain())
       private$value <- value
       private$dependents$invalidate()
       invisible(TRUE)
@@ -221,20 +205,13 @@ ReactiveVal <- R6Class(
 #'
 #' @export
 reactiveVal <- function(value = NULL, label = NULL) {
-  call_srcref <- get_call_srcref()
   if (missing(label)) {
-    label <- rassignSrcrefToLabel(
-      call_srcref,
-      defaultLabel = paste0("reactiveVal", createUniqueId(4))
-    )
+    call <- sys.call()
+    label <- rvalSrcrefToLabel(attr(call, "srcref", exact = TRUE))
   }
 
   rv <- ReactiveVal$new(value, label)
-  if (!is.null(call_srcref)) {
-    rv$.otelAttrs <- otel_srcref_attributes(call_srcref, fn_name = "reactiveVal")
-  }
-
-  ret <- structure(
+  structure(
     function(x) {
       if (missing(x)) {
         rv$get()
@@ -247,12 +224,6 @@ reactiveVal <- function(value = NULL, label = NULL) {
     label = label,
     .impl = rv
   )
-
-  if (has_otel_collect("reactivity")) {
-    ret <- enable_otel_reactive_val(ret)
-  }
-
-  ret
 }
 
 #' @rdname freezeReactiveValue
@@ -291,11 +262,8 @@ format.reactiveVal <- function(x, ...) {
 # assigned to (e.g. for `a <- reactiveVal()`, the result should be "a"). This
 # is a fragile, error-prone operation, so we default to a random label if
 # necessary.
-rassignSrcrefToLabel <- function(
-  srcref,
-  defaultLabel,
-  fnName = "([a-zA-Z0-9_.]+)"
-) {
+rvalSrcrefToLabel <- function(srcref,
+  defaultLabel = paste0("reactiveVal", createUniqueId(4))) {
 
   if (is.null(srcref))
     return(defaultLabel)
@@ -304,29 +272,22 @@ rassignSrcrefToLabel <- function(
   if (is.null(srcfile))
     return(defaultLabel)
 
-  src <- getSrcfileLines(srcfile, srcref)
-  lines <- src$lines
-  line_num <- src$line_num
-
-  if (is.null(lines))
+  if (is.null(srcfile$lines))
     return(defaultLabel)
 
+  lines <- srcfile$lines
   # When pasting at the Console, srcfile$lines is not split
   if (length(lines) == 1) {
     lines <- strsplit(lines, "\n")[[1]]
   }
 
-  if (length(lines) < line_num) {
+  if (length(lines) < srcref[1]) {
     return(defaultLabel)
   }
 
-  firstLine <- substring(lines[line_num], srcref[2] - 1)
+  firstLine <- substring(lines[srcref[1]], srcref[2] - 1)
 
-  m <- regexec(
-    # Require the first assignment within the line
-    paste0("^\\s*([^[:space:]]+)\\s*(<<-|<-|=)\\s*", fnName, "\\b"),
-    firstLine
-  )
+  m <- regexec("\\s*([^[:space:]]+)\\s*(<-|=)\\s*reactiveVal\\b", firstLine)
   if (m[[1]][1] == -1) {
     return(defaultLabel)
   }
@@ -369,9 +330,6 @@ ReactiveValues <- R6Class(
     # object, but it does not preserve order.
     .nameOrder = character(0),
 
-    .isRecordingOtel = FALSE, # Needs to be set by Shiny
-    .otelAttrs = NULL, # Needs to be set by Shiny
-
 
     initialize = function(
       dedupe = TRUE,
@@ -448,21 +406,6 @@ ReactiveValues <- R6Class(
         return(invisible())
       }
 
-      if ((!is.null(domain)) && .isRecordingOtel) {
-        if (
-          # Any reactiveValues (other than input or clientData) are fair game
-          !(.label == "input" || .label == "clientData") ||
-          # Do not include updates to input or clientData unless _some_ reactivity has occured
-          !is.null(domain$userData[["_otel_has_reactive_cleanup"]])
-        ) {
-          otel_log(
-            otel_log_label_set_reactive_values(.label, key, domain = domain),
-            severity = "info",
-            attributes = c(.otelAttrs, otel_session_id_attrs(domain))
-          )
-        }
-      }
-
       # If it's new, append key to the name order
       if (!key_exists) {
         .nameOrder[length(.nameOrder) + 1] <<- key
@@ -636,28 +579,10 @@ reactiveValues <- function(...) {
   if ((length(args) > 0) && (is.null(names(args)) || any(names(args) == "")))
     rlang::abort("All arguments passed to reactiveValues() must be named.")
 
-  values <- .createReactiveValues(ReactiveValues$new(), withOtel = FALSE)
+  values <- .createReactiveValues(ReactiveValues$new())
 
   # Use .subset2() instead of [[, to avoid method dispatch
-  impl <- .subset2(values, 'impl')
-
-  call_srcref <- get_call_srcref()
-  if (!is.null(call_srcref)) {
-    impl$.label <- rassignSrcrefToLabel(
-      call_srcref,
-      # Pass through the random default label created in ReactiveValues$new()
-      defaultLabel = impl$.label
-    )
-
-    impl$.otelAttrs <- otel_srcref_attributes(call_srcref, fn_name = "reactiveValues")
-  }
-
-  impl$mset(args)
-
-  # Add otel collection after `$mset()` so that we don't log the initial values
-  # Add otel collection after `.label` so that any logging uses the correct label
-  values <- maybeAddReactiveValuesOtel(values)
-
+  .subset2(values, 'impl')$mset(args)
   values
 }
 
@@ -672,11 +597,10 @@ checkName <- function(x) {
 # @param values A ReactiveValues object
 # @param readonly Should this object be read-only?
 # @param ns A namespace function (either `identity` or `NS(namespace)`)
-# @param withOtel Should otel collection be attempted?
 .createReactiveValues <- function(values = NULL, readonly = FALSE,
-  ns = identity, withOtel = TRUE) {
+  ns = identity) {
 
-  ret <- structure(
+  structure(
     list(
       impl = values,
       readonly = readonly,
@@ -684,20 +608,6 @@ checkName <- function(x) {
     ),
     class='reactivevalues'
   )
-
-  if (withOtel) {
-    ret <- maybeAddReactiveValuesOtel(ret)
-  }
-
-  ret
-}
-
-maybeAddReactiveValuesOtel <- function(x) {
-  if (!has_otel_collect("reactivity")) {
-    return(x)
-  }
-
-  enable_otel_reactive_values(x)
 }
 
 #' @export
@@ -921,10 +831,6 @@ Observable <- R6Class(
     .mostRecentCtxId = character(0),
     .ctx = 'Context',
 
-    .isRecordingOtel = FALSE, # Needs to be set by Shiny
-    .otelLabel = NULL, # Needs to be set by Shiny
-    .otelAttrs = NULL, # Needs to be set by Shiny
-
     initialize = function(func, label = deparse(substitute(func)),
                           domain = getDefaultReactiveDomain(),
                           ..stacktraceon = TRUE) {
@@ -979,19 +885,9 @@ Observable <- R6Class(
       simpleExprToFunction(fn_body(.origFunc), "reactive")
     },
     .updateValue = function() {
-      ctx <- Context$new(
-        .domain,
-        .label,
-        type = 'observable',
-        prevId = .mostRecentCtxId,
-        reactId = .reactId,
-        weak = TRUE,
-        otel_info = ctx_otel_info_obj(
-          isRecordingOtel = .isRecordingOtel,
-          otelLabel = .otelLabel,
-          otelAttrs = c(.otelAttrs, otel_session_id_attrs(.domain))
-        )
-      )
+      ctx <- Context$new(.domain, .label, type = 'observable',
+                         prevId = .mostRecentCtxId, reactId = .reactId,
+                         weak = TRUE)
       .mostRecentCtxId <<- ctx$id
 
       # A Dependency object will have a weak reference to the context, which
@@ -1024,15 +920,6 @@ Observable <- R6Class(
           },
 
           error = function(cond) {
-            if (.isRecordingOtel) {
-              # `cond` is too early in the stack to be updated by `ctx`'s
-              # `with_otel_span_context()` where it calls
-              # `set_otel_exception_status_and_throw()` on eval error.
-              # So we mark it as seen here.
-              # When the error is re-thrown later, it won't be a _new_ error
-              cond <- mark_otel_exception_as_seen(cond)
-            }
-
             # If an error occurs, we want to propagate the error, but we also
             # want to save a copy of it, so future callers of this reactive will
             # get the same error (i.e. the error is cached).
@@ -1064,10 +951,7 @@ Observable <- R6Class(
 #' See the [Shiny tutorial](https://shiny.rstudio.com/tutorial/) for
 #' more information about reactive expressions.
 #'
-#' @param x For `is.reactive()`, an object to test. For `reactive()`, an
-#'   expression. When passing in a [`rlang::quo()`]sure with `reactive()`,
-#'   remember to use [`rlang::inject()`] to distinguish that you are passing in
-#'   the content of your quosure, not the expression of the quosure.
+#' @param x For `is.reactive()`, an object to test. For `reactive()`, an expression. When passing in a [`quo()`]sure with `reactive()`, remember to use [`rlang::inject()`] to distinguish that you are passing in the content of your quosure, not the expression of the quosure.
 #' @template param-env
 #' @templateVar x x
 #' @templateVar env env
@@ -1130,24 +1014,12 @@ reactive <- function(
   label <- exprToLabel(userExpr, "reactive", label)
 
   o <- Observable$new(func, label, domain, ..stacktraceon = ..stacktraceon)
-
-  call_srcref <- get_call_srcref()
-  if (!is.null(call_srcref)) {
-    o$.otelAttrs <- otel_srcref_attributes(call_srcref, fn_name = "reactive")
-  }
-
-  ret <- structure(
+  structure(
     o$getValue,
     observable = o,
     cacheHint = list(userExpr = zap_srcref(userExpr)),
     class = c("reactiveExpr", "reactive", "function")
   )
-
-  if (has_otel_collect("reactivity")) {
-    ret <- enable_otel_reactive_expr(ret)
-  }
-
-  ret
 }
 
 # Given the srcref to a reactive expression, attempts to figure out what the
@@ -1155,7 +1027,7 @@ reactive <- function(
 # scans the line of code that started the reactive block and looks for something
 # that looks like assignment. If we fail, fall back to a default value (likely
 # the block of code in the body of the reactive).
-rexprSrcrefToLabel <- function(srcref, defaultLabel, fnName) {
+rexprSrcrefToLabel <- function(srcref, defaultLabel) {
   if (is.null(srcref))
     return(defaultLabel)
 
@@ -1163,26 +1035,22 @@ rexprSrcrefToLabel <- function(srcref, defaultLabel, fnName) {
   if (is.null(srcfile))
     return(defaultLabel)
 
-  src <- getSrcfileLines(srcfile, srcref)
-  lines <- src$lines
-  line_num <- src$line_num
-
-  if (is.null(lines))
+  if (is.null(srcfile$lines))
     return(defaultLabel)
 
+  lines <- srcfile$lines
   # When pasting at the Console, srcfile$lines is not split
   if (length(lines) == 1) {
     lines <- strsplit(lines, "\n")[[1]]
   }
 
-  if (length(lines) < line_num) {
+  if (length(lines) < srcref[1]) {
     return(defaultLabel)
   }
 
-  firstLine <- substring(lines[line_num], 1, srcref[2] - 1)
+  firstLine <- substring(lines[srcref[1]], 1, srcref[2] - 1)
 
-  # Require the assignment to be parsed from the start
-  m <- regexec(paste0("^(.*)(<<-|<-|=)\\s*", fnName, "\\s*\\($"), firstLine)
+  m <- regexec("(.*)(<-|=)\\s*reactive\\s*\\($", firstLine)
   if (m[[1]][1] == -1) {
     return(defaultLabel)
   }
@@ -1256,10 +1124,6 @@ Observer <- R6Class(
     .prevId = character(0),
     .ctx = NULL,
 
-    .isRecordingOtel = FALSE, # Needs to be set by Shiny
-    .otelLabel = NULL, # Needs to be set by Shiny
-    .otelAttrs = NULL, # Needs to be set by Shiny
-
     initialize = function(observerFunc, label, suspended = FALSE, priority = 0,
                           domain = getDefaultReactiveDomain(),
                           autoDestroy = TRUE, ..stacktraceon = TRUE) {
@@ -1294,18 +1158,7 @@ Observer <- R6Class(
       .createContext()$invalidate()
     },
     .createContext = function() {
-      ctx <- Context$new(
-        .domain,
-        .label,
-        type = 'observer',
-        prevId = .prevId,
-        reactId = .reactId,
-        otel_info = ctx_otel_info_obj(
-          isRecordingOtel = .isRecordingOtel,
-          otelLabel = .otelLabel,
-          otelAttrs = c(.otelAttrs, otel_session_id_attrs(.domain))
-        )
-      )
+      ctx <- Context$new(.domain, .label, type='observer', prevId=.prevId, reactId = .reactId)
       .prevId <<- ctx$id
 
       if (!is.null(.ctx)) {
@@ -1574,14 +1427,7 @@ observe <- function(
   check_dots_empty()
 
   func <- installExprFunction(x, "func", env, quoted)
-
-  call_srcref <- get_call_srcref()
-  if (is.null(label)) {
-    label <- rassignSrcrefToLabel(
-      call_srcref,
-      defaultLabel = funcToLabel(func, "observe", label)
-    )
-  }
+  label <- funcToLabel(func, "observe", label)
 
   o <- Observer$new(
     func,
@@ -1592,14 +1438,6 @@ observe <- function(
     autoDestroy = autoDestroy,
     ..stacktraceon = ..stacktraceon
   )
-  if (!is.null(call_srcref)) {
-    o$.otelAttrs <- otel_srcref_attributes(call_srcref, fn_name = "observe")
-  }
-
-  if (has_otel_collect("reactivity")) {
-    o <- enable_otel_observe(o)
-  }
-
   invisible(o)
 }
 
@@ -1987,64 +1825,34 @@ coerceToFunc <- function(x) {
 #' }
 #' @export
 reactivePoll <- function(intervalMillis, session, checkFunc, valueFunc) {
-  reactive_poll_impl(
-    fnName = "reactivePoll",
-    intervalMillis = intervalMillis,
-    session = session,
-    checkFunc = checkFunc,
-    valueFunc = valueFunc
-  )
-}
-
-reactive_poll_impl <- function(
-  fnName,
-  intervalMillis,
-  session,
-  checkFunc,
-  valueFunc
-) {
   intervalMillis <- coerceToFunc(intervalMillis)
 
-  fnName <- match.arg(fnName, c("reactivePoll", "reactiveFileReader"), several.ok = FALSE)
-
-  call_srcref <- get_call_srcref(-1)
-  label <- rassignSrcrefToLabel(
-    call_srcref,
-    defaultLabel = "<anonymous>",
-    fnName = fnName
-  )
+  rv <- reactiveValues(cookie = isolate(checkFunc()))
 
   re_finalized <- FALSE
   env <- environment()
 
-  with_no_otel_collect({
-    cookie <- reactiveVal(
-      isolate(checkFunc()),
-      label = sprintf("%s %s cookie", fnName, label)
-    )
+  o <- observe({
+    # When no one holds a reference to the reactive returned from
+    # reactivePoll, destroy and remove the observer so that it doesn't keep
+    # firing and hold onto resources.
+    if (re_finalized) {
+      o$destroy()
+      rm(o, envir = env)
+      return()
+    }
 
-    o <- observe({
-      # When no one holds a reference to the reactive returned from
-      # reactivePoll, destroy and remove the observer so that it doesn't keep
-      # firing and hold onto resources.
-      if (re_finalized) {
-        o$destroy()
-        rm(o, envir = env)
-        return()
-      }
-
-      cookie(checkFunc())
-      invalidateLater(intervalMillis(), session)
-    }, label = sprintf("%s %s cleanup", fnName, label))
+    rv$cookie <- checkFunc()
+    invalidateLater(intervalMillis(), session)
   })
 
-  re <- reactive(label = sprintf("%s %s", fnName, label), {
-    # Take a dependency on the cookie, so that when it changes, this
-    # reactive expression is invalidated.
-    cookie()
+  # TODO: what to use for a label?
+  re <- reactive({
+    rv$cookie
 
     valueFunc()
-  })
+
+  }, label = NULL)
 
   reg.finalizer(attr(re, "observable"), function(e) {
     re_finalized <<- TRUE
@@ -2054,16 +1862,6 @@ reactive_poll_impl <- function(
   # reference to `re` and thus prevent it from getting GC'd.
   on.exit(rm(re))
 
-  local({
-    impl <- attr(re, "observable", exact = TRUE)
-    impl$.otelLabel <-
-      if (fnName == "reactivePoll")
-        otel_label_reactive_poll(label, domain = impl$.domain)
-      else if (fnName == "reactiveFileReader")
-        otel_label_reactive_file_reader(label, domain = impl$.domain)
-    impl$.otelAttrs <- append_otel_srcref_attrs(impl$.otelAttrs, call_srcref, fn_name = fnName)
-  })
-
   return(re)
 }
 
@@ -2127,16 +1925,14 @@ reactiveFileReader <- function(intervalMillis, session, filePath, readFunc, ...)
   filePath <- coerceToFunc(filePath)
   extraArgs <- list2(...)
 
-  reactive_poll_impl(
-    fnName = "reactiveFileReader",
-    intervalMillis = intervalMillis,
-    session = session,
-    checkFunc = function() {
+  reactivePoll(
+    intervalMillis, session,
+    function() {
       path <- filePath()
       info <- file.info(path)
       return(paste(path, info$mtime, info$size))
     },
-    valueFunc = function() {
+    function() {
       do.call(readFunc, c(filePath(), extraArgs))
     }
   )
@@ -2218,8 +2014,6 @@ isolate <- function(expr) {
   } else {
     reactId <- rLog$noReactId
   }
-
-  # Do not track otel spans for `isolate()`
   ctx <- Context$new(getDefaultReactiveDomain(), '[isolate]', type='isolate', reactId = reactId)
   on.exit(ctx$invalidate())
   # Matching ..stacktraceon../..stacktraceoff.. pair
@@ -2498,41 +2292,26 @@ observeEvent <- function(eventExpr, handlerExpr,
   eventQ <- exprToQuo(eventExpr, event.env, event.quoted)
   handlerQ <- exprToQuo(handlerExpr, handler.env, handler.quoted)
 
-  call_srcref <- get_call_srcref()
-  if (is.null(label)) {
-    label <- rassignSrcrefToLabel(
-      call_srcref,
-      defaultLabel = quoToLabel(eventQ, "observeEvent", label)
-    )
-  }
+  label <- quoToLabel(eventQ, "observeEvent", label)
 
-  with_no_otel_collect({
-    handler <- inject(observe(
-      !!handlerQ,
-      label = label,
-      suspended = suspended,
-      priority = priority,
-      domain = domain,
-      autoDestroy = TRUE,
-      ..stacktraceon = TRUE
-    ))
+  handler <- inject(observe(
+    !!handlerQ,
+    label = label,
+    suspended = suspended,
+    priority = priority,
+    domain = domain,
+    autoDestroy = TRUE,
+    ..stacktraceon = FALSE # TODO: Does this go in the bindEvent?
+  ))
 
-    o <- inject(bindEvent(
-      ignoreNULL = ignoreNULL,
-      ignoreInit = ignoreInit,
-      once = once,
-      label = label,
-      !!eventQ,
-      x = handler
-    ))
-  })
-
-  if (!is.null(call_srcref)) {
-    o$.otelAttrs <- otel_srcref_attributes(call_srcref, fn_name = "observeEvent")
-  }
-  if (has_otel_collect("reactivity")) {
-    o <- enable_otel_observe(o)
-  }
+  o <- inject(bindEvent(
+    ignoreNULL = ignoreNULL,
+    ignoreInit = ignoreInit,
+    once = once,
+    label = label,
+    !!eventQ,
+    x = handler
+  ))
 
   invisible(o)
 }
@@ -2551,40 +2330,15 @@ eventReactive <- function(eventExpr, valueExpr,
   eventQ <- exprToQuo(eventExpr, event.env, event.quoted)
   valueQ <- exprToQuo(valueExpr, value.env, value.quoted)
 
-  func <- installExprFunction(eventExpr, "func", event.env, event.quoted, wrappedWithLabel = FALSE)
-  # Attach a label and a reference to the original user source for debugging
-  userEventExpr <- fn_body(func)
+  label <- quoToLabel(eventQ, "eventReactive", label)
 
-  call_srcref <- get_call_srcref()
-  if (is.null(label)) {
-    label <- rassignSrcrefToLabel(
-      call_srcref,
-      defaultLabel = exprToLabel(userEventExpr, "eventReactive", label)
-    )
-  }
-
-  with_no_otel_collect({
-    value_r <- inject(reactive(!!valueQ, domain = domain, label = label))
-
-    r <- inject(bindEvent(
-      ignoreNULL = ignoreNULL,
-      ignoreInit = ignoreInit,
-      label = label,
-      !!eventQ,
-      x = value_r
-    ))
-  })
-
-  if (!is.null(call_srcref)) {
-    impl <- attr(r, "observable", exact = TRUE)
-    impl$.otelAttrs <- otel_srcref_attributes(call_srcref, fn_name = "eventReactive")
-  }
-  if (has_otel_collect("reactivity")) {
-    r <- enable_otel_reactive_expr(r)
-  }
-
-
-  return(r)
+  invisible(inject(bindEvent(
+    ignoreNULL = ignoreNULL,
+    ignoreInit = ignoreInit,
+    label = label,
+    !!eventQ,
+    x = reactive(!!valueQ, domain = domain, label = label)
+  )))
 }
 
 isNullEvent <- function(value) {
@@ -2699,103 +2453,71 @@ isNullEvent <- function(value) {
 #'
 #' @export
 debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomain()) {
-  # Do not bind OpenTelemetry spans for debounce reactivity internals,
-  # except for the eventReactive that is returned.
+
+  # TODO: make a nice label for the observer(s)
 
   force(r)
   force(millis)
 
-  call_srcref <- get_call_srcref()
-  label <- rassignSrcrefToLabel(
-    call_srcref,
-    defaultLabel = "<anonymous>"
-  )
-
   if (!is.function(millis)) {
     origMillis <- millis
     millis <- function() origMillis
   }
 
-  with_no_otel_collect({
-    trigger <- reactiveVal(NULL, label = sprintf("debounce %s trigger", label))
-    # the deadline for the timer to fire; NULL if not scheduled
-    when <- reactiveVal(NULL, label = sprintf("debounce %s when", label))
-
-    # Responsible for tracking when r() changes.
-    firstRun <- TRUE
-    observe(
-      label = sprintf("debounce %s tracker", label),
-      domain = domain,
-      priority = priority,
-      {
-        if (firstRun) {
-          # During the first run we don't want to set `when`, as this will kick
-          # off the timer. We only want to do that when we see `r()` change.
-          firstRun <<- FALSE
-
-          # Ensure r() is called only after setting firstRun to FALSE since r()
-          # may throw an error
-          try(r(), silent = TRUE)
-          return()
-        }
-        # This ensures r() is still tracked after firstRun
-        try(r(), silent = TRUE)
-
-        # The value (or possibly millis) changed. Start or reset the timer.
-        when(
-          getDomainTimeMs(domain) + millis()
-        )
-      }
-    )
-
-    # This observer is the timer. It rests until `when` elapses, then touches
-    # `trigger`.
-    observe(
-      label = sprintf("debounce %s timer", label),
-      domain = domain,
-      priority = priority,
-      {
-        if (is.null(when()))
-          return()
-
-        now <- getDomainTimeMs(domain)
-        if (now >= when()) {
-          # Mod by 999999999 to get predictable overflow behavior
-          trigger(
-            isolate(trigger() %||% 0) %% 999999999 + 1
-          )
-          when(NULL)
-        } else {
-          invalidateLater(when() - now)
-        }
-      }
-    )
-
-  })
-
-  # This is the actual reactive that is returned to the user. It returns the
-  # value of r(), but only invalidates/updates when `trigger` is touched.
-  er <- eventReactive(
-    {trigger()}, {r()},
-    label = sprintf("debounce %s result", label), ignoreNULL = FALSE, domain = domain
+  v <- reactiveValues(
+    trigger = NULL,
+    when = NULL # the deadline for the timer to fire; NULL if not scheduled
   )
 
-  # Update the otel label
-  local({
-    er_impl <- attr(er, "observable", exact = TRUE)
-    er_impl$.otelLabel <- otel_label_debounce(label, domain = domain)
-    er_impl$.otelAttrs <- append_otel_srcref_attrs(er_impl$.otelAttrs, call_srcref, fn_name = "debounce")
-  })
+  # Responsible for tracking when r() changes.
+  firstRun <- TRUE
+  observe({
+    if (firstRun) {
+      # During the first run we don't want to set v$when, as this will kick off
+      # the timer. We only want to do that when we see r() change.
+      firstRun <<- FALSE
 
-  with_no_otel_collect({
-    # Force the value of er to be immediately cached upon creation. It's very hard
-    # to explain why this observer is needed, but if you want to understand, try
-    # commenting it out and studying the unit test failure that results.
-    primer <- observe({
-      primer$destroy()
-      try(er(), silent = TRUE)
-    }, label = sprintf("debounce %s primer", label), domain = domain, priority = priority)
-  })
+      # Ensure r() is called only after setting firstRun to FALSE since r()
+      # may throw an error
+      try(r(), silent = TRUE)
+      return()
+    }
+    # This ensures r() is still tracked after firstRun
+    try(r(), silent = TRUE)
+
+    # The value (or possibly millis) changed. Start or reset the timer.
+    v$when <- getDomainTimeMs(domain) + millis()
+  }, label = "debounce tracker", domain = domain, priority = priority)
+
+  # This observer is the timer. It rests until v$when elapses, then touches
+  # v$trigger.
+  observe({
+    if (is.null(v$when))
+      return()
+
+    now <- getDomainTimeMs(domain)
+    if (now >= v$when) {
+      # Mod by 999999999 to get predictable overflow behavior
+      v$trigger <- isolate(v$trigger %||% 0) %% 999999999 + 1
+      v$when <- NULL
+    } else {
+      invalidateLater(v$when - now)
+    }
+  }, label = "debounce timer", domain = domain, priority = priority)
+
+  # This is the actual reactive that is returned to the user. It returns the
+  # value of r(), but only invalidates/updates when v$trigger is touched.
+  er <- eventReactive(v$trigger, {
+    r()
+  }, label = "debounce result", ignoreNULL = FALSE, domain = domain)
+
+  # Force the value of er to be immediately cached upon creation. It's very hard
+  # to explain why this observer is needed, but if you want to understand, try
+  # commenting it out and studying the unit test failure that results.
+  primer <- observe({
+    primer$destroy()
+    try(er(), silent = TRUE)
+  }, label = "debounce primer", domain = domain, priority = priority)
 
   er
 }
@@ -2803,88 +2525,69 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
 #' @rdname debounce
 #' @export
 throttle <- function(r, millis, priority = 100, domain = getDefaultReactiveDomain()) {
-  # Do not bind OpenTelemetry spans for throttle reactivity internals,
-  # except for the eventReactive that is returned.
+
+  # TODO: make a nice label for the observer(s)
 
   force(r)
   force(millis)
 
-  call_srcref <- get_call_srcref()
-  label <- rassignSrcrefToLabel(
-    call_srcref,
-    defaultLabel = "<anonymous>"
-  )
-
   if (!is.function(millis)) {
     origMillis <- millis
     millis <- function() origMillis
   }
 
-  with_no_otel_collect({
-    trigger <- reactiveVal(0, label = sprintf("throttle %s trigger", label))
-    # Last time we fired; NULL if never
-    lastTriggeredAt <- reactiveVal(NULL, label = sprintf("throttle %s last triggered at", label))
-    # If TRUE, trigger again when timer elapses
-    pending <- reactiveVal(FALSE, label = sprintf("throttle %s pending", label))
-  })
+  v <- reactiveValues(
+    trigger = 0,
+    lastTriggeredAt = NULL, # Last time we fired; NULL if never
+    pending = FALSE # If TRUE, trigger again when timer elapses
+  )
 
   blackoutMillisLeft <- function() {
-    if (is.null(lastTriggeredAt())) {
+    if (is.null(v$lastTriggeredAt)) {
       0
     } else {
-      max(0, lastTriggeredAt() + millis() - getDomainTimeMs(domain))
+      max(0, v$lastTriggeredAt + millis() - getDomainTimeMs(domain))
     }
   }
 
-  update_trigger <- function() {
-    lastTriggeredAt(getDomainTimeMs(domain))
+  trigger <- function() {
+    v$lastTriggeredAt <- getDomainTimeMs(domain)
     # Mod by 999999999 to get predictable overflow behavior
-    trigger(isolate(trigger()) %% 999999999 + 1)
-    pending(FALSE)
+    v$trigger <- isolate(v$trigger) %% 999999999 + 1
+    v$pending <- FALSE
   }
 
-  with_no_otel_collect({
-    # Responsible for tracking when f() changes.
-    observeEvent(try(r(), silent = TRUE), {
-      if (pending()) {
-        # In a blackout period and someone already scheduled; do nothing
-      } else if (blackoutMillisLeft() > 0) {
-        # In a blackout period but this is the first change in that period; set
-        # pending so that a trigger will be scheduled at the end of the period
-        pending(TRUE)
-      } else {
-        # Not in a blackout period. Trigger, which will start a new blackout
-        # period.
-        update_trigger()
-      }
-    }, label = sprintf("throttle %s tracker", label), ignoreNULL = FALSE, priority = priority, domain = domain)
+  # Responsible for tracking when f() changes.
+  observeEvent(try(r(), silent = TRUE), {
+    if (v$pending) {
+      # In a blackout period and someone already scheduled; do nothing
+    } else if (blackoutMillisLeft() > 0) {
+      # In a blackout period but this is the first change in that period; set
+      # v$pending so that a trigger will be scheduled at the end of the period
+      v$pending <- TRUE
+    } else {
+      # Not in a blackout period. Trigger, which will start a new blackout
+      # period.
+      trigger()
+    }
+  }, label = "throttle tracker", ignoreNULL = FALSE, priority = priority, domain = domain)
 
-    observe({
-      if (!pending()) {
-        return()
-      }
+  observe({
+    if (!v$pending) {
+      return()
+    }
 
-      timeout <- blackoutMillisLeft()
-      if (timeout > 0) {
-        invalidateLater(timeout)
-      } else {
-        update_trigger()
-      }
-    }, label = sprintf("throttle %s trigger", label), priority = priority, domain = domain)
-  })
+    timeout <- blackoutMillisLeft()
+    if (timeout > 0) {
+      invalidateLater(timeout)
+    } else {
+      trigger()
+    }
+  }, priority = priority, domain = domain)
 
   # This is the actual reactive that is returned to the user. It returns the
-  # value of r(), but only invalidates/updates when trigger is touched.
-  er <- eventReactive({trigger()}, {
+  # value of r(), but only invalidates/updates when v$trigger is touched.
+  eventReactive(v$trigger, {
     r()
-  }, label = sprintf("throttle %s result", label), ignoreNULL = FALSE, domain = domain)
-
-  # Update the otel label
-  local({
-    er_impl <- attr(er, "observable", exact = TRUE)
-    er_impl$.otelLabel <- otel_label_throttle(label, domain = domain)
-    er_impl$.otelAttrs <- append_otel_srcref_attrs(er_impl$.otelAttrs, call_srcref, fn_name = "throttle")
-  })
-
-  er
+  }, label = "throttle result", ignoreNULL = FALSE, domain = domain)
 }

R/render-plot.R

@@ -253,7 +253,7 @@ drawPlot <- function(name, session, func, width, height, alt, pixelratio, res, .
 
   hybrid_chain(
     hybrid_chain(
-      with_promise_domain(domain, {
+      promises::with_promise_domain(domain, {
         hybrid_chain(
           func(),
           function(value) {
@@ -266,8 +266,6 @@ drawPlot <- function(name, session, func, width, height, alt, pixelratio, res, .
               # addition to ggplot, and there's a print method for that class, that we
               # won't override that method. https://github.com/rstudio/shiny/issues/841
               print.ggplot <- custom_print.ggplot
-              # For compatibility with ggplot2 >v4.0.0
-              `print.ggplot2::ggplot` <- custom_print.ggplot
 
               # Use capture.output to squelch printing to the actual console; we
               # are only interested in plot output

R/runapp.R

@@ -46,12 +46,6 @@
 #'   only used for recording or running automated tests. Defaults to the
 #'   `shiny.testmode` option, or FALSE if the option is not set.
 #'
-#' @return The value passed to [stopApp()], or throws an error if the app was
-#'   stopped with an error.
-#'
-#' @seealso [startApp()] for non-blocking mode, [stopApp()] to stop a running
-#'   app.
-#'
 #' @examples
 #' \dontrun{
 #' # Start app in the current working directory
@@ -90,23 +84,18 @@
 #'   runApp(app)
 #' }
 #' @export
-runApp <- function(
-  appDir=getwd(),
-  port=getOption('shiny.port'),
-  launch.browser = getOption('shiny.launch.browser', interactive()),
-  host=getOption('shiny.host', '127.0.0.1'),
-  workerId="", quiet=FALSE,
-  display.mode=c("auto", "normal", "showcase"),
-  test.mode=getOption('shiny.testmode', FALSE)
-) {
-  # * Wrap **all** execution of the app inside the otel promise domain
-  # * While this could be done at a lower level, it allows for _anything_ within
-  #   shiny's control to allow for the opportunity to have otel active spans be
-  #   reactivated upon promise domain restoration
-  promises::local_otel_promise_domain()
+runApp <- function(appDir=getwd(),
+                   port=getOption('shiny.port'),
+                   launch.browser = getOption('shiny.launch.browser', interactive()),
+                   host=getOption('shiny.host', '127.0.0.1'),
+                   workerId="", quiet=FALSE,
+                   display.mode=c("auto", "normal", "showcase"),
+                   test.mode=getOption('shiny.testmode', FALSE)) {
+  on.exit({
+    handlerManager$clear()
+  }, add = TRUE)
 
-  # Check for nested blocking runApp() before sourcing app code
-  if (isRunning() && is.null(.globals$runningHandle)) {
+  if (isRunning()) {
     stop("Can't call `runApp()` from within `runApp()`. If your ",
          "application code contains `runApp()`, please remove it.")
   }
@@ -118,13 +107,14 @@ runApp <- function(
     warn = max(1, getOption("warn", default = 1)),
     pool.scheduler = scheduleTask
   )
+  on.exit(options(ops), add = TRUE)
 
-  # Ensure options are restored and onStop callbacks fire even if
-  # as.shiny.appobj() errors. Once .setupShinyApp() succeeds, the returned
-  # cleanup function takes over and this guard becomes a no-op.
-  setupComplete <- FALSE
-  on.exit(if (!setupComplete) {
-    options(ops)
+  # ============================================================================
+  # Global onStart/onStop callbacks
+  # ============================================================================
+  # Invoke user-defined onStop callbacks, before the application's internal
+  # onStop callbacks.
+  on.exit({
     .globals$onStopCallbacks$invoke()
     .globals$onStopCallbacks <- Callbacks$new()
   }, add = TRUE)
@@ -136,140 +126,32 @@ runApp <- function(
   # ============================================================================
   appParts <- as.shiny.appobj(appDir)
 
-  result <- .setupShinyApp(
-    appDir, appParts, port, launch.browser, host,
-    workerId, quiet, display.mode, test.mode, ops = ops
-  )
-  setupComplete <- TRUE
-  on.exit(result$cleanup(), add = TRUE)
+  # ============================================================================
+  # Initialize app state object
+  # ============================================================================
+  # This is so calls to getCurrentAppState() can be used to find (A) whether an
+  # app is running and (B), get options and data associated with the app.
+  initCurrentAppState(appParts)
+  on.exit(clearCurrentAppState(), add = TRUE)
+  # Any shinyOptions set after this point will apply to the current app only
+  # (and will not persist after the app stops).
 
   # ============================================================================
-  # Run event loop via httpuv
+  # shinyOptions
   # ============================================================================
-  # Top-level ..stacktraceoff..; matches with ..stacktraceon in observe(),
-  # reactive(), Callbacks$invoke(), and others
-  ..stacktraceoff..(
-    captureStackTraces({
-      while (!.globals$stopped) {
-        ..stacktracefloor..(serviceApp())
-      }
-    })
-  )
+  # A unique identifier associated with this run of this application. It is
+  # shared across sessions.
+  shinyOptions(appToken = createUniqueId(8))
 
-  if (isTRUE(.globals$reterror)) {
-    stop(.globals$retval)
-  } else if (.globals$retval$visible) {
-    .globals$retval$value
-  } else {
-    invisible(.globals$retval$value)
+  # Set up default cache for app.
+  if (is.null(getShinyOption("cache", default = NULL))) {
+    shinyOptions(cache = cachem::cache_mem(max_size = 200 * 1024^2))
   }
-}
 
-#' Start Shiny Application (Non-Blocking)
-#'
-#' Starts a Shiny application in non-blocking mode, returning a
-#' `ShinyAppHandle` immediately while the app runs in the background.
-#' The `later` event loop services the app, so the R console remains
-#' available for interaction.
-#'
-#' @inheritParams runApp
-#'
-#' @return A `ShinyAppHandle` object with methods `stop()`, `status()`,
-#'   `url()`, and `result()`. The `status()` method returns `"running"`,
-#'   `"success"`, or `"error"`. The `result()` method throws an error if called
-#'   while running, or re-throws the error if the app stopped with an error.
-#'
-#' @examples
-#' \dontrun{
-#' # Start app in the background
-#' handle <- startApp("myapp")
-#'
-#' # Check status
-#' handle$status()
-#' handle$url()
-#'
-#' # Stop the app
-#' handle$stop()
-#' }
-#'
-#' @seealso [runApp()] for blocking mode, [stopApp()] to stop a running app.
-#' @export
-startApp <- function(
-  appDir = getwd(),
-  port = getOption("shiny.port"),
-  launch.browser = getOption("shiny.launch.browser", interactive()),
-  host = getOption("shiny.host", "127.0.0.1"),
-  workerId = "",
-  quiet = FALSE,
-  display.mode = c("auto", "normal", "showcase"),
-  test.mode = getOption("shiny.testmode", FALSE)
-) {
-  # OTEL: `local_otel_promise_domain()` ties its lifetime to this frame,
-  # which exits as soon as the handle is returned — before any request is
-  # served. A persistent global install would instead leak into unrelated
-  # user promises between ticks. Wrap the synchronous setup below (covers
-  # onStart) and each service iteration in `serviceNonBlocking()` (covers
-  # handlers and observers). The domain is dormant between ticks, so it
-  # stays out of user promises created at the console.
-
-  # Make warnings print immediately
-  # Set pool.scheduler to support pool package
-  ops <- options(
-    # Raise warn level to 1, but don't lower it
-    warn = max(1, getOption("warn", default = 1)),
-    pool.scheduler = scheduleTask
-  )
-
-  # Ensure options are restored and onStop callbacks fire even if
-  # as.shiny.appobj() errors. See matching guard in runApp().
-  setupComplete <- FALSE
-  on.exit(if (!setupComplete) {
-    options(ops)
-    .globals$onStopCallbacks$invoke()
-    .globals$onStopCallbacks <- Callbacks$new()
-  }, add = TRUE)
-
-  require(shiny)
-
-  result <- promises::with_otel_promise_domain({
-    appParts <- as.shiny.appobj(appDir)
-    .setupShinyApp(
-      appDir, appParts, port, launch.browser, host,
-      workerId, quiet, display.mode, test.mode, ops = ops
-    )
-  })
-  setupComplete <- TRUE
-
-  handle <- ShinyAppHandle$new(result$appUrl, result$cleanup)
-  .globals$runningHandle <- handle
-  serviceNonBlocking(handle, .globals$serviceGeneration)
-  handle
-}
-
-# Shared initialization for runApp() and startApp().
-# Handles all app setup: options, state, httpuv server, browser launch, etc.
-# Returns list(appUrl, cleanup) where cleanup() tears down the app.
-# On setup failure, internal on.exit handlers clean up partial state.
-.setupShinyApp <- function(appDir, appParts, port, launch.browser, host,
-                           workerId, quiet, display.mode, test.mode, ops,
-                           caller = parent.frame()) {
-  # Guard on.exit handlers with this flag so they only fire on setup failure.
-  # On success, cleanup responsibility is handed to the caller via the
-  # returned cleanup function.
-  cleanupOnExit <- TRUE
-
-  on.exit(if (cleanupOnExit) handlerManager$clear(), add = TRUE)
-
-  if (isRunning()) {
-    if (!is.null(.globals$runningHandle)) {
-      message("Stopping running Shiny app.")
-      .globals$runningHandle$stop()
-    } else {
-      stop("Can't start a new app while another is running. ",
-           "If your application code contains `runApp()` or `startApp()`, remove it. ",
-           "Otherwise, stop the current app first with stopApp().")
-    }
-  }
+  # Extract appOptions (which is a list) and store them as shinyOptions, for
+  # this app. (This is the only place we have to store settings that are
+  # accessible both the UI and server portion of the app.)
+  applyCapturedAppOptions(appParts$appOptions)
 
   # ============================================================================
   # runApp options set via shinyApp(options = list(...))
@@ -291,55 +173,25 @@ startApp <- function(
   # | no          | yes       | use runApp   | if it's not missing (runApp specifies), use those                                                                                      |
   # | yes         | yes       | use runApp   | if it's not missing (runApp specifies), use those                                                                                      |
   #
-  # `missing()` runs in the caller's frame: with defaults on the outer
-  # formals, arguments are no longer missing by the time they reach here.
+  # I tried to make this as compact and intuitive as possible,
+  # given that there are four distinct possibilities to check
   appOps <- appParts$options
   findVal <- function(arg, default) {
     if (arg %in% names(appOps)) appOps[[arg]] else default
   }
-  if (evalq(missing(port), caller))           port <- findVal("port", port)
-  if (evalq(missing(launch.browser), caller)) launch.browser <- findVal("launch.browser", launch.browser)
-  if (evalq(missing(host), caller))           host <- findVal("host", host)
-  if (evalq(missing(quiet), caller))          quiet <- findVal("quiet", quiet)
-  if (evalq(missing(display.mode), caller))   display.mode <- findVal("display.mode", display.mode)
-  if (evalq(missing(test.mode), caller))      test.mode <- findVal("test.mode", test.mode)
 
-  on.exit(if (cleanupOnExit) options(ops), add = TRUE)
-
-  # ============================================================================
-  # Global onStart/onStop callbacks
-  # ============================================================================
-  on.exit(if (cleanupOnExit) {
-    .globals$onStopCallbacks$invoke()
-    .globals$onStopCallbacks <- Callbacks$new()
-  }, add = TRUE)
-
-  # ============================================================================
-  # Initialize app state object
-  # ============================================================================
-  # This is so calls to getCurrentAppState() can be used to find (A) whether an
-  # app is running and (B), get options and data associated with the app.
-  initCurrentAppState(appParts)
-  on.exit(if (cleanupOnExit) clearCurrentAppState(), add = TRUE)
-  # Any shinyOptions set after this point will apply to the current app only
-  # (and will not persist after the app stops).
-
-  # ============================================================================
-  # shinyOptions
-  # ============================================================================
-  # A unique identifier associated with this run of this application. It is
-  # shared across sessions.
-  shinyOptions(appToken = createUniqueId(8))
-
-  # Set up default cache for app.
-  if (is.null(getShinyOption("cache", default = NULL))) {
-    shinyOptions(cache = cachem::cache_mem(max_size = 200 * 1024^2))
-  }
-
-  # Extract appOptions (which is a list) and store them as shinyOptions, for
-  # this app. (This is the only place we have to store settings that are
-  # accessible both the UI and server portion of the app.)
-  applyCapturedAppOptions(appParts$appOptions)
+  if (missing(port))
+    port <- findVal("port", port)
+  if (missing(launch.browser))
+    launch.browser <- findVal("launch.browser", launch.browser)
+  if (missing(host))
+    host <- findVal("host", host)
+  if (missing(quiet))
+    quiet <- findVal("quiet", quiet)
+  if (missing(display.mode))
+    display.mode <- findVal("display.mode", display.mode)
+  if (missing(test.mode))
+    test.mode <- findVal("test.mode", test.mode)
 
   if (is.null(host) || is.na(host)) host <- '0.0.0.0'
 
@@ -355,14 +207,8 @@ startApp <- function(
     # any valid version.
     ver <- Sys.getenv('SHINY_SERVER_VERSION')
     if (utils::compareVersion(ver, .shinyServerMinVersion) < 0) {
-      rlang::warn(c(
-        sprintf(
-          "Shiny Server v%s or later is required; please upgrade.",
-          .shinyServerMinVersion
-        ),
-        "i" = "If you are not using Shiny Server, you are likely seeing this message because the `SHINY_PORT` environment variable is set in your environment.",
-        "i" = "Avoid using `SHINY_PORT` to prevent this warning."
-      ))
+      warning('Shiny Server v', .shinyServerMinVersion,
+              ' or later is required; please upgrade!')
     }
   }
 
@@ -425,7 +271,7 @@ startApp <- function(
 
   # If display mode is specified as an argument, apply it (overriding the
   # value specified in DESCRIPTION, if any).
-  display.mode <- match.arg(display.mode, c("auto", "normal", "showcase"))
+  display.mode <- match.arg(display.mode)
   if (display.mode == "normal") {
     setShowcaseDefault(0)
   }
@@ -479,21 +325,24 @@ startApp <- function(
   # onStart/onStop callbacks
   # ============================================================================
   # Set up the onStop before we call onStart, so that it gets called even if an
-  # error happens in onStart or later during startup.
+  # error happens in onStart.
   if (!is.null(appParts$onStop))
-    on.exit(if (cleanupOnExit) appParts$onStop(), add = TRUE)
+    on.exit(appParts$onStop(), add = TRUE)
   if (!is.null(appParts$onStart))
     appParts$onStart()
 
   # ============================================================================
-  # Start httpuv app
+  # Start/stop httpuv app
   # ============================================================================
-  server <- startHttpuvApp(appParts, port, host, quiet)
+  server <- startApp(appParts, port, host, quiet)
 
   # Make the httpuv server object accessible. Needed for calling
   # addResourcePath while app is running.
   shinyOptions(server = server)
-  on.exit(if (cleanupOnExit) stopServer(server), add = TRUE)
+
+  on.exit({
+    stopServer(server)
+  }, add = TRUE)
 
   # ============================================================================
   # Launch web browser
@@ -524,52 +373,39 @@ startApp <- function(
   # Application hooks
   # ============================================================================
   callAppHook("onAppStart", appUrl)
-  on.exit(if (cleanupOnExit) callAppHook("onAppStop", appUrl), add = TRUE)
+  on.exit({
+    callAppHook("onAppStop", appUrl)
+  }, add = TRUE)
 
-  # Initialize globals used by the event loop and stopApp()
+  # ============================================================================
+  # Run event loop via httpuv
+  # ============================================================================
   .globals$reterror <- NULL
   .globals$retval <- NULL
   .globals$stopped <- FALSE
-
-  # Invalidate any stale non-blocking service loops from a previous app.
-  # Each app launch gets a fresh generation so old callbacks become no-ops.
-  .globals$serviceGeneration <- (.globals$serviceGeneration %||% 0L) + 1L
-
-  # Setup complete - disable on.exit cleanup, hand off to caller
-  cleanupOnExit <- FALSE
-
-  list(
-    appUrl = appUrl,
-    cleanup = .createCleanup(server, appParts, appUrl, ops)
+  # Top-level ..stacktraceoff..; matches with ..stacktraceon in observe(),
+  # reactive(), Callbacks$invoke(), and others
+  ..stacktraceoff..(
+    captureStackTraces({
+      while (!.globals$stopped) {
+        ..stacktracefloor..(serviceApp())
+      }
+    })
   )
-}
 
-# Consolidated cleanup function for app teardown
-.createCleanup <- function(server, appParts, appUrl, ops) {
-  cleanedUp <- FALSE
-  function() {
-    if (cleanedUp) return()
-    cleanedUp <<- TRUE
-
-    .globals$stopped <- TRUE
-    .globals$runningHandle <- NULL
-    handlerManager$clear()
-    options(ops)
-    .globals$onStopCallbacks$invoke()
-    .globals$onStopCallbacks <- Callbacks$new()
-    clearCurrentAppState()
-    if (!is.null(appParts$onStop)) appParts$onStop()
-    stopServer(server)
-    callAppHook("onAppStop", appUrl)
+  if (isTRUE(.globals$reterror)) {
+    stop(.globals$retval)
   }
+  else if (.globals$retval$visible)
+    .globals$retval$value
+  else
+    invisible(.globals$retval$value)
 }
 
 #' Stop the currently running Shiny app
 #'
 #' Stops the currently running Shiny app, returning control to the caller of
-#' [runApp()]. Despite the similar names, `stopApp()` is not the
-#' counterpart of [startApp()] — it is the counterpart of [runApp()],
-#' controlling its return value via `returnValue`.
+#' [runApp()].
 #'
 #' @param returnValue The value that should be returned from
 #'   [runApp()].
@@ -609,9 +445,7 @@ stopApp <- function(returnValue = invisible()) {
 #' @param host The IPv4 address that the application should listen on. Defaults
 #'   to the `shiny.host` option, if set, or `"127.0.0.1"` if not.
 #' @param display.mode The mode in which to display the example. Defaults to
-#'   `"auto"`, which uses the value of `DisplayMode` in the example's
-#'   `DESCRIPTION` file. Set to `"showcase"` to show the app code and
-#'   description with the running app, or `"normal"` to see the example without
+#'   `showcase`, but may be set to `normal` to see the example without
 #'   code or commentary.
 #' @param package The package in which to find the example (defaults to
 #'   `"shiny"`).

R/server.R

@@ -274,20 +274,15 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
                 args <- argsForServerFunc(serverFunc, shinysession)
 
                 withReactiveDomain(shinysession, {
-                  otel_span_session_start(domain = shinysession, {
-
-                    do.call(
-                      # No corresponding ..stacktraceoff; the server func is pure
-                      # user code
-                      wrapFunctionLabel(appvars$server, "server",
-                        ..stacktraceon = TRUE
-                      ),
-                      args
-                    )
-
-                  })
+                  do.call(
+                    # No corresponding ..stacktraceoff; the server func is pure
+                    # user code
+                    wrapFunctionLabel(appvars$server, "server",
+                      ..stacktraceon = TRUE
+                    ),
+                    args
+                  )
                 })
-
               })
             },
             update = {
@@ -387,7 +382,7 @@ removeSubApp <- function(path) {
   handlerManager$removeWSHandler(path)
 }
 
-startHttpuvApp <- function(appObj, port, host, quiet) {
+startApp <- function(appObj, port, host, quiet) {
   appHandlers <- createAppHandlers(appObj$httpHandler, appObj$serverFuncSource)
   handlerManager$addHandler(appHandlers$http, "/", tail = TRUE)
   handlerManager$addWSHandler(appHandlers$ws, "/", tail = TRUE)
@@ -479,12 +474,9 @@ startHttpuvApp <- function(appObj, port, host, quiet) {
   }
 }
 
-# Run an application that was created by \code{\link{startHttpuvApp}}. This
+# Run an application that was created by \code{\link{startApp}}. This
 # function should normally be called in a \code{while(TRUE)} loop.
-serviceApp <- function(
-  # rely on lazy evaluation for maximum efficiency
-  timeout = max(1, min(maxTimeout, timerCallbacks$timeToNextEvent(), later::next_op_secs()))
-) {
+serviceApp <- function() {
   timerCallbacks$executeElapsed()
 
   flushReact()
@@ -494,58 +486,13 @@ serviceApp <- function(
   # to keep the session responsive to user input
   maxTimeout <- ifelse(interactive(), 100, 1000)
 
+  timeout <- max(1, min(maxTimeout, timerCallbacks$timeToNextEvent(), later::next_op_secs()))
   service(timeout)
 
   flushReact()
   flushPendingSessions()
 }
 
-# Non-blocking service loop using later callbacks.
-# Uses 1ms delay between iterations to yield CPU for console interaction.
-# The generation token (incremented on every runApp() call) ensures that when
-# a new app starts, any stale service loop from a previous non-blocking app
-# exits cleanly instead of continuing to run.
-# Each iteration wraps `serviceApp()` in `with_otel_promise_domain()` so the
-# OTEL domain is active while Shiny processes its own work — handlers,
-# later callbacks, promise fulfillments — all executed synchronously inside
-# `serviceApp()`. Span wrapping is attached at promise-registration time, so
-# callbacks registered inside an iteration stay instrumented when they fire
-# later. The domain is dormant between ticks, keeping it out of unrelated
-# user promises created while the console is interactive.
-serviceNonBlocking <- function(handle, generation) {
-  serviceLoop <- function() {
-    if (!identical(.globals$serviceGeneration, generation)) {
-      return(invisible())
-    }
-    if (!.globals$stopped) {
-      promises::with_otel_promise_domain(
-        ..stacktraceoff..(
-          captureStackTraces(
-            tryCatch(
-              ..stacktracefloor..(serviceApp(.shinyServiceDelaySecs * 1000)),
-              error = function(e) {
-                .globals$stopped <- TRUE
-                .globals$retval <- e
-                .globals$reterror <- TRUE
-              }
-            )
-          )
-        )
-      )
-    }
-    if (!identical(.globals$serviceGeneration, generation)) {
-      return(invisible())
-    }
-    if (!.globals$stopped) {
-      later::later(serviceLoop, delay = .shinyServiceDelaySecs)
-    } else {
-      handle$stop()
-    }
-  }
-  later::later(serviceLoop, delay = .shinyServiceDelaySecs)
-}
-
-.shinyServiceDelaySecs <- 0.001
 .shinyServerMinVersion <- '0.3.4'
 
 #' Check whether a Shiny application is running

R/shiny-options.R

@@ -65,20 +65,16 @@ getShinyOption <- function(name, default = NULL) {
 #'   changes are detected, all connected Shiny sessions are reloaded. This
 #'   allows for fast feedback loops when tweaking Shiny UI.
 #'
-#'   Monitoring for changes is no longer expensive, thanks to the \pkg{watcher}
-#'   package, but this feature is still intended only for development.
+#'   Since monitoring for changes is expensive (we simply poll for last
+#'   modified times), this feature is intended only for development.
 #'
 #'   You can customize the file patterns Shiny will monitor by setting the
-#'   shiny.autoreload.pattern option. For example, to monitor only `ui.R`:
-#'   `options(shiny.autoreload.pattern = glob2rx("ui.R"))`.
+#'   shiny.autoreload.pattern option. For example, to monitor only ui.R:
+#'   `options(shiny.autoreload.pattern = glob2rx("ui.R"))`
 #'
-#'   As mentioned above, Shiny no longer polls watched files for changes.
-#'   Instead, using \pkg{watcher}, Shiny is notified of file changes as they
-#'   occur. These changes are batched together within a customizable latency
-#'   period. You can adjust this period by setting
-#'   `options(shiny.autoreload.interval = 2000)` (in milliseconds). This value
-#'   converted to seconds and passed to the `latency` argument of
-#'   [watcher::watcher()]. The default latency is 250ms.}
+#'   The default polling interval is 500 milliseconds. You can change this
+#'   by setting e.g. `options(shiny.autoreload.interval = 2000)` (every
+#'   two seconds).}
 #' \item{shiny.deprecation.messages (defaults to `TRUE`)}{This controls whether messages for
 #'   deprecated functions in Shiny will be printed. See
 #'   [shinyDeprecated()] for more information.}
@@ -155,36 +151,6 @@ getShinyOption <- function(name, default = NULL) {
 # ' \item{shiny.devmode.verbose (defaults to `TRUE`)}{If `TRUE`, will display messages printed
 # '   about which options are being set. See [devmode()] for more details. }
 ### (end not documenting 'shiny.devmode.verbose')
-### start shiny.client_devmode is primarily for niche, internal shinylive usage
-# ' \item{shiny.client_devmode (defaults to `FALSE`)}{If `TRUE`, enables client-
-# '  side devmode features. Currently the primary feature is the client-side
-# '  error console.}
-### end shiny.client_devmode
-#' \item{shiny.otel.collect (defaults to `Sys.getenv("SHINY_OTEL_COLLECT",
-#'   "all")`)}{Determines how Shiny will interact with OpenTelemetry.
-#'
-#'   Supported values:
-#'   * `"none"` - No Shiny OpenTelemetry tracing.
-#'   * `"session"` - Adds session start/end spans.
-#'   * `"reactive_update"` - Spans for any synchronous/asynchronous reactive
-#'     update. (Includes `"session"` features).
-#'   * `"reactivity"` - Spans for all reactive expressions and logs for setting
-#'     reactive vals and values. (Includes `"reactive_update"` features). This
-#'     option must be set when creating any reactive objects that should record
-#'     OpenTelemetry spans / logs. See [`withOtelCollect()`] and
-#'     [`localOtelCollect()`] for ways to set this option locally when creating
-#'     your reactive expressions.
-#'   * `"all"` - All Shiny OpenTelemetry tracing. Currently equivalent to
-#'     `"reactivity"`.
-#'
-#'   This option is useful for debugging and profiling while in production. This
-#'   option will only be useful if the `otelsdk` package is installed and
-#'   `otel::is_tracing_enabled()` returns `TRUE`. Please have any OpenTelemetry
-#'   environment variables set before loading any relevant R packages.
-#'
-#'   To set this option locally within a specific part of your Shiny
-#'   application, see [`withOtelCollect()`] and [`localOtelCollect()`].}
-#' \item{shiny.otel.sanitize.errors (defaults to `TRUE`)}{If `TRUE`, fatal and unhandled errors will be sanitized before being sent to the OpenTelemetry backend. The default value of `TRUE` is set to avoid potentially sending sensitive information to the OpenTelemetry backend. If you want the full error message and stack trace to be sent to the OpenTelemetry backend, set this option to `FALSE` or use `safeError(e)`.}
 #' }
 #'
 #'

R/shiny-package.R

@@ -4,12 +4,11 @@
 #' @importFrom lifecycle deprecated is_present
 #' @importFrom grDevices dev.set dev.cur
 #' @importFrom fastmap fastmap
+#' @importFrom promises %...!%
+#' @importFrom promises %...>%
 #' @importFrom promises
-#'     %...!% %...>%
-#'    as.promise is.promising is.promise
-#'    promise_resolve promise_reject
-#'    hybrid_then
-#'    with_promise_domain new_promise_domain
+#'    promise promise_resolve promise_reject is.promising
+#'    as.promise
 #' @importFrom rlang
 #'    quo enquo enquo0 as_function get_expr get_env new_function enquos
 #'    eval_tidy expr pairlist2 new_quosure enexpr as_quosure is_quosure inject

R/shiny.R

@@ -428,7 +428,7 @@ ShinySession <- R6Class(
         stop("Nested calls to withCurrentOutput() are not allowed.")
       }
 
-      with_promise_domain(
+      promises::with_promise_domain(
         createVarPromiseDomain(private, "currentOutputName", name),
         expr
       )
@@ -1056,19 +1056,6 @@ ShinySession <- R6Class(
         class(e) <- c("shiny.error.fatal", class(e))
       }
 
-      # For fatal errors, always log.
-      # For non-fatal errors, only log if we haven't seen this error before.
-      if (close || !has_seen_otel_exception(e)) {
-        otel_log(
-          if (close) "Fatal error" else "Unhandled error",
-          severity = if (close) "fatal" else "error",
-          attributes = otel::as_attributes(list(
-            session.id = self$token,
-            error = get_otel_error_obj(e)
-          ))
-        )
-      }
-
       private$unhandledErrorCallbacks$invoke(e, onError = printError)
       .globals$onUnhandledErrorCallbacks$invoke(e, onError = printError)
 
@@ -1086,9 +1073,7 @@ ShinySession <- R6Class(
       }
       # ..stacktraceon matches with the top-level ..stacktraceoff..
       withReactiveDomain(self, {
-        otel_span_session_end(domain = self, {
-          private$closedCallbacks$invoke(onError = printError, ..stacktraceon = TRUE)
-        })
+        private$closedCallbacks$invoke(onError = printError, ..stacktraceon = TRUE)
       })
     },
     isClosed = function() {
@@ -1157,8 +1142,7 @@ ShinySession <- R6Class(
         attr(label, "srcref") <- srcref
         attr(label, "srcfile") <- srcfile
 
-        # Do not bind this `observe()` call
-        obs <- with_no_otel_collect(observe(..stacktraceon = FALSE, {
+        obs <- observe(..stacktraceon = FALSE, {
 
           private$sendMessage(recalculating = list(
             name = name, status = 'recalculating'
@@ -1170,9 +1154,7 @@ ShinySession <- R6Class(
             hybrid_chain(
               {
                 private$withCurrentOutput(name, {
-                  maybe_with_otel_span_reactive_update({
-                    shinyCallingHandlers(func())
-                  }, domain = self)
+                  shinyCallingHandlers(func())
                 })
               },
               catch = function(cond) {
@@ -1197,7 +1179,9 @@ ShinySession <- R6Class(
                 } else {
                   if (isTRUE(getOption("show.error.messages"))) printError(cond)
                   if (getOption("shiny.sanitize.errors", FALSE)) {
-                    cond <- sanitized_error()
+                    cond <- simpleError(paste("An error has occurred. Check your",
+                      "logs or contact the app author for",
+                      "clarification."))
                   }
                   self$unhandledError(cond, close = FALSE)
                   invisible(structure(list(), class = "try-error", condition = cond))
@@ -1261,7 +1245,7 @@ ShinySession <- R6Class(
                 private$invalidatedOutputValues$set(name, value)
             }
           )
-        }, suspended=private$shouldSuspend(name), label=label))
+        }, suspended=private$shouldSuspend(name), label=label)
 
         # If any output attributes were added to the render function attach
         # them to observer.
@@ -2039,8 +2023,8 @@ ShinySession <- R6Class(
           ext <- paste(".", ext, sep = "")
         tmpdata <- tempfile(fileext = ext)
         return(Context$new(getDefaultReactiveDomain(), '[download]')$run(function() {
-          with_promise_domain(reactivePromiseDomain(), {
-            captureStackTraces({
+          promises::with_promise_domain(reactivePromiseDomain(), {
+            promises::with_promise_domain(createStackTracePromiseDomain(), {
               self$incrementBusyCount()
               hybrid_chain(
                 # ..stacktraceon matches with the top-level ..stacktraceoff..
@@ -2211,8 +2195,6 @@ ShinySession <- R6Class(
       if (private$busyCount == 0L) {
         rLog$asyncStart(domain = self)
         private$sendMessage(busy = "busy")
-
-        otel_span_reactive_update_init(domain = self)
       }
       private$busyCount <- private$busyCount + 1L
     },
@@ -2234,8 +2216,6 @@ ShinySession <- R6Class(
             private$startCycle()
           }
         })
-
-        otel_span_reactive_update_teardown(domain = self)
       }
     }
   )
@@ -2743,10 +2723,3 @@ validate_session_object <- function(session, label = as.character(sys.call(sys.p
     )
   }
 }
-
-
-sanitized_error <- function() {
-  simpleError(paste("An error has occurred. Check your",
-    "logs or contact the app author for",
-    "clarification."))
-}

R/shinyapp.R

@@ -162,29 +162,11 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
     sharedEnv <- globalenv()
   }
 
-  # To enable hot-reloading of support files, this function is called
-  # whenever the UI or Server func source is updated. To avoid loading
-  # support files 2x, we follow the last cache update trigger timestamp.
-  autoload_r_support_if_needed <- local({
-    autoload_last_loaded <- -1
-    function() {
-      if (!isTRUE(getOption("shiny.autoload.r", TRUE))) return()
-      
-      last_cache_trigger <- cachedAutoReloadLastChanged$get()
-      if (identical(autoload_last_loaded, last_cache_trigger)) return()
-
-      loadSupport(appDir, renv = sharedEnv, globalrenv = globalenv())
-
-      autoload_last_loaded <<- last_cache_trigger
-    }
-  })
-
   # uiHandlerSource is a function that returns an HTTP handler for serving up
   # ui.R as a webpage. The "cachedFuncWithFile" call makes sure that the closure
   # we're creating here only gets executed when ui.R's contents change.
   uiHandlerSource <- cachedFuncWithFile(appDir, "ui.R", case.sensitive = FALSE,
     function(uiR) {
-      autoload_r_support_if_needed()
       if (file.exists(uiR)) {
         # If ui.R contains a call to shinyUI (which sets .globals$ui), use that.
         # If not, then take the last expression that's returned from ui.R.
@@ -215,7 +197,6 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 
   serverSource <- cachedFuncWithFile(appDir, "server.R", case.sensitive = FALSE,
     function(serverR) {
-      autoload_r_support_if_needed()
       # If server.R contains a call to shinyServer (which sets .globals$server),
       # use that. If not, then take the last expression that's returned from
       # server.R.
@@ -251,9 +232,10 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
   onStart <- function() {
     oldwd <<- getwd()
     setwd(appDir)
+    # TODO: we should support hot reloading on global.R and R/*.R changes.
     if (getOption("shiny.autoload.r", TRUE)) {
-      autoload_r_support_if_needed()
-    } else {
+      loadSupport(appDir, renv=sharedEnv, globalrenv=globalenv())
+    }  else {
       if (file.exists(file.path.ci(appDir, "global.R")))
         sourceUTF8(file.path.ci(appDir, "global.R"))
     }
@@ -308,77 +290,33 @@ initAutoReloadMonitor <- function(dir) {
     return(function(){})
   }
 
-  filePattern <- getOption(
-    "shiny.autoreload.pattern",
-    ".*\\.(r|html?|js|css|png|jpe?g|gif)$"
-  )
+  filePattern <- getOption("shiny.autoreload.pattern",
+    ".*\\.(r|html?|js|css|png|jpe?g|gif)$")
 
-  
-  if (is_installed("watcher")) {
-    check_for_update <- function(paths) {
-      paths <- grep(
-        filePattern,
-        paths,
-        ignore.case = TRUE,
-        value = TRUE
-      )
-      
-      if (length(paths) == 0) {
-        return()
-      }
-      
-      cachedAutoReloadLastChanged$set()
+  lastValue <- NULL
+  observeLabel <- paste0("File Auto-Reload - '", basename(dir), "'")
+  obs <- observe(label = observeLabel, {
+    files <- sort_c(
+      list.files(dir, pattern = filePattern, recursive = TRUE, ignore.case = TRUE)
+    )
+    times <- file.info(files)$mtime
+    names(times) <- files
+
+    if (is.null(lastValue)) {
+      # First run
+      lastValue <<- times
+    } else if (!identical(lastValue, times)) {
+      # We've changed!
+      lastValue <<- times
       autoReloadCallbacks$invoke()
     }
-    
-    # [garrick, 2025-02-20] Shiny <= v1.10.0 used `invalidateLater()` with an
-    # autoreload.interval in ms. {watcher} instead uses a latency parameter in
-    # seconds, which serves a similar purpose and that I'm keeping for backcompat.
-    latency <- getOption("shiny.autoreload.interval", 250) / 1000
-    watcher <- watcher::watcher(dir, check_for_update, latency = latency)
-    watcher$start()
-    onStop(watcher$stop)
-  } else {
-    # Fall back to legacy observer behavior
-    if (!is_false(getOption("shiny.autoreload.legacy_warning", TRUE))) {
-      cli::cli_warn(
-        c(
-          "Using legacy autoreload file watching. Please install {.pkg watcher} for a more performant autoreload file watcher.",
-          "i" = "Set {.run options(shiny.autoreload.legacy_warning = FALSE)} to suppress this warning."
-        ),
-        .frequency = "regularly",
-        .frequency_id = "shiny.autoreload.legacy_warning"
-      )
-    }
 
-    lastValue <- NULL
-    observeLabel <- paste0("File Auto-Reload - '", basename(dir), "'")
-    watcher <- observe(label = observeLabel, {
-      files <- sort_c(
-        list.files(dir, pattern = filePattern, recursive = TRUE, ignore.case = TRUE)
-      )
-      times <- file.info(files)$mtime
-      names(times) <- files
-  
-      if (is.null(lastValue)) {
-        # First run
-        lastValue <<- times
-      } else if (!identical(lastValue, times)) {
-        # We've changed!
-        lastValue <<- times
-        cachedAutoReloadLastChanged$set()
-        autoReloadCallbacks$invoke()
-      }
-  
-      invalidateLater(getOption("shiny.autoreload.interval", 500))
-    })
-  
-    onStop(watcher$destroy)
-  
-    watcher$destroy
-  }
+    invalidateLater(getOption("shiny.autoreload.interval", 500))
+  })
 
-  invisible(watcher)
+  onStop(obs$destroy)
+
+  obs$destroy
 }
 
 #' Load an app's supporting R files
@@ -483,6 +421,8 @@ shinyAppDir_appR <- function(fileName, appDir, options=list())
       wasDir <- setwd(appDir)
       on.exit(setwd(wasDir))
 
+      # TODO: we should support hot reloading on R/*.R changes.
+      # In an upcoming version of shiny, this option will go away.
       if (getOption("shiny.autoload.r", TRUE)) {
         # Create a child env which contains all the helpers and will be the shared parent
         # of the ui.R and server.R load.

R/shinyui.R

@@ -69,7 +69,7 @@ renderPage <- function(ui, showcase=0, testMode=FALSE) {
       )
   }
 
-  if (in_devmode() || in_client_devmode()) {
+  if (in_devmode()) {
     # If we're in dev mode, add a simple script to the head that injects a
     # global variable for the client to use to detect dev mode.
     shiny_deps[[length(shiny_deps) + 1]] <-
@@ -135,14 +135,6 @@ shinyDependencies <- function() {
   )
 }
 
-shinyDependencySass <- function(bs_version) {
-  bootstrap_scss <- paste0("shiny.bootstrap", bs_version, ".scss")
-
-  scss_home <- system_file("www/shared/shiny_scss", package = "shiny")
-  scss_files <- file.path(scss_home, c(bootstrap_scss, "shiny.scss"))
-  lapply(scss_files, sass::sass_file)
-}
-
 shinyDependencyCSS <- function(theme) {
   version <- get_package_version("shiny")
 
@@ -158,9 +150,14 @@ shinyDependencyCSS <- function(theme) {
   }
 
   bs_version <- bslib::theme_version(theme)
+  bootstrap_scss <- paste0("shiny.bootstrap", bs_version, ".scss")
+
+  scss_home <- system_file("www/shared/shiny_scss", package = "shiny")
+  scss_files <- file.path(scss_home, c(bootstrap_scss, "shiny.scss"))
+  scss_files <- lapply(scss_files, sass::sass_file)
 
   bslib::bs_dependency(
-    input = shinyDependencySass(bs_version),
+    input = scss_files,
     theme = theme,
     name = "shiny-sass",
     version = version,

R/shinywrappers.R

@@ -130,20 +130,11 @@ markRenderFunction <- function(
       # stop warning from happening again for the same object
       hasExecuted$set(TRUE)
     }
-    ..stacktraceoff..(
-      if (is.null(formals(renderFunc))) renderFunc()
-      else renderFunc(...)
-    )
+    if (is.null(formals(renderFunc))) renderFunc()
+    else renderFunc(...)
   }
 
-  otelAttrs <-
-    otel_srcref_attributes(
-      attr(renderFunc, "wrappedFunc", exact = TRUE),
-      # Can't retrieve the render function used at this point, so just use NULL
-      fn_name = NULL
-    )
-
-  ret <- structure(
+  structure(
     wrappedRenderFunc,
     class          = c("shiny.render.function", "function"),
     outputFunc     = uiFunc,
@@ -151,15 +142,8 @@ markRenderFunction <- function(
     hasExecuted    = hasExecuted,
     cacheHint      = cacheHint,
     cacheWriteHook = cacheWriteHook,
-    cacheReadHook  = cacheReadHook,
-    otelAttrs      = otelAttrs
+    cacheReadHook  = cacheReadHook
   )
-
-  if (has_otel_collect("reactivity")) {
-    ret <- enable_otel_shiny_render_function(ret)
-  }
-
-  ret
 }
 
 #' @export
@@ -277,7 +261,7 @@ createRenderFunction <- function(
 ) {
   renderFunc <- function(shinysession, name, ...) {
     hybrid_chain(
-      ..stacktraceon..(func()),
+      func(),
       function(value) {
         transform(value, shinysession, name, ...)
       }
@@ -287,7 +271,9 @@ createRenderFunction <- function(
   # Hoist func's wrappedFunc attribute into renderFunc, so that when we pass
   # renderFunc on to markRenderFunction, it is able to find the original user
   # function.
-  attr(renderFunc, "wrappedFunc") <- attr(func, "wrappedFunc", exact = TRUE)
+  if (identical(cacheHint, "auto")) {
+    attr(renderFunc, "wrappedFunc") <- attr(func, "wrappedFunc", exact = TRUE)
+  }
 
   markRenderFunction(outputFunc, renderFunc, outputArgs, cacheHint,
                      cacheWriteHook, cacheReadHook)
@@ -335,7 +321,7 @@ as.tags.shiny.render.function <- function(x, ..., inline = FALSE) {
 
 # Get relevant attributes from a render function object.
 renderFunctionAttributes <- function(x) {
-  attrs <- c("outputFunc", "outputArgs", "hasExecuted", "cacheHint", "otelAttrs")
+  attrs <- c("outputFunc", "outputArgs", "hasExecuted", "cacheHint")
   names(attrs) <- attrs
   lapply(attrs, function(name) attr(x, name, exact = TRUE))
 }
@@ -397,10 +383,8 @@ markOutputAttrs <- function(renderFunc, snapshotExclude = NULL,
 #' The corresponding HTML output tag should be `div` or `img` and have
 #' the CSS class name `shiny-image-output`.
 #'
-#' @seealso
-#' * For more details on how the images are generated, and how to control
+#' @seealso For more details on how the images are generated, and how to control
 #'   the output, see [plotPNG()].
-#' * Use [outputOptions()] to set general output options for an image output.
 #'
 #' @param expr An expression that returns a list.
 #' @inheritParams renderUI
@@ -614,7 +598,6 @@ isTemp <- function(path, tempDir = tempdir(), mustExist) {
 #'   used in an interactive RMarkdown document.
 #'
 #' @example res/text-example.R
-#' @seealso [outputOptions()]
 #' @export
 renderPrint <- function(expr, env = parent.frame(), quoted = FALSE,
                         width = getOption('width'), outputArgs=list())
@@ -630,7 +613,7 @@ renderPrint <- function(expr, env = parent.frame(), quoted = FALSE,
     domain <- createRenderPrintPromiseDomain(width)
     hybrid_chain(
       {
-        with_promise_domain(domain, ..stacktraceon..(func()))
+        promises::with_promise_domain(domain, func())
       },
       function(value) {
         res <- withVisible(value)
@@ -659,7 +642,7 @@ renderPrint <- function(expr, env = parent.frame(), quoted = FALSE,
 createRenderPrintPromiseDomain <- function(width) {
   f <- file()
 
-  new_promise_domain(
+  promises::new_promise_domain(
     wrapOnFulfilled = function(onFulfilled) {
       force(onFulfilled)
       function(...) {
@@ -736,7 +719,7 @@ renderText <- function(expr, env = parent.frame(), quoted = FALSE,
 #'   call to [uiOutput()] when `renderUI` is used in an
 #'   interactive R Markdown document.
 #'
-#' @seealso [uiOutput()], [outputOptions()]
+#' @seealso [uiOutput()]
 #' @export
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -826,13 +809,6 @@ renderUI <- function(expr, env = parent.frame(), quoted = FALSE,
 #'
 #' shinyApp(ui, server)
 #' }
-#'
-#' @seealso
-#' * The download handler, like other outputs, is suspended (disabled) by
-#'   default for download buttons and links that are hidden. Use
-#'   [outputOptions()] to control this behavior, e.g. to set
-#'   `suspendWhenHidden = FALSE` if the download is initiated by
-#'   programmatically clicking on the download button using JavaScript.
 #' @export
 downloadHandler <- function(filename, content, contentType=NULL, outputArgs=list()) {
   renderFunc <- function(shinysession, name, ...) {
@@ -965,7 +941,7 @@ legacyRenderDataTable <- function(expr, options = NULL, searchDelay = 500,
     options <- checkDT9(options)
     res <- checkAsIs(options)
     hybrid_chain(
-      ..stacktraceon..(func()),
+      func(),
       function(data) {
         if (length(dim(data)) != 2) return() # expects a rectangular data object
         if (is.data.frame(data)) data <- as.data.frame(data)

R/showcase.R

@@ -33,6 +33,13 @@ showcaseHead <- function() {
 
   deps  <- list(
     jqueryuiDependency(),
+    htmlDependency(
+      "showdown",
+      "0.3.1",
+      src = "www/shared/showdown/compressed",
+      package="shiny",
+      script = "showdown.js"
+    ),
     htmlDependency(
       "highlight.js",
       "6.2",
@@ -54,11 +61,10 @@ showcaseHead <- function() {
 
   mdfile <- file.path.ci(getwd(), 'Readme.md')
   html <- tagList(
-    if (file.exists(mdfile)) {
-      md_content <- paste(readUTF8(mdfile), collapse="\n")
-      md_html <- commonmark::markdown_html(md_content, extensions = TRUE)
-      tags$template(id="showcase-markdown-content", HTML(md_html))
-    } else ""
+    if (file.exists(mdfile))
+      tags$script(type="text/markdown", id="showcase-markdown-content",
+        paste(readUTF8(mdfile), collapse="\n"))
+    else ""
   )
 
   return(attachDependencies(html, deps))

R/test.R

@@ -158,7 +158,8 @@ print.shiny_runtests <- function(x, ..., reporter = "summary") {
 
 
   if (any(x$pass)) {
-    cli::cat_bullet("Success", bullet = "tick", bullet_col = "green")
+    # TODO in future... use clisymbols::symbol$tick and crayon green
+    cat("* Success\n")
     mapply(
       x$file,
       x$pass,
@@ -170,8 +171,9 @@ print.shiny_runtests <- function(x, ..., reporter = "summary") {
       }
     )
   }
-  if (!all(x$pass)) {
-    cli::cat_bullet("Failure", bullet = "cross", bullet_col = "red")
+  if (any(!x$pass)) {
+    # TODO in future... use clisymbols::symbol$cross and crayon red
+    cat("* Failure\n")
     mapply(
       x$file,
       x$pass,

R/update-input.R

@@ -37,11 +37,7 @@
 updateTextInput <- function(session = getDefaultReactiveDomain(), inputId, label = NULL, value = NULL, placeholder = NULL) {
   validate_session_object(session)
 
-  message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    value = value,
-    placeholder = placeholder
-  ))
+  message <- dropNulls(list(label=label, value=value, placeholder=placeholder))
   session$sendInputMessage(inputId, message)
 }
 
@@ -115,10 +111,7 @@ updateTextAreaInput <- updateTextInput
 updateCheckboxInput <- function(session = getDefaultReactiveDomain(), inputId, label = NULL, value = NULL) {
   validate_session_object(session)
 
-  message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    value = value
-  ))
+  message <- dropNulls(list(label=label, value=value))
   session$sendInputMessage(inputId, message)
 }
 
@@ -181,11 +174,8 @@ updateCheckboxInput <- function(session = getDefaultReactiveDomain(), inputId, l
 updateActionButton <- function(session = getDefaultReactiveDomain(), inputId, label = NULL, icon = NULL, disabled = NULL) {
   validate_session_object(session)
 
-  message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    icon = if (!is.null(icon)) processDeps(validateIcon(icon), session),
-    disabled = disabled
-  ))
+  if (!is.null(icon)) icon <- as.character(validateIcon(icon))
+  message <- dropNulls(list(label=label, icon=icon, disabled=disabled))
   session$sendInputMessage(inputId, message)
 }
 #' @rdname updateActionButton
@@ -235,12 +225,7 @@ updateDateInput <- function(session = getDefaultReactiveDomain(), inputId, label
   min   <- dateYMD(min, "min")
   max   <- dateYMD(max, "max")
 
-  message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    value = value,
-    min = min,
-    max = max
-  ))
+  message <- dropNulls(list(label=label, value=value, min=min, max=max))
   session$sendInputMessage(inputId, message)
 }
 
@@ -290,7 +275,7 @@ updateDateRangeInput <- function(session = getDefaultReactiveDomain(), inputId,
   max <- dateYMD(max, "max")
 
   message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
+    label = label,
     value = dropNulls(list(start = start, end = end)),
     min = min,
     max = max
@@ -389,16 +374,13 @@ updateNavlistPanel <- updateTabsetPanel
 #' }
 #' @export
 updateNumericInput <- function(session = getDefaultReactiveDomain(), inputId, label = NULL, value = NULL,
-  min = NULL, max = NULL, step = NULL) {
+    min = NULL, max = NULL, step = NULL) {
 
   validate_session_object(session)
 
   message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    value = formatNoSci(value),
-    min = formatNoSci(min),
-    max = formatNoSci(max),
-    step = formatNoSci(step)
+    label = label, value = formatNoSci(value),
+    min = formatNoSci(min), max = formatNoSci(max), step = formatNoSci(step)
   ))
   session$sendInputMessage(inputId, message)
 }
@@ -478,7 +460,7 @@ updateSliderInput <- function(session = getDefaultReactiveDomain(), inputId, lab
   }
 
   message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
+    label = label,
     value = formatNoSci(value),
     min = formatNoSci(min),
     max = formatNoSci(max),
@@ -509,11 +491,7 @@ updateInputOptions <- function(session, inputId, label = NULL, choices = NULL,
     ))
   }
 
-  message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    options = options,
-    value = selected
-  ))
+  message <- dropNulls(list(label = label, options = options, value = selected))
 
   session$sendInputMessage(inputId, message)
 }
@@ -666,11 +644,7 @@ updateSelectInput <- function(session = getDefaultReactiveDomain(), inputId, lab
   choices <- if (!is.null(choices)) choicesWithNames(choices)
   if (!is.null(selected)) selected <- as.character(selected)
   options <- if (!is.null(choices)) selectOptions(choices, selected, inputId, FALSE)
-  message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    options = options,
-    value = selected
-  ))
+  message <- dropNulls(list(label = label, options = options, value = selected))
   session$sendInputMessage(inputId, message)
 }
 

R/utils-lang.R

@@ -53,8 +53,8 @@ formalsAndBody <- function(x) {
 
 #' @describeIn createRenderFunction convert a quosure to a function.
 #' @param q Quosure of the expression `x`. When capturing expressions to create
-#'   your quosure, it is recommended to use [`rlang::enquo0()`] to not unquote
-#'   the object too early. See [`rlang::enquo0()`] for more details.
+#'   your quosure, it is recommended to use [`enquo0()`] to not unquote the
+#'   object too early. See [`enquo0()`] for more details.
 #' @inheritParams installExprFunction
 #' @export
 quoToFunction <- function(
@@ -208,10 +208,8 @@ exprToLabel <- function(expr, function_name, label = NULL) {
   if (is.null(label)) {
     label <- rexprSrcrefToLabel(
       srcref[[1]],
-      simpleExprToFunction(expr, function_name),
-      function_name
+      simpleExprToFunction(expr, function_name)
     )
-    label <- as_default_label(label)
   }
   if (length(srcref) >= 2) attr(label, "srcref") <- srcref[[2]]
   attr(label, "srcfile") <- srcFileOfRef(srcref[[1]])
@@ -231,12 +229,10 @@ funcToLabelBody <- function(func) {
 funcToLabel <- function(func, functionLabel, label = NULL) {
   if (!is.null(label)) return(label)
 
-  as_default_label(
-    sprintf(
-      '%s(%s)',
-      functionLabel,
-      funcToLabelBody(func)
-    )
+  sprintf(
+    '%s(%s)',
+    functionLabel,
+    funcToLabelBody(func)
   )
 }
 quoToLabelBody <- function(q) {
@@ -245,19 +241,9 @@ quoToLabelBody <- function(q) {
 quoToLabel <- function(q, functionLabel, label = NULL) {
   if (!is.null(label)) return(label)
 
-  as_default_label(
-    sprintf(
-      '%s(%s)',
-      functionLabel,
-      quoToLabelBody(q)
-    )
+  sprintf(
+    '%s(%s)',
+    functionLabel,
+    quoToLabelBody(q)
   )
 }
-
-as_default_label <- function(x) {
-  class(x) <- c("default_label", class(x))
-  x
-}
-is_default_label <- function(x) {
-  inherits(x, "default_label")
-}

R/utils-tags.R

@@ -1,21 +0,0 @@
-# Check if `x` is a tag(), tagList(), or HTML()
-# @param strict If `FALSE`, also consider a normal list() of 'tags' to be a tag list.
-isTagLike <- function(x, strict = FALSE) {
-  isTag(x) || isTagList(x, strict = strict) || isTRUE(attr(x, "html"))
-}
-
-isTag <- function(x) {
-  inherits(x, "shiny.tag")
-}
-
-isTagList <- function(x, strict = TRUE) {
-  if (strict) {
-    return(inherits(x, "shiny.tag.list"))
-  }
-
-  if (!is.list(x)) {
-    return(FALSE)
-  }
-
-  all(vapply(x, isTagLike, logical(1)))
-}

R/utils.R

@@ -770,45 +770,22 @@ formatNoSci <- function(x) {
   format(x, scientific = FALSE, digits = 15)
 }
 
-# A simple getter/setting to track the last time the auto-reload process
-# updated. This value is used by `cachedFuncWithFile()` when auto-reload is
-# enabled to reload app/ui/server files when watched supporting files change.
-cachedAutoReloadLastChanged <- local({
-  last_update <- 0
-
-  list(
-    set = function() {
-      last_update <<- as.integer(Sys.time())
-      invisible(last_update)
-    },
-    get = function() {
-      last_update
-    }
-  )
-})
-
 # Returns a function that calls the given func and caches the result for
 # subsequent calls, unless the given file's mtime changes.
 cachedFuncWithFile <- function(dir, file, func, case.sensitive = FALSE) {
-  dir <- normalizePath(dir, mustWork = TRUE)
-
+  dir <- normalizePath(dir, mustWork=TRUE)
+  mtime <- NA
   value <- NULL
-  last_mtime_file <- NA
-  last_autoreload <- 0
-
   function(...) {
-    fname <- if (case.sensitive) {
+    fname <- if (case.sensitive)
       file.path(dir, file)
-    } else {
+    else
       file.path.ci(dir, file)
-    }
 
     now <- file.info(fname)$mtime
-    autoreload <- last_autoreload < cachedAutoReloadLastChanged$get()
-    if (autoreload || !identical(last_mtime_file, now)) {
+    if (!identical(mtime, now)) {
       value <<- func(fname, ...)
-      last_mtime_file <<- now
-      last_autoreload <<- cachedAutoReloadLastChanged$get()
+      mtime <<- now
     }
     value
   }
@@ -1366,62 +1343,31 @@ tryNativeEncoding <- function(string) {
   if (identical(enc2utf8(string2), string)) string2 else string
 }
 
-maybeAnnotateSourceForArk <- function(file, lines) {
-  ark_annotate_source <- get0(".ark_annotate_source", baseenv())
-
-  if (is.null(ark_annotate_source)) {
-    return(lines)
-  }
-
-  file <- normalizePath(file, mustWork = TRUE, winslash = "/") # Just to be safe
-  uri <- paste0("file:///", sub("^/", "", file)) # Ark expects URIs
-  lines_str <- paste(lines, collapse = "\n")
-  tryCatch(
-    {
-      annotated <- ark_annotate_source(lines_str, uri)
-      if (!is.null(annotated)) {
-        lines <- strsplit(annotated, "\n", fixed = TRUE)[[1]]
-      }
-    },
-    error = function(cnd) {
-      rlang::warn("Can't inject breakpoints for Ark", parent = cnd)
-    }
-  )
-
-
-  lines
-}
-
 # similarly, try to source() a file with UTF-8
 sourceUTF8 <- function(file, envir = globalenv()) {
-  file_norm <- normalizePath(file, mustWork = TRUE, winslash = "/")
   lines <- readUTF8(file)
   enc <- if (any(Encoding(lines) == 'UTF-8')) 'UTF-8' else 'unknown'
+  src <- srcfilecopy(file, lines, isFile = TRUE)  # source reference info
+  # oddly, parse(file) does not work when file contains multibyte chars that
+  # **can** be encoded natively on Windows (might be a bug in base R); we
+  # rewrite the source code in a natively encoded temp file and parse it in this
+  # case (the source reference is still pointed to the original file, though)
+  if (isWindows() && enc == 'unknown') {
+    file <- tempfile(); on.exit(unlink(file), add = TRUE)
+    writeLines(lines, file)
+  }
+  exprs <- try(parse(file, keep.source = FALSE, srcfile = src, encoding = enc))
+  if (inherits(exprs, "try-error")) {
+    diagnoseCode(file)
+    stop("Error sourcing ", file)
+  }
 
-  # Inject Ark annotations for breakpoints if available
-  lines <- maybeAnnotateSourceForArk(file, lines)
-
-  # Wrap in `..stacktraceon..({...})` using string manipulation before parsing,
-  # with a `#line` directive to map source references back to the original file
-  lines <- c(
-    "..stacktraceon..({",
-    sprintf('#line 1 "%s"', file_norm),
-    lines,
-    "})"
-  )
-
-  # Create a source file copy, i.e. an in-memory srcfile that contains all the
-  # code but refers to an original file
-  src <- srcfilecopy(file, lines, isFile = TRUE)
-
-  # Parse from our annotated lines
-  exprs <- tryCatch(
-    parse(text = lines, keep.source = FALSE, srcfile = src, encoding = enc),
-    error = function(cnd) {
-      diagnoseCode(file)
-      stop("Error sourcing ", file)
-    }
-  )
+  # Wrap the exprs in first `{`, then ..stacktraceon..(). It's only really the
+  # ..stacktraceon..() that we care about, but the `{` is needed to make that
+  # possible.
+  exprs <- makeCall(`{`, exprs)
+  # Need to wrap exprs in a list because we want it treated as a single argument
+  exprs <- makeCall(..stacktraceon.., list(exprs))
 
   eval(exprs, envir)
 }
@@ -1464,11 +1410,7 @@ URLencode <- function(value, reserved = FALSE) {
 dateYMD <- function(date = NULL, argName = "value") {
   if (!length(date)) return(NULL)
   tryCatch({
-      if (inherits(date, "POSIXt")) {
-        res <- format(date, "%Y-%m-%d")
-      } else {
-        res <- format(as.Date(date), "%Y-%m-%d")
-      }
+      res <- format(as.Date(date), "%Y-%m-%d")
       if (any(is.na(res))) stop()
       date <- res
     },
@@ -1560,7 +1502,7 @@ promise_chain <- function(promise, ..., catch = NULL, finally = NULL,
   }
 
   if (!is.null(domain)) {
-    with_promise_domain(domain, do(), replace = replace)
+    promises::with_promise_domain(domain, do(), replace = replace)
   } else {
     do()
   }
@@ -1577,7 +1519,7 @@ hybrid_chain <- function(expr, ..., catch = NULL, finally = NULL,
       {
         captureStackTraces({
           result <- withVisible(force(expr))
-          if (is.promising(result$value)) {
+          if (promises::is.promising(result$value)) {
             # Purposefully NOT including domain (nor replace), as we're already in
             # the domain at this point
             p <- promise_chain(valueWithVisible(result), ..., catch = catch, finally = finally)
@@ -1611,7 +1553,7 @@ hybrid_chain <- function(expr, ..., catch = NULL, finally = NULL,
   }
 
   if (!is.null(domain)) {
-    with_promise_domain(domain, do(), replace = replace)
+    promises::with_promise_domain(domain, do(), replace = replace)
   } else {
     do()
   }
@@ -1629,7 +1571,7 @@ createVarPromiseDomain <- function(env, name, value) {
   force(name)
   force(value)
 
-  new_promise_domain(
+  promises::new_promise_domain(
     wrapOnFulfilled = function(onFulfilled) {
       function(...) {
         orig <- env[[name]]

R/version_bs_date_picker.R

@@ -1,2 +1,2 @@
 # Generated by tools/updateBootstrapDatepicker.R; do not edit by hand
-version_bs_date_picker <- "1.10.0"
+version_bs_date_picker <- "1.9.0"

R/version_jquery.R

@@ -1,2 +1,2 @@
 # Generated by tools/updatejQuery.R; do not edit by hand
-version_jquery <- "3.7.1"
+version_jquery <- "3.6.0"

R/version_jqueryui.R

@@ -1,2 +1,2 @@
 # Generated by tools/updatejQueryUI.R; do not edit by hand
-version_jqueryui <- "1.14.1"
+version_jqueryui <- "1.13.2"

README-npm.md

@@ -1,14 +0,0 @@
-@posit/shiny
-============
-
-This npm package contains TypeScript type definitions for Shiny's client-side JavaScript libraries.
-
-It does not include the Shiny framework itself, though that may change in the future.
-
-[Shiny](https://github.com/rstudio/shiny) is a web application framework for both R and Python, developed by Posit PBC.
-
-## Installation
-
-```bash
-npm install @posit/shiny
-```

README.md

@@ -61,8 +61,8 @@ We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.
 
 ## License
 
-The shiny package as a whole is licensed under the MIT License. See the [LICENSE](LICENSE) file for more details.
+The shiny package as a whole is licensed under the GPLv3. See the [LICENSE](LICENSE) file for more details.
 
 ## R version support
 
-Shiny is supported on the latest release version of R, as well as the previous four minor release versions of R. For example, if the latest release R version is 4.3, then that version is supported, as well as 4.2, 4.1, 4.0, 3.6.
+Shiny is supported on the latest release version of R, as well as the previous four minor release versions of R. For example, if the latest release R version is 4.1, then that version is supported, as well as 4.0, 3.6, 3.5, and 3.4.

babel.config.json

@@ -0,0 +1,15 @@
+{
+  "presets": [
+    "@babel/preset-typescript",
+    [
+      "@babel/preset-env",
+      {
+        "useBuiltIns": "usage",
+        "corejs": "3.12"
+      }
+    ]
+  ],
+  "ignore":[
+    "node_modules/core-js"
+  ]
+}

cran-comments.md

@@ -1,129 +0,0 @@
-## Comments
-
-#### 2025-12-08
-
-Test has been removed from CRAN checks.
-
-Also added a couple bug fixes as found by users.
-
-Please let me know if you need any further changes.
-
-Thank you,
-Carson
-
-#### 2025-12-04
-
-Error:
-
-```
-Check Details
-Version: 1.12.0
-Check: tests
-Result: ERROR
-    Running ‘testthat.R’ [100s/394s]
-  Running the tests in ‘tests/testthat.R’ failed.
-  Complete output:
-    > library(testthat)
-    > library(shiny)
-    >
-    > test_check("shiny")
-    Saving _problems/test-timer-35.R
-    [ FAIL 1 | WARN 0 | SKIP 22 | PASS 1981 ]
-
-    ══ Skipped tests (22) ══════════════════════════════════════════════════════════
-    • File system is not case-sensitive (1): 'test-app.R:36:5'
-    • I'm not sure of a great way to test this without timers. (1):
-      'test-test-server.R:216:3'
-    • Not testing in CI (1): 'test-devmode.R:17:3'
-    • On CRAN (18): 'test-actionButton.R:59:1', 'test-busy-indication.R:1:1',
-      'test-busy-indication.R:15:1', 'test-busy-indication.R:50:1',
-      'test-otel-error.R:1:1', 'test-otel-mock.R:1:1', 'test-pkgdown.R:3:3',
-      'test-reactivity.r:146:1', 'test-reactivity.r:1240:5',
-      'test-reactivity.r:1240:5', 'test-stacks-deep.R:93:1',
-      'test-stacks-deep.R:141:1', 'test-stacks.R:140:3', 'test-tabPanel.R:46:1',
-      'test-tabPanel.R:66:1', 'test-tabPanel.R:73:1', 'test-tabPanel.R:83:1',
-      'test-utils.R:177:3'
-    • {shinytest2} is not installed (1): 'test-test-shinyAppTemplate.R:2:1'
-
-    ══ Failed tests ════════════════════════════════════════════════════════════════
-    ── Failure ('test-timer.R:35:3'): Unscheduling works ───────────────────────────
-    Expected `timerCallbacks$.times` to be identical to `origTimes`.
-    Differences:
-    `attr(actual, 'row.names')` is an integer vector ()
-    `attr(expected, 'row.names')` is a character vector ()
-
-
-    [ FAIL 1 | WARN 0 | SKIP 22 | PASS 1981 ]
-    Error:
-    ! Test failures.
-    Execution halted
-```
-
-
-#### 2025-12-03
-
-```
-Dear maintainer,
-
-Please see the problems shown on
-<https://cran.r-project.org/web/checks/check_results_shiny.html>.
-
-Please correct before 2025-12-17 to safely retain your package on CRAN.
-
-The CRAN Team
-```
-
-## `R CMD check` results:
-
-0 errors | 0 warning | 1 note
-
-```
-─  checking CRAN incoming feasibility ... [7s/70s] NOTE (1m 9.5s)
-   Maintainer: ‘Carson Sievert <carson@posit.co>’
-
-   Days since last update: 5
-```
-
-
-## revdepcheck results
-
-We checked 1383 reverse dependencies (1376 from CRAN + 7 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
-
- * We saw 0 new problems
- * We failed to check 31 packages
-
-Issues with CRAN packages are summarised below.
-
-### Failed to check
-
-* AssumpSure
-* boinet
-* brms
-* cheem
-* ctsem
-* detourr
-* FAfA
-* fio
-* fitteR
-* FossilSimShiny
-* GDINA
-* ggsem
-* grandR
-* hbsaems
-* langevitour
-* lavaan.shiny
-* lcsm
-* linkspotter
-* loon.shiny
-* MOsemiind
-* MVN
-* pandemonium
-* polarisR
-* RCTrep
-* rstanarm
-* semdrw
-* shotGroups
-* sphereML
-* spinifex
-* SurprisalAnalysis
-* TestAnaAPP

eslint.config.mjs

@@ -1,108 +0,0 @@
-import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import prettier from "eslint-plugin-prettier";
-import unicorn from "eslint-plugin-unicorn";
-import globals from "globals";
-import tsParser from "@typescript-eslint/parser";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended,
-    allConfig: js.configs.all
-});
-
-export default [{
-    ignores: ["**/*.d.ts"],
-}, ...compat.extends(
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended",
-), {
-    plugins: {
-        "@typescript-eslint": typescriptEslint,
-        prettier,
-        unicorn,
-    },
-
-    languageOptions: {
-        globals: {
-            ...globals.browser,
-            Atomics: "readonly",
-            SharedArrayBuffer: "readonly",
-        },
-
-        parser: tsParser,
-        ecmaVersion: 2021,
-        sourceType: "module",
-
-        parserOptions: {
-            project: ["./tsconfig.json"],
-        },
-    },
-
-    rules: {
-        "@typescript-eslint/explicit-function-return-type": "off",
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/explicit-module-boundary-types": "error",
-        "default-case": ["error"],
-        "linebreak-style": ["error", "unix"],
-        quotes: ["error", "double", "avoid-escape"],
-        semi: ["error", "always"],
-        "dot-location": ["error", "property"],
-        camelcase: ["off"],
-
-        "unicorn/filename-case": ["error", {
-            case: "camelCase",
-        }],
-
-        "@typescript-eslint/array-type": ["error", {
-            default: "array-simple",
-            readonly: "array-simple",
-        }],
-
-        "@typescript-eslint/consistent-indexed-object-style": ["error", "index-signature"],
-        "@typescript-eslint/consistent-type-imports": "error",
-        "@typescript-eslint/no-floating-promises": "error",
-
-        "@typescript-eslint/naming-convention": ["error", {
-            selector: "default",
-            format: ["camelCase"],
-        }, {
-            selector: "method",
-            modifiers: ["private"],
-            format: ["camelCase"],
-            leadingUnderscore: "require",
-        }, {
-            selector: "method",
-            modifiers: ["protected"],
-            format: ["camelCase"],
-            leadingUnderscore: "require",
-        }, {
-            selector: "variable",
-            format: ["camelCase"],
-            trailingUnderscore: "forbid",
-            leadingUnderscore: "forbid",
-        }, {
-            selector: "parameter",
-            format: ["camelCase"],
-            trailingUnderscore: "allow",
-            leadingUnderscore: "forbid",
-        }, {
-            selector: ["enum", "enumMember"],
-            format: ["PascalCase"],
-        }, {
-            selector: "typeLike",
-            format: ["PascalCase"],
-
-            custom: {
-                regex: "(t|T)ype$",
-                match: false,
-            },
-        }],
-    },
-}];

inst/app_template/tests/testthat/test-shinytest2.R

@@ -5,7 +5,7 @@ test_that("Initial snapshot values are consistent", {
   app$expect_values()
 }){{
 if (isTRUE(module)) {
-shiny::HTML('
+HTML('
 
 
 test_that("Module values are consistent", {

inst/examples-shiny/08_html/www/index.html

@@ -1,9 +1,9 @@
 <html>
 
 <head>
-  <script src="shared/jquery.min.js" type="text/javascript"></script>
-  <script src="shared/shiny.min.js" type="text/javascript"></script>
-  <link rel="stylesheet" type="text/css" href="shared/shiny.min.css"/>
+  <script src="shared/jquery.js" type="text/javascript"></script>
+  <script src="shared/shiny.js" type="text/javascript"></script>
+  <link rel="stylesheet" type="text/css" href="shared/shiny.css"/>
 </head>
 
 <body>

inst/www/shared/busy-indicators/busy-indicators.js

@@ -0,0 +1,3 @@
+/*! shiny 1.8.1.9001 | (c) 2012-2024 RStudio, PBC. | License: GPL-3 | file LICENSE */
+"use strict";(function(){document.documentElement.classList.add("shiny-not-yet-idle");$(document).one("shiny:idle",function(){document.documentElement.classList.remove("shiny-not-yet-idle")});})();
+//# sourceMappingURL=busy-indicators.js.map

inst/www/shared/busy-indicators/busy-indicators.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../srcts/extras/busy-indicators/busy-indicators.ts"],
+  "sourcesContent": ["// Think of this like the .shiny-busy class that shiny.js puts on the root element,\n// except it's added before shiny.js is initialized, connected, etc.\ndocument.documentElement.classList.add(\"shiny-not-yet-idle\");\n$(document).one(\"shiny:idle\", function () {\n  document.documentElement.classList.remove(\"shiny-not-yet-idle\");\n});"],
+  "mappings": ";yBAEA,SAAS,gBAAgB,UAAU,IAAI,oBAAoB,EAC3D,EAAE,QAAQ,EAAE,IAAI,aAAc,UAAY,CACxC,SAAS,gBAAgB,UAAU,OAAO,oBAAoB,CAChE,CAAC",
+  "names": []
+}

inst/www/shared/busy-indicators/spinners/12-dots-scale-rotate.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><circle cx="12" cy="3" r="1"><animate id="spinner_7Z73" begin="0;spinner_tKsu.end-0.5s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="16.50" cy="4.21" r="1"><animate id="spinner_Wd87" begin="spinner_7Z73.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="7.50" cy="4.21" r="1"><animate id="spinner_tKsu" begin="spinner_9Qlc.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="19.79" cy="7.50" r="1"><animate id="spinner_lMMO" begin="spinner_Wd87.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="4.21" cy="7.50" r="1"><animate id="spinner_9Qlc" begin="spinner_Khxv.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="21.00" cy="12.00" r="1"><animate id="spinner_5L9t" begin="spinner_lMMO.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="3.00" cy="12.00" r="1"><animate id="spinner_Khxv" begin="spinner_ld6P.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="19.79" cy="16.50" r="1"><animate id="spinner_BfTD" begin="spinner_5L9t.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="4.21" cy="16.50" r="1"><animate id="spinner_ld6P" begin="spinner_XyBs.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="16.50" cy="19.79" r="1"><animate id="spinner_7gAK" begin="spinner_BfTD.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="7.50" cy="19.79" r="1"><animate id="spinner_XyBs" begin="spinner_HiSl.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="12" cy="21" r="1"><animate id="spinner_HiSl" begin="spinner_7gAK.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="1;2;1" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><animateTransform attributeName="transform" type="rotate" dur="6s" values="360 12 12;0 12 12" repeatCount="indefinite"/></g></svg>

inst/www/shared/busy-indicators/spinners/180-ring-with-bg.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z" opacity=".25"/><path d="M12,4a8,8,0,0,1,7.89,6.7A1.53,1.53,0,0,0,21.38,12h0a1.5,1.5,0,0,0,1.48-1.75,11,11,0,0,0-21.72,0A1.5,1.5,0,0,0,2.62,12h0a1.53,1.53,0,0,0,1.49-1.3A8,8,0,0,1,12,4Z"><animateTransform attributeName="transform" type="rotate" dur="0.75s" values="0 12 12;360 12 12" repeatCount="indefinite"/></path></svg>

inst/www/shared/busy-indicators/spinners/180-ring.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12,4a8,8,0,0,1,7.89,6.7A1.53,1.53,0,0,0,21.38,12h0a1.5,1.5,0,0,0,1.48-1.75,11,11,0,0,0-21.72,0A1.5,1.5,0,0,0,2.62,12h0a1.53,1.53,0,0,0,1.49-1.3A8,8,0,0,1,12,4Z"><animateTransform attributeName="transform" type="rotate" dur="0.75s" values="0 12 12;360 12 12" repeatCount="indefinite"/></path></svg>

inst/www/shared/busy-indicators/spinners/270-ring-with-bg.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z" opacity=".25"/><path d="M10.72,19.9a8,8,0,0,1-6.5-9.79A7.77,7.77,0,0,1,10.4,4.16a8,8,0,0,1,9.49,6.52A1.54,1.54,0,0,0,21.38,12h.13a1.37,1.37,0,0,0,1.38-1.54,11,11,0,1,0-12.7,12.39A1.54,1.54,0,0,0,12,21.34h0A1.47,1.47,0,0,0,10.72,19.9Z"><animateTransform attributeName="transform" type="rotate" dur="0.75s" values="0 12 12;360 12 12" repeatCount="indefinite"/></path></svg>

inst/www/shared/busy-indicators/spinners/270-ring.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M10.72,19.9a8,8,0,0,1-6.5-9.79A7.77,7.77,0,0,1,10.4,4.16a8,8,0,0,1,9.49,6.52A1.54,1.54,0,0,0,21.38,12h.13a1.37,1.37,0,0,0,1.38-1.54,11,11,0,1,0-12.7,12.39A1.54,1.54,0,0,0,12,21.34h0A1.47,1.47,0,0,0,10.72,19.9Z"><animateTransform attributeName="transform" type="rotate" dur="0.75s" values="0 12 12;360 12 12" repeatCount="indefinite"/></path></svg>

inst/www/shared/busy-indicators/spinners/3-dots-bounce.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="4" cy="12" r="3"><animate id="spinner_qFRN" begin="0;spinner_OcgL.end+0.25s" attributeName="cy" calcMode="spline" dur="0.6s" values="12;6;12" keySplines=".33,.66,.66,1;.33,0,.66,.33"/></circle><circle cx="12" cy="12" r="3"><animate begin="spinner_qFRN.begin+0.1s" attributeName="cy" calcMode="spline" dur="0.6s" values="12;6;12" keySplines=".33,.66,.66,1;.33,0,.66,.33"/></circle><circle cx="20" cy="12" r="3"><animate id="spinner_OcgL" begin="spinner_qFRN.begin+0.2s" attributeName="cy" calcMode="spline" dur="0.6s" values="12;6;12" keySplines=".33,.66,.66,1;.33,0,.66,.33"/></circle></svg>

inst/www/shared/busy-indicators/spinners/3-dots-fade.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="4" cy="12" r="3" opacity="1"><animate id="spinner_qYjJ" begin="0;spinner_t4KZ.end-0.25s" attributeName="opacity" dur="0.75s" values="1;.2" fill="freeze"/></circle><circle cx="12" cy="12" r="3" opacity=".4"><animate begin="spinner_qYjJ.begin+0.15s" attributeName="opacity" dur="0.75s" values="1;.2" fill="freeze"/></circle><circle cx="20" cy="12" r="3" opacity=".3"><animate id="spinner_t4KZ" begin="spinner_qYjJ.begin+0.3s" attributeName="opacity" dur="0.75s" values="1;.2" fill="freeze"/></circle></svg>

inst/www/shared/busy-indicators/spinners/3-dots-move.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="4" cy="12" r="0"><animate begin="0;spinner_z0Or.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="0;3" fill="freeze"/><animate begin="spinner_OLMs.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="4;12" fill="freeze"/><animate begin="spinner_UHR2.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="12;20" fill="freeze"/><animate id="spinner_lo66" begin="spinner_Aguh.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="3;0" fill="freeze"/><animate id="spinner_z0Or" begin="spinner_lo66.end" attributeName="cx" dur="0.001s" values="20;4" fill="freeze"/></circle><circle cx="4" cy="12" r="3"><animate begin="0;spinner_z0Or.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="4;12" fill="freeze"/><animate begin="spinner_OLMs.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="12;20" fill="freeze"/><animate id="spinner_JsnR" begin="spinner_UHR2.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="3;0" fill="freeze"/><animate id="spinner_Aguh" begin="spinner_JsnR.end" attributeName="cx" dur="0.001s" values="20;4" fill="freeze"/><animate begin="spinner_Aguh.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="0;3" fill="freeze"/></circle><circle cx="12" cy="12" r="3"><animate begin="0;spinner_z0Or.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="12;20" fill="freeze"/><animate id="spinner_hSjk" begin="spinner_OLMs.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="3;0" fill="freeze"/><animate id="spinner_UHR2" begin="spinner_hSjk.end" attributeName="cx" dur="0.001s" values="20;4" fill="freeze"/><animate begin="spinner_UHR2.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="0;3" fill="freeze"/><animate begin="spinner_Aguh.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="4;12" fill="freeze"/></circle><circle cx="20" cy="12" r="3"><animate id="spinner_4v5M" begin="0;spinner_z0Or.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="3;0" fill="freeze"/><animate id="spinner_OLMs" begin="spinner_4v5M.end" attributeName="cx" dur="0.001s" values="20;4" fill="freeze"/><animate begin="spinner_OLMs.end" attributeName="r" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="0;3" fill="freeze"/><animate begin="spinner_UHR2.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="4;12" fill="freeze"/><animate begin="spinner_Aguh.end" attributeName="cx" calcMode="spline" dur="0.5s" keySplines=".36,.6,.31,1" values="12;20" fill="freeze"/></circle></svg>

inst/www/shared/busy-indicators/spinners/3-dots-rotate.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><g><circle cx="4" cy="12" r="3"/><circle cx="20" cy="12" r="3"/><animateTransform attributeName="transform" type="rotate" calcMode="spline" dur="1s" keySplines=".36,.6,.31,1;.36,.6,.31,1" values="0 12 12;180 12 12;360 12 12" repeatCount="indefinite"/></g></svg>

inst/www/shared/busy-indicators/spinners/3-dots-scale-middle.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="4" cy="12" r="1.5"><animate attributeName="r" dur="0.75s" values="1.5;3;1.5" repeatCount="indefinite"/></circle><circle cx="12" cy="12" r="3"><animate attributeName="r" dur="0.75s" values="3;1.5;3" repeatCount="indefinite"/></circle><circle cx="20" cy="12" r="1.5"><animate attributeName="r" dur="0.75s" values="1.5;3;1.5" repeatCount="indefinite"/></circle></svg>

inst/www/shared/busy-indicators/spinners/3-dots-scale.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="4" cy="12" r="3"><animate id="spinner_jObz" begin="0;spinner_vwSQ.end-0.25s" attributeName="r" dur="0.75s" values="3;.2;3"/></circle><circle cx="12" cy="12" r="3"><animate begin="spinner_jObz.end-0.6s" attributeName="r" dur="0.75s" values="3;.2;3"/></circle><circle cx="20" cy="12" r="3"><animate id="spinner_vwSQ" begin="spinner_jObz.end-0.45s" attributeName="r" dur="0.75s" values="3;.2;3"/></circle></svg>

inst/www/shared/busy-indicators/spinners/6-dots-rotate.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><circle cx="12" cy="2.5" r="1.5" opacity=".14"/><circle cx="16.75" cy="3.77" r="1.5" opacity=".29"/><circle cx="20.23" cy="7.25" r="1.5" opacity=".43"/><circle cx="21.50" cy="12.00" r="1.5" opacity=".57"/><circle cx="20.23" cy="16.75" r="1.5" opacity=".71"/><circle cx="16.75" cy="20.23" r="1.5" opacity=".86"/><circle cx="12" cy="21.5" r="1.5"/><animateTransform attributeName="transform" type="rotate" calcMode="discrete" dur="0.75s" values="0 12 12;30 12 12;60 12 12;90 12 12;120 12 12;150 12 12;180 12 12;210 12 12;240 12 12;270 12 12;300 12 12;330 12 12;360 12 12" repeatCount="indefinite"/></g></svg>

inst/www/shared/busy-indicators/spinners/6-dots-scale-middle.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="3" r="0"><animate id="spinner_6RAU" begin="0;spinner_GErc.end-0.5s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="16.50" cy="4.21" r="0"><animate id="spinner_khXL" begin="spinner_6RAU.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="7.50" cy="4.21" r="0"><animate id="spinner_GErc" begin="spinner_JEaM.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="19.79" cy="7.50" r="0"><animate id="spinner_9orP" begin="spinner_khXL.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="4.21" cy="7.50" r="0"><animate id="spinner_JEaM" begin="spinner_RwRf.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="21.00" cy="12.00" r="0"><animate id="spinner_W8J5" begin="spinner_9orP.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="3.00" cy="12.00" r="0"><animate id="spinner_RwRf" begin="spinner_tByH.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="19.79" cy="16.50" r="0"><animate id="spinner_tedm" begin="spinner_W8J5.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="4.21" cy="16.50" r="0"><animate id="spinner_tByH" begin="spinner_c3Lr.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="16.50" cy="19.79" r="0"><animate id="spinner_QxRo" begin="spinner_tedm.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="7.50" cy="19.79" r="0"><animate id="spinner_c3Lr" begin="spinner_PW3C.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle><circle cx="12" cy="21" r="0"><animate id="spinner_PW3C" begin="spinner_QxRo.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keySplines=".27,.42,.37,.99;.53,0,.61,.73"/></circle></svg>

inst/www/shared/busy-indicators/spinners/6-dots-scale.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="3" r="0"><animate id="spinner_318l" begin="0;spinner_cvkU.end-0.5s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="16.50" cy="4.21" r="0"><animate id="spinner_g5Gj" begin="spinner_318l.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="7.50" cy="4.21" r="0"><animate id="spinner_cvkU" begin="spinner_Uuk0.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="19.79" cy="7.50" r="0"><animate id="spinner_e8rM" begin="spinner_g5Gj.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="4.21" cy="7.50" r="0"><animate id="spinner_Uuk0" begin="spinner_z7ol.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="21.00" cy="12.00" r="0"><animate id="spinner_MooL" begin="spinner_e8rM.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="3.00" cy="12.00" r="0"><animate id="spinner_z7ol" begin="spinner_KEoo.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="19.79" cy="16.50" r="0"><animate id="spinner_btyV" begin="spinner_MooL.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="4.21" cy="16.50" r="0"><animate id="spinner_KEoo" begin="spinner_1IYD.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="16.50" cy="19.79" r="0"><animate id="spinner_1sIS" begin="spinner_btyV.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="7.50" cy="19.79" r="0"><animate id="spinner_1IYD" begin="spinner_NWhh.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle><circle cx="12" cy="21" r="0"><animate id="spinner_NWhh" begin="spinner_1sIS.begin+0.1s" attributeName="r" calcMode="spline" dur="0.6s" values="0;2;0" keyTimes="0;.2;1" keySplines="0,1,0,1;.53,0,.61,.73" fill="freeze"/></circle></svg>

inst/www/shared/busy-indicators/spinners/8-dots-rotate.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><circle cx="3" cy="12" r="2"/><circle cx="21" cy="12" r="2"/><circle cx="12" cy="21" r="2"/><circle cx="12" cy="3" r="2"/><circle cx="5.64" cy="5.64" r="2"/><circle cx="18.36" cy="18.36" r="2"/><circle cx="5.64" cy="18.36" r="2"/><circle cx="18.36" cy="5.64" r="2"/><animateTransform attributeName="transform" type="rotate" dur="1.5s" values="0 12 12;360 12 12" repeatCount="indefinite"/></g></svg>

inst/www/shared/busy-indicators/spinners/90-ring-with-bg.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z" opacity=".25"/><path d="M10.14,1.16a11,11,0,0,0-9,8.92A1.59,1.59,0,0,0,2.46,12,1.52,1.52,0,0,0,4.11,10.7a8,8,0,0,1,6.66-6.61A1.42,1.42,0,0,0,12,2.69h0A1.57,1.57,0,0,0,10.14,1.16Z"><animateTransform attributeName="transform" type="rotate" dur="0.75s" values="0 12 12;360 12 12" repeatCount="indefinite"/></path></svg>

inst/www/shared/busy-indicators/spinners/90-ring.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M10.14,1.16a11,11,0,0,0-9,8.92A1.59,1.59,0,0,0,2.46,12,1.52,1.52,0,0,0,4.11,10.7a8,8,0,0,1,6.66-6.61A1.42,1.42,0,0,0,12,2.69h0A1.57,1.57,0,0,0,10.14,1.16Z"><animateTransform attributeName="transform" type="rotate" dur="0.75s" values="0 12 12;360 12 12" repeatCount="indefinite"/></path></svg>

inst/www/shared/busy-indicators/spinners/bars-fade.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect x="1" y="4" width="6" height="14" opacity="1"><animate id="spinner_rQ7m" begin="0;spinner_2dMV.end-0.25s" attributeName="opacity" dur="0.75s" values="1;.2" fill="freeze"/></rect><rect x="9" y="4" width="6" height="14" opacity=".4"><animate begin="spinner_rQ7m.begin+0.15s" attributeName="opacity" dur="0.75s" values="1;.2" fill="freeze"/></rect><rect x="17" y="4" width="6" height="14" opacity=".3"><animate id="spinner_2dMV" begin="spinner_rQ7m.begin+0.3s" attributeName="opacity" dur="0.75s" values="1;.2" fill="freeze"/></rect></svg>