From 05bb07e37d0c54afe2b6a8fea9f34705d9008100 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 20 Feb 2019 01:57:38 +0100 Subject: [PATCH] bumped electron --- app/lib/window.ts | 4 +++- package.json | 4 ++-- yarn.lock | 31 ++++++++++++++++--------------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/lib/window.ts b/app/lib/window.ts index 5b2bd11a..94687af7 100644 --- a/app/lib/window.ts +++ b/app/lib/window.ts @@ -44,7 +44,9 @@ export class Window { title: 'Terminus', minWidth: 400, minHeight: 300, - webPreferences: { webSecurity: false }, + webPreferences: { + nodeIntegration: true, + }, frame: false, show: false, backgroundColor: '#00000000' diff --git a/package.json b/package.json index bf6e11b0..01347b3a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "core-js": "2.4.1", "cross-env": "4.0.0", "css-loader": "0.28.0", - "electron": "4.0.0", + "electron": "4.0.5", "electron-builder": "^20.38.4", "electron-builder-squirrel-windows": "^20.28.3", "electron-installer-snap": "^3.0.0", @@ -39,7 +39,7 @@ "shelljs": "0.7.7", "source-code-pro": "^2.30.1", "source-sans-pro": "2.0.10", - "style-loader": "0.13.1", + "style-loader": "^0.23.1", "svg-inline-loader": "^0.8.0", "to-string-loader": "1.1.5", "tslint": "^5.12.0", diff --git a/yarn.lock b/yarn.lock index 322b607b..bb39c3ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -64,10 +64,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.5.tgz#6489ebda4452592d3fd37aefa57eedc01ed13378" integrity sha512-3j1EFLfrjYRHRFjBb+RIXXwr1YGzcfpQVMP39thZa6tMY+JjVgQddPF+hsdV800JqbuLwpwAWclDpbGSAw44vQ== -"@types/node@^8.0.24": - version "8.10.26" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.26.tgz#950e3d4e6b316ba6e1ae4e84d9155aba67f88c2f" - integrity sha512-opk6bLLErLSwyVVJeSH5Ek7ZWOBSsN0JrvXTNVGLXLAXKB9xlTYajrplR44xVyMrmbut94H6uJ9jqzM/12jxkA== +"@types/node@^10.12.18": + version "10.12.26" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.26.tgz#2dec19f1f7981c95cb54bab8f618ecb5dc983d0e" + integrity sha512-nMRqS+mL1TOnIJrL6LKJcNZPB8V3eTfRo9FQA2b5gDvrHurC8XbSA86KNe0dShlEL7ReWJv/OU9NL7Z0dnqWTg== "@types/webpack-env@1.13.0": version "1.13.0" @@ -2324,12 +2324,12 @@ electron-to-chromium@^1.2.7: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188" integrity sha512-AGJxlBEn2wOohxqWZkISVsOjZueKTQljfEODTDSEiMqSpH0S+xzV+/5oEM9AGaqhu7DzrpKOgU7ocQRjj0nJmg== -electron@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.0.tgz#6ccb40cc8bf2d49954dcea73b97ae7ad12ee04b3" - integrity sha512-3XPG/3IXlvnT1oe1K6zEushoD0SKbP8xwdrL10EWGe6k2iOV4hSHqJ8vWnR8yZ7VbSXmBRfomEFDNAo/q/cwKw== +electron@4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.5.tgz#d8e7d8a581a3e31071b2226129b26b6110c1d877" + integrity sha512-UWFH6SrzNtzfvusGUFYxXDrgsUEbtBXkH/66hpDWxjA2Ckt7ozcYIujZpshbr7LPy8kV3ZRxIvoyCMdaS5DkVQ== dependencies: - "@types/node" "^8.0.24" + "@types/node" "^10.12.18" electron-download "^4.1.0" extract-zip "^1.0.3" @@ -3965,7 +3965,7 @@ loader-runner@^2.3.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979" integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw== -loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.14, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.6: +loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.14, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@~0.2.6: version "0.2.17" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g= @@ -7062,12 +7062,13 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -style-loader@0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9" - integrity sha1-RoKA77wEcwI806bNVuM7Wh1/w6k= +style-loader@^0.23.1: + version "0.23.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" + integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg== dependencies: - loader-utils "^0.2.7" + loader-utils "^1.1.0" + schema-utils "^1.0.0" sumchecker@^2.0.2: version "2.0.2"