Merge pull request #37858 from nextcloud/fix/lock

Fix lockfile and update cypress

apps/theming/src/components/ItemPreview.vue

@@ -95,6 +95,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@use 'sass:math';
+
 .theming__preview {
 	// We make previews on 16/10 screens
 	--ratio: 16;
@@ -144,7 +146,7 @@ export default {
 	}
 }
 
-@media (max-width: (1024px / 1.5)) {
+@media (max-width: math.div(1024px, 1.5)) {
 	.theming__preview {
 		flex-direction: column;
 

apps/workflowengine/src/components/Checks/FileMimeType.vue

@@ -19,7 +19,6 @@
   - along with this program. If not, see <http://www.gnu.org/licenses/>.
   -
   -->
-
 <template>
 	<div>
 		<NcMultiselect :value="currentValue"
@@ -144,24 +143,24 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-	.multiselect, input[type='text'] {
-		width: 100%;
-	}
-	.multiselect >>> .multiselect__content-wrapper li>span,
-	.multiselect >>> .multiselect__single {
-		display: flex;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
+.multiselect, input[type='text'] {
+	width: 100%;
+}
+.multiselect::v-deep .multiselect__content-wrapper li > span,
+.multiselect::v-deep .multiselect__single {
+	display: flex;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
 
-	.option__icon {
-		display: inline-block;
-		min-width: 30px;
-		background-position: left;
-	}
+.option__icon {
+	display: inline-block;
+	min-width: 30px;
+	background-position: left;
+}
 
-	.option__icon-img {
-		margin-right: 14px;
-	}
+.option__icon-img {
+	margin-right: 14px;
+}
 </style>

cypress.config.ts

@@ -41,9 +41,8 @@ export default defineConfig({
 	trashAssetsBeforeRuns: true,
 
 	e2e: {
-		// Enable session management and disable isolation
-		experimentalSessionAndOrigin: true,
-		testIsolation: 'off',
+		// Disable session isolation
+		testIsolation: false,
 
 		// We've imported your old cypress plugins here.
 		// You may want to clean this up later by importing these.

cypress.d.ts

@@ -20,7 +20,7 @@
  *
  */
 /* eslint-disable */
-import { mount } from 'cypress/vue2'
+import { mount } from '@cypress/vue2'
 
 type MountParams = Parameters<typeof mount>;
 type OptionsParam = MountParams[1];

cypress/support/component.ts

@@ -20,8 +20,8 @@
  *
  */
 /* eslint-disable */
-import { mount } from 'cypress/vue2'
-  
+import { mount } from '@cypress/vue2'
+
 // Example use:
 // cy.mount(MyComponent)
 Cypress.Commands.add('mount', (component, optionsOrProps) => {

dist/core-common.js.LICENSE.txt

@@ -26,7 +26,7 @@ object-assign
 */
 
 /*!
-  * pinia v2.0.33
+  * pinia v2.0.35
   * (c) 2023 Eduardo San Martin Morote
   * @license MIT
   */
@@ -38,13 +38,13 @@ object-assign
   */
 
 /*!
- * Cropper.js v1.5.12
+ * Cropper.js v1.5.13
  * https://fengyuanchen.github.io/cropperjs
  *
  * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2021-06-12T08:00:17.411Z
+ * Date: 2022-11-20T05:30:46.114Z
  */
 
 /*!
@@ -55,14 +55,14 @@ object-assign
  */
 
 /*!
- * Sizzle CSS Selector Engine v2.3.6
+ * Sizzle CSS Selector Engine v2.3.10
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2021-02-16
+ * Date: 2023-02-14
  */
 
 /*!
@@ -109,7 +109,7 @@ object-assign
  */
 
 /*!
- * jQuery JavaScript Library v3.6.0
+ * jQuery JavaScript Library v3.6.4
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -119,7 +119,7 @@ object-assign
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2021-03-02T17:08Z
+ * Date: 2023-03-08T15:28Z
  */
 
 /*!
@@ -337,12 +337,12 @@ object-assign
  */
 
 /*!
-* focus-trap 7.1.0
+* focus-trap 7.2.0
 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
 */
 
 /*!
-* focus-trap 7.2.0
+* focus-trap 7.4.0
 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
 */
 
@@ -351,8 +351,15 @@ object-assign
 * @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
 */
 
+/*!
+* tabbable 6.1.1
+* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
+*/
+
 /*! @license DOMPurify 2.4.3 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.3/LICENSE */
 
+/*! @license DOMPurify 2.4.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.5/LICENSE */
+
 /*! For license information please see NcActionSeparator.js.LICENSE.txt */
 
 /*! For license information please see NcActions.js.LICENSE.txt */
@@ -421,7 +428,7 @@ object-assign
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! jQuery Migrate v3.4.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+/*! jQuery Migrate v3.4.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
 
 /*! jQuery UI - v1.13.2 - 2022-07-14
 * http://jqueryui.com

dist/core-unsupported-browser-redirect.js

@@ -1,3 +1,3 @@
 /*! For license information please see core-unsupported-browser-redirect.js.LICENSE.txt */
-(()=>{var e,r={25714:(e,r,o)=>{"use strict";var t=o(79753),n=o(81655),i=o(31e3),l=o.n(i),a=o(77727),s=o.n(a);const u=(0,n.ZI)({allowHigherVersions:!0,browsers:s()});l()(s());const d=(0,o(62556).getBuilder)("core").clearOnLogout().persist().build();var c=o(45994),f=o(17499);const p=null===(b=(0,c.ts)())?(0,f.IY)().setApp("core").build():(0,f.IY)().setApp("core").setUid(b.uid).build();var b,v=o(48764).Buffer;const h=(0,t.generateUrl)("/unsupported"),g="true"===d.getItem("unsupported-browser-ignore");var w,y;window.TESTING||null!==(w=OC)&&void 0!==w&&null!==(y=w.config)&&void 0!==y&&y.no_unsupported_browser_warning||function(){if(u.test(navigator.userAgent))p.debug("this browser is officially supported ! 🚀");else if(g)p.debug("this browser is NOT supported but has been manually overridden ! ⚠️");else if(-1===window.location.pathname.indexOf(h)){const e=window.location.href.replace(window.location.origin,""),r=v.from(e).toString("base64");history.pushState(null,null,"".concat(h,"?redirect_url=").concat(r)),window.location.reload()}}()},72950:()=>{}},o={};function t(e){var n=o[e];if(void 0!==n)return n.exports;var i=o[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}t.m=r,e=[],t.O=(r,o,n,i)=>{if(!o){var l=1/0;for(d=0;d<e.length;d++){o=e[d][0],n=e[d][1],i=e[d][2];for(var a=!0,s=0;s<o.length;s++)(!1&i||l>=i)&&Object.keys(t.O).every((e=>t.O[e](o[s])))?o.splice(s--,1):(a=!1,i<l&&(l=i));if(a){e.splice(d--,1);var u=n();void 0!==u&&(r=u)}}return r}i=i||0;for(var d=e.length;d>0&&e[d-1][2]>i;d--)e[d]=e[d-1];e[d]=[o,n,i]},t.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return t.d(r,{a:r}),r},t.d=(e,r)=>{for(var o in r)t.o(r,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),t.j=8876,(()=>{t.b=document.baseURI||self.location.href;var e={8876:0};t.O.j=r=>0===e[r];var r=(r,o)=>{var n,i,l=o[0],a=o[1],s=o[2],u=0;if(l.some((r=>0!==e[r]))){for(n in a)t.o(a,n)&&(t.m[n]=a[n]);if(s)var d=s(t)}for(r&&r(o);u<l.length;u++)i=l[u],t.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return t.O(d)},o=self.webpackChunknextcloud=self.webpackChunknextcloud||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})(),t.nc=void 0;var n=t.O(void 0,[7874],(()=>t(25714)));n=t.O(n)})();
-//# sourceMappingURL=core-unsupported-browser-redirect.js.map?v=9467085f5477c09134d6
+(()=>{var e,r={25714:(e,r,o)=>{"use strict";var t=o(79753),n=o(81655),i=o(31e3),l=o.n(i),a=o(77727),s=o.n(a);const u=(0,n.ZI)({allowHigherVersions:!0,browsers:s()});l()(s());const d=(0,o(62556).getBuilder)("core").clearOnLogout().persist().build();var c=o(45994),p=o(17499);const f=null===(b=(0,c.ts)())?(0,p.IY)().setApp("core").build():(0,p.IY)().setApp("core").setUid(b.uid).build();var b,v=o(23085).lW;const h=(0,t.generateUrl)("/unsupported"),g="true"===d.getItem("unsupported-browser-ignore");var w,y;window.TESTING||null!==(w=OC)&&void 0!==w&&null!==(y=w.config)&&void 0!==y&&y.no_unsupported_browser_warning||function(){if(u.test(navigator.userAgent))f.debug("this browser is officially supported ! 🚀");else if(g)f.debug("this browser is NOT supported but has been manually overridden ! ⚠️");else if(-1===window.location.pathname.indexOf(h)){const e=window.location.href.replace(window.location.origin,""),r=v.from(e).toString("base64");history.pushState(null,null,"".concat(h,"?redirect_url=").concat(r)),window.location.reload()}}()},72950:()=>{}},o={};function t(e){var n=o[e];if(void 0!==n)return n.exports;var i=o[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}t.m=r,e=[],t.O=(r,o,n,i)=>{if(!o){var l=1/0;for(d=0;d<e.length;d++){o=e[d][0],n=e[d][1],i=e[d][2];for(var a=!0,s=0;s<o.length;s++)(!1&i||l>=i)&&Object.keys(t.O).every((e=>t.O[e](o[s])))?o.splice(s--,1):(a=!1,i<l&&(l=i));if(a){e.splice(d--,1);var u=n();void 0!==u&&(r=u)}}return r}i=i||0;for(var d=e.length;d>0&&e[d-1][2]>i;d--)e[d]=e[d-1];e[d]=[o,n,i]},t.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return t.d(r,{a:r}),r},t.d=(e,r)=>{for(var o in r)t.o(r,o)&&!t.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),t.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),t.j=8876,(()=>{t.b=document.baseURI||self.location.href;var e={8876:0};t.O.j=r=>0===e[r];var r=(r,o)=>{var n,i,l=o[0],a=o[1],s=o[2],u=0;if(l.some((r=>0!==e[r]))){for(n in a)t.o(a,n)&&(t.m[n]=a[n]);if(s)var d=s(t)}for(r&&r(o);u<l.length;u++)i=l[u],t.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return t.O(d)},o=self.webpackChunknextcloud=self.webpackChunknextcloud||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})(),t.nc=void 0;var n=t.O(void 0,[7874],(()=>t(25714)));n=t.O(n)})();
+//# sourceMappingURL=core-unsupported-browser-redirect.js.map?v=b0237273fa8976c5ffb6

dist/files_sharing-collaboration.js.map

@@ -1 +1 @@
-{"version":3,"file":"files_sharing-collaboration.js?v=f799f63870ede0105298","mappings":"AAwBoBA,KAAKC,GAAGC,cAE5BC,OAAOC,IAAIC,cAAcC,aAAa,OAAQ,CAC7CC,OAAQ,IACA,IAAIC,SAAQ,CAACC,EAASC,KAC5BT,GAAGU,QAAQC,WAAWC,EAAE,gBAAiB,mBAAmB,SAASC,GACrDb,GAAGc,MAAMC,YACjBC,YAAYH,GAAGI,MAAK,CAACC,EAAQC,KACnCX,EAAQW,EAASC,GAAG,IAClBC,MAAK,KACPZ,EAAO,IAAIa,MAAM,uBAAuB,GAE1C,IAAG,EAAO,MAAM,EAAOtB,GAAGU,QAAQa,uBAAwB,GAAI,CAAEC,uBAAuB,GAAO,IAGhGC,WAAYb,EAAE,gBAAiB,kBAC/Bc,cAAe","sources":["webpack:///nextcloud/apps/files_sharing/src/collaborationresourceshandler.js"],"sourcesContent":["/**\n * @copyright Copyright (c) 2016 John Molakvoæ <skjnldsv@protonmail.com>\n *\n * @author John Molakvoæ <skjnldsv@protonmail.com>\n * @author Julius Härtl <jus@bitgrid.net>\n *\n * @license AGPL-3.0-or-later\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the\n * License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU Affero General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with this program. If not, see <http://www.gnu.org/licenses/>.\n *\n */\n\n// eslint-disable-next-line camelcase\n__webpack_nonce__ = btoa(OC.requestToken)\n\nwindow.OCP.Collaboration.registerType('file', {\n\taction: () => {\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tOC.dialogs.filepicker(t('files_sharing', 'Link to a file'), function(f) {\n\t\t\t\tconst client = OC.Files.getClient()\n\t\t\t\tclient.getFileInfo(f).then((status, fileInfo) => {\n\t\t\t\t\tresolve(fileInfo.id)\n\t\t\t\t}).fail(() => {\n\t\t\t\t\treject(new Error('Cannot get fileinfo'))\n\t\t\t\t})\n\t\t\t}, false, null, false, OC.dialogs.FILEPICKER_TYPE_CHOOSE, '', { allowDirectoryChooser: true })\n\t\t})\n\t},\n\ttypeString: t('files_sharing', 'Link to a file'),\n\ttypeIconClass: 'icon-files-dark',\n})\n"],"names":["btoa","OC","requestToken","window","OCP","Collaboration","registerType","action","Promise","resolve","reject","dialogs","filepicker","t","f","Files","getClient","getFileInfo","then","status","fileInfo","id","fail","Error","FILEPICKER_TYPE_CHOOSE","allowDirectoryChooser","typeString","typeIconClass"],"sourceRoot":""}
+{"version":3,"file":"files_sharing-collaboration.js?v=f799f63870ede0105298","mappings":"AAwBoBA,KAAKC,GAAGC,cAE5BC,OAAOC,IAAIC,cAAcC,aAAa,OAAQ,CAC7CC,OAAQA,IACA,IAAIC,SAAQ,CAACC,EAASC,KAC5BT,GAAGU,QAAQC,WAAWC,EAAE,gBAAiB,mBAAmB,SAASC,GACrDb,GAAGc,MAAMC,YACjBC,YAAYH,GAAGI,MAAK,CAACC,EAAQC,KACnCX,EAAQW,EAASC,GAAG,IAClBC,MAAK,KACPZ,EAAO,IAAIa,MAAM,uBAAuB,GAE1C,IAAG,EAAO,MAAM,EAAOtB,GAAGU,QAAQa,uBAAwB,GAAI,CAAEC,uBAAuB,GAAO,IAGhGC,WAAYb,EAAE,gBAAiB,kBAC/Bc,cAAe","sources":["webpack:///nextcloud/apps/files_sharing/src/collaborationresourceshandler.js"],"sourcesContent":["/**\n * @copyright Copyright (c) 2016 John Molakvoæ <skjnldsv@protonmail.com>\n *\n * @author John Molakvoæ <skjnldsv@protonmail.com>\n * @author Julius Härtl <jus@bitgrid.net>\n *\n * @license AGPL-3.0-or-later\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the\n * License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU Affero General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with this program. If not, see <http://www.gnu.org/licenses/>.\n *\n */\n\n// eslint-disable-next-line camelcase\n__webpack_nonce__ = btoa(OC.requestToken)\n\nwindow.OCP.Collaboration.registerType('file', {\n\taction: () => {\n\t\treturn new Promise((resolve, reject) => {\n\t\t\tOC.dialogs.filepicker(t('files_sharing', 'Link to a file'), function(f) {\n\t\t\t\tconst client = OC.Files.getClient()\n\t\t\t\tclient.getFileInfo(f).then((status, fileInfo) => {\n\t\t\t\t\tresolve(fileInfo.id)\n\t\t\t\t}).fail(() => {\n\t\t\t\t\treject(new Error('Cannot get fileinfo'))\n\t\t\t\t})\n\t\t\t}, false, null, false, OC.dialogs.FILEPICKER_TYPE_CHOOSE, '', { allowDirectoryChooser: true })\n\t\t})\n\t},\n\ttypeString: t('files_sharing', 'Link to a file'),\n\ttypeIconClass: 'icon-files-dark',\n})\n"],"names":["btoa","OC","requestToken","window","OCP","Collaboration","registerType","action","Promise","resolve","reject","dialogs","filepicker","t","f","Files","getClient","getFileInfo","then","status","fileInfo","id","fail","Error","FILEPICKER_TYPE_CHOOSE","allowDirectoryChooser","typeString","typeIconClass"],"sourceRoot":""}

package.json

@@ -118,8 +118,9 @@
     "@babel/node": "^7.20.7",
     "@babel/preset-typescript": "^7.18.6",
     "@cypress/browserify-preprocessor": "^3.0.2",
+    "@cypress/vue2": "^2.0.1",
     "@nextcloud/babel-config": "^1.0.0",
-    "@nextcloud/cypress": "^1.0.0-beta.1",
+    "@nextcloud/cypress": "^1.0.0-beta.2",
     "@nextcloud/eslint-config": "^8.2.1",
     "@nextcloud/stylelint-config": "^2.1.2",
     "@nextcloud/webpack-vue-config": "^5.5.0",
@@ -130,17 +131,17 @@
     "@types/dockerode": "^3.3.14",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.44.0",
-    "@vue/test-utils": "^1.3.3",
+    "@vue/test-utils": "^1.3.5",
     "@vue/tsconfig": "^0.1.3",
     "@vue/vue2-jest": "^29.2.3",
     "babel-jest": "^29.5.0",
     "babel-loader": "^9.1.0",
     "babel-loader-exclude-node-modules-except": "^1.2.1",
     "css-loader": "^6.7.1",
-    "cypress": "^11.2.0",
+    "cypress": "^12.10.0",
     "cypress-wait-until": "^1.7.2",
-    "dockerode": "^3.3.4",
-    "eslint-plugin-cypress": "^2.12.1",
+    "dockerode": "^3.3.5",
+    "eslint-plugin-cypress": "^2.13.2",
     "eslint-plugin-es": "^4.1.0",
     "exports-loader": "^4.0.0",
     "file-loader": "^6.2.0",
@@ -166,6 +167,7 @@
     "sass-loader": "^13.2.2",
     "sinon": "<= 5.0.7",
     "style-loader": "^3.3.1",
+    "tar": "^6.1.13",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.1",