deephaven · mofojed · Sep 7, 2022 · Oct 14, 2022 · Oct 14, 2022 · Oct 14, 2022
diff --git a/jest.setup.ts b/jest.setup.ts
@@ -1,8 +1,17 @@
 import '@testing-library/jest-dom';
 import 'jest-canvas-mock';
-import './__mocks__/dh-core';
 import Log from '@deephaven/log';
 
+jest.mock('@deephaven/jsapi-shim', () => {
+  return jest.fn().mockImplementation(() => {
+    return {
+      Client: {
+        connect: jest.fn(),
+      },
+    };
+  });
+});
+
 let logLevel = parseInt(process.env.DH_LOG_LEVEL ?? '', 10);
 if (!Number.isFinite(logLevel)) {
   logLevel = -1;

diff --git a/packages/code-studio/index.html b/packages/code-studio/index.html
@@ -15,38 +15,6 @@
     <link rel="manifest" href="/manifest.json" />
 
     <link rel="icon" href="#VITE_FAVICON#" />
-
-    <!-- The script is currently tightly coupled with the server -->
-    <script
-      src="#VITE_CORE_API_URL#/#VITE_OPEN_API_NAME#"
-      type="text/javascript"
-    ></script>
-    <script
-      src="#VITE_CORE_API_URL#/#VITE_CORE_API_NAME#"
-      type="text/javascript"
-    ></script>
-    <script>
-      (function () {
-        document.addEventListener('DOMContentLoaded', function () {
-          // If for some reason the API doesn't load, our app will not work. Write out a message to help the user.
-          if (!window.dh) {
-            document.getElementById('root').insertAdjacentHTML(
-              'afterbegin',
-              `<div class="modal  d-block">
-                <div class="modal-dialog modal-dialog-centered theme-bg-light">
-                  <div class="modal-content">
-                    <div class="modal-body">
-                      <h5 class="modal-title">Error: Unable to load API</h5>
-                      <p class="text-break">Ensure the server is running and you are able to reach #VITE_CORE_API_URL#/#VITE_CORE_API_NAME#, then refresh the page.</p>
-                    </div>
-                  </div>
-                </div>
-              </div>`
-            );
-          }
-        });
-      })();
-    </script>
     <title>Deephaven</title>
   </head>
   <body>

diff --git a/packages/code-studio/src/storage/grpc/GrpcFileStorage.ts b/packages/code-studio/src/storage/grpc/GrpcFileStorage.ts
@@ -9,7 +9,7 @@ import {
   FileStorageTable,
   FileUtils,
 } from '@deephaven/file-explorer';
-import { StorageService } from '@deephaven/jsapi-shim';
+import dh, { StorageService } from '@deephaven/jsapi-shim';
 import Log from '@deephaven/log';
 import GrpcFileStorageTable from './GrpcFileStorageTable';
 

diff --git a/packages/code-studio/vite.config.ts b/packages/code-studio/vite.config.ts
@@ -107,6 +107,7 @@ export default defineConfig(({ mode }) => {
       outDir: path.resolve(__dirname, env.VITE_BUILD_PATH),
       emptyOutDir: true,
       sourcemap: true,
+      target: 'esnext',
       rollupOptions: {
         output: {
           manualChunks: id => {

diff --git a/packages/dashboard-core-plugins/src/ChartPlugin.tsx b/packages/dashboard-core-plugins/src/ChartPlugin.tsx
@@ -8,7 +8,7 @@ import {
   PanelHydrateFunction,
   useListener,
 } from '@deephaven/dashboard';
-import { Figure, VariableDefinition } from '@deephaven/jsapi-shim';
+import dh, { Figure, VariableDefinition } from '@deephaven/jsapi-shim';
 import shortid from 'shortid';
 import { ChartPanel, ChartPanelProps } from './panels';
 

diff --git a/packages/dashboard-core-plugins/src/GridPlugin.tsx b/packages/dashboard-core-plugins/src/GridPlugin.tsx
@@ -8,7 +8,7 @@ import {
   useListener,
 } from '@deephaven/dashboard';
 import { IrisGridModelFactory, IrisGridThemeType } from '@deephaven/iris-grid';
-import { Table, VariableDefinition } from '@deephaven/jsapi-shim';
+import dh, { Table, VariableDefinition } from '@deephaven/jsapi-shim';
 import shortid from 'shortid';
 import { IrisGridPanel, IrisGridPanelProps } from './panels';
 

diff --git a/packages/dashboard-core-plugins/src/PandasPlugin.tsx b/packages/dashboard-core-plugins/src/PandasPlugin.tsx
@@ -8,7 +8,7 @@ import {
   useListener,
 } from '@deephaven/dashboard';
 import { IrisGridModelFactory } from '@deephaven/iris-grid';
-import { Table } from '@deephaven/jsapi-shim';
+import dh, { Table } from '@deephaven/jsapi-shim';
 import shortid from 'shortid';
 import { PandasPanel, PandasPanelProps } from './panels';
 

diff --git a/packages/embed-chart/vite.config.ts b/packages/embed-chart/vite.config.ts
@@ -51,6 +51,7 @@ export default defineConfig(({ mode }) => {
       outDir: env.VITE_BUILD_PATH,
       emptyOutDir: true,
       sourcemap: true,
+      target: 'esnext',
       rollupOptions: {
         output: {
           manualChunks: id => {

diff --git a/packages/embed-grid/vite.config.ts b/packages/embed-grid/vite.config.ts
@@ -51,6 +51,7 @@ export default defineConfig(({ mode }) => {
       outDir: env.VITE_BUILD_PATH,
       emptyOutDir: true,
       sourcemap: true,
+      target: 'esnext',
       rollupOptions: {
         output: {
           manualChunks: id => {

diff --git a/packages/iris-grid/src/GotoRow.tsx b/packages/iris-grid/src/GotoRow.tsx
@@ -8,7 +8,7 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { Column } from '@deephaven/jsapi-shim';
+import dh, { Column } from '@deephaven/jsapi-shim';
 import {
   Type as FilterType,
   TypeValue as FilterTypeValue,

diff --git a/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingAPIUtils.ts b/packages/iris-grid/src/sidebar/conditional-formatting/ConditionalFormattingAPIUtils.ts
@@ -1,4 +1,4 @@
-import { Column, CustomColumn } from '@deephaven/jsapi-shim';
+import dh, { Column, CustomColumn } from '@deephaven/jsapi-shim';
 import {
   BaseFormatConfig,
   getConditionDBString,

diff --git a/packages/jsapi-components/src/useTable.ts b/packages/jsapi-components/src/useTable.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { Column, Row, Table } from '@deephaven/jsapi-shim';
+import dh, { Column, Row, Table } from '@deephaven/jsapi-shim';
 import Log from '@deephaven/log';
 import useTableListener from './useTableListener';
 import ColumnNameError from './ColumnNameError';

diff --git a/packages/jsapi-shim/src/dh.ts b/packages/jsapi-shim/src/dh.ts
@@ -2,11 +2,11 @@
 // This include file is simply a wrapper so that it behaves like a module, and can be mocked easily for unit tests
 import type dhType from './dh.types';
 
-declare global {
-  // eslint-disable-next-line vars-on-top,no-var
-  var dh: dhType;
-}
+const dhModule = await import(
+  /* @vite-ignore */
+  `${import.meta.env.VITE_CORE_API_URL}/${import.meta.env.VITE_CORE_API_NAME}`
+);
 
-const { dh } = globalThis;
+const dh = dhModule.default as dhType;
 
 export default dh;
diff --git a/packages/jsapi-shim/src/dh.types.ts b/packages/jsapi-shim/src/dh.types.ts
@@ -34,7 +34,7 @@ export interface dh {
   storage: {
     FileContents: FileContentsStatic;
   };
-  ValueType: ValueTypeStatic;
+  ValueType: typeof ValueType;
 }
 
 const VariableType = {
@@ -48,16 +48,16 @@ const VariableType = {
   PARTITIONEDTABLE: 'PartitionedTable',
 } as const;
 
-export interface ValueTypeStatic {
-  STRING: 'String';
-  NUMBER: 'Number';
-  DOUBLE: 'Double';
-  LONG: 'Long';
-  DATETIME: 'Datetime';
-  BOOLEAN: 'Boolean';
-}
+const ValueType = {
+  STRING: 'String',
+  NUMBER: 'Number',
+  DOUBLE: 'Double',
+  LONG: 'Long',
+  DATETIME: 'Datetime',
+  BOOLEAN: 'Boolean',
+} as const;
 
-export type ValueTypeUnion = typeof dh.ValueType[keyof typeof dh.ValueType];
+export type ValueTypeUnion = typeof ValueType[keyof typeof ValueType];
 
 export interface CalendarStatic {
   DayOfWeek: { values: () => string[] };

diff --git a/packages/jsapi-shim/src/vite-env.d.ts b/packages/jsapi-shim/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/packages/mocks/src/jsapi-shim.ts b/packages/mocks/src/jsapi-shim.ts
@@ -0,0 +1,9 @@
+class Client {
+  constructor() {}
+}
+
+const dh = {
+  Client,
+};
+
+export default dh;