From e78c7c7526633826a920c3e8622f469d5cb6e59e Mon Sep 17 00:00:00 2001 From: Jonas Heinrich <onny@project-insanity.org> Date: Sun, 17 Oct 2021 09:17:59 +0200 Subject: [PATCH] Fix loading of JS and CSS --- .gitignore | 1 + webpack.js | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e1dbdc1..5ff88f5 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ js/ build/ coverage/ utils/docker-ci +translationfiles/de/podcast.mo diff --git a/webpack.js b/webpack.js index 34fefed..977af25 100644 --- a/webpack.js +++ b/webpack.js @@ -1,6 +1,7 @@ -const { merge } = require('webpack-merge') -const path = require('path') const webpackConfig = require('@nextcloud/webpack-vue-config') +const path = require('path') + +const { merge } = require('webpack-merge') const config = { entry: { @@ -10,20 +11,27 @@ const config = { rules: [ { test: /\.css$/, - use: ['vue-style-loader', 'css-loader', 'postcss-loader'], + use: [ + 'style-loader', + 'css-loader', + ], }, { test: /\.scss$/, use: [ - 'vue-style-loader', + 'style-loader', 'css-loader', - 'postcss-loader', 'sass-loader', ], }, { test: /\.vue$/, - use: ['vue-loader'], + use: 'vue-loader', + }, + { + test: /\.js$/, + loader: 'babel-loader', + exclude: /node_modules(?!(\/|\\)(@ckeditor|@nextcloud\/calendar-js|js-base64|)(\/|\\))/ }, ], }, -- GitLab