Merge pull request #88 from acelaya/feature/update-dependencies

Updated linting dependencies

CHANGELOG.md

@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#87](https://github.com/shlinkio/shlink-web-client/issues/87) Updated linting dependencies to latest major versions.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
 ## 1.2.1 - 2018-12-21
 
 #### Added

package.json

@@ -52,58 +52,58 @@
   },
   "devDependencies": {
     "adm-zip": "^0.4.11",
-    "autoprefixer": "7.1.6",
-    "babel-core": "6.26.0",
-    "babel-eslint": "7.2.3",
-    "babel-jest": "20.0.3",
+    "autoprefixer": "^7.1.6",
+    "babel-core": "^6.26.0",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^20.0.3",
     "babel-loader": "^7.1.2",
     "babel-preset-react-app": "^3.1.1",
-    "babel-runtime": "6.26.0",
-    "case-sensitive-paths-webpack-plugin": "2.1.1",
-    "chalk": "1.1.3",
-    "css-loader": "0.28.7",
-    "dotenv": "4.0.0",
-    "dotenv-expand": "4.2.0",
+    "babel-runtime": "^6.26.0",
+    "case-sensitive-paths-webpack-plugin": "^2.1.1",
+    "chalk": "^1.1.3",
+    "css-loader": "^0.28.7",
+    "dotenv": "^4.0.0",
+    "dotenv-expand": "^4.2.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.19.0",
-    "eslint-config-adidas-babel": "^1.0.1",
-    "eslint-config-adidas-env": "^1.0.1",
-    "eslint-config-adidas-es6": "^1.0.1",
-    "eslint-config-adidas-react": "^1.0.1",
-    "eslint-loader": "1.9.0",
+    "eslint": "^5.11.1",
+    "eslint-config-adidas-babel": "^1.1.0",
+    "eslint-config-adidas-env": "^1.1.0",
+    "eslint-config-adidas-es6": "^1.2.0",
+    "eslint-config-adidas-react": "^1.1.1",
+    "eslint-loader": "^2.1.1",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jest": "^21.22.0",
-    "eslint-plugin-promise": "^3.0.0",
+    "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-react": "^7.4.0",
     "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "1.1.5",
-    "fs-extra": "3.0.1",
-    "html-webpack-plugin": "2.29.0",
-    "jest": "20.0.4",
+    "file-loader": "^1.1.5",
+    "fs-extra": "^3.0.1",
+    "html-webpack-plugin": "^2.29.0",
+    "jest": "^20.0.4",
     "node-sass": "^4.9.0",
     "object-assign": "4.1.1",
     "ocular.js": "^0.1.0",
-    "postcss-flexbugs-fixes": "3.2.0",
-    "postcss-loader": "2.0.8",
-    "raf": "3.4.0",
+    "postcss-flexbugs-fixes": "^4.1.0",
+    "postcss-loader": "^3.0.0",
+    "raf": "^3.4.0",
     "react-dev-utils": "^5.0.1",
-    "resolve": "1.6.0",
+    "resolve": "^1.6.0",
     "sass-loader": "^7.0.1",
     "serve": "^10.0.0",
     "sinon": "^6.1.5",
-    "style-loader": "0.19.0",
-    "stylelint": "^9.5.0",
-    "stylelint-config-adidas": "^1.0.1",
-    "stylelint-config-adidas-bem": "^1.0.1",
+    "style-loader": "^0.19.0",
+    "stylelint": "^9.9.0",
+    "stylelint-config-adidas": "^1.2.1",
+    "stylelint-config-adidas-bem": "^1.2.0",
     "stylelint-config-recommended-scss": "^3.2.0",
     "stylelint-scss": "^3.3.0",
-    "sw-precache-webpack-plugin": "0.11.4",
-    "url-loader": "0.6.2",
-    "webpack": "3.8.1",
-    "webpack-dev-server": "2.9.4",
-    "webpack-manifest-plugin": "1.3.2",
-    "whatwg-fetch": "2.0.3"
+    "sw-precache-webpack-plugin": "^0.11.4",
+    "url-loader": "^0.6.2",
+    "webpack": "^3.8.1",
+    "webpack-dev-server": "^2.9.4",
+    "webpack-manifest-plugin": "^1.3.2",
+    "whatwg-fetch": "^2.0.3"
   },
   "babel": {
     "presets": [

scripts/build.js

@@ -102,7 +102,8 @@ measureFileSizesBeforeBuild(paths.appBuild)
       process.exit(1);
     }
   )
-  .then(zipDist);
+  .then(zipDist)
+  .catch((err) => console.error(err));
 
 // Create the production build and print the deployment instructions.
 function build(previousFileSizes) {

scripts/start.js

@@ -41,7 +41,7 @@ if (!checkRequiredFiles([ paths.appHtml, paths.appIndexJs ])) {
 
 // Tools like Cloud9 rely on this.
 const FALLBACK_PORT = 3000;
-const DEFAULT_PORT = parseInt(process.env.PORT, 10) || FALLBACK_PORT;
+const DEFAULT_PORT = parseInt(process.env.PORT) || FALLBACK_PORT;
 const HOST = process.env.HOST || '0.0.0.0';
 
 if (process.env.HOST) {

src/common/react-tagsinput.scss

@@ -27,12 +27,12 @@
 
 .react-tagsinput-remove {
   cursor: pointer;
-  font-weight: bold;
+  font-weight: 700;
   margin-left: 8px;
 }
 
 .react-tagsinput-tag span:before {
-  content: "\2715";
+  content: '\2715';
   color: #fff;
 }
 

src/registerServiceWorker.js

@@ -43,22 +43,22 @@ export default function register() {
 
         // Add some additional logging to localhost, pointing developers to the
         // service worker/PWA documentation.
-        navigator.serviceWorker.ready.then(() => {
+        return navigator.serviceWorker.ready.then(() => {
           console.log(
             'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://goo.gl/SC7cgQ'
+            'worker. To learn more, visit https://goo.gl/SC7cgQ'
           );
         });
-      } else {
-        // Is not local host. Just register service worker
-        registerValidSW(swUrl);
       }
+
+      // Is not local host. Just register service worker
+      return registerValidSW(swUrl);
     });
   }
 }
 
 function registerValidSW(swUrl) {
-  navigator.serviceWorker
+  return navigator.serviceWorker
     .register(swUrl)
     .then((registration) => {
       registration.onupdatefound = () => {
@@ -99,15 +99,14 @@ function checkValidServiceWorker(swUrl) {
         response.headers.get('content-type').indexOf('javascript') === -1
       ) {
         // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then((registration) => {
+        return navigator.serviceWorker.ready.then((registration) =>
           registration.unregister().then(() => {
             window.location.reload();
-          });
-        });
-      } else {
-        // Service worker found. Proceed as normal.
-        registerValidSW(swUrl);
+          }));
       }
+
+      // Service worker found. Proceed as normal.
+      return registerValidSW(swUrl);
     })
     .catch(() => {
       console.log(
@@ -120,6 +119,6 @@ export function unregister() {
   if ('serviceWorker' in navigator) {
     navigator.serviceWorker.ready.then((registration) => {
       registration.unregister();
-    });
+    }).catch(() => {});
   }
 }

src/servers/CreateServer.scss

@@ -5,7 +5,7 @@
 }
 
 .create-server__label {
-  font-weight: bold;
+  font-weight: 700;
   cursor: pointer;
 
   @media (min-width: $mdMin) {

src/tags/helpers/DeleteTagConfirmModal.js

@@ -16,7 +16,7 @@ export default class DeleteTagConfirmModal extends React.Component {
   doDelete = () => {
     const { tag, toggle, deleteTag } = this.props;
 
-    deleteTag(tag).then(() => {
+    return deleteTag(tag).then(() => {
       this.tagWasDeleted = true;
       toggle();
     });

src/utils/SortingDropdown.js

@@ -6,7 +6,7 @@ import FontAwesomeIcon from '@fortawesome/react-fontawesome';
 import sortAscIcon from '@fortawesome/fontawesome-free-solid/faSortAmountUp';
 import sortDescIcon from '@fortawesome/fontawesome-free-solid/faSortAmountDown';
 import classNames from 'classnames';
-import { determineOrderDir } from '../utils/utils';
+import { determineOrderDir } from './utils';
 import './SortingDropdown.scss';
 
 const propTypes = {

src/utils/base.scss

@@ -1,4 +1,3 @@
-
 // Breakpoints
 $xsMax: 575px;
 $smMin: 576px;