From: Julius Härtl <jus@bitgrid.net>
Date: Wed, 24 Jun 2020 09:20:15 +0000 (+0200)
Subject: Fix export for davclient.js legacy dependency
X-Git-Tag: v20.0.0beta1~365^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9239793a651e1e5ab868eaa8c23b4481ea6e3933;p=nextcloud-server.git

Fix export for davclient.js legacy dependency

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

diff --git a/core/src/OC/backbone-webdav.js b/core/src/OC/backbone-webdav.js
index b27d117e568..4175b386b21 100644
--- a/core/src/OC/backbone-webdav.js
+++ b/core/src/OC/backbone-webdav.js
@@ -55,7 +55,7 @@
  */
 
 import _ from 'underscore'
-import dav from 'davclient.js'
+import { dav } from 'davclient.js'
 
 const methodMap = {
 	create: 'POST',
diff --git a/core/src/globals.js b/core/src/globals.js
index 783c6556659..2318182da01 100644
--- a/core/src/globals.js
+++ b/core/src/globals.js
@@ -36,7 +36,7 @@ import Backbone from 'backbone'
 import 'bootstrap/js/dist/tooltip'
 import './Polyfill/tooltip'
 import ClipboardJS from 'clipboard'
-import dav from 'davclient.js'
+import { dav } from 'davclient.js'
 import DOMPurify from 'dompurify'
 import Handlebars from 'handlebars'
 import 'jcrop/js/jquery.Jcrop'
diff --git a/core/webpack.js b/core/webpack.js
index 303d6f67dfc..631f1532399 100644
--- a/core/webpack.js
+++ b/core/webpack.js
@@ -22,7 +22,11 @@ module.exports = [
 			rules: [
 				{
 					test: /davclient/,
-					use: 'exports-loader?dav'
+					loader: 'exports-loader',
+					options: {
+						type: 'commonjs',
+						exports: 'dav',
+					}
 				}
 			]
 		},