Permalink
Browse files

Fix Chrome error, promise was not loading

  • Loading branch information...
akazorg committed Nov 4, 2018
1 parent 2dd35f4 commit d2d12a95fdcfa31723e842690f9b8823aafac4b4
Showing with 10 additions and 9 deletions.
  1. +1 −1 package.json
  2. +1 −1 publishable/public/js/mercurius.js
  3. +8 −7 resources/js/bootstrap.js
@@ -24,7 +24,7 @@
"lodash": "^4.17.5",
"moment": "^2.19.4",
"popper.js": "^1.12",
"promise": "^7.1.1",
"promise": "^8.0.2",
"pusher-js": "^4.3.1",
"sass-loader": "^6.0.6",
"sweetalert": "^2.1.0",

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -7,13 +7,14 @@ import vuescroll from 'vuescroll/dist/vuescroll-native';

import 'vuescroll/dist/vuescroll.css';

window._ = require('lodash');
window.Vue = Vue;
window.swal = swal;
window.Bus = new Vue();
window.axios = axios;
window.moment = moment;
window.Pusher = require('pusher-js');
window._ = require('lodash');
window.Vue = Vue;
window.swal = swal;
window.Bus = new Vue();
window.axios = axios;
window.moment = moment;
window.Promise = require('promise');
window.Pusher = require('pusher-js');


require('./bootstrap-mercurius');

0 comments on commit d2d12a9

Please sign in to comment.