[renderer] disable nodeIntegration and use preload

toyobayashi · Jul 9, 2019 · fdd1e7d · fdd1e7d
1 parent 450023a
commit fdd1e7d
Show file tree

Hide file tree

Showing 48 changed files with 606 additions and 535 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -70,7 +70,7 @@
     "vue-loader": "^15.7.0",
     "vue-property-decorator": "^8.2.1",
     "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.35.2",
+    "webpack": "^4.35.3",
     "webpack-dev-server": "^3.7.2",
     "webpack-node-externals": "^1.7.2"
   },

diff --git a/app/script/build.ts b/app/script/build.ts
@@ -1,11 +1,11 @@
-import { mainConfig, rendererConfig/* , preloadConfig */ } from './webpack.config'
+import { mainConfig, rendererConfig, preloadConfig } from './webpack.config'
 import { compile } from './util'
 import config from './config'
 
 export default function build () {
   return Promise.all([
     compile(mainConfig, config.statsOptions),
-    // compile(preloadConfig, config.statsOptions),
+    compile(preloadConfig, config.statsOptions),
     compile(rendererConfig, config.statsOptions)
   ])
 }

diff --git a/app/script/dev.ts b/app/script/dev.ts
@@ -1,4 +1,4 @@
-import { mainConfig, rendererConfig/* , preloadConfig */ } from './webpack.config'
+import { mainConfig, rendererConfig, preloadConfig } from './webpack.config'
 import { watch, startDevServer } from './util'
 import config from './config'
 import start from './start'
@@ -17,11 +17,11 @@ export default function dev () {
 
   const firstLaunch = {
     main: false,
-    // preload: false,
+    preload: false,
     renderer: false
   }
 
-  const isReady = () => firstLaunch.main /* && firstLaunch.preload */ && firstLaunch.renderer
+  const isReady = () => firstLaunch.main && firstLaunch.preload && firstLaunch.renderer
 
   const relaunch = function relaunch () {
     if (appProcess) {
@@ -47,7 +47,7 @@ export default function dev () {
     console.log(stats.toString(config.statsOptions) + '\n')
   })
 
-  /* watch(preloadConfig, function watchHandler (err, stats) {
+  watch(preloadConfig, function watchHandler (err, stats) {
     if (err) {
       console.log(err)
       return
@@ -60,7 +60,7 @@ export default function dev () {
     }
 
     console.log(stats.toString(config.statsOptions) + '\n')
-  }) */
+  })
 
   startDevServer(rendererConfig, config.devServerPort, config.devServerHost, function (err) {
     if (err) {