Merge branch 'horizon' into mainmast

jpolitz · jpolitz · commit 384d6b41b983 · 2025-08-28T09:02:03.000-07:00
diff --git a/src/scripts/npm-dependencies.js b/src/scripts/npm-dependencies.js
@@ -59,7 +59,7 @@ function rpcForwardCallback(module, name) {
   return async function(...args) {
     const realargs = args.slice(0, args.length - 1);
     const callback = args[args.length - 1];
-    if(!window.MESSAGES.sendRpc) { throw new Error("Cannot " + name + " on the web"); }
+    if(!(window.MESSAGES && window.MESSAGES.sendRpc)) { throw new Error("Cannot " + name + " on the web"); }
     else {
       try {
         const result = await window.MESSAGES.sendRpc(module, name, realargs);
diff --git a/src/web/arr/trove/dcic2024.arr b/src/web/arr/trove/dcic2024.arr
@@ -13,8 +13,9 @@ include from BASIC: *, type *, data * end
 include tables
 include chart 
 import statistics as S 
-# import lists as L
+#  import lists as L
 import sets as ST
+import constants as C
 
 provide: 
   get-row,
@@ -42,7 +43,15 @@ provide:
   group,
   count,
   count-many,
-  render-chart
+  render-chart,
+  pie-chart,
+  bar-chart,
+  dot-plot,
+  labeled-dot-plot
+end
+
+provide from C:
+  E
 end
 
 # ----------- TABLE FUNCTIONS -----------
diff --git a/src/web/blocks.html b/src/web/blocks.html
@@ -3,7 +3,8 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <title>code.pyret.org</title>
-  <link rel="preload" href="{{&PYRET}}" as="script">
+  <link crossorigin="anonymous" rel="preload" href="{{&PYRET}}" as="script">
+  <script>window.PYRET = "{{&PYRET}}";</script>
   <link rel="stylesheet" href="/css/reset.css" />
   <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.css" />
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Fira+Mono:400,700" />
@@ -23,6 +24,8 @@
   <link rel="stylesheet" href="/css/themes/high-contrast-dark.css" />
   <link rel="icon" type="image/png" href="/img/pyret-icon.png" />
   <style id="highlight-styles"></style>
+  <script src="{{ &BASE_URL }}/js/vega.min.js"></script>
+  <script src="{{ &BASE_URL }}/js/vega-tooltip.min.js"></script>
   <script>var APP_LOG_URL = "{{{ LOG_URL }}}";</script>
   <script src="/js/localSettings.js"></script>
 </head>
@@ -485,6 +488,7 @@ <h2>Announcements</h2>
 <script src="js/snap/src/sha512.js"></script>
 <script src="js/snap/src/FileSaver.min.js"></script>
 <script>
+var IMAGE_PROXY_BYPASS = "{{ &IMAGE_PROXY_BYPASS }}" === "true";
 var APP_BASE_URL = "{{{ BASE_URL }}}";
 var CSRF_TOKEN = "{{{ CSRF_TOKEN }}}";
 $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
@@ -494,6 +498,7 @@ <h2>Announcements</h2>
     jqXHR.setRequestHeader('X-CSRF-Token', CSRF_TOKEN);
   }
 });
+var URL_FILE_MODE = window.URL_FILE_MODE = "{{ URL_FILE_MODE }}";
 </script>
 <script>
   var replMain = $(".replMain");
diff --git a/src/web/js/beforeBlocks.js b/src/web/js/beforeBlocks.js
@@ -1304,8 +1304,8 @@ $(function() {
   });
 
   var pyretLoad = document.createElement('script');
-  console.log(process.env.PYRET);
-  pyretLoad.src = process.env.PYRET;
+  console.log(window.PYRET);
+  pyretLoad.src = window.PYRET;
   pyretLoad.type = "text/javascript";
   document.body.appendChild(pyretLoad);
 
@@ -1358,8 +1358,7 @@ $(function() {
   }
 
   $(pyretLoad).on("error", function(e) {
-    logFailureAndManualFetch(process.env.PYRET, e);
-    console.log(process.env);
+    logFailureAndManualFetch(window.PYRET, e);
     pyretLoad2.src = process.env.PYRET_BACKUP;
     pyretLoad2.type = "text/javascript";
     document.body.appendChild(pyretLoad2);
