Make prettier happy in build.ts and App.tsx

posit-dev · Sep 13, 2023 · cf5455f · cf5455f
1 parent 0b0678b
commit cf5455f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 31 deletions.
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -2,11 +2,11 @@ import { spawn } from "child_process";
 import esbuild from "esbuild";
 import * as fs from "fs";
 import http from "http";
-import process from "process";
 import path from "path";
+import process from "process";
 import packageJson from "../package.json";
+import type { AppEngine } from "../src/Components/App";
 import buildExamples from "./build_examples_json";
-import type { AppEngine } from '../src/Components/App';
 
 const EXAMPLES_SOURCE_DIR = "./examples";
 const BUILD_DIR = "./build";
@@ -91,12 +91,11 @@ function readdirSyncRecursive(dir: string, root: string = dir): string[] {
 
 function buildSiteHtml(appEngine: AppEngine) {
   console.log(`[${new Date().toISOString()}] Copying HTML templates...`);
-  readdirSyncRecursive('site_template')
-    .forEach((file) => {
-      const tmpl = fs.readFileSync(`site_template/${file}`, 'utf8');
-      const html = tmpl.replace('{{APP_ENGINE}}', appEngine);
-      fs.writeFileSync(`${SITE_DIR}/${file}`, html);
-    });
+  readdirSyncRecursive("site_template").forEach((file) => {
+    const tmpl = fs.readFileSync(`site_template/${file}`, "utf8");
+    const html = tmpl.replace("{{APP_ENGINE}}", appEngine);
+    fs.writeFileSync(`${SITE_DIR}/${file}`, html);
+  });
 }
 
 const buildmap = {
@@ -259,7 +258,7 @@ if (serve) {
               http.request(
                 { hostname: "0.0.0.0", port: 3001, path: url, method, headers },
                 (proxyRes) => {
-                  if (appEngine === 'r') {
+                  if (appEngine === "r") {
                     proxyRes.headers = {
                       ...proxyRes.headers,
                       "cross-origin-opener-policy": "same-origin",

diff --git a/src/Components/App.tsx b/src/Components/App.tsx
@@ -1,19 +1,22 @@
+import LZString from "lz-string";
+import * as React from "react";
+import { createRoot } from "react-dom/client";
 import {
   findExampleByTitle,
   getExampleCategories,
   sanitizeTitleForUrl,
 } from "../examples";
 import {
+  PyodideProxyHandle,
   initPyodide,
   initShiny,
-  PyodideProxyHandle,
   usePyodide,
 } from "../hooks/usePyodide";
 import {
-  initWebR,
+  WebRProxyHandle,
   initRShiny,
+  initWebR,
   useWebR,
-  WebRProxyHandle
 } from "../hooks/useWebR";
 import { ProxyType } from "../pyodide-proxy";
 import "./App.css";
@@ -26,9 +29,6 @@ import { Viewer, ViewerMethods } from "./Viewer";
 import { FCorFCJSONtoFC, FileContent, FileContentJson } from "./filecontent";
 import { fetchGist, gistApiResponseToFileContents } from "./gist";
 import { editorUrlPrefix, fileContentsToUrlString } from "./share";
-import LZString from "lz-string";
-import * as React from "react";
-import { createRoot } from "react-dom/client";
 
 // Load Editor component dynamically and lazily because it's large and not
 // needed for all configurations.
@@ -97,7 +97,6 @@ type AppOptions = {
   showHeaderBar?: boolean;
 };
 
-
 export type ProxyHandle = PyodideProxyHandle | WebRProxyHandle;
 let pyodideProxyHandlePromise: Promise<PyodideProxyHandle> | null = null;
 let webRProxyHandlePromise: Promise<WebRProxyHandle> | null = null;
@@ -220,10 +219,10 @@ export function App({
       useWasmEngine = () => usePyodide({ pyodideProxyHandlePromise: promise });
       break;
     }
-    case "r":{
-      const promise = webRProxyHandlePromise = ensureWebRProxyHandlePromise({
+    case "r": {
+      const promise = (webRProxyHandlePromise = ensureWebRProxyHandlePromise({
         shiny: loadShiny,
-      });
+      }));
       useWasmEngine = () => useWebR({ webRProxyHandlePromise: promise });
       break;
     }
@@ -310,7 +309,9 @@ export function App({
     setHeaderBarCallbacks({
       openEditorWindowFromViewer: () => {
         window.open(
-          editorUrlPrefix(appEngine) + "#code=" + fileContentsToUrlString(startFiles),
+          editorUrlPrefix(appEngine) +
+            "#code=" +
+            fileContentsToUrlString(startFiles),
           "_blank"
         );
       },
@@ -348,8 +349,11 @@ export function App({
               terminalMethods={terminalMethods}
               viewerMethods={viewerMethods}
               utilityMethods={utilityMethods}
-              runOnLoad={currentFiles.some((file) =>
-                file.name === "app.py" || file.name === "app.R" || file.name === "server.R"
+              runOnLoad={currentFiles.some(
+                (file) =>
+                  file.name === "app.py" ||
+                  file.name === "app.R" ||
+                  file.name === "server.R"
               )}
               appEngine={appEngine}
             />
@@ -391,8 +395,11 @@ export function App({
               terminalMethods={terminalMethods}
               viewerMethods={viewerMethods}
               utilityMethods={utilityMethods}
-              runOnLoad={currentFiles.some((file) =>
-                file.name === "app.py" || file.name === "app.R" || file.name === "server.R"
+              runOnLoad={currentFiles.some(
+                (file) =>
+                  file.name === "app.py" ||
+                  file.name === "app.R" ||
+                  file.name === "server.R"
               )}
               appEngine={appEngine}
             />
@@ -491,10 +498,7 @@ export function App({
             appEngine={appEngine}
           />
         </React.Suspense>
-        <Viewer
-          proxyHandle={proxyHandle}
-          setViewerMethods={setViewerMethods}
-        />
+        <Viewer proxyHandle={proxyHandle} setViewerMethods={setViewerMethods} />
       </ResizableGrid>
     );
   } else if (appMode === "viewer") {
@@ -542,7 +546,7 @@ export function runApp(
     allowGistUrl?: boolean;
     allowExampleUrl?: boolean;
   } = {},
-  appEngine: AppEngine,
+  appEngine: AppEngine
 ) {
   const optsDefaults = {
     allowCodeUrl: false,
@@ -595,7 +599,7 @@ export function runApp(
           if (value === "") exampleName = key;
         }
 
-        const exampleCategories = (await getExampleCategories(appEngine));
+        const exampleCategories = await getExampleCategories(appEngine);
         let pos = findExampleByTitle(exampleName, exampleCategories);
         if (pos) {
           opts.selectedExample = exampleName;
@@ -640,7 +644,12 @@ export function runApp(
     const root = createRoot(domTarget);
     root.render(
       <React.StrictMode>
-        <App appMode={mode} startFiles={startFiles} appOptions={appOpts} appEngine={appEngine} />
+        <App
+          appMode={mode}
+          startFiles={startFiles}
+          appOptions={appOpts}
+          appEngine={appEngine}
+        />
       </React.StrictMode>
     );
   })();