Skip to content

Commit 70532dd

Browse files
committed
Merge branch 'mix' of https://github.com/JeffreyWay/laravel into JeffreyWay-mix
2 parents c8ec9d4 + dc58f95 commit 70532dd

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
"bootstrap": "^4.0.0",
1515
"cross-env": "^5.1",
1616
"jquery": "^3.2",
17-
"laravel-mix": "^2.0",
17+
"laravel-mix": "^4.0.7",
1818
"lodash": "^4.17.5",
1919
"popper.js": "^1.12",
20+
"resolve-url-loader": "^2.3.1",
21+
"sass": "^1.15.2",
22+
"sass-loader": "^7.1.0",
2023
"vue": "^2.5.17"
2124
}
2225
}

public/css/app.css

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ window.Vue = require('vue');
1818
*/
1919

2020
// const files = require.context('./', true, /\.vue$/i)
21-
// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key)))
21+
// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default))
2222

23-
Vue.component('example-component', require('./components/ExampleComponent.vue'));
23+
Vue.component('example-component', require('./components/ExampleComponent.vue').default);
2424

2525
/**
2626
* Next, we will create a fresh Vue application instance and attach it to

0 commit comments

Comments
 (0)