chore: move web/packages/ to packages/

2025-12-16 11:47:54 +01:00 · 2022-08-25 16:03:57 +05:00
parent 828f46c0ed
commit a6a0e995ee
21 changed files with 89 additions and 89 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
--- a/apps/web/package-lock.json
+++ b/apps/web/package-lock.json
@@ -16,7 +16,9 @@
        "@mdi/js": "^6.5.95",
        "@mdi/react": "^1.4.0",
        "@notesnook/crypto": "^1.0.0",
+        "@notesnook/crypto-worker": "file:../../packages/crypto-worker",
        "@notesnook/desktop": "file:desktop",
+        "@notesnook/streamable-fs": "file:../../packages/streamable-fs",
        "@rebass/forms": "^4.0.6",
        "@streetwriters/editor": "^1.3.1",
        "@streetwriters/notesnook-core": "^7.3.6",
@@ -37,7 +39,6 @@
        "localforage": "^1.10.0",
        "localforage-driver-memory": "^1.0.5",
        "localforage-getitems": "https://github.com/thecodrr/localForage-getItems.git",
-        "nncryptoworker": "file:packages/nncryptoworker",
        "phone": "^3.1.14",
        "platform": "^1.3.6",
        "print-js": "^1.6.0",
@@ -56,7 +57,6 @@
        "react-virtuoso": "^2.4.0",
        "rebass": "^4.0.7",
        "showdown": "github:thecodrr/showdown",
-        "streamablefs": "file:packages/streamablefs",
        "timeago.js": "^4.0.2",
        "web-streams-polyfill": "^3.1.1",
        "wouter": "^2.7.3",
@@ -98,9 +98,34 @@
        "zx": "^2.0.0"
      }
    },
+    "../../packages/crypto-worker": {
+      "name": "@notesnook/crypto-worker",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@notesnook/crypto": "^1.0.0",
+        "comlink": "^4.3.1"
+      },
+      "devDependencies": {
+        "typescript": "^4.4.3"
+      }
+    },
+    "../../packages/streamable-fs": {
+      "name": "@notesnook/streamable-fs",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@notesnook/crypto": "^1.0.0",
+        "localforage": "^1.10.0"
+      },
+      "devDependencies": {
+        "@types/localforage": "^0.0.34",
+        "typescript": "^4.4.3"
+      }
+    },
    "desktop": {
      "name": "@notesnook/desktop",
-      "version": "2.1.5",
+      "version": "2.1.6",
      "dependencies": {
        "diary": "^0.3.1",
        "electron-better-ipc": "^2.0.1",
@@ -3219,10 +3244,18 @@
        "libsodium-wrappers": "^0.7.9"
      }
    },
+    "node_modules/@notesnook/crypto-worker": {
+      "resolved": "../../packages/crypto-worker",
+      "link": true
+    },
    "node_modules/@notesnook/desktop": {
      "resolved": "desktop",
      "link": true
    },
+    "node_modules/@notesnook/streamable-fs": {
+      "resolved": "../../packages/streamable-fs",
+      "link": true
+    },
    "node_modules/@playwright/test": {
      "version": "1.24.1",
      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.24.1.tgz",
@@ -4616,14 +4649,6 @@
      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
    },
-    "node_modules/@types/localforage": {
-      "version": "0.0.34",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "localforage": "*"
-      }
-    },
    "node_modules/@types/mime": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -7382,10 +7407,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/comlink": {
-      "version": "4.3.1",
-      "license": "Apache-2.0"
-    },
    "node_modules/comma-separated-tokens": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
@@ -14649,10 +14670,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/nncryptoworker": {
-      "resolved": "packages/nncryptoworker",
-      "link": true
-    },
    "node_modules/no-case": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -19898,10 +19915,6 @@
        "duplexer": "~0.1.1"
      }
    },
-    "node_modules/streamablefs": {
-      "resolved": "packages/streamablefs",
-      "link": true
-    },
    "node_modules/string_decoder": {
      "version": "1.3.0",
      "license": "MIT",
@@ -22451,6 +22464,7 @@
    },
    "packages/nncryptoworker": {
      "version": "1.0.0",
+      "extraneous": true,
      "license": "ISC",
      "dependencies": {
        "@notesnook/crypto": "^1.0.0",
@@ -22463,6 +22477,7 @@
    },
    "packages/streamablefs": {
      "version": "1.0.0",
+      "extraneous": true,
      "license": "ISC",
      "dependencies": {
        "@notesnook/crypto": "^1.0.0",
@@ -24488,6 +24503,14 @@
        "libsodium-wrappers": "^0.7.9"
      }
    },
+    "@notesnook/crypto-worker": {
+      "version": "file:../../packages/crypto-worker",
+      "requires": {
+        "@notesnook/crypto": "^1.0.0",
+        "comlink": "^4.3.1",
+        "typescript": "^4.4.3"
+      }
+    },
    "@notesnook/desktop": {
      "version": "file:desktop",
      "requires": {
@@ -24598,6 +24621,15 @@
        }
      }
    },
+    "@notesnook/streamable-fs": {
+      "version": "file:../../packages/streamable-fs",
+      "requires": {
+        "@notesnook/crypto": "^1.0.0",
+        "@types/localforage": "^0.0.34",
+        "localforage": "^1.10.0",
+        "typescript": "^4.4.3"
+      }
+    },
    "@playwright/test": {
      "version": "1.24.1",
      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.24.1.tgz",
@@ -25562,13 +25594,6 @@
      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
    },
-    "@types/localforage": {
-      "version": "0.0.34",
-      "dev": true,
-      "requires": {
-        "localforage": "*"
-      }
-    },
    "@types/mime": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -27600,9 +27625,6 @@
        "delayed-stream": "~1.0.0"
      }
    },
-    "comlink": {
-      "version": "4.3.1"
-    },
    "comma-separated-tokens": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
@@ -32565,15 +32587,6 @@
      "version": "1.0.5",
      "dev": true
    },
-    "nncryptoworker": {
-      "version": "file:packages/nncryptoworker",
-      "requires": {
-        "@notesnook/crypto": "^1.0.0",
-        "comlink": "^4.3.1",
-        "streamablefs": "file:../streamablefs",
-        "typescript": "^4.4.3"
-      }
-    },
    "no-case": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -36048,15 +36061,6 @@
        "duplexer": "~0.1.1"
      }
    },
-    "streamablefs": {
-      "version": "file:packages/streamablefs",
-      "requires": {
-        "@notesnook/crypto": "^1.0.0",
-        "@types/localforage": "^0.0.34",
-        "localforage": "^1.10.0",
-        "typescript": "^4.4.3"
-      }
-    },
    "string_decoder": {
      "version": "1.3.0",
      "requires": {
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -35,7 +35,7 @@
    "localforage": "^1.10.0",
    "localforage-driver-memory": "^1.0.5",
    "localforage-getitems": "https://github.com/thecodrr/localForage-getItems.git",
-    "nncryptoworker": "file:packages/nncryptoworker",
+    "@notesnook/crypto-worker": "file:../../packages/crypto-worker",
    "phone": "^3.1.14",
    "platform": "^1.3.6",
    "print-js": "^1.6.0",
@@ -54,7 +54,7 @@
    "react-virtuoso": "^2.4.0",
    "rebass": "^4.0.7",
    "showdown": "github:thecodrr/showdown",
-    "streamablefs": "file:packages/streamablefs",
+    "@notesnook/streamable-fs": "file:../../packages/streamable-fs",
    "timeago.js": "^4.0.2",
    "web-streams-polyfill": "^3.1.1",
    "wouter": "^2.7.3",
@@ -96,7 +96,6 @@
    "zx": "^2.0.0"
  },
  "scripts": {
-    "preinstall": "./scripts/build-deps.sh",
    "start": "env-cmd -e all,dev,web react-scripts start",
    "start:desktop": "env-cmd -e all,desktop react-scripts start",
    "build": "env-cmd -e all,web react-scripts --max_old_space_size=8092 build",
--- a/apps/web/scripts/build-deps.sh
+++ b/apps/web/scripts/build-deps.sh
@@ -1,7 +0,0 @@
-cd ./packages/streamablefs
-npm i
-npm run build
-
-cd ../nncryptoworker
-npm i
-npm run build
--- a/apps/web/src/interfaces/fs.js
+++ b/apps/web/src/interfaces/fs.js
@@ -3,7 +3,7 @@ import localforage from "localforage";
 import { xxhash64, createXXHash64 } from "hash-wasm";
 import axios from "axios";
 import { AppEventManager, AppEvents } from "../common/app-events";
-import { StreamableFS } from "streamablefs";
+import { StreamableFS } from "@notesnook/streamable-fs";
 import { getNNCrypto } from "./nncrypto.stub";
 import hosts from "@streetwriters/notesnook-core/utils/constants";
 import { sendAttachmentsProgressEvent } from "@streetwriters/notesnook-core/common";
--- a/apps/web/src/interfaces/nncrypto.stub.ts
+++ b/apps/web/src/interfaces/nncrypto.stub.ts
@@ -1,13 +1,13 @@
 import { INNCrypto } from "@notesnook/crypto/dist/src/interfaces";
 // eslint-disable-next-line import/no-webpack-loader-syntax
-import "worker-loader?filename=static/workers/nncrypto.worker.js!nncryptoworker/dist/src/worker.js";
+import "worker-loader?filename=static/workers/nncrypto.worker.js!@notesnook/crypto-worker/dist/src/worker.js";

 const WORKER_PATH = "/static/workers/nncrypto.worker.js";

 async function loadNNCrypto() {
  const hasWorker = "Worker" in window || "Worker" in global;
  if (hasWorker) {
-    const { NNCryptoWorker } = await import("nncryptoworker");
+    const { NNCryptoWorker } = await import("@notesnook/crypto-worker");
    return NNCryptoWorker;
  } else {
    const { NNCrypto } = await import("@notesnook/crypto");
--- a/apps/web/packages/nncryptoworker/index.ts
+++ b/apps/web/packages/nncryptoworker/index.ts
--- a/apps/web/packages/nncryptoworker/package-lock.json
+++ b/apps/web/packages/nncryptoworker/package-lock.json
@@ -1,17 +1,16 @@
 {
-  "name": "nncryptoworker",
+  "name": "@notesnook/crypto-worker",
  "version": "1.0.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
-      "name": "nncryptoworker",
+      "name": "@notesnook/crypto-worker",
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
        "@notesnook/crypto": "^1.0.0",
-        "comlink": "^4.3.1",
-        "streamablefs": "file:../streamablefs"
+        "comlink": "^4.3.1"
      },
      "devDependencies": {
        "typescript": "^4.4.3"
@@ -29,8 +28,23 @@
        "streamablefs": "file:../streamablefs"
      }
    },
+    "../streamable-fs": {
+      "name": "@notesnook/streamable-fs",
+      "version": "1.0.0",
+      "extraneous": true,
+      "license": "ISC",
+      "dependencies": {
+        "@notesnook/crypto": "^1.0.0",
+        "localforage": "^1.10.0"
+      },
+      "devDependencies": {
+        "@types/localforage": "^0.0.34",
+        "typescript": "^4.4.3"
+      }
+    },
    "../streamablefs": {
      "version": "1.0.0",
+      "extraneous": true,
      "license": "ISC",
      "dependencies": {
        "@notesnook/crypto": "^1.0.0",
@@ -67,10 +81,6 @@
        "libsodium": "^0.7.0"
      }
    },
-    "node_modules/streamablefs": {
-      "resolved": "../streamablefs",
-      "link": true
-    },
    "node_modules/typescript": {
      "version": "4.4.3",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
@@ -112,15 +122,6 @@
        "libsodium": "^0.7.0"
      }
    },
-    "streamablefs": {
-      "version": "file:../streamablefs",
-      "requires": {
-        "@notesnook/crypto": "^1.0.0",
-        "@types/localforage": "^0.0.34",
-        "localforage": "^1.10.0",
-        "typescript": "^4.4.3"
-      }
-    },
    "typescript": {
      "version": "4.4.3",
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
--- a/apps/web/packages/nncryptoworker/package.json
+++ b/apps/web/packages/nncryptoworker/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nncryptoworker",
+  "name": "@notesnook/crypto-worker",
  "version": "1.0.0",
  "description": "",
  "main": "./dist/index.js",
@@ -11,8 +11,7 @@
  "license": "ISC",
  "dependencies": {
    "@notesnook/crypto": "^1.0.0",
-    "comlink": "^4.3.1",
-    "streamablefs": "file:../streamablefs"
+    "comlink": "^4.3.1"
  },
  "devDependencies": {
    "typescript": "^4.4.3"
--- a/apps/web/packages/nncryptoworker/src/utils.ts
+++ b/apps/web/packages/nncryptoworker/src/utils.ts
--- a/apps/web/packages/nncryptoworker/src/worker.ts
+++ b/apps/web/packages/nncryptoworker/src/worker.ts
--- a/apps/web/packages/nncryptoworker/src/workerstream.ts
+++ b/apps/web/packages/nncryptoworker/src/workerstream.ts
--- a/apps/web/packages/nncryptoworker/tsconfig.json
+++ b/apps/web/packages/nncryptoworker/tsconfig.json
@@ -14,7 +14,8 @@
    "target": "es2020" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
    "lib": [
      "DOM",
-      "WebWorker"
+      "WebWorker",
+      "ES2015"
    ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
--- a/apps/web/packages/streamablefs/index.ts
+++ b/apps/web/packages/streamablefs/index.ts
--- a/apps/web/packages/streamablefs/package-lock.json
+++ b/apps/web/packages/streamablefs/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "streamablefs",
+  "name": "@notesnook/streamable-fs",
  "version": "1.0.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
-      "name": "streamablefs",
+      "name": "@notesnook/streamable-fs",
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
--- a/apps/web/packages/streamablefs/package.json
+++ b/apps/web/packages/streamablefs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "streamablefs",
+  "name": "@notesnook/streamable-fs",
  "version": "1.0.0",
  "description": "",
  "main": "./dist/index.js",
--- a/apps/web/packages/streamablefs/src/filehandle.ts
+++ b/apps/web/packages/streamablefs/src/filehandle.ts
--- a/apps/web/packages/streamablefs/src/filestreamsource.ts
+++ b/apps/web/packages/streamablefs/src/filestreamsource.ts
--- a/apps/web/packages/streamablefs/src/interfaces.ts
+++ b/apps/web/packages/streamablefs/src/interfaces.ts
--- a/apps/web/packages/streamablefs/src/types.ts
+++ b/apps/web/packages/streamablefs/src/types.ts
--- a/apps/web/packages/streamablefs/tsconfig.json
+++ b/apps/web/packages/streamablefs/tsconfig.json
@@ -13,7 +13,8 @@
    /* Language and Environment */
    "target": "es2020" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
    "lib": [
-      "DOM"
+      "DOM",
+      "ES2015"
    ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */