Merge pull request #54 from KiFoundation/miniexplorer-grantsig-commissions-fixes

Miniexplorer grantsig commissions fixes

Author: TarekAwwad

app/.babelrc

@@ -1,12 +1,18 @@
 {
   "presets": [
-    ["babel-preset-env", { "modules": false }],
-    "babel-preset-stage-2"
+    [
+      "@babel/preset-env",
+      {
+        "modules": false,
+        "targets": {
+          "browsers": ["> 1%", "last 2 versions", "not ie <= 8", "ie >= 11"]
+        }
+      }
+    ]
   ],
   "plugins": [
-    "babel-plugin-syntax-jsx",
-    "babel-plugin-transform-runtime",
-    "babel-plugin-transform-vue-jsx"
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-proposal-class-properties"
   ],
   "comments": true
 }

app/.eslintrc

@@ -1,34 +1,29 @@
 {
-  "parser": "vue-eslint-parser",
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "es6": true,
+    "node": true
+  },
   "parserOptions": {
     "parser": "babel-eslint",
-    "sourceType": "module"
+    "sourceType": "module",
+    "ecmaVersion": 2018
   },
-  "extends": [
-    // add more generic rulesets here, such as:
-    // "eslint:recommended",
-    "plugin:vue/vue3-recommended"
-  ],
+  "extends": ["eslint:recommended", "plugin:vue/recommended"],
   "rules": {
-    // override/add rules settings here, such as:
-    // 'vue/no-unused-vars': 'error'
-    "vue/component-tags-order": [
-      "error",
-      {
-        "order": ["template", "script", "style"]
-      }
-    ],
-    "vue/html-self-closing": [
-      "error",
-      {
-        "html": {
-          "void": "always",
-          "normal": "always",
-          "component": "always"
-        },
-        "svg": "always",
-        "math": "always"
-      }
-    ]
-  }
+    "no-unused-vars": "warn",
+    "no-async-promise-executor": "warn",
+    "no-empty": "warn",
+    "no-redeclare": "warn",
+    "no-extra-semi": "warn",
+    "no-useless-escape": "warn",
+    "no-undef": "warn",
+    "no-global-assign": "warn",
+    "no-unreachable": "warn",
+    "no-prototype-builtins": "warn",
+    "no-dupe-keys": "warn",
+    "no-sparse-arrays": "warn"
+  },
+  "plugins": ["vue"]
 }

app/build/utils.js

@@ -1,58 +1,50 @@
-'use strict'
-const path = require('path')
-const config = require('../config')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const packageConfig = require('../package.json')
+'use strict';
+const path = require('path');
+const config = require('../config');
+const packageConfig = require('../package.json');
 
 exports.assetsPath = function(_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production' ?
-    config.build.assetsSubDirectory :
-    config.dev.assetsSubDirectory
+  const assetsSubDirectory =
+    process.env.NODE_ENV === 'production'
+      ? config.build.assetsSubDirectory
+      : config.dev.assetsSubDirectory;
 
-  return path.posix.join(assetsSubDirectory, _path)
-}
+  return path.posix.join(assetsSubDirectory, _path);
+};
 
 exports.cssLoaders = function(options) {
-  options = options || {}
+  options = options || {};
 
   const cssLoader = {
     loader: 'css-loader',
     options: {
-      sourceMap: options.sourceMap
-    }
-  }
+      sourceMap: options.sourceMap,
+    },
+  };
 
   const postcssLoader = {
     loader: 'postcss-loader',
     options: {
-      sourceMap: options.sourceMap
-    }
-  }
+      sourceMap: options.sourceMap,
+    },
+  };
 
   // generate loader string to be used with extract text plugin
   function generateLoaders(loader, loaderOptions) {
-    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+    const loaders = options.usePostCSS
+      ? [cssLoader, postcssLoader]
+      : [cssLoader];
 
     if (loader) {
       loaders.push({
         loader: loader + '-loader',
         options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
-      })
+          sourceMap: options.sourceMap,
+        }),
+      });
     }
 
-    // Extract CSS when that option is specified
-    // (which is the case during production build)
-    if (options.extract) {
-      return ExtractTextPlugin.extract({
-        use: loaders,
-        fallback: 'vue-style-loader',
-        publicPath: '../../'
-      })
-    } else {
-      return ['vue-style-loader'].concat(loaders)
-    }
+    return ['vue-style-loader'].concat(loaders);
   }
 
   // https://vue-loader.vuejs.org/en/configurations/extract-css.html
@@ -63,40 +55,40 @@ exports.cssLoaders = function(options) {
     sass: generateLoaders('sass', { indentedSyntax: true }),
     scss: generateLoaders('sass'),
     stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
-  }
-}
+    styl: generateLoaders('stylus'),
+  };
+};
 
 // Generate loaders for standalone style files (outside of .vue)
 exports.styleLoaders = function(options) {
-  const output = []
-  const loaders = exports.cssLoaders(options)
+  const output = [];
+  const loaders = exports.cssLoaders(options);
 
   for (const extension in loaders) {
-    const loader = loaders[extension]
+    const loader = loaders[extension];
     output.push({
       test: new RegExp('\\.' + extension + '$'),
-      use: loader
-    })
+      use: loader,
+    });
   }
 
-  return output
-}
+  return output;
+};
 
 exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier')
+  const notifier = require('node-notifier');
 
   return (severity, errors) => {
-    if (severity !== 'error') return
+    if (severity !== 'error') return;
 
-    const error = errors[0]
-    const filename = error.file && error.file.split('!').pop()
+    const error = errors[0];
+    const filename = error.file && error.file.split('!').pop();
 
     notifier.notify({
       title: packageConfig.name,
       message: severity + ': ' + error.name,
       subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    })
-  }
-}
+      icon: path.join(__dirname, 'logo.png'),
+    });
+  };
+};

app/build/webpack.base.conf.js

@@ -2,8 +2,9 @@
 const path = require('path');
 const utils = require('./utils');
 const config = require('../config');
-const vueLoaderConfig = require('./vue-loader.conf');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const webpack = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 function resolve(dir) {
   return path.join(__dirname, '..', dir);
@@ -36,19 +37,12 @@ module.exports = {
       jquery: 'jquery',
     },
   },
-  plugins: [
-    new webpack.ProvidePlugin({
-      $: 'jquery',
-      jQuery: 'jquery',
-      'window.jQuery': 'jquery',
-    }),
-  ],
   module: {
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        options: vueLoaderConfig,
+        include: [resolve('src')],
       },
       {
         test: /\.js|.jsx$/,
@@ -95,6 +89,18 @@ module.exports = {
       },
     ],
   },
+  plugins: [
+    new VueLoaderPlugin(),
+    new HtmlWebpackPlugin({
+      template: 'index.html',
+      chunksSortMode: 'dependency',
+    }),
+    new webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      'window.jQuery': 'jquery',
+    }),
+  ],
   node: {
     // prevent webpack from injecting useless setImmediate polyfill because Vue
     // source contains it (although only uses it if it's native).