From 4d2ac39a5b7f785ec63bab070757694331218118 Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Wed, 6 Jun 2018 12:33:57 -0500 Subject: [PATCH 1/7] Updating Electron --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ef9a8d..ec362e3 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "clean-webpack-plugin": "0.1.15", "copy-webpack-plugin": "4.0.1", "css-loader": "0.26.1", - "electron": "1.6.6", + "electron": "1.8.2-beta5", "extract-zip": "=1.6.0", "electron-packager": "8.5.1", "extract-text-webpack-plugin": "1.0.1", From ac78ca240153c6a9d216313f8660aa77b1618030 Mon Sep 17 00:00:00 2001 From: "Will Presley (amory)" Date: Thu, 11 Oct 2018 11:09:55 -0400 Subject: [PATCH 2/7] Update Electron and a couple of dependencies This builds and seems to work just fine, but I want to do some testing first. --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ec362e3..b2c05f0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "openwmail", "humanName": "openWMail", - "version": "1.0.0", + "version": "1.0.1", "prerelease": false, "description": "The missing desktop client for Gmail and Google Inbox", "scripts": { @@ -43,8 +43,8 @@ "clean-webpack-plugin": "0.1.15", "copy-webpack-plugin": "4.0.1", "css-loader": "0.26.1", - "electron": "1.8.2-beta5", - "extract-zip": "=1.6.0", + "electron": "1.8.8", + "extract-zip": "=1.6.7", "electron-packager": "8.5.1", "extract-text-webpack-plugin": "1.0.1", "file-loader": "0.10.0", @@ -57,8 +57,8 @@ "recursive-readdir": "2.1.0", "style-loader": "0.13.1", "temp": "0.8.3", - "uglify-js": "mishoo/UglifyJS2#3ee46e91e802fb8bf20656bce115375c5f624052", - "url-loader": "0.5.7", + "uglify-js": "3.4.9", + "url-loader": "1.1.2", "uuid": "3.0.1", "webpack": "1.14.0", "webpack-target-electron-renderer": "0.4.0", From 50c55471511424836615c87cfef7ee233a4b74eb Mon Sep 17 00:00:00 2001 From: "Will Presley (amory)" Date: Thu, 11 Oct 2018 11:39:20 -0400 Subject: [PATCH 3/7] Update the rest of the audited dependencies --- src/app/package.json | 6 +++--- src/scenes/mailboxes/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/package.json b/src/app/package.json index 19f9ea5..9b25548 100644 --- a/src/app/package.json +++ b/src/app/package.json @@ -10,16 +10,16 @@ "dictionary-en-us": "1.2.0", "escape-html": "1.0.3", "fs-extra": "2.0.0", - "gmail-js": "0.6.8", + "gmail-js": "0.7.7", "googleapis": "16.1.0", "home-dir": "1.0.0", - "https-proxy-agent": "1.0.0", + "https-proxy-agent": "2.2.1", "jquery": "3.1.1", "minivents": "2.0.2", "mkdirp": "0.5.1", "node-fetch": "1.6.3", "os-locale": "2.0.0", - "request": "2.79.0", + "request": "2.88.0", "unused-filename": "0.1.0", "uuid": "3.0.1", "windows-shortcuts": "openWMail/windows-shortcuts#0.1.4", diff --git a/src/scenes/mailboxes/package.json b/src/scenes/mailboxes/package.json index 3562a6f..e4411d1 100644 --- a/src/scenes/mailboxes/package.json +++ b/src/scenes/mailboxes/package.json @@ -11,7 +11,7 @@ "camelcase": "4.0.0", "compare-version": "0.1.2", "fbjs": "0.8.9", - "https-proxy-agent": "1.0.0", + "https-proxy-agent": "2.2.1", "material-ui": "0.17.0", "minivents": "2.0.2", "qs": "6.3.1", From 7fd315f76072caf345f2e64701be589946ba6b62 Mon Sep 17 00:00:00 2001 From: "Will Presley (amory)" Date: Thu, 11 Oct 2018 12:21:16 -0400 Subject: [PATCH 4/7] Push a packager and Advanced Installer MSI update --- package.json | 5 +- packager/msi/openWMail_x86_64.aip | 163 ++++++++++++++++++++++-------- 2 files changed, 126 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index b2c05f0..62e6da1 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "dev:app": "webpack --task=app && electron bin/app/index.js", "dev:mailboxes": "webpack --task=mailboxes && electron bin/app/index.js", "dev:assets": "webpack --task=assets && electron bin/app/index.js", - "dev:run": "electron bin/app/index.js" + "dev:run": "electron bin/app/index.js", + "clean": "rimraf \"node_modules/!(rimraf|.bin)\"" }, "keywords": [], "author": { @@ -45,7 +46,7 @@ "css-loader": "0.26.1", "electron": "1.8.8", "extract-zip": "=1.6.7", - "electron-packager": "8.5.1", + "electron-packager": "12.2.0", "extract-text-webpack-plugin": "1.0.1", "file-loader": "0.10.0", "json-loader": "0.5.4", diff --git a/packager/msi/openWMail_x86_64.aip b/packager/msi/openWMail_x86_64.aip index 5310c49..82cf57d 100644 --- a/packager/msi/openWMail_x86_64.aip +++ b/packager/msi/openWMail_x86_64.aip @@ -1,5 +1,5 @@ - + @@ -10,8 +10,7 @@ - - + @@ -19,7 +18,7 @@ - + @@ -32,55 +31,135 @@ - + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - + @@ -88,7 +167,7 @@ - + @@ -97,25 +176,26 @@ - + - - + + - + + - - - + + + @@ -123,7 +203,7 @@ - + @@ -131,13 +211,15 @@ - + + + + - - + - + @@ -212,7 +294,7 @@ - + @@ -247,7 +329,8 @@ - + + From eb0b87c8c57f7e369592edeeacf10e09ca67766d Mon Sep 17 00:00:00 2001 From: "Will Presley (amory)" Date: Fri, 12 Oct 2018 15:16:40 -0400 Subject: [PATCH 5/7] Update Babel, replace fs with graceful-fs --- package.json | 9 ++++++--- src/app/src/app/main.js | 5 +++++ src/scenes/mailboxes/webpack.config.js | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 62e6da1..24aa4c4 100644 --- a/package.json +++ b/package.json @@ -35,20 +35,23 @@ "appdmg": "0.4.5" }, "dependencies": { - "babel": "6.23.0", + "babel-cli": "^6.26.0", "babel-core": "6.23.1", "babel-loader": "6.3.2", - "babel-preset-es2015": "6.22.0", + "babel-preset-env": "^1.7.0", "babel-preset-react": "6.23.0", "babel-preset-stage-0": "6.22.0", + "babelify": "^10.0.0", + "browserify": "^16.2.3", "clean-webpack-plugin": "0.1.15", "copy-webpack-plugin": "4.0.1", "css-loader": "0.26.1", "electron": "1.8.8", - "extract-zip": "=1.6.7", "electron-packager": "12.2.0", "extract-text-webpack-plugin": "1.0.1", + "extract-zip": "=1.6.7", "file-loader": "0.10.0", + "graceful-fs": "4.1.11", "json-loader": "0.5.4", "jsx-loader": "0.13.2", "less": "2.7.2", diff --git a/src/app/src/app/main.js b/src/app/src/app/main.js index e92dd10..bbee82d 100644 --- a/src/app/src/app/main.js +++ b/src/app/src/app/main.js @@ -1,4 +1,9 @@ ;(function () { + + var realFs = require('fs') + var gracefulFs = require('graceful-fs') + gracefulFs.gracefulify(realFs) + const {ipcMain, dialog, app, shell} = require('electron') let windowManager diff --git a/src/scenes/mailboxes/webpack.config.js b/src/scenes/mailboxes/webpack.config.js index 535707e..a15d6cc 100644 --- a/src/scenes/mailboxes/webpack.config.js +++ b/src/scenes/mailboxes/webpack.config.js @@ -76,7 +76,7 @@ const options = { ], query: { cacheDirectory: true, - presets: ['react', 'stage-0', 'es2015'] + presets: ['react', 'stage-0', 'env'] } }, { From a4cc25c29bd9e1aa5525d47d5850bb3ff3ca077d Mon Sep 17 00:00:00 2001 From: "Will Presley (amory)" Date: Thu, 1 Nov 2018 11:39:14 -0400 Subject: [PATCH 6/7] Untrack ST3 files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index a7f3b0c..a46a096 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ prime stage *.snap *.log + +*.sublime-project + +*.sublime-workspace From d3fb9d1a286e1c2ca2907a0d76b524e7d419fb1b Mon Sep 17 00:00:00 2001 From: dogierdenis Date: Tue, 12 Feb 2019 17:40:36 +0100 Subject: [PATCH 7/7] Fixed spellChecker related to electron version update - Need to be rebuild as electron because is a native module --- README.md | 1 + package.json | 8 ++++++ packager/ElectronBuilder.js | 25 ++++++++----------- snap/snapcraft.yaml | 2 +- src/app/package.json | 4 +-- src/scenes/mailboxes/package.json | 2 +- src/scenes/mailboxes/webpack.config.js | 1 - .../webviewInjection/Browser/Spellchecker.js | 4 +-- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 497d993..41e1397 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ Then run the following... ``` npm install webpack -g npm run-script install-all +npm run-script rebuild:electron npm start ``` diff --git a/package.json b/package.json index 24aa4c4..8441355 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "prerelease": false, "description": "The missing desktop client for Gmail and Google Inbox", "scripts": { + "rebuild:electron": "electron-rebuild -f -m src/app -v 1.8.8 -t prod,optional", "prestart": "webpack", "start": "electron bin/app/index.js", "test": "standard", @@ -12,7 +13,13 @@ "package:linux": "node packager --platform=linux", "package:win32": "node packager --platform=win32", "package": "node packager --distribution", + "package:darwin:distrib": "node packager --platform=darwin --distribution", + "package:linux:distrib": "node packager --platform=linux --distribution", + "package:win32:distrib": "node packager --platform=win32 --distribution", "package:finalise": "node packager --finalise", + "package:darwin:finalise": "node packager --platform=darwin --finalise", + "package:linux:finalise": "node packager --platform=linux --finalise", + "package:win32:finalise": "node packager --platform=win32 --finalise", "install-all": "echo ':wmail' && npm install && cd src/app && echo ':wmail-app' && npm install && cd ../../src/scenes/mailboxes && echo ':wmail-scenes-mailboxes' && npm install", "outdated-all": "echo ':wmail' && npm outdated && cd src/app && echo ':wmail-app' && npm outdated && cd ../../src/scenes/mailboxes && echo ':wmail-scenes-mailboxes' && npm outdated", "dev:platform": "webpack --task=platform && electron bin/app/index.js", @@ -48,6 +55,7 @@ "css-loader": "0.26.1", "electron": "1.8.8", "electron-packager": "12.2.0", + "electron-rebuild": "^1.8.4", "extract-text-webpack-plugin": "1.0.1", "extract-zip": "=1.6.7", "file-loader": "0.10.0", diff --git a/packager/ElectronBuilder.js b/packager/ElectronBuilder.js index 31c1bc9..6e5f2bb 100644 --- a/packager/ElectronBuilder.js +++ b/packager/ElectronBuilder.js @@ -2,6 +2,8 @@ const packager = require('electron-packager') const TaskLogger = require('./TaskLogger') const path = require('path') const { ROOT_PATH } = require('./constants') +const { rebuild } = require('electron-rebuild') +const { serialHooks } = require('electron-packager/hooks') const PLATFORM_ARCHES = { darwin: ['x64'], @@ -43,19 +45,7 @@ class ElectronBuilder { '/openWMail-darwin-x64' ] - // Spellchecker - const wmailSpellcheckerPath = path.join(ROOT_PATH, 'bin/app/node_modules/wmail-spellchecker') - const wmailSpellchecker = require(path.join(wmailSpellcheckerPath, 'package.json')) - const wmailSpellcheckerIgnores = Object.keys(wmailSpellchecker.wmailPlatformCode) - .map((platformArch) => `${platform}_${arch}` === platformArch ? undefined : platformArch) - .filter((platformArch) => !!platformArch) - .map((platformArch) => { - const ignorePath = path.join(wmailSpellcheckerPath, wmailSpellchecker.wmailPlatformCode[platformArch]) - return '/' + path.relative(ROOT_PATH, ignorePath) - }) - - const allIgnores = ignores.concat(wmailSpellcheckerIgnores) - return '^(' + allIgnores.join('|') + ')' + return '^(' + ignores.join('|') + ')' } /** @@ -89,7 +79,14 @@ class ElectronBuilder { 'extend-info': { 'CFBundleURLSchemes': ['mailto'] }, - ignore: ElectronBuilder.packagerIgnoreString(platform, arch) + ignore: ElectronBuilder.packagerIgnoreString(platform, arch), + tmpdir: false, + afterCopy: [serialHooks([ + (buildPath, electronVersion, platform, arch) => { + const buildNativePath = path.join(buildPath, 'bin/app') + rebuild({ buildNativePath, electronVersion, arch }) + } + ])] }, function (err, appPath) { if (err) { reject(err) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f287d80..3d0fded 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: openwmail -version: 1.0.0 +version: 1.0.1 summary: openWMail description: openWMail confinement: strict diff --git a/src/app/package.json b/src/app/package.json index 9b25548..be2c3e6 100644 --- a/src/app/package.json +++ b/src/app/package.json @@ -17,14 +17,14 @@ "jquery": "3.1.1", "minivents": "2.0.2", "mkdirp": "0.5.1", + "nodehun": "2.0.12", "node-fetch": "1.6.3", "os-locale": "2.0.0", "request": "2.88.0", "unused-filename": "0.1.0", "uuid": "3.0.1", "windows-shortcuts": "openWMail/windows-shortcuts#0.1.4", - "wmail-spellchecker": "openWMail/wmail-spellchecker#1.0.5", - "write-file-atomic": "git://github.com/geekgonecrazy/write-file-atomic.git#5be21f07e36664e47a7e342c26d8ee93424b5f42", + "write-file-atomic": "https://github.com/geekgonecrazy/write-file-atomic.git#v1.3.4", "yargs": "6.6.0" }, "devDependencies": { diff --git a/src/scenes/mailboxes/package.json b/src/scenes/mailboxes/package.json index e4411d1..3642ef6 100644 --- a/src/scenes/mailboxes/package.json +++ b/src/scenes/mailboxes/package.json @@ -18,7 +18,7 @@ "querystring": "0.2.0", "react": "15.4.2", "react-addons-shallow-compare": "15.4.2", - "react-color": "2.11.1", + "react-color": "2.17.0", "react-dom": "15.4.2", "react-tap-event-plugin": "2.0.1", "react-timer-mixin": "0.13.3", diff --git a/src/scenes/mailboxes/webpack.config.js b/src/scenes/mailboxes/webpack.config.js index a15d6cc..a10bd50 100644 --- a/src/scenes/mailboxes/webpack.config.js +++ b/src/scenes/mailboxes/webpack.config.js @@ -69,7 +69,6 @@ const options = { { test: /(\.jsx|\.js)$/, loader: 'babel', - exclude: /node_modules/, include: [ __dirname, path.resolve(path.join(__dirname, '../../shared')) diff --git a/src/scenes/platform/src/webviewInjection/Browser/Spellchecker.js b/src/scenes/platform/src/webviewInjection/Browser/Spellchecker.js index 29457d5..4a15ce7 100644 --- a/src/scenes/platform/src/webviewInjection/Browser/Spellchecker.js +++ b/src/scenes/platform/src/webviewInjection/Browser/Spellchecker.js @@ -5,10 +5,10 @@ const elconsole = require('../elconsole') let Nodehun try { - Nodehun = require('../../../../app/node_modules/wmail-spellchecker') + Nodehun = require('../../../../app/node_modules/nodehun') } catch (ex) { elconsole.error('Failed to initialize spellchecker', ex) - throw ex + Nodehun = null } class Spellchecker {