diff options
author | 2019-11-27 17:30:36 +0700 | |
---|---|---|
committer | 2019-11-27 17:30:36 +0700 | |
commit | 09e69024e8b3ffe790a34c6a544f58b5007870a6 (patch) | |
tree | 8cc3dc152ce39a482bd196b0cce5502638a6529d | |
parent | Deprecate electron-rebuild, follow electron-builder suggestion (diff) | |
download | ferdium-app-09e69024e8b3ffe790a34c6a544f58b5007870a6.tar.gz ferdium-app-09e69024e8b3ffe790a34c6a544f58b5007870a6.tar.zst ferdium-app-09e69024e8b3ffe790a34c6a544f58b5007870a6.zip |
Revert "Deprecate electron-rebuild, follow electron-builder suggestion"
This reverts commit ce8ecefe2fe7df1f0a5e213852a4bef2e2bd57e1.
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | package-lock.json | 215 | ||||
-rw-r--r-- | package.json | 3 |
3 files changed, 223 insertions, 1 deletions
@@ -165,6 +165,12 @@ $ npx lerna bootstrap | |||
165 | 165 | ||
166 | If you previously ran `npm install` it sometimes is necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. | 166 | If you previously ran `npm install` it sometimes is necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. |
167 | 167 | ||
168 | ### Fix native modules to match current electron node version | ||
169 | |||
170 | ```bash | ||
171 | $ npm run rebuild | ||
172 | ``` | ||
173 | |||
168 | ### Start development app | 174 | ### Start development app |
169 | 175 | ||
170 | Run these two commands **simultaneously** in different console tabs: | 176 | Run these two commands **simultaneously** in different console tabs: |
diff --git a/package-lock.json b/package-lock.json index 35ad73ef4..43432b4ac 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -6208,6 +6208,12 @@ | |||
6208 | "restore-cursor": "^2.0.0" | 6208 | "restore-cursor": "^2.0.0" |
6209 | } | 6209 | } |
6210 | }, | 6210 | }, |
6211 | "cli-spinners": { | ||
6212 | "version": "2.2.0", | ||
6213 | "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz", | ||
6214 | "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==", | ||
6215 | "dev": true | ||
6216 | }, | ||
6211 | "cli-table": { | 6217 | "cli-table": { |
6212 | "version": "0.3.1", | 6218 | "version": "0.3.1", |
6213 | "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", | 6219 | "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", |
@@ -8491,6 +8497,138 @@ | |||
8491 | "react-virtualized": "^9.7.6" | 8497 | "react-virtualized": "^9.7.6" |
8492 | } | 8498 | } |
8493 | }, | 8499 | }, |
8500 | "electron-rebuild": { | ||
8501 | "version": "1.8.6", | ||
8502 | "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.6.tgz", | ||
8503 | "integrity": "sha512-4BAPcNG0XP6stByqvFXggrjmf/C47P2L6HFFrWdR2ako1VLiTDIeZAOmU4WEBuWdaXYNqstleszVmcNHdRDojA==", | ||
8504 | "dev": true, | ||
8505 | "requires": { | ||
8506 | "colors": "^1.3.3", | ||
8507 | "debug": "^4.1.1", | ||
8508 | "detect-libc": "^1.0.3", | ||
8509 | "fs-extra": "^7.0.1", | ||
8510 | "node-abi": "^2.9.0", | ||
8511 | "node-gyp": "^5.0.1", | ||
8512 | "ora": "^3.4.0", | ||
8513 | "spawn-rx": "^3.0.0", | ||
8514 | "yargs": "^13.2.4" | ||
8515 | }, | ||
8516 | "dependencies": { | ||
8517 | "ansi-regex": { | ||
8518 | "version": "4.1.0", | ||
8519 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", | ||
8520 | "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", | ||
8521 | "dev": true | ||
8522 | }, | ||
8523 | "cliui": { | ||
8524 | "version": "5.0.0", | ||
8525 | "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", | ||
8526 | "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", | ||
8527 | "dev": true, | ||
8528 | "requires": { | ||
8529 | "string-width": "^3.1.0", | ||
8530 | "strip-ansi": "^5.2.0", | ||
8531 | "wrap-ansi": "^5.1.0" | ||
8532 | } | ||
8533 | }, | ||
8534 | "get-caller-file": { | ||
8535 | "version": "2.0.5", | ||
8536 | "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", | ||
8537 | "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", | ||
8538 | "dev": true | ||
8539 | }, | ||
8540 | "node-gyp": { | ||
8541 | "version": "5.0.3", | ||
8542 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.3.tgz", | ||
8543 | "integrity": "sha512-z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ==", | ||
8544 | "dev": true, | ||
8545 | "requires": { | ||
8546 | "env-paths": "^1.0.0", | ||
8547 | "glob": "^7.0.3", | ||
8548 | "graceful-fs": "^4.1.2", | ||
8549 | "mkdirp": "^0.5.0", | ||
8550 | "nopt": "2 || 3", | ||
8551 | "npmlog": "0 || 1 || 2 || 3 || 4", | ||
8552 | "request": "^2.87.0", | ||
8553 | "rimraf": "2", | ||
8554 | "semver": "~5.3.0", | ||
8555 | "tar": "^4.4.8", | ||
8556 | "which": "1" | ||
8557 | } | ||
8558 | }, | ||
8559 | "require-main-filename": { | ||
8560 | "version": "2.0.0", | ||
8561 | "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", | ||
8562 | "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", | ||
8563 | "dev": true | ||
8564 | }, | ||
8565 | "semver": { | ||
8566 | "version": "5.3.0", | ||
8567 | "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", | ||
8568 | "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", | ||
8569 | "dev": true | ||
8570 | }, | ||
8571 | "string-width": { | ||
8572 | "version": "3.1.0", | ||
8573 | "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", | ||
8574 | "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", | ||
8575 | "dev": true, | ||
8576 | "requires": { | ||
8577 | "emoji-regex": "^7.0.1", | ||
8578 | "is-fullwidth-code-point": "^2.0.0", | ||
8579 | "strip-ansi": "^5.1.0" | ||
8580 | } | ||
8581 | }, | ||
8582 | "strip-ansi": { | ||
8583 | "version": "5.2.0", | ||
8584 | "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", | ||
8585 | "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", | ||
8586 | "dev": true, | ||
8587 | "requires": { | ||
8588 | "ansi-regex": "^4.1.0" | ||
8589 | } | ||
8590 | }, | ||
8591 | "wrap-ansi": { | ||
8592 | "version": "5.1.0", | ||
8593 | "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", | ||
8594 | "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", | ||
8595 | "dev": true, | ||
8596 | "requires": { | ||
8597 | "ansi-styles": "^3.2.0", | ||
8598 | "string-width": "^3.0.0", | ||
8599 | "strip-ansi": "^5.0.0" | ||
8600 | } | ||
8601 | }, | ||
8602 | "yargs": { | ||
8603 | "version": "13.3.0", | ||
8604 | "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", | ||
8605 | "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", | ||
8606 | "dev": true, | ||
8607 | "requires": { | ||
8608 | "cliui": "^5.0.0", | ||
8609 | "find-up": "^3.0.0", | ||
8610 | "get-caller-file": "^2.0.1", | ||
8611 | "require-directory": "^2.1.1", | ||
8612 | "require-main-filename": "^2.0.0", | ||
8613 | "set-blocking": "^2.0.0", | ||
8614 | "string-width": "^3.0.0", | ||
8615 | "which-module": "^2.0.0", | ||
8616 | "y18n": "^4.0.0", | ||
8617 | "yargs-parser": "^13.1.1" | ||
8618 | } | ||
8619 | }, | ||
8620 | "yargs-parser": { | ||
8621 | "version": "13.1.1", | ||
8622 | "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", | ||
8623 | "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", | ||
8624 | "dev": true, | ||
8625 | "requires": { | ||
8626 | "camelcase": "^5.0.0", | ||
8627 | "decamelize": "^1.2.0" | ||
8628 | } | ||
8629 | } | ||
8630 | } | ||
8631 | }, | ||
8494 | "electron-spellchecker": { | 8632 | "electron-spellchecker": { |
8495 | "version": "2.2.0", | 8633 | "version": "2.2.0", |
8496 | "resolved": "https://registry.npmjs.org/electron-spellchecker/-/electron-spellchecker-2.2.0.tgz", | 8634 | "resolved": "https://registry.npmjs.org/electron-spellchecker/-/electron-spellchecker-2.2.0.tgz", |
@@ -16346,6 +16484,15 @@ | |||
16346 | "success-symbol": "^0.1.0" | 16484 | "success-symbol": "^0.1.0" |
16347 | } | 16485 | } |
16348 | }, | 16486 | }, |
16487 | "log-symbols": { | ||
16488 | "version": "2.2.0", | ||
16489 | "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", | ||
16490 | "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", | ||
16491 | "dev": true, | ||
16492 | "requires": { | ||
16493 | "chalk": "^2.0.1" | ||
16494 | } | ||
16495 | }, | ||
16349 | "log-utils": { | 16496 | "log-utils": { |
16350 | "version": "0.2.1", | 16497 | "version": "0.2.1", |
16351 | "resolved": "https://registry.npmjs.org/log-utils/-/log-utils-0.2.1.tgz", | 16498 | "resolved": "https://registry.npmjs.org/log-utils/-/log-utils-0.2.1.tgz", |
@@ -17416,6 +17563,15 @@ | |||
17416 | "lower-case": "^1.1.1" | 17563 | "lower-case": "^1.1.1" |
17417 | } | 17564 | } |
17418 | }, | 17565 | }, |
17566 | "node-abi": { | ||
17567 | "version": "2.11.0", | ||
17568 | "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz", | ||
17569 | "integrity": "sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==", | ||
17570 | "dev": true, | ||
17571 | "requires": { | ||
17572 | "semver": "^5.4.1" | ||
17573 | } | ||
17574 | }, | ||
17419 | "node-cookie": { | 17575 | "node-cookie": { |
17420 | "version": "2.1.1", | 17576 | "version": "2.1.1", |
17421 | "resolved": "https://registry.npmjs.org/node-cookie/-/node-cookie-2.1.1.tgz", | 17577 | "resolved": "https://registry.npmjs.org/node-cookie/-/node-cookie-2.1.1.tgz", |
@@ -18739,6 +18895,37 @@ | |||
18739 | "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", | 18895 | "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", |
18740 | "dev": true | 18896 | "dev": true |
18741 | }, | 18897 | }, |
18898 | "ora": { | ||
18899 | "version": "3.4.0", | ||
18900 | "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz", | ||
18901 | "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==", | ||
18902 | "dev": true, | ||
18903 | "requires": { | ||
18904 | "chalk": "^2.4.2", | ||
18905 | "cli-cursor": "^2.1.0", | ||
18906 | "cli-spinners": "^2.0.0", | ||
18907 | "log-symbols": "^2.2.0", | ||
18908 | "strip-ansi": "^5.2.0", | ||
18909 | "wcwidth": "^1.0.1" | ||
18910 | }, | ||
18911 | "dependencies": { | ||
18912 | "ansi-regex": { | ||
18913 | "version": "4.1.0", | ||
18914 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", | ||
18915 | "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", | ||
18916 | "dev": true | ||
18917 | }, | ||
18918 | "strip-ansi": { | ||
18919 | "version": "5.2.0", | ||
18920 | "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", | ||
18921 | "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", | ||
18922 | "dev": true, | ||
18923 | "requires": { | ||
18924 | "ansi-regex": "^4.1.0" | ||
18925 | } | ||
18926 | } | ||
18927 | } | ||
18928 | }, | ||
18742 | "ordered-read-streams": { | 18929 | "ordered-read-streams": { |
18743 | "version": "1.0.1", | 18930 | "version": "1.0.1", |
18744 | "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", | 18931 | "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", |
@@ -22631,6 +22818,34 @@ | |||
22631 | "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=", | 22818 | "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=", |
22632 | "dev": true | 22819 | "dev": true |
22633 | }, | 22820 | }, |
22821 | "spawn-rx": { | ||
22822 | "version": "3.0.0", | ||
22823 | "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-3.0.0.tgz", | ||
22824 | "integrity": "sha512-dw4Ryg/KMNfkKa5ezAR5aZe9wNwPdKlnHEXtHOjVnyEDSPQyOpIPPRtcIiu7127SmtHhaCjw21yC43HliW0iIg==", | ||
22825 | "dev": true, | ||
22826 | "requires": { | ||
22827 | "debug": "^2.5.1", | ||
22828 | "lodash.assign": "^4.2.0", | ||
22829 | "rxjs": "^6.3.1" | ||
22830 | }, | ||
22831 | "dependencies": { | ||
22832 | "debug": { | ||
22833 | "version": "2.6.9", | ||
22834 | "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", | ||
22835 | "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", | ||
22836 | "dev": true, | ||
22837 | "requires": { | ||
22838 | "ms": "2.0.0" | ||
22839 | } | ||
22840 | }, | ||
22841 | "ms": { | ||
22842 | "version": "2.0.0", | ||
22843 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", | ||
22844 | "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", | ||
22845 | "dev": true | ||
22846 | } | ||
22847 | } | ||
22848 | }, | ||
22634 | "spdx-correct": { | 22849 | "spdx-correct": { |
22635 | "version": "3.1.0", | 22850 | "version": "3.1.0", |
22636 | "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", | 22851 | "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", |
diff --git a/package.json b/package.json index 57540fd11..fe4950776 100644 --- a/package.json +++ b/package.json | |||
@@ -28,7 +28,7 @@ | |||
28 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", | 28 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", |
29 | "packages": "npx lerna publish --no-git-tag-version", | 29 | "packages": "npx lerna publish --no-git-tag-version", |
30 | "uidev": "cd uidev && webpack-dev-server", | 30 | "uidev": "cd uidev && webpack-dev-server", |
31 | "postinstall": "electron-builder install-app-deps && npx lerna run prepare", | 31 | "postinstall": "npx lerna run prepare", |
32 | "apply-branding": "node ./src/i18n/apply-branding.js", | 32 | "apply-branding": "node ./src/i18n/apply-branding.js", |
33 | "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", | 33 | "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", |
34 | "build-theme-info": "node src/scripts/build-theme-info.js" | 34 | "build-theme-info": "node src/scripts/build-theme-info.js" |
@@ -155,6 +155,7 @@ | |||
155 | "electron": "6.0.10", | 155 | "electron": "6.0.10", |
156 | "electron-builder": "21.2.0", | 156 | "electron-builder": "21.2.0", |
157 | "electron-notarize": "0.1.1", | 157 | "electron-notarize": "0.1.1", |
158 | "electron-rebuild": "1.8.6", | ||
158 | "eslint": "5.10.0", | 159 | "eslint": "5.10.0", |
159 | "eslint-config-airbnb": "17.1.0", | 160 | "eslint-config-airbnb": "17.1.0", |
160 | "eslint-loader": "^1.9.0", | 161 | "eslint-loader": "^1.9.0", |