Merge remote-tracking branch 'origin/master'

# Conflicts: # package.json
liberu-genealogy · Jun 11, 2018 · 8bdad91 · 8bdad91
2 parents 797388c + 3e1f134
commit 8bdad91
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 63 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,21 +11,21 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "babel-eslint": "^8.2.3",
-        "babel-plugin-syntax-dynamic-import": "^6.18.0",
-        "babel-plugin-transform-object-rest-spread": "^6.26.0",
-        "cross-env": "^5.1.6",
-        "eslint": "^4.19.1",
-        "eslint-config-airbnb": "^16.1.0",
-        "eslint-config-airbnb-base": "^12.1.0",
-        "eslint-plugin-import": "^2.12.0",
-        "eslint-plugin-jsx-a11y": "^6.0.3",
-        "eslint-plugin-react": "^7.8.2",
-        "eslint-plugin-vue": "^4.5.0",
-        "laravel-mix": "^2.1.11",
-        "node-sass": "^4.9.0",
-        "sass-loader": "^6.0.7",
-        "vue-template-compiler": "^2.5.16"
+        "babel-eslint": "8.2.3",
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-object-rest-spread": "6.26.0",
+        "cross-env": "5.1.6",
+        "eslint": "4.19.1",
+        "eslint-config-airbnb": "16.1.0",
+        "eslint-config-airbnb-base": "12.1.0",
+        "eslint-plugin-import": "2.12.0",
+        "eslint-plugin-jsx-a11y": "6.0.3",
+        "eslint-plugin-react": "7.9.1",
+        "eslint-plugin-vue": "4.5.0",
+        "laravel-mix": "2.1.11",
+        "node-sass": "4.9.0",
+        "sass-loader": "6.0.7",
+        "vue-template-compiler": "2.5.16"
     },
     "name": "enso",
     "description": "[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.svg)](https://packagist.org/packages/laravel/framework) [![Latest Stable Version](https://poser.pugx.org/laravel/framework/v/stable.svg)](https://packagist.org/packages/laravel/framework) [![Latest Unstable Version](https://poser.pugx.org/laravel/framework/v/unstable.svg)](https://packagist.org/packages/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.svg)](https://packagist.org/packages/laravel/framework)",
@@ -45,45 +45,42 @@
     },
     "false": {},
     "dependencies": {
-        "@fortawesome/fontawesome": "^1.1.8",
-        "@fortawesome/fontawesome-free-brands": "^5.0.13",
-        "@fortawesome/fontawesome-free-regular": "^5.0.13",
-        "@fortawesome/fontawesome-free-solid": "^5.0.13",
+        "@fortawesome/fontawesome": "1.1.8",
+        "@fortawesome/fontawesome-free-brands": "5.0.13",
+        "@fortawesome/fontawesome-free-regular": "5.0.13",
+        "@fortawesome/fontawesome-free-solid": "5.0.13",
         "@fortawesome/vue-fontawesome": "0.0.22",
-        "accounting-js": "^1.1.1",
-        "animate.css": "^3.6.1",
-        "axios": "^0.17",
-        "bulma": "^0.7.1",
-        "bulma-extensions": "^1.0.32",
-        "bulmaswatch": "^0.6.2",
-        "chart.js": "^2.7.2",
-        "chartjs-plugin-datalabels": "^0.3.0",
-        "css-element-queries": "^1.0.2",
-        "d3": "^5.4.0",
-        "d3-dtree": "^2.0.2",
+        "accounting-js": "1.1.1",
+        "animate.css": "3.6.1",
+        "axios": "0.17.1",
+        "bulma": "0.7.1",
+        "bulma-extensions": "1.0.34",
+        "bulmaswatch": "0.6.2",
+        "chart.js": "2.7.2",
+        "chartjs-plugin-datalabels": "0.3.0",
+        "css-element-queries": "1.0.2",
         "date-fns": "2.0.0-alpha.7",
-        "favico.js": "^0.3.10",
-        "file-saver": "^1.3.8",
-        "flag-icon-css": "^3.0.0",
-        "flatpickr": "^4.5.0",
-        "highlight.js": "^9.12.0",
-        "intro.js": "^2.9.3",
-        "laravel-echo": "^1.4.0",
-        "lodash": "^4.17.10",
-        "nprogress": "^0.2.0",
-        "popper.js": "^1.14.3",
-        "pusher-js": "^4.2.2",
-        "raven-js": "^3.25.2",
-        "textarea-caret": "^3.1.0",
-        "tooltip.js": "^1.2.0",
-        "v-click-outside": "^1.0.4",
-        "v-tooltip": "^2.0.0-rc.32",
-        "video.js": "^7.0.3",
-        "vue": "^2.5.16",
-        "vue-d3-network": "^0.1.24",
-        "vue-router": "^3.0.1",
-        "vue-video-player": "^5.0.2",
-        "vuex": "^3.0.0",
-        "zxcvbn": "^4.4.2"
+        "favico.js": "0.3.10",
+        "file-saver": "1.3.8",
+        "flag-icon-css": "3.0.0",
+        "flatpickr": "4.5.0",
+        "highlight.js": "9.12.0",
+        "intro.js": "2.9.3",
+        "laravel-echo": "1.4.0",
+        "lodash": "4.17.10",
+        "nprogress": "0.2.0",
+        "popper.js": "1.14.3",
+        "pusher-js": "4.2.2",
+        "raven-js": "3.25.2",
+        "textarea-caret": "3.1.0",
+        "tooltip.js": "1.2.0",
+        "v-click-outside": "1.0.4",
+        "v-tooltip": "2.0.0-rc.32",
+        "video.js": "7.0.3",
+        "vue": "2.5.16",
+        "vue-router": "3.0.1",
+        "vue-video-player": "5.0.2",
+        "vuex": "3.0.1",
+        "zxcvbn": "4.4.2"
     }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -106,9 +106,9 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.1.7"
 
-"@fortawesome/[email protected].22":
-  version "0.0.22"
-  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.0.22.tgz#720457bda0e5866265e5e0f8fe4fbd857fa5653f"
+"@fortawesome/[email protected].23":
+  version "0.0.23"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.0.23.tgz#e70e3a9c30840e7ef437f99879254245c27c1b76"
 
 "@videojs/http-streaming@^1.0.2":
   version "1.1.0"