Skip to content
This repository has been archived by the owner on Apr 19, 2022. It is now read-only.

Commit

Permalink
Синхронизация с laravel/laravel
Browse files Browse the repository at this point in the history
  • Loading branch information
jhaoda committed Oct 5, 2016
1 parent 6643c48 commit f48d0db
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const elixir = require('laravel-elixir');

require('laravel-elixir-vue');
require('laravel-elixir-vue-2');

/*
|--------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"gulp": "^3.9.1",
"jquery": "^3.1.0",
"laravel-elixir": "^6.0.0-9",
"laravel-elixir-vue": "^0.1.4",
"laravel-elixir-vue-2": "^0.2.0",
"laravel-elixir-webpack-official": "^1.0.2",
"lodash": "^4.14.0",
"vue": "^1.0.26",
"vue-resource": "^1.0.2"
"lodash": "^4.16.2",
"vue": "^2.0.1",
"vue-resource": "^1.0.3"
}
}
2 changes: 1 addition & 1 deletion resources/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ require('./bootstrap');
Vue.component('example', require('./components/Example.vue'));

const app = new Vue({
el: 'body'
el: '#app'
});
2 changes: 1 addition & 1 deletion resources/assets/js/components/Example.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<script>
export default {
ready() {
mounted() {
console.log('Component ready.')
}
}
Expand Down

0 comments on commit f48d0db

Please sign in to comment.