Merge branch 'main' of https://github.com/cybersemics/em into joe/fix…

…-986
cybersemics · Aug 13, 2024 · 23a374e · 23a374e
2 parents c673719 + 867af01
commit 23a374e
Show file tree

Hide file tree

Showing 212 changed files with 1,875 additions and 1,761 deletions.
diff --git a/.hooks/pre-push b/.hooks/pre-push
@@ -1 +1 @@
-npm run lint:src
+npm run lint
diff --git a/firebase.json b/firebase.json
@@ -5,8 +5,7 @@
       { "source": "**/.woff2", "headers": [{ "key": "Cache-Control", "value": "31536000" }] },
       { "source": "/", "headers": [{ "key": "Cache-Control", "value": "no-cache" }] },
       { "source": "/index.html", "headers": [{ "key": "Cache-Control", "value": "no-cache" }] },
-      { "source": "/service-worker.js", "headers": [{ "key": "Cache-Control", "value": "no-cache" }] },
-      { "source": "/scripts/firebase-v*", "headers": [{ "key": "Cache-Control", "value": "31536000" }] }
+      { "source": "/service-worker.js", "headers": [{ "key": "Cache-Control", "value": "no-cache" }] }
     ],
     "public": "build",
     "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],

diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -36,6 +36,16 @@
     <div id="debug"></div>
 
     <script>
+      // Prevent the React DevTools console message in Puppeteer tests.
+      // https://github.com/cybersemics/em/issues/2251
+      if (navigator.webdriver) {
+        const info = console.info.bind(console)
+        console.info = (...args) => {
+          if (typeof args[0] === 'string' && args[0].startsWith('%cDownload the React DevTools')) return
+          info(...args)
+        }
+      }
+
       // Note: theme needs to be loaded here before react loads, otherwise it causes a white flash.
       const theme = localStorage.getItem('storageCache/theme')?.toLowerCase() || 'dark'
       document.body.classList.add(theme)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "em",
-  "version": "300.30.10",
+  "version": "300.30.11",
   "author": "Raine Revere <raine@cybersemics.org>",
   "description": "A beautiful, minimalistic note-taking app for personal sensemaking.",
   "license": "NoHarm-draft",
@@ -28,7 +28,7 @@
     "cap:sync:prod": "npm run build && NODE_ENV=production cap sync",
     "start": "vite --host --port 3000",
     "build": "vite build",
-    "clean": "rm -rf ./node_modules/.cache && rm -rf .eslintcache",
+    "clean": "rm -rf ./node_modules/.cache && rm -rf ./node_modules/.vite && rm -rf .eslintcache",
     "deploy:major": "npm run lint && npm version major && npm run build && firebase deploy --only hosting",
     "deploy:minor": "npm run lint && npm version minor && npm run build && firebase deploy --only hosting",
     "deploy:patch": "npm run lint && npm version patch && npm run build && firebase deploy --only hosting",
@@ -39,6 +39,7 @@
     "lint:src": "FORCE_COLOR=1 eslint . --cache --rule 'no-console: [2, { allow: [error, info, warn] }]'",
     "lint:lockfile": "npx lockfile-lint",
     "lint:no-npm": "node ./scripts/no-files.js package-lock.json",
+    "lint:tsc": "tsc",
     "postinstall": "scripts/install-hooks.sh",
     "servebuild": "npx serve -s build -l 3000",
     "test": "vitest --project unit",
@@ -93,24 +94,24 @@
     "immer": "^10.1.1",
     "ipfs-http-client": "^43.0.1",
     "lodash": "^4.17.21",
-    "marked": "^13.0.2",
+    "marked": "^13.0.3",
     "moize": "^6.1.6",
     "murmurhash3js": "^3.0.1",
     "nanoid": "^5.0.7",
-    "openai": "^4.52.3",
+    "openai": "^4.54.0",
     "page-lifecycle": "git+https://git@github.com/magic-akari/page-lifecycle#feat/add-types",
     "pluralize": "^8.0.0",
     "qrcode.react": "^3.1.0",
     "react": "18.3.1",
     "react-contenteditable": "^3.3.7",
-    "react-dnd": "^11.1.3",
-    "react-dnd-html5-backend": "^11.1.3",
-    "react-dnd-multi-backend": "^6.0.2",
-    "react-dnd-touch-backend": "^11.1.3",
+    "react-dnd": "14.0.0",
+    "react-dnd-html5-backend": "14.0.0",
+    "react-dnd-multi-backend": "8.0.3",
+    "react-dnd-touch-backend": "14.0.0",
     "react-dom": "18.3.1",
     "react-error-boundary": "^4.0.13",
     "react-gravatar": "^2.6.3",
-    "react-native-gesture-handler": "^2.17.1",
+    "react-native-gesture-handler": "^2.18.1",
     "react-native-web": "^0.19.12",
     "react-redux": "^9.1.2",
     "react-signature-pad-wrapper": "^3.4.0",
@@ -145,6 +146,7 @@
     "@testing-library/jest-dom": "^6.4.8",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^13.5.0",
+    "@total-typescript/ts-reset": "^0.5.1",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/classnames": "^2.3.1",
     "@types/clipboard": "^2.0.7",
@@ -154,7 +156,7 @@
     "@types/jest-image-snapshot": "^6.4.0",
     "@types/lodash": "^4.17.5",
     "@types/murmurhash3js": "^3.0.7",
-    "@types/node": "^20.14.2",
+    "@types/node": "^22.1.0",
     "@types/pluralize": "0.0.33",
     "@types/react": "^18.3.3",
     "@types/react-dnd-multi-backend": "^6.0.6",
@@ -205,7 +207,8 @@
     "redux-mock-store": "^1.5.4",
     "tcp-port-used": "^1.0.2",
     "typescript": "5.4.5",
-    "vite": "^5.3.4",
+    "vite": "^5.4.0",
+    "vite-plugin-checker": "^0.7.2",
     "vite-plugin-pwa": "^0.20.0",
     "vitest": "^1.6.0",
     "webdriverio": "^7.36.0"

diff --git a/public/scripts/firebase-v4.12.1.js b/public/scripts/firebase-v4.12.1.js
diff --git a/public/scripts/firebase-v4.12.1.js.map b/public/scripts/firebase-v4.12.1.js.map
diff --git a/src/@types/CommandState.ts b/src/@types/CommandState.ts
@@ -0,0 +1,6 @@
+import FormattingCommand from './FormattingCommand'
+
+/** The set of commands applied to text (bold, italic, underline, strikethrough). */
+type CommandState = Record<FormattingCommand, boolean>
+
+export default CommandState
diff --git a/src/@types/DragThoughtItem.ts b/src/@types/DragThoughtItem.ts
@@ -1,4 +1,3 @@
-import DragAndDropType from './DragAndDropType'
 import DragThoughtZone from './DragThoughtZone'
 import Path from './Path'
 import SimplePath from './SimplePath'
@@ -8,7 +7,6 @@ interface DragThoughtItem {
   path: Path
   simplePath: SimplePath
   zone: DragThoughtZone
-  type: DragAndDropType
 }
 
 export default DragThoughtItem
diff --git a/src/@types/FormattingCommand.ts b/src/@types/FormattingCommand.ts
@@ -0,0 +1,8 @@
+enum FormattingCommand {
+  bold = 'bold',
+  italic = 'italic',
+  underline = 'underline',
+  strikethrough = 'strikethrough',
+}
+
+export default FormattingCommand
diff --git a/src/@types/react-contenteditable.d.ts b/src/@types/react-contenteditable.d.ts
@@ -0,0 +1,7 @@
+import 'react-contenteditable'
+
+declare module 'react-contenteditable' {
+  export interface Props {
+    placeholder?: string
+  }
+}
diff --git a/src/@types/react-dnd.d.ts b/src/@types/react-dnd.d.ts
@@ -0,0 +1,5 @@
+import { DndProviderProps } from 'react-dnd'
+
+declare module 'react-dnd' {
+  export declare const DndProvider: React.FC<DndProviderProps<any, any> & { children?: React.ReactNode }>
+}
diff --git a/src/@types/react-split-pane.d.ts b/src/@types/react-split-pane.d.ts
@@ -0,0 +1,11 @@
+import { SplitPaneProps, SplitPaneState } from 'react-split-pane'
+
+declare module 'react-split-pane' {
+  // eslint-disable-next-line jsdoc/require-jsdoc
+  export class SplitPane extends React.Component<SplitPaneProps & { children: React.ReactNode }, SplitPaneState> {
+    // eslint-disable-next-line jsdoc/require-jsdoc
+    render(): React.ReactNode
+  }
+
+  export default SplitPane
+}
diff --git a/src/actions/deleteThought.ts b/src/actions/deleteThought.ts
@@ -87,7 +87,7 @@ const deleteThought = (state: State, { local = true, pathParent, thoughtId, orph
 
   // The new Lexeme is typically the old Lexeme less the deleted context.
   // However, during deallocation we should not remove a single context, which would create an invalid Lexeme. Instead, we keep the Lexeme intact with all contexts, only deallocating it when all of its context thoughts have been deallocated.
-  const lexemeWithoutContext = lexeme ? removeContext(state, lexeme, thoughtId) : null
+  const lexemeWithoutContext = lexeme ? removeContext(lexeme, thoughtId) : null
 
   const lexemeNew = persist
     ? lexemeWithoutContext?.contexts.length
@@ -131,7 +131,7 @@ const deleteThought = (state: State, { local = true, pathParent, thoughtId, orph
 
         // The new Lexeme is typically the old Lexeme less the deleted context.
         // However, during deallocation we should not remove a single context, which would create an invalid context superscript. Instead, we keep the Lexeme intact with all contexts, only deallocating it when all of its context thoughts have been deallocated.
-        const lexemeChildWithoutContext = lexemeChild ? removeContext(state, lexemeChild, child.id) : null
+        const lexemeChildWithoutContext = lexemeChild ? removeContext(lexemeChild, child.id) : null
         const lexemeChildNew = persist
           ? lexemeChildWithoutContext?.contexts.length
             ? lexemeChildWithoutContext

diff --git a/src/actions/editThought.ts b/src/actions/editThought.ts
@@ -111,7 +111,7 @@ const editThought = (state: State, { force, oldValue, newValue, path, rankInCont
   }
 
   // the old thought less the context
-  const newOldLexeme = lexemeOld && !isThoughtOldOrphan() ? removeContext(state, lexemeOld, editedThoughtId) : null
+  const newOldLexeme = lexemeOld && !isThoughtOldOrphan() ? removeContext(lexemeOld, editedThoughtId) : null
 
   const lexemeNew = addContext(lexemeNewWithoutContext, { id: editedThoughtId, archived: editedThought.archived })
 

diff --git a/src/actions/freeThoughts.ts b/src/actions/freeThoughts.ts
@@ -69,14 +69,16 @@ const freeThoughts = (state: State) => {
         ...getAllChildren(state, head(path)),
         // preserve context view (including context ancestors)
         ...(showContexts
-          ? getContexts(state, getThoughtById(state, head(path)).value).flatMap(cxid => thoughtToPath(state, cxid))
+          ? (getContexts(state, getThoughtById(state, head(path)).value).flatMap(cxid =>
+              thoughtToPath(state, cxid),
+            ) as ThoughtId[])
           : []),
       ]
     }),
     // preserve EM context
     ...getDescendantThoughtIds(state, EM_TOKEN),
     // preserve favorites contexts and their ancestors
-    ...(getLexeme(state, '=favorite')?.contexts || []).flatMap(cxid => thoughtToPath(state, cxid)),
+    ...((getLexeme(state, '=favorite')?.contexts || []).flatMap(cxid => thoughtToPath(state, cxid)) as ThoughtId[]),
   ])
 
   // iterate over the entire thoughtIndex, deleting thoughts that are no longer visible

diff --git a/src/actions/importText.ts b/src/actions/importText.ts
@@ -2,6 +2,7 @@ import _ from 'lodash'
 import Path from '../@types/Path'
 import SimplePath from '../@types/SimplePath'
 import State from '../@types/State'
+import ThoughtIndices from '../@types/ThoughtIndices'
 import Thunk from '../@types/Thunk'
 import Timestamp from '../@types/Timestamp'
 import editThought from '../actions/editThought'
@@ -25,7 +26,7 @@ import isRoot from '../util/isRoot'
 import { markdownToText } from '../util/markdownToText'
 import parentOf from '../util/parentOf'
 import reducerFlow from '../util/reducerFlow'
-import roamJsonToBlocks from '../util/roamJsonToBlocks'
+import roamJsonToBlocks, { RoamPage } from '../util/roamJsonToBlocks'
 import strip from '../util/strip'
 import textToHtml from '../util/textToHtml'
 import unroot from '../util/unroot'
@@ -111,7 +112,7 @@ const importText = (
   "thoughtIndex": {
     "__ROOT__": {`)
   ) {
-    const thoughts = JSON.parse(text)
+    const thoughts = JSON.parse(text) as ThoughtIndices
     const stateNew = initialState()
     return {
       ...stateNew,
@@ -155,7 +156,7 @@ const importText = (
         : null,
     ])(state)
   } else {
-    const json = isRoam ? roamJsonToBlocks(JSON.parse(convertedText)) : htmlToJson(convertedText)
+    const json = isRoam ? roamJsonToBlocks(JSON.parse(convertedText) as RoamPage[]) : htmlToJson(convertedText)
 
     const destIsLeaf = !anyChild(state, head(simplePath))
 

diff --git a/src/actions/mergeThoughts.ts b/src/actions/mergeThoughts.ts
@@ -88,7 +88,7 @@ const mergeThoughts = (
           // update Lexeme
           lexemeIndexUpdates: lexeme
             ? {
-                [key]: removeContext(state, lexeme, sourceThought.id),
+                [key]: removeContext(lexeme, sourceThought.id),
               }
             : {},
         }),

diff --git a/src/actions/repairThought.ts b/src/actions/repairThought.ts
@@ -33,7 +33,7 @@ export const repairThoughtActionCreator =
           updateThoughts({
             thoughtIndexUpdates: {},
             lexemeIndexUpdates: {
-              [hashThought(cursorValue!)]: removeContext(state, cursorLexeme, id),
+              [hashThought(cursorValue!)]: removeContext(cursorLexeme, id),
             },
           }),
         )
@@ -55,7 +55,7 @@ export const repairThoughtActionCreator =
                   updateThoughts({
                     thoughtIndexUpdates: {},
                     lexemeIndexUpdates: {
-                      [hashThought(cursorValue!)]: removeContext(getState(), cursorLexeme, id),
+                      [hashThought(cursorValue!)]: removeContext(cursorLexeme, id),
                     },
                   }),
                   // add the missing thought to its parent

diff --git a/src/components/AppComponent.tsx b/src/components/AppComponent.tsx
@@ -85,7 +85,7 @@ const StyleInjector = ({
 const GlobalStyles = React.memo(({ styles }: { styles: [string, React.CSSProperties][] }) => {
   const [globalStyle, setGlobalStyle] = useState<Index<string>>({})
   const appendGlobalStyle = useCallback(
-    i => (css: string) => setGlobalStyle(globalStyle => ({ ...globalStyle, [i]: css })),
+    (i: number) => (css: string) => setGlobalStyle(globalStyle => ({ ...globalStyle, [i]: css })),
     [],
   )
   return (

diff --git a/src/components/CommandPalette.tsx b/src/components/CommandPalette.tsx
@@ -63,7 +63,7 @@ const CommandSearch: FC<{
 
   /** Handle command palette shortuts. */
   const onKeyDown = useCallback(
-    e => {
+    (e: KeyboardEvent) => {
       if (
         e.key === 'Escape' ||
         // manually check if the commandPalette shortcut is entered since global shortcuts are disabled while the command palette is open
@@ -446,10 +446,13 @@ const CommandPalette: FC = () => {
   )
 
   /** Execute the selected shortcut. */
-  const onExecuteSelected = useCallback(e => onExecute(e, selectedShortcut), [onExecute, selectedShortcut])
+  const onExecuteSelected = useCallback(
+    (e: KeyboardEvent) => onExecute(e, selectedShortcut),
+    [onExecute, selectedShortcut],
+  )
 
   /** Select shortcuts on hover. */
-  const onHover = useCallback((e, shortcut) => setSelectedShortcut(shortcut), [])
+  const onHover = useCallback((e: MouseEvent, shortcut: Shortcut) => setSelectedShortcut(shortcut), [])
 
   // Select the first shortcut when the input changes.
   useEffect(() => {
@@ -467,7 +470,7 @@ const CommandPalette: FC = () => {
 
   /** Select the previous shortcut in the list. */
   const onSelectUp = useCallback(
-    e => {
+    (e: KeyboardEvent) => {
       e.preventDefault()
       e.stopPropagation()
       if (selectedShortcut !== possibleShortcutsSorted[0]) {
@@ -480,7 +483,7 @@ const CommandPalette: FC = () => {
 
   /** Select the next shortcut in the list. */
   const onSelectDown = useCallback(
-    e => {
+    (e: KeyboardEvent) => {
       e.preventDefault()
       e.stopPropagation()
       if (selectedShortcut !== possibleShortcutsSorted[possibleShortcutsSorted.length - 1]) {
@@ -493,7 +496,7 @@ const CommandPalette: FC = () => {
 
   /** Select the first shortcut in the list. */
   const onSelectTop = useCallback(
-    e => {
+    (e: KeyboardEvent) => {
       e.preventDefault()
       e.stopPropagation()
       setSelectedShortcut(possibleShortcutsSorted[0])
@@ -503,7 +506,7 @@ const CommandPalette: FC = () => {
 
   /* Select the last shortcut in the list. */
   const onSelectBottom = useCallback(
-    e => {
+    (e: KeyboardEvent) => {
       e.preventDefault()
       e.stopPropagation()
       setSelectedShortcut(possibleShortcutsSorted[possibleShortcutsSorted.length - 1])

diff --git a/src/components/DragAndDropContext.tsx b/src/components/DragAndDropContext.tsx
@@ -1,16 +1,19 @@
-import React, { FC, PropsWithChildren } from 'react'
+import { FC, PropsWithChildren } from 'react'
 import { DndProvider } from 'react-dnd'
 import { HTML5Backend } from 'react-dnd-html5-backend'
-import MultiBackend, { TouchTransition } from 'react-dnd-multi-backend'
+import { MouseTransition, MultiBackend, TouchTransition } from 'react-dnd-multi-backend'
 import { TouchBackend } from 'react-dnd-touch-backend'
 import { TIMEOUT_LONG_PRESS_THOUGHT } from '../constants'
 
 const options = {
   backends: [
     {
+      id: 'html5',
       backend: HTML5Backend,
+      transition: MouseTransition,
     },
     {
+      id: 'touch',
       backend: TouchBackend,
       options: { delayTouchStart: TIMEOUT_LONG_PRESS_THOUGHT },
       preview: true,