chore: update dep versions (realreality#73)

vire · Mar 30, 2017 · 2afd012 · 2afd012
1 parent 02dd718
commit 2afd012
Show file tree

Hide file tree

Showing 6 changed files with 1,648 additions and 1,052 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,12 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+  "files.exclude": {
+      "**/.git": true,
+      "**/.svn": true,
+      "**/.hg": true,
+      "**/.DS_Store": true,
+      "coverage": true,
+      "build": true,
+      ".idea": true
+    }
+}
diff --git a/config/env.js b/config/env.js
@@ -4,7 +4,7 @@ const env = require('dotenv');
 env.load();
 
 module.exports = {
-  NODE_ENV: (process.env.NODE_ENV || 'development'),
+
   PORT: (process.env.PORT || 3000),
   GMAPS_API_KEY: process.env.GMAPS_API_KEY,
   IPR_REST_API: (process.env.IPR_REST_API || 'https://realreality.publicstaticvoidmain.cz/rest')

diff --git a/package.json b/package.json
@@ -5,44 +5,47 @@
   "private": true,
   "scripts": {
     "build": "node scripts/build.js",
+    "commit": "git-cz",
     "lint": "eslint -c .eslintrc ./src/",
     "start": "node scripts/webserver.js",
     "test": "jest",
     "test:ci": "yarn lint && jest --coverage"
   },
   "dependencies": {
-    "dotenv": "^2.0.0",
+    "dotenv": "4.0.0",
     "font-awesome": "^4.7.0",
-    "jquery": "^3.1.1",
-    "moment": "^2.17.1",
+    "jquery": "3.2.1",
     "vue": "2.1.4",
-    "vue-i18n": "^4.9.0"
+    "vue-i18n": "5.0.3"
   },
   "devDependencies": {
-    "babel-core": "^6.21.0",
-    "babel-loader": "^6.2.10",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-preset-es2015": "^6.18.0",
+    "babel-core": "6.24.0",
+    "babel-loader": "6.4.1",
+    "babel-plugin-transform-runtime": "6.23.0",
+    "babel-preset-es2015": "6.24.0",
     "chai": "^3.5.0",
+    "commitizen": "2.9.6",
     "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.26.1",
-    "eslint": "^3.12.2",
-    "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "fs-extra": "^1.0.0",
-    "html-loader": "^0.4.4",
-    "html-webpack-plugin": "^2.24.1",
-    "jest": "^18.0.0",
-    "jest-vue-preprocessor": "^0.1.1",
-    "postcss-loader": "^1.2.1",
+    "css-loader": "0.27.3",
+    "cz-conventional-changelog": "2.0.0",
+    "eslint": "3.18.0",
+    "eslint-loader": "1.7.0",
+    "expose-loader": "0.7.3",
+    "extract-text-webpack-plugin": "2.1.0",
+    "fs-extra": "2.1.2",
+    "html-loader": "0.4.5",
+    "html-webpack-plugin": "2.28.0",
+    "jest": "19.0.2",
+    "jest-vue-preprocessor": "0.2.0",
+    "postcss-loader": "1.3.3",
     "precss": "^1.4.0",
     "pug": "^2.0.0-beta6",
-    "style-loader": "^0.13.1",
-    "vue-loader": "^10.0.2",
+    "style-loader": "0.16.1",
+    "vue-loader": "11.3.4",
     "vue-template-compiler": "2.1.4",
-    "webpack": "^1.14.0",
-    "webpack-dev-server": "^1.16.2",
-    "write-file-webpack-plugin": "^3.4.2"
+    "webpack": "2.3.2",
+    "webpack-dev-server": "2.4.2",
+    "write-file-webpack-plugin": "4.0.0"
   },
   "jest": {
     "collectCoverage": false,
@@ -69,5 +72,10 @@
   },
   "engines": {
     "node": ">=6.3"
+  },
+   "config": {
+    "commitizen": {
+      "path": "cz-conventional-changelog"
+    }
   }
 }
diff --git a/src/js/contentscript.js b/src/js/contentscript.js
@@ -1,4 +1,4 @@
-import 'expose?$!expose?jQuery!jquery/dist/jquery.min.js';
+import 'expose-loader?$!expose-loader?jQuery!jquery/dist/jquery.min.js';
 import Vue from 'vue';
 import VueI18n from 'vue-i18n';
 
@@ -9,7 +9,7 @@ import { streetNamePredicate, addStyles } from './utils';
 
 import '../css/cssnormalize.scss';
 import '../css/panel.scss';
-import panelTemplate from 'html!../templates/panel.html';
+import panelTemplate from 'html-loader!../templates/panel.html';
 
 import App from './components/App.vue';
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -15,35 +15,51 @@ module.exports = {
     contentscript: basePath('contentscript.js'),
     popup: basePath('popup.js')
   },
-  excludeEntriesToHotReload: ['contentscript'], // a non-standard webpack opt, see usage in `./scripts/webserver.js`
   output: {
     path: path.join(__dirname, 'build'),
     filename: '[name].bundle.js'
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        options: {
-          // vue-loader options go here
-        }
       },
       {
-        test: /\.js$/, exclude: /node_modules/, loader: 'babel'
+        enforce: 'pre',
+        test: /\.js$/,
+        exclude: /node_modules/,
+        loader: 'eslint-loader'
+      },
+      {
+        test: /\.js$/, 
+        exclude: /node_modules/, 
+        loader: 'babel-loader'
       },
       {
         test: /\.scss$/,
-        loader: ExtractTextPlugin.extract('style-loader', ['css-loader', 'postcss-loader'])
+        loader: ExtractTextPlugin.extract({
+          fallback: 'style-loader', 
+          use: ['css-loader', 'postcss-loader']
+        })
       }
     ]
   },
-  postcss: function() {
-    return [autoprefixer, precss];
-  },
   plugins: [
+    new webpack.LoaderOptionsPlugin({
+      options: {
+        postcss: [autoprefixer, precss],
+        excludeEntriesToHotReload: ['contentscript'], // a non-standard webpack opt, see usage in `./scripts/webserver.js`
+      }
+    }),
     // expose and write the allowed env vars on the compiled bundle
-    new webpack.DefinePlugin({ 'process.env': JSON.stringify(env) }),
+    new webpack.DefinePlugin({
+      'process.env': { 
+        NODE_ENV: JSON.stringify(process.env.NODE_ENV || 'development'),
+        GMAPS_API_KEY: JSON.stringify(env.GMAPS_API_KEY),
+        IPR_REST_API: JSON.stringify(env.IPR_REST_API),
+      }
+    }),
     new HtmlWebpackPlugin({
       template: path.join(__dirname, 'src', 'popup.html'),
       filename: 'popup.html',