Merge branch 'master' into davkal/babel-7

2018-11-23 13:44:59 +01:00
parent fd71abc301 56d95e7913
commit 5038efe09e
426 changed files with 20781 additions and 3787 deletions
@@ -93,7 +93,7 @@ module.exports = merge(common, {
    new CleanWebpackPlugin('../public/build', { allowExternal: true }),
    new HtmlWebpackPlugin({
      filename: path.resolve(__dirname, '../../public/views/index.html'),
-      template: path.resolve(__dirname, '../../public/views/index.template.html'),
+      template: path.resolve(__dirname, '../../public/views/index-template.html'),
      inject: 'body',
      alwaysWriteToDisk: true
    }),