Merge pull request #45125 from nextcloud/fix/drop-ical-js

pull/45150/head
John Molakvoæ 7 months ago committed by GitHub
commit d1a31ca22f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      dist/dav-settings-personal-availability.js
  2. 2
      dist/dav-settings-personal-availability.js.map
  3. 1
      package-lock.json
  4. 1
      package.json
  5. 6
      webpack.common.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
package-lock.json generated

@ -49,7 +49,6 @@
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"focus-trap": "^7.5.4", "focus-trap": "^7.5.4",
"handlebars": "^4.7.7", "handlebars": "^4.7.7",
"ical.js": "^1.4.0",
"jquery": "~3.7", "jquery": "~3.7",
"jquery-ui": "^1.13.2", "jquery-ui": "^1.13.2",
"jquery-ui-dist": "^1.13.2", "jquery-ui-dist": "^1.13.2",

@ -76,7 +76,6 @@
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"focus-trap": "^7.5.4", "focus-trap": "^7.5.4",
"handlebars": "^4.7.7", "handlebars": "^4.7.7",
"ical.js": "^1.4.0",
"jquery": "~3.7", "jquery": "~3.7",
"jquery-ui": "^1.13.2", "jquery-ui": "^1.13.2",
"jquery-ui-dist": "^1.13.2", "jquery-ui-dist": "^1.13.2",

@ -167,12 +167,6 @@ module.exports = {
// We need to provide the path to node_moduels as otherwise npm link will fail due // We need to provide the path to node_moduels as otherwise npm link will fail due
// to tribute.js checking for jQuery in @nextcloud/vue // to tribute.js checking for jQuery in @nextcloud/vue
jQuery: path.resolve(path.join(__dirname, 'node_modules/jquery')), jQuery: path.resolve(path.join(__dirname, 'node_modules/jquery')),
// Shim ICAL to prevent using the global object (window.ICAL).
// The library ical.js heavily depends on instanceof checks which will
// break if two separate versions of the library are used (e.g. bundled one
// and global one).
ICAL: 'ical.js',
}), }),
new WorkboxPlugin.GenerateSW({ new WorkboxPlugin.GenerateSW({

Loading…
Cancel
Save