Start without yarn

eatonphil · eatonphil · commit 6c61e159554e · 2023-07-18T21:06:09.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,12 @@ dsq
 data
 .idea
 
-fileserver
+fileserver
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/desktop/partial.ts b/desktop/partial.ts
@@ -1,6 +1,6 @@
+import { preview } from '@multiprocess/preview';
+import { shape } from '@multiprocess/shape';
 import fs from 'fs';
-import { preview } from 'preview';
-import { shape } from 'shape';
 import { NoResultError } from '../shared/errors';
 import log from '../shared/log';
 
diff --git a/desktop/store.ts b/desktop/store.ts
@@ -1,4 +1,4 @@
-import asar from 'asar';
+import asar from '@electron/asar';
 import * as sqlite3 from 'better-sqlite3';
 import { Buffer } from 'buffer';
 import fs from 'fs';
diff --git a/package.json b/package.json
@@ -26,9 +26,11 @@
     "e2e-test": "node --unhandled-rejections=throw ./e2e/index.js"
   },
   "dependencies": {
-    "@tabler/icons": "npm:@tabler/icons-react",
+    "@electron/asar": "^3.2.0",
+    "@multiprocess/preview": "^0.2.3",
+    "@multiprocess/shape": "^0.2.2",
+    "@tabler/icons-react": "^2.26.0",
     "ace-builds": "^1.23.1",
-    "asar": "^3.2.0",
     "better-sqlite3": "^8.4.0",
     "chart.js": "^4.3.0",
     "cookie-parser": "^1.4.6",
@@ -46,14 +48,12 @@
     "openid-client": "^5.4.2",
     "papaparse": "^5.4.1",
     "passport": "^0.6.0",
-    "preview": "npm:@multiprocess/preview",
     "react": "17",
     "react-ace": "^10.1.0",
     "react-dom": "17",
     "react-hotkeys-hook": "^4.4.0",
     "react-syntax-highlighter": "^15.5.0",
     "sass": "^1.63.6",
-    "shape": "npm:@multiprocess/shape",
     "source-map-support": "^0.5.21",
     "sql-formatter": "^12.2.3",
     "tmp-promise": "^3.0.3",
diff --git a/shared/languages/javascript.ts b/shared/languages/javascript.ts
@@ -1,5 +1,5 @@
+import { preview } from '@multiprocess/preview';
 import circularSafeStringify from 'json-stringify-safe';
-import { preview } from 'preview';
 import { InvalidDependentPanelError, NoResultError } from '../errors';
 import log from '../log';
 import { deepClone, windowOrGlobal } from '../object';
diff --git a/shared/languages/python.ts b/shared/languages/python.ts
@@ -1,5 +1,5 @@
+import { preview } from '@multiprocess/preview';
 import circularSafeStringify from 'json-stringify-safe';
-import { preview } from 'preview';
 import { InvalidDependentPanelError, NoResultError } from '../errors';
 import log from '../log';
 import { deepClone, windowOrGlobal } from '../object';
diff --git a/shared/languages/sql.ts b/shared/languages/sql.ts
@@ -1,5 +1,5 @@
-import { preview } from 'preview';
-import { Shape } from 'shape';
+import { preview } from '@multiprocess/preview';
+import { Shape } from '@multiprocess/shape';
 import {
   InvalidDependentPanelError,
   NotAnArrayOfObjectsError,
diff --git a/shared/languages/types.ts b/shared/languages/types.ts
@@ -1,4 +1,4 @@
-import { Shape } from 'shape';
+import { Shape } from '@multiprocess/shape';
 import { PanelResult } from '../state';
 
 export const EOL = /\r?\n/;
diff --git a/shared/log.ts b/shared/log.ts
@@ -1,4 +1,4 @@
-import { preview } from 'preview';
+import { preview } from '@multiprocess/preview';
 export const logger = {
   INFO: console.log,
   ERROR: console.trace,
diff --git a/shared/state.ts b/shared/state.ts
@@ -1,4 +1,4 @@
-import { Shape } from 'shape';
+import { Shape } from '@multiprocess/shape';
 import { VERSION } from './constants';
 import { SupportedLanguages } from './languages';
 import { mergeDeep, newId, setPath } from './object';
diff --git a/ui/Connector.tsx b/ui/Connector.tsx
@@ -1,4 +1,4 @@
-import { IconTrash } from '@tabler/icons';
+import { IconTrash } from '@tabler/icons-react';
 import * as React from 'react';
 import { ConnectorInfo, DatabaseConnectorInfo } from '../shared/state';
 import { DatabaseConnector } from './DatabaseConnector';
diff --git a/ui/DownloadPanel.tsx b/ui/DownloadPanel.tsx
@@ -1,4 +1,4 @@
-import { IconCheck, IconDownload } from '@tabler/icons';
+import { IconCheck, IconDownload } from '@tabler/icons-react';
 import circularSafeStringify from 'json-stringify-safe';
 import React from 'react';
 import { MODE } from '../shared/constants';
diff --git a/ui/Navigation.tsx b/ui/Navigation.tsx
@@ -1,4 +1,4 @@
-import { Icon as TablerIcon } from '@tabler/icons';
+import { Icon as TablerIcon } from '@tabler/icons-react';
 import React from 'react';
 import { Button } from './components/Button';
 import { DefaultView, UrlStateContext } from './urlState';
diff --git a/ui/PageList.tsx b/ui/PageList.tsx
@@ -1,4 +1,4 @@
-import { IconTrash } from '@tabler/icons';
+import { IconTrash } from '@tabler/icons-react';
 import * as React from 'react';
 import { MODE, MODE_FEATURES } from '../shared/constants';
 import {
diff --git a/ui/Panel.tsx b/ui/Panel.tsx
@@ -1,3 +1,4 @@
+import { toString } from '@multiprocess/shape';
 import {
   IconAlertTriangle,
   IconArrowsDiagonal,
@@ -12,12 +13,11 @@ import {
   IconPlayerPause,
   IconPlayerPlay,
   IconTrash,
-} from '@tabler/icons';
+} from '@tabler/icons-react';
 import formatDistanceStrict from 'date-fns/formatDistanceStrict';
 import formatDistanceToNow from 'date-fns/formatDistanceToNow';
 import circularSafeStringify from 'json-stringify-safe';
 import * as React from 'react';
-import { toString } from 'shape';
 import { format as sqlFormat } from 'sql-formatter';
 import { MODE_FEATURES } from '../shared/constants';
 import { EVAL_ERRORS } from '../shared/errors';
diff --git a/ui/PanelList.tsx b/ui/PanelList.tsx
@@ -1,6 +1,6 @@
-import { IconChartBar, IconTable } from '@tabler/icons';
+import { ArrayShape, ObjectShape } from '@multiprocess/shape';
+import { IconChartBar, IconTable } from '@tabler/icons-react';
 import * as React from 'react';
-import { ArrayShape, ObjectShape } from 'shape';
 import {
   GraphPanelInfo,
   PanelInfo,
diff --git a/ui/Server.tsx b/ui/Server.tsx
@@ -1,4 +1,4 @@
-import { IconTrash } from '@tabler/icons';
+import { IconTrash } from '@tabler/icons-react';
 import * as React from 'react';
 import { MODE } from '../shared/constants';
 import { ServerInfo, ServerInfoType } from '../shared/state';
diff --git a/ui/Settings.tsx b/ui/Settings.tsx
@@ -1,4 +1,4 @@
-import { IconTrash } from '@tabler/icons';
+import { IconTrash } from '@tabler/icons-react';
 import React from 'react';
 import { MODE } from '../shared/constants';
 import { LANGUAGES } from '../shared/languages';
diff --git a/ui/Sidebar.tsx b/ui/Sidebar.tsx
@@ -1,4 +1,4 @@
-import { IconChevronLeft, IconChevronRight } from '@tabler/icons';
+import { IconChevronLeft, IconChevronRight } from '@tabler/icons-react';
 import * as React from 'react';
 import { Button } from './components/Button';
 import { UrlStateContext } from './urlState';
diff --git a/ui/app.tsx b/ui/app.tsx
@@ -6,7 +6,7 @@ import {
   IconLayoutDashboard,
   IconSettings,
   Icon as TablerIcon,
-} from '@tabler/icons';
+} from '@tabler/icons-react';
 import * as React from 'react';
 import { MODE, MODE_FEATURES } from '../shared/constants';
 import { LANGUAGES } from '../shared/languages';
diff --git a/ui/components/Alert.tsx b/ui/components/Alert.tsx
@@ -3,7 +3,7 @@ import {
   IconBug,
   IconHeartbeat,
   IconInfoCircle,
-} from '@tabler/icons';
+} from '@tabler/icons-react';
 import * as React from 'react';
 
 type AlertTypes = 'fatal' | 'error' | 'warning' | 'info';
diff --git a/ui/components/FieldPicker.tsx b/ui/components/FieldPicker.tsx
@@ -1,6 +1,11 @@
-import { IconTrash } from '@tabler/icons';
+import {
+  ArrayShape,
+  ObjectShape,
+  ScalarShape,
+  Shape,
+} from '@multiprocess/shape';
+import { IconTrash } from '@tabler/icons-react';
 import * as React from 'react';
-import { ArrayShape, ObjectShape, ScalarShape, Shape } from 'shape';
 import { title } from '../../shared/text';
 import { Button } from './Button';
 import { Input } from './Input';
diff --git a/ui/components/TimeSeriesRange.tsx b/ui/components/TimeSeriesRange.tsx
@@ -1,6 +1,6 @@
+import { Shape } from '@multiprocess/shape';
 import subMinutes from 'date-fns/subMinutes';
 import * as React from 'react';
-import { Shape } from 'shape';
 import { newId } from '../../shared/object';
 import {
   TimeSeriesFixedTimes,
diff --git a/ui/components/Tooltip.tsx b/ui/components/Tooltip.tsx
@@ -1,4 +1,4 @@
-import { IconHelp } from '@tabler/icons';
+import { IconHelp } from '@tabler/icons-react';
 import React from 'react';
 
 export function Tooltip({ children }: { children: React.ReactNode }) {
diff --git a/ui/panels/FilePanel.tsx b/ui/panels/FilePanel.tsx
@@ -1,6 +1,6 @@
-import { preview } from 'preview';
+import { preview } from '@multiprocess/preview';
+import { shape } from '@multiprocess/shape';
 import * as React from 'react';
-import { shape } from 'shape';
 import { MODE } from '../../shared/constants';
 import { FilePanelInfo, PanelResult } from '../../shared/state';
 import { parseArrayBuffer } from '../../shared/text';
diff --git a/ui/panels/FilterAggregatePanel.tsx b/ui/panels/FilterAggregatePanel.tsx
@@ -1,5 +1,5 @@
+import { ArrayShape, ObjectShape, Shape, shape } from '@multiprocess/shape';
 import React from 'react';
-import { ArrayShape, ObjectShape, Shape, shape } from 'shape';
 import { MODE } from '../../shared/constants';
 import { InvalidDependentPanelError } from '../../shared/errors';
 import { LANGUAGES } from '../../shared/languages';
diff --git a/ui/panels/GraphPanel.tsx b/ui/panels/GraphPanel.tsx
@@ -1,5 +1,5 @@
+import { preview } from '@multiprocess/preview';
 import Chart from 'chart.js/auto';
-import { preview } from 'preview';
 import * as React from 'react';
 import log from '../../shared/log';
 import {
diff --git a/ui/panels/HTTPPanel.tsx b/ui/panels/HTTPPanel.tsx
@@ -1,7 +1,7 @@
-import { IconTrash } from '@tabler/icons';
-import { preview } from 'preview';
+import { preview } from '@multiprocess/preview';
+import { shape } from '@multiprocess/shape';
+import { IconTrash } from '@tabler/icons-react';
 import * as React from 'react';
-import { shape } from 'shape';
 import { MODE, MODE_FEATURES } from '../../shared/constants';
 import { request } from '../../shared/http';
 import { newId } from '../../shared/object';
diff --git a/ui/panels/LiteralPanel.tsx b/ui/panels/LiteralPanel.tsx
@@ -1,6 +1,6 @@
-import { preview } from 'preview';
+import { preview } from '@multiprocess/preview';
+import { shape } from '@multiprocess/shape';
 import * as React from 'react';
-import { shape } from 'shape';
 import { MODE } from '../../shared/constants';
 import { ContentTypeInfo, LiteralPanelInfo } from '../../shared/state';
 import { parseArrayBuffer } from '../../shared/text';
diff --git a/ui/panels/ProgramPanel.tsx b/ui/panels/ProgramPanel.tsx
@@ -1,6 +1,6 @@
+import { shape, toString as shapeToString } from '@multiprocess/shape';
 import { Ace } from 'ace-builds';
 import React from 'react';
-import { shape, toString as shapeToString } from 'shape';
 import { DOCS_ROOT, MODE } from '../../shared/constants';
 import { LANGUAGES, SupportedLanguages } from '../../shared/languages';
 import { PanelInfo, PanelResult, ProgramPanelInfo } from '../../shared/state';
diff --git a/ui/panels/TablePanel.tsx b/ui/panels/TablePanel.tsx
@@ -1,11 +1,11 @@
+import { preview } from '@multiprocess/preview';
+import { shape } from '@multiprocess/shape';
 import {
   IconPlayerSkipBack,
   IconPlayerTrackNext,
   IconPlayerTrackPrev,
-} from '@tabler/icons';
-import { preview } from 'preview';
+} from '@tabler/icons-react';
 import * as React from 'react';
-import { shape } from 'shape';
 import { MODE } from '../../shared/constants';
 import { InvalidDependentPanelError } from '../../shared/errors';
 import {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import asar from 'asar';`
	`1`	`+import asar from '@electron/asar';`
`2`	`2`	`import * as sqlite3 from 'better-sqlite3';`
`3`	`3`	`import { Buffer } from 'buffer';`
`4`	`4`	`import fs from 'fs';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Shape } from 'shape';`
	`1`	`+import { Shape } from '@multiprocess/shape';`
`2`	`2`	`import { PanelResult } from '../state';`
`3`	`3`
`4`	`4`	`export const EOL = /\r?\n/;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { preview } from 'preview';`
	`1`	`+import { preview } from '@multiprocess/preview';`
`2`	`2`	`export const logger = {`
`3`	`3`	`INFO: console.log,`
`4`	`4`	`ERROR: console.trace,`