Merge branch 'dev' into main

Author: gustavotoyota

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepnotes/client",
   "description": "DeepNotes",
-  "version": "0.0.2",
+  "version": "1.0.0",
   "author": "Gustavo Toyota <[email protected]>",
   "dependencies": {
     "@_ueberdosis/prosemirror-tables": "1.1.3",
@@ -50,6 +50,7 @@
     "compression": "1.7.4",
     "cookie": "0.5.0",
     "crypto-js": "^4.1.1",
+    "dotenv": "16.0.3",
     "dotenv-expand": "9.0.0",
     "downloadjs": "^1.4.7",
     "electron-log": "^4.4.8",
@@ -90,6 +91,7 @@
     "zod": "3.19.1"
   },
   "devDependencies": {
+    "@electron/notarize": "^2.1.0",
     "@intlify/vite-plugin-vue-i18n": "3.4.0",
     "@quasar/app-vite": "^1.4.3",
     "@types/argon2-browser": "^1.18.1",
@@ -105,7 +107,6 @@
     "@types/zxcvbn": "4.4.1",
     "@vue/devtools": "6.4.5",
     "autoprefixer": "10.4.13",
-    "dotenv": "16.0.3",
     "electron": "25.2.0",
     "electron-builder": "^24.4.0",
     "electron-packager": "^17.1.1",

apps/client/quasar.config.js

@@ -327,13 +327,25 @@ module.exports = configure(function (ctx) {
 
         mac: {
           target: 'dmg',
+
+          hardenedRuntime: true,
+          gatekeeperAssess: false,
+          entitlements: 'src-capacitor/ios/App/App/entitlements.mac.plist',
+          entitlementsInherit:
+            'src-capacitor/ios/App/App/entitlements.mac.plist',
         },
         linux: {
           target: 'AppImage',
         },
         win: {
           target: 'nsis',
         },
+
+        dmg: {
+          sign: false,
+        },
+
+        afterSign: 'src-electron/notarize.js',
       },
     },
 

apps/client/src-capacitor/ios/App/App/entitlements.mac.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+  </dict>
+</plist>

apps/client/src-electron/notarize.js

@@ -0,0 +1,19 @@
+require('dotenv').config();
+const { notarize } = require('@electron/notarize');
+
+exports.default = async function notarizing(context) {
+  const { electronPlatformName, appOutDir } = context;
+  if (electronPlatformName !== 'darwin') {
+    return;
+  }
+
+  const appName = context.packager.appInfo.productFilename;
+
+  return await notarize({
+    appBundleId: 'app.deepnotes',
+    appPath: `${appOutDir}/${appName}.app`,
+    appleId: process.env.APPLE_ID,
+    appleIdPassword: process.env.APPLE_ID_PASSWORD,
+    teamId: process.env.TEAM_ID,
+  });
+};

apps/client/src/App.vue

@@ -144,6 +144,10 @@ html {
   isolation: isolate;
 }
 
+a {
+  text-decoration: none;
+}
+
 h1,
 h2,
 h3 {

apps/client/src/code/pages/serialization.ts

@@ -135,36 +135,20 @@ export class Serialization {
       arrowMap: new Map(),
     };
 
-    for (const note of input.notes) {
-      for (const arrow of internals.pages.react.page.arrows.fromIds(
-        Array.from(note.incomingArrowIds),
-      )) {
-        input.arrows.push(arrow);
-      }
-
-      for (const arrow of internals.pages.react.page.arrows.fromIds(
-        Array.from(note.outgoingArrowIds),
-      )) {
-        input.arrows.push(arrow);
-      }
-    }
-
-    this._serializeRegion(input, aux.serialObj.root, aux);
+    this._serializeRegionNotes(input, aux.serialObj.root, aux);
+    this._serializeRegionArrows(input, aux.serialObj.root, aux);
 
     return aux.serialObj;
   }
-  private _serializeRegion(
+
+  private _serializeRegionNotes(
     region: IRegionElemsOutput,
     serialRegion: ISerialRegionOutput,
     aux: SerializationAux,
   ) {
     for (const note of region.notes) {
       this._serializeNote(note, serialRegion, aux);
     }
-
-    for (const arrow of region.arrows) {
-      this._serializeArrow(arrow, serialRegion, aux);
-    }
   }
   private _serializeNote(
     note: PageNote,
@@ -203,7 +187,36 @@ export class Serialization {
     serialRegion.noteIdxs.push(noteIndex);
     aux.noteMap.set(note.id, noteIndex);
 
-    this._serializeRegion(note.react, serialNote, aux);
+    this._serializeRegionNotes(note.react, serialNote, aux);
+  }
+
+  private _serializeRegionArrows(
+    region: IRegionElemsOutput,
+    serialRegion: ISerialRegionOutput,
+    aux: SerializationAux,
+    note?: PageNote,
+  ) {
+    for (const arrow of [
+      ...region.arrows,
+
+      ...internals.pages.react.page.arrows.fromIds(
+        Array.from(note?.incomingArrowIds ?? []),
+      ),
+      ...internals.pages.react.page.arrows.fromIds(
+        Array.from(note?.outgoingArrowIds ?? []),
+      ),
+    ]) {
+      this._serializeArrow(arrow, serialRegion, aux);
+    }
+
+    for (const note of region.notes) {
+      this._serializeRegionArrows(
+        note.react,
+        aux.serialObj.notes[aux.noteMap.get(note.id)!],
+        aux,
+        note,
+      );
+    }
   }
   private _serializeArrow(
     arrow: PageArrow,
@@ -256,7 +269,15 @@ export class Serialization {
     });
 
     internals.pages.react.page.collab.doc.transact(() => {
-      this._deserializeRegion(
+      this._deserializeRegionNotes(
+        serialObj.root,
+        serialObj,
+        noteMap,
+        destRegion.id,
+        fakeRegionCollab,
+      );
+
+      this._deserializeRegionArrows(
         serialObj.root,
         serialObj,
         noteMap,
@@ -285,7 +306,7 @@ export class Serialization {
       ),
     };
   }
-  private _deserializeRegion(
+  private _deserializeRegionNotes(
     serialRegion: ISerialRegionOutput,
     serialObj: ISerialObjectOutput,
     noteMap: Map<number, string>,
@@ -302,16 +323,8 @@ export class Serialization {
         destRegionCollab,
       );
     }
-
-    for (const arrowIndex of serialRegion.arrowIdxs) {
-      this._deserializeArrow(
-        serialObj.arrows[arrowIndex],
-        noteMap,
-        destRegionId,
-        destRegionCollab,
-      );
-    }
   }
+
   private _deserializeNote(
     serialNote: ISerialNoteOutput,
     noteIndex: number,
@@ -356,10 +369,46 @@ export class Serialization {
 
     destRegionCollab.noteIds.push(noteId);
 
-    this._deserializeRegion(serialNote, serialObj, noteMap, noteId, noteCollab);
+    this._deserializeRegionNotes(
+      serialNote,
+      serialObj,
+      noteMap,
+      noteId,
+      noteCollab,
+    );
 
     internals.pages.react.page.notes.react.collab[noteId] = noteCollab;
   }
+
+  private _deserializeRegionArrows(
+    serialRegion: ISerialRegionOutput,
+    serialObj: ISerialObjectOutput,
+    noteMap: Map<number, string>,
+    destRegionId: string,
+    destRegionCollab: IRegionCollabOutput,
+  ) {
+    for (const arrowIndex of serialRegion.arrowIdxs) {
+      this._deserializeArrow(
+        serialObj.arrows[arrowIndex],
+        noteMap,
+        destRegionId,
+        destRegionCollab,
+      );
+    }
+
+    for (const noteIndex of serialRegion.noteIdxs) {
+      const noteId = noteMap.get(noteIndex)!;
+      const noteCollab = internals.pages.react.page.notes.react.collab[noteId];
+
+      this._deserializeRegionArrows(
+        serialObj.notes[noteIndex],
+        serialObj,
+        noteMap,
+        noteId,
+        noteCollab,
+      );
+    }
+  }
   private _deserializeArrow(
     serialArrow: ISerialArrowOutput,
     noteMap: Map<number, string>,

apps/client/src/code/tiptap/inline-math/extension.ts

@@ -3,6 +3,14 @@ import { VueNodeViewRenderer } from '@tiptap/vue-3';
 
 import NodeView from './NodeView.vue';
 
+declare module '@tiptap/core' {
+  interface Commands<ReturnType> {
+    inlineMath: {
+      addInlineMath: () => ReturnType;
+    };
+  }
+}
+
 export const InlineMathExtension = Node.create({
   name: 'inlineMath',
 
@@ -41,14 +49,19 @@ export const InlineMathExtension = Node.create({
     return VueNodeViewRenderer(NodeView);
   },
 
-  addCommands(): any {
+  addCommands() {
     return {
       addInlineMath:
-        (options: any) =>
-        ({ commands }: any) =>
+        () =>
+        ({ commands, state }) =>
           commands.insertContent({
             type: this.name,
-            attrs: options,
+            attrs: {
+              input: state.doc.textBetween(
+                state.selection.from,
+                state.selection.to,
+              ),
+            },
           }),
     };
   },

apps/client/src/code/tiptap/math-block/extension.ts

@@ -3,6 +3,14 @@ import { VueNodeViewRenderer } from '@tiptap/vue-3';
 
 import NodeView from './NodeView.vue';
 
+declare module '@tiptap/core' {
+  interface Commands<ReturnType> {
+    mathBlock: {
+      addMathBlock: () => ReturnType;
+    };
+  }
+}
+
 export const MathBlockExtension = Node.create({
   name: 'mathBlock',
 
@@ -40,14 +48,19 @@ export const MathBlockExtension = Node.create({
     return VueNodeViewRenderer(NodeView);
   },
 
-  addCommands(): any {
+  addCommands() {
     return {
       addMathBlock:
-        (options: any) =>
-        ({ commands }: any) =>
+        () =>
+        ({ commands, state }) =>
           commands.insertContent({
             type: this.name,
-            attrs: options,
+            attrs: {
+              input: state.doc.textBetween(
+                state.selection.from,
+                state.selection.to,
+              ),
+            },
           }),
     };
   },