posit-dev · georgestagg · Sep 5, 2023 · Jul 24, 2023 · Jul 24, 2023 · Jul 24, 2023
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@
 	packages \
 	quarto quartoserve \
 	clean-packages clean distclean \
-	test test-watch
+	test test-watch webr
 
 .DEFAULT_GOAL := help
 
@@ -93,6 +93,7 @@ submodules-pull:
 all: node_modules \
 	$(BUILD_DIR)/shinylive/style-resets.css \
 	$(BUILD_DIR)/shinylive/pyodide \
+	$(BUILD_DIR)/shinylive/webr \
 	src/pyodide/pyodide.js \
 	src/pyodide/pyodide.d.ts \
 	pyodide_packages_local \
@@ -126,6 +127,11 @@ $(BUILD_DIR)/shinylive/pyodide:
 	curl -L https://github.com/pyodide/pyodide/releases/download/$(PYODIDE_VERSION)/$(PYODIDE_DIST_FILENAME) \
 	    | tar --exclude "*test*.tar" --exclude "node_modules" -xvj
 
+$(BUILD_DIR)/shinylive/webr: webr
+webr:
+	mkdir -p $(BUILD_DIR)/shinylive/webr
+	cp -r node_modules/webr/dist/. $(BUILD_DIR)/shinylive/webr
+
 # Copy pyodide.js and .d.ts to src/pyodide/. This is a little weird in that in
 # `make all`, it comes after downloading pyodide. In the future we may be able
 # to use a pyodide node module, but the one currently on npm is a bit out of
@@ -206,6 +212,18 @@ serve:
 serve-prod:
 	node_modules/.bin/tsx scripts/build.ts --serve --prod
 
+# Build JS resources (with minification) with webR as the default engine
+buildjs-prod-r:
+	node_modules/.bin/tsx scripts/build.ts --prod --r
+
+# Build and serve (with minification) with webR as the default engine
+serve-prod-r:
+	node_modules/.bin/tsx scripts/build.ts --serve --prod --r
+
+# Build and serve with webR as the default engine
+serve-r:
+	node_modules/.bin/tsx scripts/build.ts --serve --r
+
 
 # Build htmltools, shiny, and shinywidgets. This target must be run manually after
 # updating the package submodules; it will not run automatically with `make all`

diff --git a/examples/index.json b/examples/index.json
@@ -1,87 +1,113 @@
 [
   {
-    "category": "Basic",
-    "apps": ["basic_app", "app_with_plot"]
-  },
-  {
-    "category": "Featured",
-    "apps": [
-      "cpuinfo",
-      "orbit",
-      "regularization",
-      "wordle",
-      "plotly",
-      "ipyleaflet",
-      "camera"
-    ]
-  },
-  {
-    "category": "Intermediate",
-    "apps": [
-      "multiple_source_files",
-      "read_local_csv_file",
-      "file_upload",
-      "file_download",
-      "insert_ui",
-      "input_update",
-      "modules",
-      "extra_packages",
-      "static_content",
-      "fetch",
-      "ipywidgets"
-    ]
-  },
-  {
-    "category": "Inputs",
-    "apps": [
-      "input_text",
-      "input_numeric",
-      "input_slider",
-      "input_checkbox",
-      "input_switch",
-      "input_checkbox_group",
-      "input_select",
-      "input_radio",
-      "input_text_area",
-      "input_date",
-      "input_date_range",
-      "input_password"
-    ]
-  },
-  {
-    "category": "Outputs",
-    "apps": [
-      "output_text",
-      "output_text_verbatim",
-      "output_ui",
-      "output_plot",
-      "output_table",
-      "output_data_frame_grid"
+    "engine": "python",
+    "examples": [
+      {
+        "category": "Basic",
+        "apps": ["basic_app", "app_with_plot"]
+      },
+      {
+        "category": "Featured",
+        "apps": [
+          "cpuinfo",
+          "orbit",
+          "regularization",
+          "wordle",
+          "plotly",
+          "ipyleaflet",
+          "camera"
+        ]
+      },
+      {
+        "category": "Intermediate",
+        "apps": [
+          "multiple_source_files",
+          "read_local_csv_file",
+          "file_upload",
+          "file_download",
+          "insert_ui",
+          "input_update",
+          "modules",
+          "extra_packages",
+          "static_content",
+          "fetch",
+          "ipywidgets"
+        ]
+      },
+      {
+        "category": "Inputs",
+        "apps": [
+          "input_text",
+          "input_numeric",
+          "input_slider",
+          "input_checkbox",
+          "input_switch",
+          "input_checkbox_group",
+          "input_select",
+          "input_radio",
+          "input_text_area",
+          "input_date",
+          "input_date_range",
+          "input_password"
+        ]
+      },
+      {
+        "category": "Outputs",
+        "apps": [
+          "output_text",
+          "output_text_verbatim",
+          "output_ui",
+          "output_plot",
+          "output_table",
+          "output_data_frame_grid"
+        ]
+      },
+      {
+        "category": "Layout",
+        "apps": ["shinyswatch", "layout_sidebar", "layout_two_column"]
+      },
+      {
+        "category": "Reactivity",
+        "apps": [
+          "reactive_event",
+          "reactive_effect",
+          "reactive_calc",
+          "reactive_value"
+        ]
+      },
+      {
+        "category": "Interactive plots",
+        "apps": [
+          "plot_interact_basic",
+          "plot_interact_select",
+          "plot_interact_exclude"
+        ]
+      },
+      {
+        "category": "Non-Apps",
+        "apps": ["hello_world"]
+      }
     ]
   },
   {
-    "category": "Layout",
-    "apps": ["shinyswatch", "layout_sidebar", "layout_two_column"]
-  },
-  {
-    "category": "Reactivity",
-    "apps": [
-      "reactive_event",
-      "reactive_effect",
-      "reactive_calc",
-      "reactive_value"
+    "engine": "r",
+    "examples": [
+      {
+        "category": "R examples",
+        "apps": [
+          "001-hello",
+          "002-text",
+          "003-reactivity",
+          "004-mpg",
+          "005-sliders",
+          "006-tabsets",
+          "007-widgets",
+          "008-html",
+          "009-upload",
+          "010-download",
+          "011-timer"
+        ]
+      }
     ]
-  },
-  {
-    "category": "Interactive plots",
-    "apps": [
-      "plot_interact_basic",
-      "plot_interact_select",
-      "plot_interact_exclude"
-    ]
-  },
-  {
-    "category": "Non-Apps",
-    "apps": ["hello_world"]
   }
 ]
diff --git a/examples/app_with_plot/about.txt → examples/python/app_with_plot/about.txt b/examples/app_with_plot/about.txt → examples/python/app_with_plot/about.txt
diff --git a/examples/app_with_plot/app.py → examples/python/app_with_plot/app.py b/examples/app_with_plot/app.py → examples/python/app_with_plot/app.py
diff --git a/examples/basic_app/about.txt → examples/python/basic_app/about.txt b/examples/basic_app/about.txt → examples/python/basic_app/about.txt
diff --git a/examples/basic_app/app.py → examples/python/basic_app/app.py b/examples/basic_app/app.py → examples/python/basic_app/app.py
diff --git a/examples/camera/about.txt → examples/python/camera/about.txt b/examples/camera/about.txt → examples/python/camera/about.txt
diff --git a/examples/camera/app.py → examples/python/camera/app.py b/examples/camera/app.py → examples/python/camera/app.py
diff --git a/examples/cpuinfo/about.txt → examples/python/cpuinfo/about.txt b/examples/cpuinfo/about.txt → examples/python/cpuinfo/about.txt
diff --git a/examples/cpuinfo/app.py → examples/python/cpuinfo/app.py b/examples/cpuinfo/app.py → examples/python/cpuinfo/app.py
diff --git a/examples/cpuinfo/fakepsutil.py → examples/python/cpuinfo/fakepsutil.py b/examples/cpuinfo/fakepsutil.py → examples/python/cpuinfo/fakepsutil.py
diff --git a/examples/extra_packages/about.txt → examples/python/extra_packages/about.txt b/examples/extra_packages/about.txt → examples/python/extra_packages/about.txt
diff --git a/examples/extra_packages/app.py → examples/python/extra_packages/app.py b/examples/extra_packages/app.py → examples/python/extra_packages/app.py
diff --git a/examples/extra_packages/requirements.txt → ...es/python/extra_packages/requirements.txt b/examples/extra_packages/requirements.txt → ...es/python/extra_packages/requirements.txt
diff --git a/examples/fetch/about.txt → examples/python/fetch/about.txt b/examples/fetch/about.txt → examples/python/fetch/about.txt
diff --git a/examples/fetch/app.py → examples/python/fetch/app.py b/examples/fetch/app.py → examples/python/fetch/app.py
diff --git a/examples/fetch/download.py → examples/python/fetch/download.py b/examples/fetch/download.py → examples/python/fetch/download.py
diff --git a/examples/file_download/about.txt → examples/python/file_download/about.txt b/examples/file_download/about.txt → examples/python/file_download/about.txt
diff --git a/examples/file_download/app.py → examples/python/file_download/app.py b/examples/file_download/app.py → examples/python/file_download/app.py
diff --git a/examples/file_download/mtcars.csv → examples/python/file_download/mtcars.csv b/examples/file_download/mtcars.csv → examples/python/file_download/mtcars.csv
diff --git a/examples/file_upload/about.txt → examples/python/file_upload/about.txt b/examples/file_upload/about.txt → examples/python/file_upload/about.txt
diff --git a/examples/file_upload/app.py → examples/python/file_upload/app.py b/examples/file_upload/app.py → examples/python/file_upload/app.py
diff --git a/examples/hello_world/about.txt → examples/python/hello_world/about.txt b/examples/hello_world/about.txt → examples/python/hello_world/about.txt
diff --git a/examples/hello_world/hello.py → examples/python/hello_world/hello.py b/examples/hello_world/hello.py → examples/python/hello_world/hello.py
diff --git a/examples/input_checkbox/about.txt → examples/python/input_checkbox/about.txt b/examples/input_checkbox/about.txt → examples/python/input_checkbox/about.txt
diff --git a/examples/input_checkbox/app.py → examples/python/input_checkbox/app.py b/examples/input_checkbox/app.py → examples/python/input_checkbox/app.py
diff --git a/examples/input_checkbox_group/about.txt → ...les/python/input_checkbox_group/about.txt b/examples/input_checkbox_group/about.txt → ...les/python/input_checkbox_group/about.txt
diff --git a/examples/input_checkbox_group/app.py → examples/python/input_checkbox_group/app.py b/examples/input_checkbox_group/app.py → examples/python/input_checkbox_group/app.py
diff --git a/examples/input_date/about.txt → examples/python/input_date/about.txt b/examples/input_date/about.txt → examples/python/input_date/about.txt
diff --git a/examples/input_date/app.py → examples/python/input_date/app.py b/examples/input_date/app.py → examples/python/input_date/app.py
diff --git a/examples/input_date_range/about.txt → examples/python/input_date_range/about.txt b/examples/input_date_range/about.txt → examples/python/input_date_range/about.txt
diff --git a/examples/input_date_range/app.py → examples/python/input_date_range/app.py b/examples/input_date_range/app.py → examples/python/input_date_range/app.py
diff --git a/examples/input_numeric/about.txt → examples/python/input_numeric/about.txt b/examples/input_numeric/about.txt → examples/python/input_numeric/about.txt
diff --git a/examples/input_numeric/app.py → examples/python/input_numeric/app.py b/examples/input_numeric/app.py → examples/python/input_numeric/app.py
diff --git a/examples/input_password/about.txt → examples/python/input_password/about.txt b/examples/input_password/about.txt → examples/python/input_password/about.txt
diff --git a/examples/input_password/app.py → examples/python/input_password/app.py b/examples/input_password/app.py → examples/python/input_password/app.py
diff --git a/examples/input_radio/about.txt → examples/python/input_radio/about.txt b/examples/input_radio/about.txt → examples/python/input_radio/about.txt
diff --git a/examples/input_radio/app.py → examples/python/input_radio/app.py b/examples/input_radio/app.py → examples/python/input_radio/app.py
diff --git a/examples/input_select/about.txt → examples/python/input_select/about.txt b/examples/input_select/about.txt → examples/python/input_select/about.txt
diff --git a/examples/input_select/app.py → examples/python/input_select/app.py b/examples/input_select/app.py → examples/python/input_select/app.py
diff --git a/examples/input_slider/about.txt → examples/python/input_slider/about.txt b/examples/input_slider/about.txt → examples/python/input_slider/about.txt
diff --git a/examples/input_slider/app.py → examples/python/input_slider/app.py b/examples/input_slider/app.py → examples/python/input_slider/app.py
diff --git a/examples/input_switch/about.txt → examples/python/input_switch/about.txt b/examples/input_switch/about.txt → examples/python/input_switch/about.txt
diff --git a/examples/input_switch/app.py → examples/python/input_switch/app.py b/examples/input_switch/app.py → examples/python/input_switch/app.py
diff --git a/examples/input_text/about.txt → examples/python/input_text/about.txt b/examples/input_text/about.txt → examples/python/input_text/about.txt
diff --git a/examples/input_text/app.py → examples/python/input_text/app.py b/examples/input_text/app.py → examples/python/input_text/app.py
diff --git a/examples/input_text_area/about.txt → examples/python/input_text_area/about.txt b/examples/input_text_area/about.txt → examples/python/input_text_area/about.txt
diff --git a/examples/input_text_area/app.py → examples/python/input_text_area/app.py b/examples/input_text_area/app.py → examples/python/input_text_area/app.py
diff --git a/examples/input_update/about.txt → examples/python/input_update/about.txt b/examples/input_update/about.txt → examples/python/input_update/about.txt
diff --git a/examples/input_update/app.py → examples/python/input_update/app.py b/examples/input_update/app.py → examples/python/input_update/app.py
diff --git a/examples/insert_ui/about.txt → examples/python/insert_ui/about.txt b/examples/insert_ui/about.txt → examples/python/insert_ui/about.txt
diff --git a/examples/insert_ui/app.py → examples/python/insert_ui/app.py b/examples/insert_ui/app.py → examples/python/insert_ui/app.py
diff --git a/examples/ipyleaflet/about.txt → examples/python/ipyleaflet/about.txt b/examples/ipyleaflet/about.txt → examples/python/ipyleaflet/about.txt
diff --git a/examples/ipyleaflet/app.py → examples/python/ipyleaflet/app.py b/examples/ipyleaflet/app.py → examples/python/ipyleaflet/app.py
diff --git a/examples/ipywidgets/about.txt → examples/python/ipywidgets/about.txt b/examples/ipywidgets/about.txt → examples/python/ipywidgets/about.txt
diff --git a/examples/ipywidgets/app.py → examples/python/ipywidgets/app.py b/examples/ipywidgets/app.py → examples/python/ipywidgets/app.py
diff --git a/examples/layout_sidebar/about.txt → examples/python/layout_sidebar/about.txt b/examples/layout_sidebar/about.txt → examples/python/layout_sidebar/about.txt
diff --git a/examples/layout_sidebar/app.py → examples/python/layout_sidebar/app.py b/examples/layout_sidebar/app.py → examples/python/layout_sidebar/app.py
diff --git a/examples/layout_two_column/about.txt → examples/python/layout_two_column/about.txt b/examples/layout_two_column/about.txt → examples/python/layout_two_column/about.txt
diff --git a/examples/layout_two_column/app.py → examples/python/layout_two_column/app.py b/examples/layout_two_column/app.py → examples/python/layout_two_column/app.py
diff --git a/examples/modules/about.txt → examples/python/modules/about.txt b/examples/modules/about.txt → examples/python/modules/about.txt
diff --git a/examples/modules/app.py → examples/python/modules/app.py b/examples/modules/app.py → examples/python/modules/app.py
diff --git a/examples/multiple_source_files/about.txt → ...es/python/multiple_source_files/about.txt b/examples/multiple_source_files/about.txt → ...es/python/multiple_source_files/about.txt
diff --git a/examples/multiple_source_files/app.py → examples/python/multiple_source_files/app.py b/examples/multiple_source_files/app.py → examples/python/multiple_source_files/app.py
diff --git a/examples/multiple_source_files/utils.py → ...les/python/multiple_source_files/utils.py b/examples/multiple_source_files/utils.py → ...les/python/multiple_source_files/utils.py
diff --git a/examples/orbit/about.txt → examples/python/orbit/about.txt b/examples/orbit/about.txt → examples/python/orbit/about.txt
diff --git a/examples/orbit/app.py → examples/python/orbit/app.py b/examples/orbit/app.py → examples/python/orbit/app.py
diff --git a/examples/orbit/body.py → examples/python/orbit/body.py b/examples/orbit/body.py → examples/python/orbit/body.py
diff --git a/examples/orbit/requirements.txt → examples/python/orbit/requirements.txt b/examples/orbit/requirements.txt → examples/python/orbit/requirements.txt
diff --git a/examples/orbit/simulation.py → examples/python/orbit/simulation.py b/examples/orbit/simulation.py → examples/python/orbit/simulation.py
diff --git a/examples/orbit/www/coords.png → examples/python/orbit/www/coords.png b/examples/orbit/www/coords.png → examples/python/orbit/www/coords.png
diff --git a/examples/output_data_frame_grid/about.txt → ...s/python/output_data_frame_grid/about.txt b/examples/output_data_frame_grid/about.txt → ...s/python/output_data_frame_grid/about.txt
diff --git a/examples/output_data_frame_grid/app.py → ...ples/python/output_data_frame_grid/app.py b/examples/output_data_frame_grid/app.py → ...ples/python/output_data_frame_grid/app.py
diff --git a/examples/output_plot/about.txt → examples/python/output_plot/about.txt b/examples/output_plot/about.txt → examples/python/output_plot/about.txt
diff --git a/examples/output_plot/app.py → examples/python/output_plot/app.py b/examples/output_plot/app.py → examples/python/output_plot/app.py
diff --git a/examples/output_table/about.txt → examples/python/output_table/about.txt b/examples/output_table/about.txt → examples/python/output_table/about.txt
diff --git a/examples/output_table/app.py → examples/python/output_table/app.py b/examples/output_table/app.py → examples/python/output_table/app.py
diff --git a/examples/output_text/about.txt → examples/python/output_text/about.txt b/examples/output_text/about.txt → examples/python/output_text/about.txt
diff --git a/examples/output_text/app.py → examples/python/output_text/app.py b/examples/output_text/app.py → examples/python/output_text/app.py
diff --git a/examples/output_text_verbatim/about.txt → ...les/python/output_text_verbatim/about.txt b/examples/output_text_verbatim/about.txt → ...les/python/output_text_verbatim/about.txt
diff --git a/examples/output_text_verbatim/app.py → examples/python/output_text_verbatim/app.py b/examples/output_text_verbatim/app.py → examples/python/output_text_verbatim/app.py
diff --git a/examples/output_ui/about.txt → examples/python/output_ui/about.txt b/examples/output_ui/about.txt → examples/python/output_ui/about.txt
diff --git a/examples/output_ui/app.py → examples/python/output_ui/app.py b/examples/output_ui/app.py → examples/python/output_ui/app.py
diff --git a/examples/plot_interact_basic/about.txt → ...ples/python/plot_interact_basic/about.txt b/examples/plot_interact_basic/about.txt → ...ples/python/plot_interact_basic/about.txt
diff --git a/examples/plot_interact_basic/app.py → examples/python/plot_interact_basic/app.py b/examples/plot_interact_basic/app.py → examples/python/plot_interact_basic/app.py
diff --git a/examples/plot_interact_basic/mtcars.csv → ...les/python/plot_interact_basic/mtcars.csv b/examples/plot_interact_basic/mtcars.csv → ...les/python/plot_interact_basic/mtcars.csv
diff --git a/examples/plot_interact_exclude/about.txt → ...es/python/plot_interact_exclude/about.txt b/examples/plot_interact_exclude/about.txt → ...es/python/plot_interact_exclude/about.txt
diff --git a/examples/plot_interact_exclude/app.py → examples/python/plot_interact_exclude/app.py b/examples/plot_interact_exclude/app.py → examples/python/plot_interact_exclude/app.py
diff --git a/examples/plot_interact_exclude/mtcars.csv → ...s/python/plot_interact_exclude/mtcars.csv b/examples/plot_interact_exclude/mtcars.csv → ...s/python/plot_interact_exclude/mtcars.csv
diff --git a/examples/plot_interact_select/about.txt → ...les/python/plot_interact_select/about.txt b/examples/plot_interact_select/about.txt → ...les/python/plot_interact_select/about.txt
diff --git a/examples/plot_interact_select/app.py → examples/python/plot_interact_select/app.py b/examples/plot_interact_select/app.py → examples/python/plot_interact_select/app.py
diff --git a/examples/plot_interact_select/mtcars.csv → ...es/python/plot_interact_select/mtcars.csv b/examples/plot_interact_select/mtcars.csv → ...es/python/plot_interact_select/mtcars.csv
diff --git a/examples/plotly/about.txt → examples/python/plotly/about.txt b/examples/plotly/about.txt → examples/python/plotly/about.txt
diff --git a/examples/plotly/app.py → examples/python/plotly/app.py b/examples/plotly/app.py → examples/python/plotly/app.py
diff --git a/examples/plotly/requirements.txt → examples/python/plotly/requirements.txt b/examples/plotly/requirements.txt → examples/python/plotly/requirements.txt
diff --git a/examples/reactive_calc/about.txt → examples/python/reactive_calc/about.txt b/examples/reactive_calc/about.txt → examples/python/reactive_calc/about.txt
diff --git a/examples/reactive_calc/app.py → examples/python/reactive_calc/app.py b/examples/reactive_calc/app.py → examples/python/reactive_calc/app.py
diff --git a/examples/reactive_effect/about.txt → examples/python/reactive_effect/about.txt b/examples/reactive_effect/about.txt → examples/python/reactive_effect/about.txt
diff --git a/examples/reactive_effect/app.py → examples/python/reactive_effect/app.py b/examples/reactive_effect/app.py → examples/python/reactive_effect/app.py
diff --git a/examples/reactive_event/about.txt → examples/python/reactive_event/about.txt b/examples/reactive_event/about.txt → examples/python/reactive_event/about.txt
diff --git a/examples/reactive_event/app.py → examples/python/reactive_event/app.py b/examples/reactive_event/app.py → examples/python/reactive_event/app.py
diff --git a/examples/reactive_value/about.txt → examples/python/reactive_value/about.txt b/examples/reactive_value/about.txt → examples/python/reactive_value/about.txt
diff --git a/examples/reactive_value/app.py → examples/python/reactive_value/app.py b/examples/reactive_value/app.py → examples/python/reactive_value/app.py
diff --git a/examples/read_local_csv_file/about.txt → ...ples/python/read_local_csv_file/about.txt b/examples/read_local_csv_file/about.txt → ...ples/python/read_local_csv_file/about.txt
diff --git a/examples/read_local_csv_file/app.py → examples/python/read_local_csv_file/app.py b/examples/read_local_csv_file/app.py → examples/python/read_local_csv_file/app.py
diff --git a/examples/read_local_csv_file/mtcars.csv → ...les/python/read_local_csv_file/mtcars.csv b/examples/read_local_csv_file/mtcars.csv → ...les/python/read_local_csv_file/mtcars.csv
diff --git a/examples/regularization/about.txt → examples/python/regularization/about.txt b/examples/regularization/about.txt → examples/python/regularization/about.txt
diff --git a/examples/regularization/app.py → examples/python/regularization/app.py b/examples/regularization/app.py → examples/python/regularization/app.py
diff --git a/examples/regularization/compare.py → examples/python/regularization/compare.py b/examples/regularization/compare.py → examples/python/regularization/compare.py
diff --git a/examples/shinyswatch/about.txt → examples/python/shinyswatch/about.txt b/examples/shinyswatch/about.txt → examples/python/shinyswatch/about.txt
diff --git a/examples/shinyswatch/app.py → examples/python/shinyswatch/app.py b/examples/shinyswatch/app.py → examples/python/shinyswatch/app.py
diff --git a/examples/shinyswatch/requirements.txt → examples/python/shinyswatch/requirements.txt b/examples/shinyswatch/requirements.txt → examples/python/shinyswatch/requirements.txt
diff --git a/examples/static_content/about.txt → examples/python/static_content/about.txt b/examples/static_content/about.txt → examples/python/static_content/about.txt
diff --git a/examples/static_content/app.py → examples/python/static_content/app.py b/examples/static_content/app.py → examples/python/static_content/app.py
diff --git a/examples/static_content/www/logo.png → examples/python/static_content/www/logo.png b/examples/static_content/www/logo.png → examples/python/static_content/www/logo.png
diff --git a/examples/wordle/about.txt → examples/python/wordle/about.txt b/examples/wordle/about.txt → examples/python/wordle/about.txt
diff --git a/examples/wordle/app.py → examples/python/wordle/app.py b/examples/wordle/app.py → examples/python/wordle/app.py
diff --git a/examples/wordle/style.css → examples/python/wordle/style.css b/examples/wordle/style.css → examples/python/wordle/style.css
diff --git a/examples/wordle/words.py → examples/python/wordle/words.py b/examples/wordle/words.py → examples/python/wordle/words.py
diff --git a/examples/r/001-hello/DESCRIPTION b/examples/r/001-hello/DESCRIPTION
@@ -0,0 +1,7 @@
+Title: Hello Shiny!
+Author: RStudio, Inc.
+AuthorUrl: http://www.rstudio.com/
+License: MIT
+DisplayMode: Showcase
+Tags: getting-started
+Type: Shiny
diff --git a/examples/r/001-hello/Readme.md b/examples/r/001-hello/Readme.md
@@ -0,0 +1,3 @@
+This small Shiny application demonstrates Shiny's automatic UI updates. 
+
+Move the *Number of bins* slider and notice how the `renderPlot` expression is automatically re-evaluated when its dependant, `input$bins`, changes, causing a histogram with a new number of bins to be rendered.
diff --git a/examples/r/001-hello/about.txt b/examples/r/001-hello/about.txt
@@ -0,0 +1 @@
+Hello Shiny!
diff --git a/examples/r/001-hello/app.R b/examples/r/001-hello/app.R
@@ -0,0 +1,59 @@
+library(shiny)
+
+# Define UI for app that draws a histogram ----
+ui <- fluidPage(
+
+  # App title ----
+  titlePanel("Hello Shiny!"),
+
+  # Sidebar layout with input and output definitions ----
+  sidebarLayout(
+
+    # Sidebar panel for inputs ----
+    sidebarPanel(
+
+      # Input: Slider for the number of bins ----
+      sliderInput(inputId = "bins",
+                  label = "Number of bins:",
+                  min = 1,
+                  max = 50,
+                  value = 30)
+
+    ),
+
+    # Main panel for displaying outputs ----
+    mainPanel(
+
+      # Output: Histogram ----
+      plotOutput(outputId = "distPlot")
+
+    )
+  )
+)
+
+# Define server logic required to draw a histogram ----
+server <- function(input, output) {
+
+  # Histogram of the Old Faithful Geyser Data ----
+  # with requested number of bins
+  # This expression that generates a histogram is wrapped in a call
+  # to renderPlot to indicate that:
+  #
+  # 1. It is "reactive" and therefore should be automatically
+  #    re-executed when inputs (input$bins) change
+  # 2. Its output type is a plot
+  output$distPlot <- renderPlot({
+
+    x    <- faithful$waiting
+    bins <- seq(min(x), max(x), length.out = input$bins + 1)
+
+    hist(x, breaks = bins, col = "#75AADB", border = "white",
+         xlab = "Waiting time to next eruption (in mins)",
+         main = "Histogram of waiting times")
+
+    })
+
+}
+
+# Create Shiny app ----
+shinyApp(ui = ui, server = server)
diff --git a/examples/r/002-text/DESCRIPTION b/examples/r/002-text/DESCRIPTION
@@ -0,0 +1,8 @@
+Title: Shiny Text
+Author: RStudio, Inc.
+AuthorUrl: http://www.rstudio.com/
+License: MIT
+DisplayMode: Showcase
+Tags: getting-started
+Type: Shiny
+
diff --git a/examples/r/002-text/Readme.md b/examples/r/002-text/Readme.md
@@ -0,0 +1 @@
+This example demonstrates output of raw text from R using the `renderPrint` function in `server` and the `verbatimTextOutput` function in `ui`. In this case, a textual summary of the data is shown using R's built-in `summary` function. 
diff --git a/examples/r/002-text/about.txt b/examples/r/002-text/about.txt
@@ -0,0 +1 @@
+Shiny Text
diff --git a/examples/r/002-text/app.R b/examples/r/002-text/app.R
@@ -0,0 +1,64 @@
+library(shiny)
+
+# Define UI for dataset viewer app ----
+ui <- fluidPage(
+
+  # App title ----
+  titlePanel("Shiny Text"),
+
+  # Sidebar layout with a input and output definitions ----
+  sidebarLayout(
+
+    # Sidebar panel for inputs ----
+    sidebarPanel(
+
+      # Input: Selector for choosing dataset ----
+      selectInput(inputId = "dataset",
+                  label = "Choose a dataset:",
+                  choices = c("rock", "pressure", "cars")),
+
+      # Input: Numeric entry for number of obs to view ----
+      numericInput(inputId = "obs",
+                   label = "Number of observations to view:",
+                   value = 10)
+    ),
+
+    # Main panel for displaying outputs ----
+    mainPanel(
+
+      # Output: Verbatim text for data summary ----
+      verbatimTextOutput("summary"),
+
+      # Output: HTML table with requested number of observations ----
+      tableOutput("view")
+
+    )
+  )
+)
+
+# Define server logic to summarize and view selected dataset ----
+server <- function(input, output) {
+
+  # Return the requested dataset ----
+  datasetInput <- reactive({
+    switch(input$dataset,
+           "rock" = rock,
+           "pressure" = pressure,
+           "cars" = cars)
+  })
+
+  # Generate a summary of the dataset ----
+  output$summary <- renderPrint({
+    dataset <- datasetInput()
+    summary(dataset)
+  })
+
+  # Show the first "n" observations ----
+  output$view <- renderTable({
+    head(datasetInput(), n = input$obs)
+  })
+
+}
+
+# Create Shiny app ----
+shinyApp(ui = ui, server = server)