Merge pull request #37858 from nextcloud/fix/lock

Fix lockfile and update cypress

Author: skjnldsv

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/comments-comments-app.js

@@ -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