Merge pull request #3073 from nextcloud/backport/3070/stable25

nextcloud · Oct 5, 2022 · 5746a14 · 5746a14
2 parents 9ebffb8 + 7aba3e2
commit 5746a14
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 33 deletions.
diff --git a/cypress/e2e/links.spec.js b/cypress/e2e/links.spec.js
@@ -16,7 +16,7 @@ describe('test link marks', function() {
 			},
 		})
 
-		cy.openFile(fileName)
+		return cy.openFile(fileName)
 	})
 
 	describe('autolink', function() {

diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/js/vendors.js b/js/vendors.js
diff --git a/js/vendors.js.map b/js/vendors.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -100,6 +100,7 @@
     "prosemirror-utils": "^1.0.0-0",
     "prosemirror-view": "^1.28.0",
     "proxy-polyfill": "^0.3.2",
+    "slug": "^8.0.0",
     "tippy.js": "^6.3.7",
     "uuid": "^9.0.0",
     "vue": "^2.7.10",
@@ -145,7 +146,7 @@
     ],
     "moduleNameMapper": {
       "^@/(.*)$": "<rootDir>/src/$1",
-	  "\\.(css)$": "identity-obj-proxy"
+      "\\.(css)$": "identity-obj-proxy"
     },
     "testPathIgnorePatterns": [
       "<rootDir>/src/tests/fixtures/",
@@ -163,8 +164,6 @@
     "setupFilesAfterEnv": [
       "<rootDir>/src/tests/setup.js"
     ],
-    "transformIgnorePatterns": [
-
-    ]
+    "transformIgnorePatterns": []
   }
 }
diff --git a/src/nodes/Heading/slug.js b/src/nodes/Heading/slug.js
@@ -1,10 +1 @@
-const regexSpaces = /\s+/g
-const regexInvalidCaracters = /[^\p{Letter}\p{Mark}\w\s-]/gu
-
-const slugify = (str) => String(str)
-	.toLowerCase()
-	.replace(regexInvalidCaracters, '')
-	.trim()
-	.replace(regexSpaces, '-')
-
-export { slugify }
+export { default as slugify } from 'slug'