Merged dev

ellcrys · Apr 5, 2019 · b2ea166 · b2ea166
2 parents 5704e0f + 83f33f1
commit b2ea166
Show file tree

Hide file tree

Showing 32 changed files with 16,024 additions and 757 deletions.
diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js
@@ -1,83 +1,83 @@
-'use strict'
+'use strict';
 
-process.env.BABEL_ENV = 'main'
+process.env.BABEL_ENV = 'main';
 
-const path = require('path')
-const { dependencies } = require('../package.json')
-const webpack = require('webpack')
+const path = require('path');
+const { dependencies } = require('../package.json');
+const webpack = require('webpack');
 
-const BabiliWebpackPlugin = require('babili-webpack-plugin')
+const BabiliWebpackPlugin = require('babili-webpack-plugin');
 
 let mainConfig = {
-  entry: {
-    main: path.join(__dirname, '../src/main/index.js')
-  },
-  externals: [
-    ...Object.keys(dependencies || {})
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.(js)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
-        use: {
-          loader: 'eslint-loader',
-          options: {
-            formatter: require('eslint-friendly-formatter')
-          }
-        }
-      },
-      {
-        test: /\.js$/,
-        use: 'babel-loader',
-        exclude: /node_modules/
-      },
-      {
-        test: /\.node$/,
-        use: 'node-loader'
-      }
-    ]
-  },
-  node: {
-    __dirname: process.env.NODE_ENV !== 'production',
-    __filename: process.env.NODE_ENV !== 'production'
-  },
-  output: {
-    filename: '[name].js',
-    libraryTarget: 'commonjs2',
-    path: path.join(__dirname, '../dist/electron')
-  },
-  plugins: [
-    new webpack.NoEmitOnErrorsPlugin()
-  ],
-  resolve: {
-    extensions: ['.js', '.json', '.node']
-  },
-  target: 'electron-main'
-}
+	entry: {
+		main: path.join(__dirname, '../src/main/index.js'),
+	},
+	externals: [...Object.keys(dependencies || {})],
+	module: {
+		rules: [
+			{
+				test: /\.(js)$/,
+				enforce: 'pre',
+				exclude: /node_modules/,
+				use: {
+					loader: 'eslint-loader',
+					options: {
+						formatter: require('eslint-friendly-formatter'),
+					},
+				},
+			},
+			{
+				test: /\.js$/,
+				use: 'babel-loader',
+				exclude: /node_modules/,
+			},
+			{
+				test: /\.node$/,
+				use: 'node-loader',
+			},
+		],
+	},
+	node: {
+		__dirname: process.env.NODE_ENV !== 'production',
+		__filename: process.env.NODE_ENV !== 'production',
+	},
+	output: {
+		filename: '[name].js',
+		libraryTarget: 'commonjs2',
+		path: path.join(__dirname, '../dist/electron'),
+	},
+	plugins: [new webpack.NoEmitOnErrorsPlugin()],
+	resolve: {
+		extensions: ['.js', '.json', '.node'],
+	},
+	target: 'electron-main',
+};
 
 /**
  * Adjust mainConfig for development settings
  */
 if (process.env.NODE_ENV !== 'production') {
-  mainConfig.plugins.push(
-    new webpack.DefinePlugin({
-      '__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`
-    })
-  )
+	mainConfig.plugins.push(
+		new webpack.DefinePlugin({
+			__static: `"${path
+				.join(__dirname, '../static')
+				.replace(/\\/g, '\\\\')}"`,
+		}),
+	);
 }
 
 /**
  * Adjust mainConfig for production settings
  */
 if (process.env.NODE_ENV === 'production') {
-  mainConfig.plugins.push(
-    new BabiliWebpackPlugin(),
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': '"production"'
-    })
-  )
+	mainConfig.plugins.push(
+		new BabiliWebpackPlugin(),
+		new webpack.DefinePlugin({
+			'process.env.NODE_ENV': '"production"',
+			'process.env.APP_VERSION': `"${process.env.APP_VERSION}"`,
+			'process.env.NET_ID': `"${process.env.NET_ID}"`,
+		}),
+	);
 }
 
-module.exports = mainConfig
+module.exports = mainConfig;