Skip to content

Commit

Permalink
Update to Laravel Mix 4 (area17#113)
Browse files Browse the repository at this point in the history
* Update to Laravel Mix 4

* update Mix

* update laravel-mix to 4.0.13

* switch out node-sass for sass
  • Loading branch information
nsivertsen authored and ifox committed Mar 15, 2019
1 parent fa78d3f commit 1969d3e
Show file tree
Hide file tree
Showing 5 changed files with 8,002 additions and 9,700 deletions.
22 changes: 11 additions & 11 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"presets": [
["env", {
["@babel/preset-env", {
"modules": false,
"targets": {
"browsers": [
">0.25%",
"not ie 11",
"not op_mini all"
]
}
}],
"stage-2"
"targets": [
">0.25%",
"not ie 11",
"not op_mini all"
]
}]
],
"plugins": [
"@babel/plugin-proposal-class-properties"
],
"env": {
"test": {
"presets": ["env", "stage-2"]
"presets": ["@babel/env"]
}
}
}
2 changes: 1 addition & 1 deletion frontend/js/main-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ importedBlocks.keys().map(block => {
const blockForName = block.replace(/customs\//, '')
const blockName = blockForName.match(/\w+/)[0].replace(/([a-z])([A-Z])/g, '$1-$2').replace(/\s+/g, '-').toLowerCase()
if (blockName !== 'block') {
return Vue.component('a17-' + blockName, importedBlocks(block))
return Vue.component('a17-' + blockName, importedBlocks(block).default)
}
})

Expand Down
Loading

0 comments on commit 1969d3e

Please sign in to comment.