Merge pull request #47 from tsuwatch/feature/optimize

Optimize file size
tsuwatch · May 27, 2017 · 85be149 · 85be149
2 parents c2bff3b + f9208d8
commit 85be149
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -2,16 +2,17 @@
   "name": "nicomentron",
   "version": "0.4.0",
   "description": "comments viewer for live.nicovideo.jp",
-  "main": "app/main.js",
+  "main": "main.js",
   "scripts": {
     "lint": "./node_modules/.bin/eslint ./src",
-    "package": "NODE_ENV=production ./node_modules/.bin/electron-packager . nicomentron --platform=darwin --arch=x64 --out=packages --overwrite",
+    "package": "NODE_ENV=production ./node_modules/.bin/electron-packager ./app nicomentron --platform=darwin --arch=x64 --out=packages --overwrite --asar",
+    "prepackage": "cp package.json ./app && cp -r plugins ./app && cd ./app && rm -rf node_modules && npm install --production && ../node_modules/.bin/electron-rebuild -m . sqlite3 keytar",
     "zip": "cd packages && zip -r nicomentron-darwin-x64.zip nicomentron-darwin-x64",
     "electron-rebuild": "./node_modules/.bin/electron-rebuild sqlite3 keytar",
-    "build": "npm run build:main && npm run build:renderer",
-    "build:main": "cross-env NODE_ENV=production node -r babel-register ./node_modules/.bin/webpack --config webpack.config.electron.js --progress --profile --colors",
-    "build:renderer": "cross-env NODE_ENV=production node -r babel-register ./node_modules/.bin/webpack --config webpack.config.production.js --progress --profile --colors --display-error-details",
-    "start": "cross-env NODE_ENV=production electron .",
+    "build": "rm -rf ./app/* && npm run build:main && npm run build:renderer && cp package.json ./app && cp -r plugins ./app",
+    "build:main": "cross-env NODE_ENV=production node -r babel-register ./node_modules/.bin/webpack --config webpack.config.electron.js --optimize-minimize --progress --profile --colors",
+    "build:renderer": "cross-env NODE_ENV=production node -r babel-register ./node_modules/.bin/webpack --config webpack.config.production.js --optimize-minimize --progress --profile --colors --display-error-details",
+    "start": "cross-env NODE_ENV=production electron ./app",
     "start:dev": "cross-env NODE_ENV=development electron -r babel-register ./src/main.js",
     "watch": "cross-env NODE_ENV=development node -r babel-register ./node_modules/.bin/webpack-dev-server --config webpack.config.development.js",
     "dev": "./node_modules/.bin/npm-run-all -p watch start:dev"

diff --git a/plugins/.travis.yml b/plugins/.travis.yml
diff --git a/src/main.js b/src/main.js
@@ -21,7 +21,7 @@ class Main {
         break;
     }
 
-    app.commandLine.appendSwitch('ppapi-flash-path', `${path.join(__dirname)}/../plugins/${pluginName}`);
+    app.commandLine.appendSwitch('ppapi-flash-path', `${path.join(__dirname)}/${process.env.NODE_ENV === 'development' ? '../' : ''}plugins/${pluginName}`);
     app.commandLine.appendSwitch('ppapi-flash-version', '25.0.0.127');
   }
 

diff --git a/webpack.config.electron.js b/webpack.config.electron.js
@@ -4,7 +4,6 @@ import merge from 'webpack-merge';
 import baseConfig from './webpack.config.base';
 
 export default merge(baseConfig, {
-  devtool: 'source-map',
   entry: ['./src/main'],
   node: {
     __dirname: false

diff --git a/webpack.config.production.js b/webpack.config.production.js
@@ -5,7 +5,6 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
 import baseConfig from './webpack.config.base';
 
 export default merge(baseConfig, {
-  devtool: 'cheap-module-eval-source-map',
   entry: {
     index: './src/renderer/index.js',
     'login/index': './src/renderer/login/index.js'