diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-31 04:10:17 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-31 04:10:17 +0000 |
| commit | 958acbab8d43b7514369f4bc69bc2fe0353eddf2 (patch) | |
| tree | 9c7b9d868f4b1cf8f0e592cdd607999d5484a18c /build/webpack.base.conf.js | |
| parent | 48391a45ba8924e20f280868bca78d77a32c3ddd (diff) | |
| parent | 8c07e63f773a15119f3cf773c083fe3b76306c3f (diff) | |
Merge branch 'polish' into 'develop'
Another one of those MR that fixes many many small-to-medium things
Closes #92, #75, #122, #52, #72, and #87
See merge request pleroma/pleroma-fe!324
Diffstat (limited to 'build/webpack.base.conf.js')
| -rw-r--r-- | build/webpack.base.conf.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 7bba3a10..198532ca 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -54,7 +54,7 @@ module.exports = { loader: 'vue' }, { - test: /\.js$/, + test: /\.jsx?$/, loader: 'babel', include: projectRoot, exclude: /node_modules\/(?!tributejs)/ |