diff --git a/apps/desktop/package-lock.json b/apps/desktop/package-lock.json index 270a9dba9..61e8b42c2 100644 --- a/apps/desktop/package-lock.json +++ b/apps/desktop/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "@notesnook/desktop", "version": "2.5.2", + "license": "GPL-3.0-or-later", "dependencies": { "@trpc/client": "^10.29.1", "@trpc/server": "^10.29.1", @@ -26,7 +27,6 @@ "electron-builder-notarize": "^1.5.1", "electron-reloader": "^1.2.3", "esbuild": "^0.17.19", - "patch-package": "^6.5.1", "undici": "^5.22.1" }, "optionalDependencies": { @@ -976,11 +976,6 @@ "@types/node": "*" } }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "dev": true, - "license": "BSD-2-Clause" - }, "node_modules/7zip-bin": { "version": "5.1.1", "dev": true, @@ -2674,14 +2669,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/find-yarn-workspace-root": { - "version": "2.0.0", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "micromatch": "^4.0.2" - } - }, "node_modules/fs-extra": { "version": "8.1.0", "dev": true, @@ -3125,20 +3112,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-docker": { - "version": "2.2.1", - "dev": true, - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "dev": true, @@ -3197,17 +3170,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/is-wsl": { - "version": "2.2.0", - "dev": true, - "license": "MIT", - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/isbinaryfile": { "version": "4.0.10", "dev": true, @@ -3308,14 +3270,6 @@ "json-buffer": "3.0.1" } }, - "node_modules/klaw-sync": { - "version": "6.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.11" - } - }, "node_modules/lazy-val": { "version": "1.0.5", "license": "MIT" @@ -3431,18 +3385,6 @@ "node": ">=10" } }, - "node_modules/micromatch": { - "version": "4.0.5", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/mime": { "version": "2.6.0", "dev": true, @@ -3614,11 +3556,6 @@ "node": ">= 0.6" } }, - "node_modules/nice-try": { - "version": "1.0.5", - "dev": true, - "license": "MIT" - }, "node_modules/node-abi": { "version": "3.44.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.44.0.tgz", @@ -3812,21 +3749,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/open": { - "version": "7.4.2", - "dev": true, - "license": "MIT", - "dependencies": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ora": { "version": "5.4.1", "dev": true, @@ -3849,14 +3771,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/os-tmpdir": { - "version": "1.0.2", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/p-cancelable": { "version": "2.1.1", "dev": true, @@ -3932,166 +3846,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/patch-package": { - "version": "6.5.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^4.1.2", - "cross-spawn": "^6.0.5", - "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^9.0.0", - "is-ci": "^2.0.0", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.6", - "open": "^7.4.2", - "rimraf": "^2.6.3", - "semver": "^5.6.0", - "slash": "^2.0.0", - "tmp": "^0.0.33", - "yaml": "^1.10.2" - }, - "bin": { - "patch-package": "index.js" - }, - "engines": { - "node": ">=10", - "npm": ">5" - } - }, - "node_modules/patch-package/node_modules/ci-info": { - "version": "2.0.0", - "dev": true, - "license": "MIT" - }, - "node_modules/patch-package/node_modules/cross-spawn": { - "version": "6.0.5", - "dev": true, - "license": "MIT", - "dependencies": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "engines": { - "node": ">=4.8" - } - }, - "node_modules/patch-package/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/patch-package/node_modules/is-ci": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^2.0.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/patch-package/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/patch-package/node_modules/path-key": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/patch-package/node_modules/rimraf": { - "version": "2.7.1", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/patch-package/node_modules/semver": { - "version": "5.7.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/patch-package/node_modules/shebang-command": { - "version": "1.2.0", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/patch-package/node_modules/shebang-regex": { - "version": "1.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/patch-package/node_modules/tmp": { - "version": "0.0.33", - "dev": true, - "license": "MIT", - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/patch-package/node_modules/universalify": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/patch-package/node_modules/which": { - "version": "1.3.1", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, "node_modules/path-exists": { "version": "4.0.0", "dev": true, @@ -4584,14 +4338,6 @@ "semver": "bin/semver.js" } }, - "node_modules/slash": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", @@ -5079,14 +4825,6 @@ "version": "4.0.0", "license": "ISC" }, - "node_modules/yaml": { - "version": "1.10.2", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 6" - } - }, "node_modules/yargs": { "version": "17.6.2", "license": "MIT", diff --git a/apps/desktop/package.json b/apps/desktop/package.json index a03a06bcc..7dd37088f 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -30,7 +30,6 @@ "electron-builder-notarize": "^1.5.1", "electron-reloader": "^1.2.3", "esbuild": "^0.17.19", - "patch-package": "^6.5.1", "undici": "^5.22.1" }, "optionalDependencies": { diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json index 9e069eb75..7d06f6878 100644 --- a/apps/mobile/package-lock.json +++ b/apps/mobile/package-lock.json @@ -19,9 +19,7 @@ }, "devDependencies": { "otplib": "12.0.1", - "patch-package": "^6.4.7", - "react-refresh": "0.14.0", - "typescript": "^4.8.2" + "react-refresh": "0.14.0" } }, "../../packages/core": { @@ -8116,11 +8114,6 @@ "dev": true, "license": "Apache-2.0" }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "dev": true, - "license": "BSD-2-Clause" - }, "node_modules/abort-controller": { "version": "3.0.0", "license": "MIT", @@ -11961,14 +11954,6 @@ "node": ">=8" } }, - "node_modules/find-yarn-workspace-root": { - "version": "2.0.0", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "micromatch": "^4.0.2" - } - }, "node_modules/flat": { "version": "5.0.2", "dev": true, @@ -12052,19 +12037,6 @@ "node": ">= 0.6" } }, - "node_modules/fs-extra": { - "version": "7.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, "node_modules/fs-monkey": { "version": "1.0.3", "license": "Unlicense" @@ -15790,14 +15762,6 @@ "graceful-fs": "^4.1.9" } }, - "node_modules/klaw-sync": { - "version": "6.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.11" - } - }, "node_modules/kleur": { "version": "3.0.3", "license": "MIT", @@ -18264,32 +18228,6 @@ "node": ">=0.10.0" } }, - "node_modules/patch-package": { - "version": "6.4.7", - "dev": true, - "license": "MIT", - "dependencies": { - "@yarnpkg/lockfile": "^1.1.0", - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^7.0.1", - "is-ci": "^2.0.0", - "klaw-sync": "^6.0.0", - "minimist": "^1.2.0", - "open": "^7.4.2", - "rimraf": "^2.6.3", - "semver": "^5.6.0", - "slash": "^2.0.0", - "tmp": "^0.0.33" - }, - "bin": { - "patch-package": "index.js" - }, - "engines": { - "npm": ">5" - } - }, "node_modules/path-exists": { "version": "3.0.0", "license": "MIT", @@ -20811,14 +20749,6 @@ "version": "1.0.5", "license": "MIT" }, - "node_modules/slash": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/slice-ansi": { "version": "2.1.0", "license": "MIT", @@ -22044,19 +21974,6 @@ "node": ">= 4" } }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "node_modules/ua-parser-js": { "version": "0.7.35", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.35.tgz", diff --git a/apps/mobile/package.json b/apps/mobile/package.json index bf48d78f9..72ac89ec2 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -23,8 +23,6 @@ "release-android-bundle": "cd native/android && ./gradlew bundleRelease --no-daemon" }, "devDependencies": { - "patch-package": "^6.4.7", - "typescript": "^4.8.2", "otplib": "12.0.1", "react-refresh": "0.14.0" }, diff --git a/apps/web/.env-cmdrc.js b/apps/web/.env-cmdrc.js index a25d31c7c..202407201 100644 --- a/apps/web/.env-cmdrc.js +++ b/apps/web/.env-cmdrc.js @@ -19,8 +19,8 @@ module.exports = { all: { UV_THREADPOOL_SIZE: IS_CI ? NUM_CPUS : 2, GENERATE_SOURCEMAP: process.env.NODE_ENV === "development", - INLINE_RUNTIME_CHUNK: false, - DISABLE_ESLINT_PLUGIN: true, + // INLINE_RUNTIME_CHUNK: false, + // DISABLE_ESLINT_PLUGIN: true, REACT_APP_GIT_HASH: gitHash, REACT_APP_VERSION: APP_VERSION }, @@ -35,13 +35,13 @@ module.exports = { DEBUG: "pw:api" }, silent: { - REACT_APP_TEST: true, - DISABLE_ESLINT_PLUGIN: "true", - FAST_REFRESH: "false", - BROWSER: "none" + REACT_APP_TEST: true + // DISABLE_ESLINT_PLUGIN: "true" + // FAST_REFRESH: "false", + // BROWSER: "none" }, desktop: { - BROWSER: "none", + // BROWSER: "none", REACT_APP_PLATFORM: "desktop" } }; diff --git a/apps/web/.gitignore b/apps/web/.gitignore index 8951265c9..828957b8c 100644 --- a/apps/web/.gitignore +++ b/apps/web/.gitignore @@ -29,4 +29,5 @@ __diff_output__ dist public/workbox scripts/secrets -test-results \ No newline at end of file +test-results +.swc \ No newline at end of file diff --git a/apps/web/public/index.html b/apps/web/index.html similarity index 92% rename from apps/web/public/index.html rename to apps/web/index.html index fe48f6a90..08f27eeff 100644 --- a/apps/web/public/index.html +++ b/apps/web/index.html @@ -2,34 +2,20 @@ - - + /> --> + - - - - + + + @@ -38,13 +24,13 @@ manifest.json provides metadata used when your web app is installed on a user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ --> - + @@ -72,6 +58,7 @@ const root = document.querySelector("html"); if (root) root.setAttribute("data-theme", theme); +