-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
32 changed files
with
1,424 additions
and
1,478 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"name": "electron-mail", | ||
"description": "Unofficial ProtonMail Desktop App", | ||
"version": "5.1.7", | ||
"version": "5.1.8", | ||
"author": "Vladimir Yakovlev <[email protected]>", | ||
"license": "GPL-3.0", | ||
"homepage": "https://github.com/vladimiry/ElectronMail", | ||
|
@@ -80,7 +80,7 @@ | |
"start:electron": "electron ./app/electron-main/index.cjs", | ||
"start:electron:dev": "electron --inspect-brk- ./app-dev/electron-main/index.cjs", | ||
"test:e2e:build-code": "cross-env NODE_ENV=e2e npm-run-all build:electron-main build:electron-preload:browser-window build:electron-preload:webview-primary build:electron-preload:webview-calendar", | ||
"test:e2e:run": "cross-env DEBUG=pw:api TS_NODE_PROJECT=./src/e2e/tsconfig.json pnpm run ts-node:shortcut ./node_modules/playwright/cli.js test --timeout 1200000", | ||
"test:e2e:run": "cross-env DEBUG=pw:api TS_NODE_PROJECT=./src/e2e/tsconfig.json pnpm run ts-node:shortcut ./node_modules/@playwright/test/cli.js test --timeout 1200000", | ||
"test:e2e": "npm-run-all test:e2e:build-code test:e2e:run", | ||
"scripts/prepare-native-deps": "pnpm run ts-node:shortcut ./scripts/prepare-native-deps.ts", | ||
"scripts/code-generation/electron-main": "pnpm run ts-node:shortcut ./scripts/code-generation/electron-main.ts", | ||
|
@@ -96,44 +96,44 @@ | |
"electron-rpc-api": "9.0.0", | ||
"fs-json-store-encryption-adapter": "3.0.4", | ||
"keytar": "7.9.0", | ||
"msgpackr": "1.8.5" | ||
"msgpackr": "1.9.5" | ||
}, | ||
"devDependencies": { | ||
"@angular-eslint/eslint-plugin": "15.2.1", | ||
"@angular/animations": "15.2.5", | ||
"@angular/cdk": "15.2.5", | ||
"@angular/common": "15.2.5", | ||
"@angular/compiler": "15.2.5", | ||
"@angular/compiler-cli": "15.2.5", | ||
"@angular/core": "15.2.5", | ||
"@angular/forms": "15.2.5", | ||
"@angular/language-service": "15.2.5", | ||
"@angular/platform-browser": "15.2.5", | ||
"@angular/platform-browser-dynamic": "15.2.5", | ||
"@angular/router": "15.2.5", | ||
"@babel/core": "7.21.4", | ||
"@angular-eslint/eslint-plugin": "16.0.3", | ||
"@angular/animations": "16.0.5", | ||
"@angular/cdk": "16.0.4", | ||
"@angular/common": "16.0.5", | ||
"@angular/compiler": "16.0.5", | ||
"@angular/compiler-cli": "16.0.5", | ||
"@angular/core": "16.0.5", | ||
"@angular/forms": "16.0.5", | ||
"@angular/language-service": "16.0.5", | ||
"@angular/platform-browser": "16.0.5", | ||
"@angular/platform-browser-dynamic": "16.0.5", | ||
"@angular/router": "16.0.5", | ||
"@babel/core": "7.22.5", | ||
"@babel/plugin-proposal-async-generator-functions": "7.20.7", | ||
"@babel/plugin-syntax-import-assertions": "7.20.0", | ||
"@babel/plugin-transform-async-to-generator": "7.20.7", | ||
"@babel/plugin-transform-runtime": "7.21.4", | ||
"@babel/runtime": "7.21.0", | ||
"@babel/plugin-syntax-import-assertions": "7.22.5", | ||
"@babel/plugin-transform-async-to-generator": "7.22.5", | ||
"@babel/plugin-transform-runtime": "7.22.5", | ||
"@babel/runtime": "7.22.5", | ||
"@cliqz/url-parser": "1.1.4", | ||
"@electron/rebuild": "3.2.10", | ||
"@electron/rebuild": "3.2.13", | ||
"@expo/spawn-async": "1.7.2", | ||
"@ng-select/ng-select": "10.0.4", | ||
"@ngrx/component": "15.4.0", | ||
"@ngrx/effects": "15.4.0", | ||
"@ngrx/store": "15.4.0", | ||
"@ngtools/webpack": "15.2.4", | ||
"@ng-select/ng-select": "11.0.0", | ||
"@ngrx/component": "16.0.1", | ||
"@ngrx/effects": "16.0.1", | ||
"@ngrx/store": "16.0.1", | ||
"@ngtools/webpack": "16.0.5", | ||
"@oneidentity/zstd-js": "1.0.3", | ||
"@playwright/test": "1.32.2", | ||
"@playwright/test": "1.35.0", | ||
"@rgba-image/lanczos": "0.1.1", | ||
"@t-bowersox/cookie": "github:vladimiry-playground/t-bowersox-cookie", | ||
"@types/archiver": "5.3.2", | ||
"@types/byline": "4.2.33", | ||
"@types/dts-generator": "2.1.7", | ||
"@types/fs-extra": "11.0.1", | ||
"@types/node": "18.15.11", | ||
"@types/node": "18.14.0", | ||
"@types/oboe": "2.1.1", | ||
"@types/opentype.js": "1.3.4", | ||
"@types/path-is-inside": "1.0.0", | ||
|
@@ -142,17 +142,17 @@ | |
"@types/react-router": "5.1.20", | ||
"@types/readable-stream": "2.3.15", | ||
"@types/sanitize-html": "2.9.0", | ||
"@types/semver": "7.3.13", | ||
"@types/sinon": "10.0.13", | ||
"@types/semver": "7.5.0", | ||
"@types/sinon": "10.0.15", | ||
"@types/tough-cookie": "4.0.2", | ||
"@types/ts-nameof": "4.2.2", | ||
"@types/turndown": "5.0.1", | ||
"@types/valid-url": "1.0.4", | ||
"@types/validator": "13.7.14", | ||
"@types/validator": "13.7.17", | ||
"@types/webpack-node-externals": "3.0.0", | ||
"@typescript-eslint/eslint-plugin": "5.57.1", | ||
"@typescript-eslint/parser": "5.57.1", | ||
"app-builder-lib": "24.1.2", | ||
"@typescript-eslint/eslint-plugin": "5.59.9", | ||
"@typescript-eslint/parser": "5.59.9", | ||
"app-builder-lib": "24.4.0", | ||
"archiver": "5.3.1", | ||
"asap-es": "1.3.3", | ||
"babel-loader": "9.1.2", | ||
|
@@ -166,32 +166,32 @@ | |
"compare-versions": "5.0.3", | ||
"cpx2": "4.2.3", | ||
"cross-env": "7.0.3", | ||
"css-loader": "6.7.3", | ||
"css-loader": "6.8.1", | ||
"dts-generator": "3.0.0", | ||
"electron": "24.0.0", | ||
"electron-builder": "24.0.0", | ||
"electron": "25.1.0", | ||
"electron-builder": "24.4.0", | ||
"electron-fetch": "1.9.1", | ||
"electron-log": "4.4.8", | ||
"electron-unhandled": "4.0.1", | ||
"eslint": "8.37.0", | ||
"eslint": "8.42.0", | ||
"eslint-plugin-import": "2.27.5", | ||
"eslint-plugin-sonarjs": "0.19.0", | ||
"fast-glob": "3.2.12", | ||
"font-awesome": "4.7.0", | ||
"format-imports": "3.2.3", | ||
"format-imports": "3.2.5", | ||
"fs-backwards-stream": "1.0.0", | ||
"fs-extra": "11.1.1", | ||
"fs-json-store": "8.0.1", | ||
"fs-write-stream-atomic": "1.0.10", | ||
"html-loader": "4.2.0", | ||
"html-webpack-plugin": "5.5.0", | ||
"html-webpack-plugin": "5.5.2", | ||
"husky": "8.0.3", | ||
"immer": "9.0.21", | ||
"immer": "10.0.2", | ||
"imports-loader": "4.0.1", | ||
"js-base64": "3.7.5", | ||
"lint-staged": "13.2.0", | ||
"lint-staged": "13.2.2", | ||
"lzutf8": "0.6.3", | ||
"mini-css-extract-plugin": "2.7.5", | ||
"mini-css-extract-plugin": "2.7.6", | ||
"monaco-editor": "0.36.1", | ||
"mrmime": "1.0.1", | ||
"ndx": "1.0.2", | ||
|
@@ -205,45 +205,46 @@ | |
"otplib": "12.0.1", | ||
"outdent": "0.8.0", | ||
"path-is-inside": "1.0.2", | ||
"playwright": "1.32.2", | ||
"postcss-loader": "7.2.3", | ||
"playwright": "1.35.0", | ||
"postcss-loader": "7.3.3", | ||
"postcss-url": "10.1.3", | ||
"pure-uuid": "1.6.3", | ||
"pureimage": "0.3.15", | ||
"quickjs-emscripten": "0.22.0", | ||
"randomstring": "1.2.3", | ||
"quickjs-emscripten": "0.23.0", | ||
"randomstring": "1.3.0", | ||
"rate-limiter-flexible": "2.4.1", | ||
"reflect-metadata": "0.1.13", | ||
"remeda": "1.12.0", | ||
"remeda": "1.19.0", | ||
"resolve-url-loader": "5.0.0", | ||
"rimraf": "4.4.1", | ||
"rxjs": "7.8.0", | ||
"rimraf": "5.0.1", | ||
"rxjs": "7.8.1", | ||
"sanitize-html": "2.10.0", | ||
"sass": "1.60.0", | ||
"sass-loader": "13.2.2", | ||
"semver": "7.3.8", | ||
"sass": "1.63.3", | ||
"sass-loader": "13.3.2", | ||
"semver": "7.5.1", | ||
"serialize-error": "11.0.0", | ||
"sinon": "15.0.3", | ||
"terser-webpack-plugin": "5.3.7", | ||
"sinon": "15.1.0", | ||
"stream-browserify": "3.0.0", | ||
"terser-webpack-plugin": "5.3.9", | ||
"to-string-loader": "1.2.0", | ||
"tough-cookie": "4.1.2", | ||
"tough-cookie": "4.1.3", | ||
"tough-cookie-web-storage-store": "1.0.0", | ||
"truncate-utf8-bytes": "1.0.2", | ||
"ts-deferred": "1.0.4", | ||
"ts-essentials": "9.3.1", | ||
"ts-loader": "9.4.2", | ||
"ts-essentials": "9.3.2", | ||
"ts-loader": "9.4.3", | ||
"ts-nameof": "5.0.0", | ||
"ts-node": "10.9.1", | ||
"ts-patch": "2.1.0", | ||
"ts-transformer-keys": "0.4.4", | ||
"tslib": "2.5.0", | ||
"tslib": "2.5.3", | ||
"turndown": "7.1.2", | ||
"typescript": "4.9.5", | ||
"typescript-transform-paths": "3.4.6", | ||
"valid-url": "1.0.9", | ||
"webpack": "5.77.0", | ||
"webpack-cli": "5.0.1", | ||
"webpack-merge": "5.8.0", | ||
"webpack": "5.86.0", | ||
"webpack-cli": "5.1.4", | ||
"webpack-merge": "5.9.0", | ||
"webpack-node-externals": "3.0.0", | ||
"zone.js": "0.13.0" | ||
}, | ||
|
@@ -258,16 +259,15 @@ | |
}, | ||
"pnpm": { | ||
"patchedDependencies": { | ||
"[email protected]": "patches/[email protected]", | ||
"@electron/[email protected]": "patches/@[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"[email protected]": "patches/[email protected]", | ||
"@electron/[email protected]": "patches/@[email protected]", | ||
"[email protected]": "patches/[email protected]" | ||
"[email protected]": "patches/[email protected]" | ||
} | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/lib/module-rebuilder.js b/lib/module-rebuilder.js | ||
index dbb5e7b03ab4297bb376fd4d5802bebc0803b385..72c74b8d48386915f6cfe6ea7b1240cf70df97b3 100644 | ||
--- a/lib/module-rebuilder.js | ||
+++ b/lib/module-rebuilder.js | ||
@@ -65,7 +65,8 @@ class ModuleRebuilder { | ||
* Whether a prebuild-install-generated native module exists. | ||
*/ | ||
async prebuildInstallNativeModuleExists() { | ||
- return this.prebuildInstall.prebuiltModuleExists(); | ||
+ // return this.prebuildInstall.prebuiltModuleExists(); | ||
+ return false; | ||
} | ||
/** | ||
* If the native module uses prebuildify, check to see if it comes with a prebuilt module for |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.