Make the electron shell work without previous extension hook

michalsnik · michalsnik · commit 7b439b5e11ad · 2018-01-22T19:31:04.000+01:00
diff --git a/shells/electron/index.js b/shells/electron/index.js
@@ -1,5 +1,6 @@
 module.exports = {
   connect: () => {
+    require('./build/hook.js')
     require('./build/backend.js')
   }
 }
diff --git a/shells/electron/server.js b/shells/electron/server.js
@@ -2,11 +2,14 @@ const app = require('express')()
 const http = require('http').Server(app)
 const io = require('socket.io')(http)
 const path = require('path')
+const fs = require('fs')
 
 const port = process.env.PORT || 8098
 
 app.get('/', function (req, res) {
-  res.sendFile(path.join(__dirname, '/build/backend.js'))
+  const hookContent = fs.readFileSync(path.join(__dirname, '/build/hook.js'), 'utf8')
+  const backendContent = fs.readFileSync(path.join(__dirname, '/build/backend.js'), 'utf8')
+  res.send([hookContent, backendContent].join('\n'))
 })
 
 // Middleman
diff --git a/shells/electron/src/backend.js b/shells/electron/src/backend.js
@@ -1,6 +1,5 @@
 import io from 'socket.io-client'
 import { initBackend } from 'src/backend'
-import { installHook } from 'src/backend/hook'
 import Bridge from 'src/bridge'
 
 (function () {
@@ -21,10 +20,6 @@ import Bridge from 'src/bridge'
     socket.disconnect()
   })
 
-  if (!window.__VUE_DEVTOOLS_GLOBAL_HOOK__) {
-    installHook(window)
-  }
-
   initBackend(bridge)
   socket.emit('vue-devtools-init')
 }())
diff --git a/shells/electron/src/hook.js b/shells/electron/src/hook.js
@@ -0,0 +1,5 @@
+import { installHook } from 'src/backend/hook'
+
+if (!window.__VUE_DEVTOOLS_GLOBAL_HOOK__) {
+  installHook(window)
+}
diff --git a/shells/electron/webpack.config.js b/shells/electron/webpack.config.js
@@ -12,11 +12,12 @@ module.exports = {
   entry: {
     devtools: './src/devtools.js',
     backend: './src/backend.js',
+    hook: './src/hook.js'
   },
   output: {
     path: __dirname + '/build',
     publicPath: '/build/',
-    filename: '[name].js',
+    filename: '[name].js'
   },
   resolve: {
     alias
@@ -25,7 +26,7 @@ module.exports = {
     rules: [
       {
         test: /\.js$/,
-        loader:  'buble-loader',
+        loader: 'buble-loader',
         exclude: /node_modules|vue\/dist|vuex\/dist/,
         options: bubleOptions
       },
@@ -47,8 +48,5 @@ module.exports = {
     hints: false
   },
   devtool: '#cheap-module-source-map',
-  devServer: {
-    quiet: true
-  },
-  plugins: process.env.VUE_DEVTOOL_TEST ? [] :[new FriendlyErrorsPlugin()]
+  plugins: process.env.VUE_DEVTOOL_TEST ? [] : [new FriendlyErrorsPlugin()]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`connect: () => {`
	`3`	`+ require('./build/hook.js')`
`3`	`4`	`require('./build/backend.js')`
`4`	`5`	`}`
`5`	`6`	`}`