update dependencies

package-lock.json

@@ -9,8 +9,8 @@
 			"version": "1.1.8",
 			"license": "AGPL-3.0-or-later",
 			"dependencies": {
-				"single-file-cli": "1.1.9",
-				"single-file-core": "1.2.10"
+				"single-file-cli": "1.1.10",
+				"single-file-core": "1.2.11"
 			},
 			"bin": {
 				"single-file": "cli/single-file"
@@ -219,9 +219,9 @@
 			"dev": true
 		},
 		"node_modules/@types/node": {
-			"version": "20.8.4",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz",
-			"integrity": "sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==",
+			"version": "20.8.5",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.5.tgz",
+			"integrity": "sha512-SPlobFgbidfIeOYlzXiEjSYeIJiOCthv+9tSQVpvk4PAdIIc+2SmjNVzWXk9t0Y7dl73Zdf+OgXKHX9XtkqUpw==",
 			"devOptional": true,
 			"dependencies": {
 				"undici-types": "~5.25.1"
@@ -1638,16 +1638,16 @@
 			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
 		},
 		"node_modules/single-file-cli": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.9.tgz",
-			"integrity": "sha512-xbqqX44UDxpW1W30gaTuD3EH/ZXYodIa6sQ0gPf0IvH8ZeEwebq+kx5kzCfdPSSs4Ic+z5vagRRkD9iVz+Tn6w==",
+			"version": "1.1.10",
+			"resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.10.tgz",
+			"integrity": "sha512-N4ImBBUXrhSo98nKZ/Dz430BOmE2aoSEpCbEkIN/ekvDvpxyUtcmCDkd1+olQAVXaWnj3zsFGWhXPmZ9VgMIgA==",
 			"dependencies": {
 				"file-url": "3.0.0",
 				"iconv-lite": "0.6.3",
 				"jsdom": "22.1.0",
 				"puppeteer-core": "21.2.1",
 				"selenium-webdriver": "4.12.0",
-				"single-file-core": "1.2.9",
+				"single-file-core": "1.2.11",
 				"strong-data-uri": "1.0.6",
 				"yargs": "17.7.2"
 			},
@@ -1655,15 +1655,10 @@
 				"single-file": "single-file"
 			}
 		},
-		"node_modules/single-file-cli/node_modules/single-file-core": {
-			"version": "1.2.9",
-			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.2.9.tgz",
-			"integrity": "sha512-F1UgTwXd7H9K4nyXFHrAfGRc3BZMtYJ6I3cshBBGh3t/u6O58M64aZDy0OjqpdHbFE2+wRdMygVy20QS9GHMbA=="
-		},
 		"node_modules/single-file-core": {
-			"version": "1.2.10",
-			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.2.10.tgz",
-			"integrity": "sha512-QBJTCNNO6E2vGXFHICG86XZb3Y+SdohOe9MqFQJ9svn/n8xND4rtfFY4ILpxtEIWeRTUKjA6dVPiBBcoUT1xqg=="
+			"version": "1.2.11",
+			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.2.11.tgz",
+			"integrity": "sha512-coW152IsyNq6CCJYTx8BfHGBzmTSbSuB+d5nwcq2e9OweBlZCmQaFcOPgB4rrUxSvTfYJ6iet/6QATWuGdkKIw=="
 		},
 		"node_modules/smart-buffer": {
 			"version": "4.2.0",

package.json

@@ -12,8 +12,8 @@
 		"single-file": "./cli/single-file"
 	},
 	"dependencies": {
-		"single-file-core": "1.2.10",
-		"single-file-cli": "1.1.9"
+		"single-file-core": "1.2.11",
+		"single-file-cli": "1.1.10"
 	},
 	"devDependencies": {
 		"@rollup/plugin-node-resolve": "15.0.1",

src/ui/content/content-ui-editor-web.js

@@ -23,10 +23,6 @@
 
 /* global globalThis, window, document, fetch, DOMParser, getComputedStyle, setTimeout, clearTimeout, NodeFilter, Readability, isProbablyReaderable, matchMedia, TextDecoder, Node, URL, MouseEvent, Blob, prompt, MutationObserver, FileReader, Worker, navigator, alert */
 
-import * as zip from "single-file-core/vendor/zip/zip.js";
-import { extract } from "single-file-core/processors/compression/compression-extract.js";
-import { display } from "single-file-core/processors/compression/compression-display.js";
-
 (globalThis => {
 
 	const IS_NOT_SAFARI = !/Safari/.test(navigator.userAgent) || /Chrome/.test(navigator.userAgent) || /Vivaldi/.test(navigator.userAgent) || /OPR/.test(navigator.userAgent);
@@ -982,7 +978,7 @@ pre code {
 	let selectedNote, anchorElement, maskNoteElement, maskPageElement, highlightSelectionMode, removeHighlightMode, resizingNoteMode, movingNoteMode, highlightColor, collapseNoteTimeout, cuttingOuterMode, cuttingMode, cuttingTouchTarget, cuttingPath, cuttingPathIndex, previousContent;
 	let removedElements = [], removedElementIndex = 0, initScriptContent, pageResources, pageUrl, pageCompressContent, includeInfobar;
 
-	globalThis.zip = zip;
+	globalThis.zip = singlefile.helper.zip;
 	window.onmessage = async event => {
 		const message = JSON.parse(event.data);
 		if (message.method == "init") {
@@ -1144,7 +1140,7 @@ pre code {
 				delete zipOptions.workerScripts;
 			}
 			zipOptions.useWebWorkers = IS_NOT_SAFARI;
-			const { docContent, origDocContent, resources, url } = await extract(content, {
+			const { docContent, origDocContent, resources, url } = await singlefile.helper.extract(content, {
 				password,
 				prompt,
 				shadowRootScriptURL: new URL("/lib/single-file-extension-editor-init.js", document.baseURI).href,
@@ -1155,7 +1151,7 @@ pre code {
 			pageCompressContent = true;
 			const contentDocument = (new DOMParser()).parseFromString(docContent, "text/html");
 			if (detectSavedPage(contentDocument)) {
-				await display(document, docContent, { disableFramePointerEvents: true });
+				await singlefile.helper.display(document, docContent, { disableFramePointerEvents: true });
 				const infobarElement = document.querySelector(singlefile.helper.INFOBAR_TAGNAME);
 				if (infobarElement) {
 					infobarElement.remove();