Browse Source

moved glasstron outside of webpack realm

Eugene Pankov 5 years ago
parent
commit
48013e2102
6 changed files with 23 additions and 18 deletions
  1. 5 1
      app/lib/window.ts
  2. 1 0
      app/package.json
  3. 1 0
      app/webpack.main.config.js
  4. 15 1
      app/yarn.lock
  5. 0 1
      package.json
  6. 1 15
      yarn.lock

+ 5 - 1
app/lib/window.ts

@@ -1,5 +1,8 @@
 import * as glasstron from 'glasstron'
-glasstron.init()
+if (process.platform === 'linux') {
+    glasstron.init()
+}
+
 import { Subject, Observable } from 'rxjs'
 import { debounceTime } from 'rxjs/operators'
 import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen } from 'electron'
@@ -91,6 +94,7 @@ export class Window {
                 linux: { requestBlur: true },
             })
         }
+
         this.window.once('ready-to-show', () => {
             if (process.platform === 'darwin') {
                 this.window.setVibrancy('window')

+ 1 - 0
app/package.json

@@ -27,6 +27,7 @@
     "electron-is-dev": "1.1.0",
     "electron-updater": "^4.3.1",
     "fontmanager-redux": "0.4.0",
+    "glasstron": "0.0.3",
     "js-yaml": "3.14.0",
     "keytar": "^5.6.0",
     "mz": "^2.7.0",

+ 1 - 0
app/webpack.main.config.js

@@ -37,6 +37,7 @@ module.exports = {
     'electron-config': 'commonjs electron-config',
     'electron-vibrancy': 'commonjs electron-vibrancy',
     fs: 'commonjs fs',
+    glasstron: 'commonjs glasstron',
     mz: 'commonjs mz',
     path: 'commonjs path',
     yargs: 'commonjs yargs',

+ 15 - 1
app/yarn.lock

@@ -1186,6 +1186,13 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
 
[email protected]:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/glasstron/-/glasstron-0.0.3.tgz#3934d9e9b51dd2fd6b07eff8395493b3361ab917"
+  integrity sha512-yJ8+8gkGXXBlnI+4j6i8N+SaeZcswtrO82M863zQkCc5BQfC5fTXcwj9+v80f0jYUfZLFigsgaFuKoFmlVsOdw==
+  dependencies:
+    x11 "^2.3.0"
+
 glob@^7.0.3, glob@^7.1.1, glob@^7.1.3:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
@@ -2349,7 +2356,7 @@ opener@^1.5.1:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
   integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
-os-homedir@^1.0.0:
+os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -3569,6 +3576,13 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+x11@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/x11/-/x11-2.3.0.tgz#bdaccedccdac2482fd560f0511e7bf2bd9e1dbf2"
+  integrity sha1-vazO3M2sJIL9Vg8FEee/K9nh2/I=
+  dependencies:
+    os-homedir "^1.0.1"
+
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"

+ 0 - 1
package.json

@@ -25,7 +25,6 @@
     "eslint-plugin-import": "^2.20.2",
     "file-loader": "^5.0.2",
     "graceful-fs": "^4.2.4",
-    "glasstron": "0.0.3",
     "html-loader": "0.5.5",
     "json-loader": "0.5.7",
     "node-abi": "^2.16.0",

+ 1 - 15
yarn.lock

@@ -2905,13 +2905,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
[email protected]:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/glasstron/-/glasstron-0.0.3.tgz#3934d9e9b51dd2fd6b07eff8395493b3361ab917"
-  integrity sha512-yJ8+8gkGXXBlnI+4j6i8N+SaeZcswtrO82M863zQkCc5BQfC5fTXcwj9+v80f0jYUfZLFigsgaFuKoFmlVsOdw==
-  dependencies:
-    x11 "^2.3.0"
-
 glob-parent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
@@ -5014,7 +5007,7 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -7598,13 +7591,6 @@ [email protected]:
   dependencies:
     mkdirp "^0.5.1"
 
-x11@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/x11/-/x11-2.3.0.tgz#bdaccedccdac2482fd560f0511e7bf2bd9e1dbf2"
-  integrity sha1-vazO3M2sJIL9Vg8FEee/K9nh2/I=
-  dependencies:
-    os-homedir "^1.0.1"
-
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"