Skip to content

Commit

Permalink
drop terser/sodium-native/keytar workarounds as fixed in upstream
Browse files Browse the repository at this point in the history 
* webpack-contrib/terser-webpack-plugin#66
* terser/terser#254
* sodium-friends/sodium-native#90
* atom/node-keytar#133
  • Loading branch information
@devDefiWeb
devDefiWeb committed Feb 5, 2019
1 parent 2e7f352 commit ed96d56
Show file tree
Hide file tree
Showing 2 changed files with 170 additions and 174 deletions.
49 changes: 21 additions & 28 deletions package.json
View file
Expand Up @@ -11,13 +11,13 @@
},
"main": "./app/electron-main.js",
"scripts": {
"postinstall": "npm-run-all clean:module:prebuild-install yarn:audit",
"postinstall": "npm-run-all yarn:audit",
"yarn:audit": "yarn audit",
"print-dist-packages-hashes": "ts-node -r tsconfig-paths/register ./scripts/print-dist-packages-hashes.ts ./dist",
"electron-rebuild:keytar": "electron-rebuild --force --only=keytar",
"github-artifact:download": "ts-node -r tsconfig-paths/register ./scripts/github-artifact.ts download",
"github-artifact:upload": "ts-node -r tsconfig-paths/register ./scripts/github-artifact.ts upload",
"app:dist": "npm-run-all lint test:electron-main test:web build assets assets:tutanota-webclient assets:protonmail-webclient clean:prebuilds:sodium-native electron-builder:install-app-deps test:e2e",
"app:dist": "npm-run-all lint test:electron-main test:web build assets electron-builder:install-app-deps test:e2e",
"build": "npm-run-all build:electron-main build:electron-preload build:web",
"build:dev": "cross-env NODE_ENV=development npm-run-all build",
"build:electron-main": "webpack --config ./src/webpack/electron-main.ts",
Expand All @@ -36,22 +36,18 @@
"clean:app": "rimraf ./app",
"clean:app-dev": "rimraf ./app-dev",
"clean:output": "rimraf ./output",
"clean:prebuilds": "npm-run-all clean:prebuilds:sodium-native clean:prebuilds:keytar",
"clean:prebuilds:sodium-native": "rimraf ./node_modules/sodium-native/prebuilds ./node_modules/sodium-native/build ./node_modules/sodium-native/lib",
"clean:prebuilds:keytar": "rimraf ./node_modules/keytar/prebuilds ./node_modules/keytar/build",
"clean:module:prebuild-install": "rimraf ./node_modules/prebuild-install",
"assets": "npm-run-all assets:copy assets:download",
"assets:dev": "npm-run-all assets:copy:dev assets:download:dev",
"assets": "npm-run-all assets:copy assets:download assets:webclient:tutanota assets:webclient:protonmail",
"assets:dev": "npm-run-all assets:copy:dev assets:download:dev assets:webclient:tutanota:dev assets:webclient:protonmail:dev",
"assets:copy": "cpx \"./src/assets/dist/**/*\" ./app/assets",
"assets:copy:dev": "cpx \"./src/assets/dist/**/*\" ./app-dev/assets",
"assets:download": "ts-node ./scripts/download-numbers-font.ts ./app/assets/numbers.ttf",
"assets:download:dev": "ts-node ./scripts/download-numbers-font.ts ./app-dev/assets/numbers.ttf",
"assets:protonmail-webclient": "yarn run assets:protonmail-webclient:base ./app/webclient",
"assets:protonmail-webclient:dev": "yarn run assets:protonmail-webclient:base ./app-dev/webclient",
"assets:protonmail-webclient:base": "ts-node -r tsconfig-paths/register ./scripts/prepare-webclient/protonmail.ts",
"assets:tutanota-webclient": "yarn run assets:tutanota-webclient:base ./app/webclient",
"assets:tutanota-webclient:dev": "yarn run assets:tutanota-webclient:base ./app-dev/webclient",
"assets:tutanota-webclient:base": "ts-node -r tsconfig-paths/register ./scripts/prepare-webclient/tutanota.ts",
"assets:webclient:tutanota": "yarn run assets:webclient:tutanota:base ./app/webclient",
"assets:webclient:tutanota:dev": "yarn run assets:webclient:tutanota:base ./app-dev/webclient",
"assets:webclient:tutanota:base": "ts-node -r tsconfig-paths/register ./scripts/prepare-webclient/tutanota.ts",
"assets:webclient:protonmail": "yarn run assets:webclient:protonmail:base ./app/webclient",
"assets:webclient:protonmail:dev": "yarn run assets:webclient:protonmail:base ./app-dev/webclient",
"assets:webclient:protonmail:base": "ts-node -r tsconfig-paths/register ./scripts/prepare-webclient/protonmail.ts",
"electron-builder:install-app-deps": "electron-builder install-app-deps --arch=x64",
"electron-builder:dir": "electron-builder --dir",
"electron-builder:dist": "electron-builder",
Expand Down Expand Up @@ -104,11 +100,11 @@
"electron-unhandled": "2.1.0",
"electron-updater": "4.0.7",
"fs-json-store": "2.2.0",
"fs-json-store-encryption-adapter": "1.3.4",
"fs-json-store-encryption-adapter": "1.3.5",
"html-to-text": "4.0.0",
"image-processing-js": "0.0.3",
"js-base64": "2.5.1",
"keytar": "4.3.2",
"keytar": "4.3.3",
"memory-streams": "0.1.3",
"mime-types": "2.1.21",
"msgpack-lite": "0.1.26",
Expand Down Expand Up @@ -141,12 +137,12 @@
"@angularclass/hmr": "2.1.3",
"@email-securely-app/import-sort-style": "0.1.0",
"@expo/spawn-async": "1.4.0",
"@ng-select/ng-select": "2.15.2",
"@ng-select/ng-select": "2.15.3",
"@ngrx/effects": "7.2.0",
"@ngrx/router-store": "7.2.0",
"@ngrx/store": "7.2.0",
"@ngtools/webpack": "7.3.0",
"@octokit/rest": "16.14.1",
"@octokit/rest": "16.15.0",
"@types/angular": "1.6.53",
"@types/byline": "4.2.31",
"@types/chalk": "2.2.0",
Expand Down Expand Up @@ -187,7 +183,7 @@
"@types/webpack-merge": "4.1.3",
"@types/webpack-node-externals": "1.6.3",
"@vladimiry/unionize": "2.1.2-add-tagprefix-option",
"ava": "1.2.0",
"ava": "1.2.1",
"awesome-typescript-loader": "5.2.1",
"bootstrap": "4.2.1",
"byline": "5.0.0",
Expand All @@ -213,7 +209,7 @@
"html-loader": "0.5.5",
"html-webpack-plugin": "4.0.0-beta.2",
"husky": "1.3.1",
"immer": "1.12.1",
"immer": "2.0.0",
"import-sort-cli": "5.2.0",
"import-sort-parser-typescript": "5.0.0",
"jasmine": "3.3.1",
Expand All @@ -227,12 +223,12 @@
"less-loader": "4.1.0",
"lint-staged": "8.1.3",
"mini-css-extract-plugin": "0.5.0",
"ndx": "1.0.0-beta.2",
"ndx-query": "1.0.0-beta.2",
"ndx": "1.0.1",
"ndx-query": "1.0.0",
"ndx-utils": "1.0.0-beta.0",
"ng2-dragula": "2.1.1",
"ngx-bootstrap": "3.2.0",
"ngx-color-picker": "7.3.0",
"ngx-color-picker": "7.3.1",
"node-fetch": "2.3.0",
"node-sass": "4.11.0",
"npm-run-all": "4.1.5",
Expand Down Expand Up @@ -268,14 +264,11 @@
"typescript": "3.3.1",
"uglifyjs-webpack-plugin": "2.1.1",
"url-loader": "1.1.2",
"webpack": "4.29.0",
"webpack-cli": "3.2.1",
"webpack": "4.29.1",
"webpack-cli": "3.2.3",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.2.1",
"webpack-node-externals": "1.7.2",
"zone.js": "0.8.29"
},
"resolutions": {
"webpack/terser-webpack-plugin/terser": "3.14.1"
}
}

0 comments on commit ed96d56

Please sign in to comment.