From 4f926554abde3fdaf327bc6b57fd01e5c5d5d12d Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Mon, 23 Dec 2024 08:33:19 +0800 Subject: [PATCH 001/110] build: add compilation distinguishing conditions --- xcode/xcconfig/Mac-App.xcconfig | 1 + xcode/xcconfig/Mac-Safari-Extension.xcconfig | 1 + xcode/xcconfig/Userscripts-Base.xcconfig | 4 ++-- xcode/xcconfig/iOS-App.xcconfig | 1 + xcode/xcconfig/iOS-Safari-Extension.xcconfig | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xcode/xcconfig/Mac-App.xcconfig b/xcode/xcconfig/Mac-App.xcconfig index 8e4e77a8..81ab00d6 100644 --- a/xcode/xcconfig/Mac-App.xcconfig +++ b/xcode/xcconfig/Mac-App.xcconfig @@ -14,6 +14,7 @@ PRODUCT_BUNDLE_IDENTIFIER = $(APP_IDENTIFIER) PRODUCT_NAME = $(PROJECT_NAME) PRODUCT_NAME[config=Debug] = $(PROJECT_NAME)-Debug PRODUCT_NAME[config=Vite] = $(PROJECT_NAME)-Vite +SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP $(inherited) // Provisioning Profile PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(APP_IDENTIFIER) macos diff --git a/xcode/xcconfig/Mac-Safari-Extension.xcconfig b/xcode/xcconfig/Mac-Safari-Extension.xcconfig index 8e85fdbf..07b33fb0 100644 --- a/xcode/xcconfig/Mac-Safari-Extension.xcconfig +++ b/xcode/xcconfig/Mac-Safari-Extension.xcconfig @@ -11,6 +11,7 @@ LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executabl PRODUCT_BUNDLE_IDENTIFIER = $(EXT_IDENTIFIER) PRODUCT_NAME = $(PROJECT_NAME)-$(TARGET_NAME) SKIP_INSTALL = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = EXT $(inherited) // Provisioning Profile PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(EXT_IDENTIFIER) macos diff --git a/xcode/xcconfig/Userscripts-Base.xcconfig b/xcode/xcconfig/Userscripts-Base.xcconfig index 6ad773d0..505bf3a9 100644 --- a/xcode/xcconfig/Userscripts-Base.xcconfig +++ b/xcode/xcconfig/Userscripts-Base.xcconfig @@ -54,8 +54,8 @@ MTL_ENABLE_DEBUG_INFO[config=Release] = NO MTL_FAST_MATH = YES ONLY_ACTIVE_ARCH[config=Debug] = YES SDKROOT = macosx -SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug] = DEBUG -SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Vite] = DEBUG +SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug] = DEBUG $(inherited) +SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Vite] = DEBUG VITE $(inherited) SWIFT_COMPILATION_MODE[config=Release] = wholemodule SWIFT_OPTIMIZATION_LEVEL[config=Debug] = -Onone SWIFT_OPTIMIZATION_LEVEL[config=Release] = -O diff --git a/xcode/xcconfig/iOS-App.xcconfig b/xcode/xcconfig/iOS-App.xcconfig index 961b978c..5dbd1119 100644 --- a/xcode/xcconfig/iOS-App.xcconfig +++ b/xcode/xcconfig/iOS-App.xcconfig @@ -25,6 +25,7 @@ SUPPORTS_MACCATALYST = NO SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO TARGETED_DEVICE_FAMILY = 1,2 VALIDATE_PRODUCT[config=Release] = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP $(inherited) // Provisioning Profile PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(APP_IDENTIFIER) diff --git a/xcode/xcconfig/iOS-Safari-Extension.xcconfig b/xcode/xcconfig/iOS-Safari-Extension.xcconfig index 77d561ab..0d65c2ca 100644 --- a/xcode/xcconfig/iOS-Safari-Extension.xcconfig +++ b/xcode/xcconfig/iOS-Safari-Extension.xcconfig @@ -15,6 +15,7 @@ SKIP_INSTALL = YES SWIFT_EMIT_LOC_STRINGS = YES TARGETED_DEVICE_FAMILY = 1,2 VALIDATE_PRODUCT[config=Release] = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = EXT $(inherited) // Provisioning Profile PROVISIONING_PROFILE_SPECIFIER[config=Release] = match AppStore $(EXT_IDENTIFIER) From 46fa1cc78345f15d6202306347ac5df75d3b7413 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Mon, 23 Dec 2024 08:58:44 +0800 Subject: [PATCH 002/110] feat: local logger feature set --- xcode/Shared/Logger.swift | 232 +++++++++++++++++++++++++++++++++++ xcode/Shared/Utilities.swift | 18 +-- 2 files changed, 238 insertions(+), 12 deletions(-) create mode 100644 xcode/Shared/Logger.swift diff --git a/xcode/Shared/Logger.swift b/xcode/Shared/Logger.swift new file mode 100644 index 00000000..7f15fab1 --- /dev/null +++ b/xcode/Shared/Logger.swift @@ -0,0 +1,232 @@ +import OSLog +import SwiftUI + +private let logger = USLogger(#fileID) +private let logDir = "Library/Caches/\(projectName)/Debug" +private let logFile = "\(bundleIdentifier).log" + +func USLogger(_ category: String) -> Logger? { +#if DEBUG // Always enable logger in DEBUG builds + print("DEBUG: logger enabled") +#else + guard Preferences.enableLogger else { return nil } +#endif + let subsystem = Bundle.main.bundleIdentifier! + return Logger(subsystem: subsystem, category: category) +} + +func USLoggerSwitch(_ enable: Bool) { + Preferences.enableLogger = enable + if enable { + USLogStoreToFile() // clean up + } else { + USLogStoreToFile(prioritize: true) + } + // update app gui + if bundleIdentifier != extIdentifier { +#if os(macOS) && APP + if let appDelegate = NSApp.delegate as? AppDelegate { + // update app menu item state + appDelegate.enbaleNativeLogger?.state = enable ? .on : .off + // update app webview state + if let viewController = appDelegate.window?.contentViewController as? ViewController { + viewController.updateEnableLoggerState() + } + } +#elseif os(iOS) && APP + if let sceneDelegate = UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate, + let viewController = sceneDelegate.window?.rootViewController as? ViewController { + // update app webview state + viewController.updateEnableLoggerState() + } +#endif + } +} + +// https://forums.swift.org/t/best-way-to-append-text-to-a-text-file/35764 +// Swift has no easy way to append to files, use POSIX APIs +private func appendToFile(_ file: URL, content: String) -> Bool { + guard file.isFileURL else { + print("Not a file scheme URL") + return false + } + if file.hasDirectoryPath { + print("Should be a file but is indicated as a directory URL") + return false + } + do { + let dir = file.deletingLastPathComponent() + try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true, attributes: nil) + } catch { + print("Failed mkdir - \(error)") + return false + } + let fileDescriptor = open(file.path, O_CREAT | O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR) + if fileDescriptor == -1 { + perror("Failed open") + return false + } + defer { close(fileDescriptor) } + guard let textData = content.cString(using: .utf8) else { + print("Failed cString") + return false + } + let result = write(fileDescriptor, textData, strlen(textData)) + if result == -1 { + perror("Failed write") + return false + } + return true +} + +private func stringFromLogLevel(_ level: OSLogEntryLog.Level) -> String { + switch level { + case .undefined: + return "Undefined" + case .debug: + return "Debug" + case .info: + return "Info" + case .notice: + return "Notice" + case .error: + return "Error" + case .fault: + return "Fault" + @unknown default: + return "Unknown" + } +} + +// The last time written to the log file +private var lastDate: Date = Date().addingTimeInterval(-3600) + +private func writeLogStoreToFile() { + logger?.debug("\(#function, privacy: .public) - USLogStoreToFile start") + guard let logDirURL: URL = getProjectSharedDirectoryURL(path: logDir) else { + logger?.error("\(#function, privacy: .public) - Failed get logDirURL") + return + } + let logFileURL: URL = logDirURL.appendingPathComponent(logFile, isDirectory: false) + // log file size limit + if let fileSize = try? FileManager.default.attributesOfItem(atPath: logFileURL.path)[.size] as? Int { +#if DEBUG + print("DEBUG: logFileSize/maxLogFileSize", fileSize, Preferences.maxLogFileSize) +#endif + if fileSize > Preferences.maxLogFileSize { + logger?.info("\(#function, privacy: .public) - Logger disabling due to max file size exceeded") + USLoggerSwitch(false) + } + } +#if DEBUG + print("DEBUG: enableLogger", Preferences.enableLogger) +#endif + guard Preferences.enableLogger else { + // clean log files + logger?.info("\(#function, privacy: .public) - Cleaning log files") + do { + try FileManager.default.removeItem(at: logDirURL) + } catch { + logger?.error("\(#function, privacy: .public) - \(error)") + } + // reset logger prompt + Preferences.promptLogger = true + return + } + // log array written to the file in one go + var logs: [String] = [] + do { + let logStore = try OSLogStore(scope: .currentProcessIdentifier) + // `position` doesn't work in `getEntries`, always returns all logs + // instead use `predicate` to filter +// let position = logStore.position(date: lastDate) + let nowDate = Date() + let predicate = NSPredicate( + format: "date between {%@, %@}", + lastDate as CVarArg, + nowDate as CVarArg + ) + lastDate = nowDate + let entries = try logStore.getEntries(matching: predicate) + for entry in entries { + if let osLogEntry = entry as? OSLogEntryLog { + lastDate = osLogEntry.date + // format a single log line + let log = [ + osLogEntry.date.description, + stringFromLogLevel(osLogEntry.level), + osLogEntry.process, + osLogEntry.subsystem, + osLogEntry.category, + osLogEntry.composedMessage + + ].joined(separator: "\t") + logs.append(log) + } + } + } catch { + logger?.error("\(#function, privacy: .public) - Failed get entries: \(error)") + return + } + var content = logs.joined(separator: "\n") + // separate single write, there may be several duplicates before and after + content += "\n-------------------------\n" + guard appendToFile(logFileURL, content: content) else { + logger?.error("\(#function, privacy: .public) - Failed appendToFile") + return + } +} + +func USLogStoreToFile(prioritize: Bool = false) { + // Note qos `.background` doesn't seem to work in extension + DispatchQueue.global(qos: prioritize ? .userInteractive : .utility).async { + writeLogStoreToFile() + } +} + +func USLogFilesExportTo(_ directory: URL) throws -> URL { + + struct USLogExportError: Error, CustomStringConvertible { + enum errType: String { + case notDirectory = "Not a directory URL" + case logDirURLNil = "Failed get logDirURL" + case noLogDir = "Log directory does not exist" + case noLogFiles = "The log directory is empty" + case exportFailed = "Export failed" + } + let type: errType + var error: Error? = nil + var description: String { + if let error = self.error { + return "\(error) - \(self.type.rawValue)" + } + return self.type.rawValue + } + } + + logger?.debug("\(#function, privacy: .public) - USLogFilesExportTo start") + guard directory.hasDirectoryPath else { + throw USLogExportError(type: .notDirectory) + } + guard let logDirURL: URL = getProjectSharedDirectoryURL(path: logDir) else { + throw USLogExportError(type: .logDirURLNil) + } + guard directoryExists(path: logDirURL.path) else { + throw USLogExportError(type: .noLogDir) + } + guard directoryEmpty(at: logDirURL) == false else { + throw USLogExportError(type: .noLogFiles) + } + let timeInterval = Date().timeIntervalSince1970 + let timestampSrt = String(Int(timeInterval)) + // Use timestamps to ensure no destination folders already exist + let outdir = "\(projectName)-logs-\(timestampSrt)" + let dstURL = directory.appendingPathComponent(outdir, isDirectory: true) + do { + try FileManager.default.copyItem(at: logDirURL, to: dstURL) + return dstURL + } catch { + throw USLogExportError(type: .logDirURLNil, error: error) + } + +} diff --git a/xcode/Shared/Utilities.swift b/xcode/Shared/Utilities.swift index dfb00425..093d0e0b 100644 --- a/xcode/Shared/Utilities.swift +++ b/xcode/Shared/Utilities.swift @@ -1,17 +1,11 @@ import SwiftUI -import os.log -func USLogger(_ category: String) -> Logger? { - let subsystem = Bundle.main.bundleIdentifier! -#if DEBUG // Always enable logger in DEBUG builds - return Logger(subsystem: subsystem, category: category) -#else - if Preferences.enableLogger { - return Logger(subsystem: subsystem, category: category) - } - return nil -#endif -} +let bundleIdentifier = Bundle.main.bundleIdentifier! +let groupIdentifier = Bundle.main.infoDictionary!["US_SHARED_GID"] as! String +let extIdentifier = Bundle.main.infoDictionary?["US_EXT_IDENTIFIER"] as! String +let projectName = "Userscripts" +//let projectName = Bundle.main.infoDictionary!["PROJECT_NAME"] as! String +private let logger = USLogger(#fileID) func getDocumentsDirectory() -> URL { let fm = FileManager.default From 6f9aea0c4f49d9dffad420b1e085bb6db50a741c Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:13:39 +0800 Subject: [PATCH 003/110] feat: add log writing points for each process --- xcode/App-Mac/AppDelegate.swift | 1 + xcode/App-iOS/SceneDelegate.swift | 4 ++++ xcode/Ext-Safari/SafariWebExtensionHandler.swift | 1 + 3 files changed, 6 insertions(+) diff --git a/xcode/App-Mac/AppDelegate.swift b/xcode/App-Mac/AppDelegate.swift index c5df851c..9fa68785 100644 --- a/xcode/App-Mac/AppDelegate.swift +++ b/xcode/App-Mac/AppDelegate.swift @@ -65,6 +65,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { func applicationWillTerminate(_ notification: Notification) { // Insert code here to tear down your application + USLogStoreToFile() } func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { diff --git a/xcode/App-iOS/SceneDelegate.swift b/xcode/App-iOS/SceneDelegate.swift index e733d27e..06e2dfdb 100644 --- a/xcode/App-iOS/SceneDelegate.swift +++ b/xcode/App-iOS/SceneDelegate.swift @@ -16,4 +16,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { guard let _ = (scene as? UIWindowScene) else { return } } + func sceneWillResignActive(_ scene: UIScene) { + USLogStoreToFile() + } + } diff --git a/xcode/Ext-Safari/SafariWebExtensionHandler.swift b/xcode/Ext-Safari/SafariWebExtensionHandler.swift index 07e3e9e9..84b84dd2 100644 --- a/xcode/Ext-Safari/SafariWebExtensionHandler.swift +++ b/xcode/Ext-Safari/SafariWebExtensionHandler.swift @@ -2,6 +2,7 @@ import SafariServices class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling { func beginRequest(with context: NSExtensionContext) { + defer { USLogStoreToFile() } let logger = USLogger(#fileID) let item = context.inputItems[0] as? NSExtensionItem let message = item?.userInfo?[SFExtensionMessageKey] as? [String: Any] From f10fc761dad623d0aea221a6c60e88cc84dd5fd9 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:14:45 +0800 Subject: [PATCH 004/110] refactor: add preference items and chores --- xcode/Ext-Safari/Functions.swift | 26 ------ xcode/Shared/Preferences.swift | 84 ++++++----------- xcode/Shared/Utilities.swift | 149 ++++++++++++++++++++++++++++--- 3 files changed, 163 insertions(+), 96 deletions(-) diff --git a/xcode/Ext-Safari/Functions.swift b/xcode/Ext-Safari/Functions.swift index 5765d11c..77431ac9 100644 --- a/xcode/Ext-Safari/Functions.swift +++ b/xcode/Ext-Safari/Functions.swift @@ -50,32 +50,6 @@ func normalizeWeight(_ weight: String) -> String { } } -func getSaveLocation() -> URL? { -#if os(iOS) - if isCurrentDefaultScriptsDirectory() { - logger?.info("\(#function, privacy: .public) - Uninitialized save location") - return nil - } -#endif - let url = Preferences.scriptsDirectoryUrl - logger?.debug("\(#function, privacy: .public) - \(url, privacy: .public)") - return url -} - -func openSaveLocation() -> Bool { - #if os(macOS) - guard let saveLocation = getSaveLocation() else { - return false - } - let didStartAccessing = saveLocation.startAccessingSecurityScopedResource() - defer { - if didStartAccessing {saveLocation.stopAccessingSecurityScopedResource()} - } - NSWorkspace.shared.selectFile(nil, inFileViewerRootedAtPath: saveLocation.path) - #endif - return true -} - func validateUrl(_ urlString: String) -> Bool { guard let parts = jsLikeURL(urlString), diff --git a/xcode/Shared/Preferences.swift b/xcode/Shared/Preferences.swift index f486cede..6d1f67fc 100644 --- a/xcode/Shared/Preferences.swift +++ b/xcode/Shared/Preferences.swift @@ -1,53 +1,7 @@ import Foundation private let logger = USLogger(#fileID) -private let suiteName = Bundle.main.infoDictionary!["US_SHARED_GID"] as! String -private let SDefaults = UserDefaults(suiteName: suiteName) // Shared UserDefaults - -let bundleIdentifier = Bundle.main.bundleIdentifier! -let extIdentifier = Bundle.main.infoDictionary?["US_EXT_IDENTIFIER"] as! String - -func getDefaultScriptsDirectoryUrl() -> URL { - var url: URL - if #available(macOS 13.0, iOS 16.0, *) { - url = getDocumentsDirectory().appending(path: "scripts") - } else { - url = getDocumentsDirectory().appendingPathComponent("scripts") - } - // if not in safari extension environment, replace with extension path - if bundleIdentifier != extIdentifier { - var path: String - if #available(macOS 13.0, iOS 16.0, *) { - path = url.path(percentEncoded: false) - } else { - path = url.path.removingPercentEncoding ?? url.path - } - let truePath = path.replacingOccurrences(of: bundleIdentifier, with: extIdentifier) - url = URL(fileURLWithPath: truePath, isDirectory: true) - } - return url -} - -func isCurrentDefaultScriptsDirectory() -> Bool { - return Preferences.scriptsDirectoryUrl == getDefaultScriptsDirectoryUrl() -} - -func isCurrentInitialScriptsDirectory() -> Bool { - let url = Preferences.scriptsDirectoryUrl.standardizedFileURL - return url == getDocumentsDirectory().standardizedFileURL -} - -func getCurrentScriptsDirectoryString() -> String { - let url = Preferences.scriptsDirectoryUrl.standardizedFileURL - if url == getDocumentsDirectory().standardizedFileURL { - return "Userscripts App Documents" - } - if #available(macOS 13.0, iOS 16.0, *) { - return url.path(percentEncoded: false) - } else { - return url.path.removingPercentEncoding ?? url.path - } -} +private let SDefaults = UserDefaults(suiteName: groupIdentifier) // Shared UserDefaults // https://docs.swift.org/swift-book/documentation/the-swift-programming-language/properties#Property-Wrappers // https://docs.swift.org/swift-book/documentation/the-swift-programming-language/generics/ @@ -248,7 +202,7 @@ private struct SecurityScopedBookmark { do { return try url.bookmarkData(options: .minimalBookmark, includingResourceValuesForKeys: nil, relativeTo: nil) } catch { - logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)") + logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)") } return nil } @@ -298,10 +252,11 @@ private struct SecurityScopedBookmark { set(url) { let k = key // key cannot be log directly with error: Escaping autoclosure captures mutating 'self' parameter logger?.info("\(#function, privacy: .public) - try set bookmark: \(k, privacy: .public) \(url, privacy: .public)") - let didStartAccessing = url.startAccessingSecurityScopedResource() - defer { - if didStartAccessing { url.stopAccessingSecurityScopedResource() } + guard url.startAccessingSecurityScopedResource() else { + logger?.error("\(#function, privacy: .public) - failed access url: \(url, privacy: .public)") + return } + defer { url.stopAccessingSecurityScopedResource() } guard let data = createBookmark(url) else { logger?.info("\(#function, privacy: .public) - failed create bookmark: \(k, privacy: .public) \(url, privacy: .public)") return @@ -312,15 +267,32 @@ private struct SecurityScopedBookmark { } #endif -// Define shared preferences, default values ​​determine data type +// Define shared preferences, default values determine data type struct Preferences { -/* Example preference, can be get or set with: Preferences.propertyName - @SharedUserDefaults("SharedUserDefaultsKeyName") - static var propertyName = "DefaultValue" // String -*/ + // Example preference, can be get or set with: Preferences.propertyName + // @SharedUserDefaults("SharedUserDefaultsKeyName") + // static var propertyName = "DefaultValue" // Type -> String + + // This is a separate wrapper, type is URL @SecurityScopedBookmark("ScriptsDirectoryUrlBookmarkData") static var scriptsDirectoryUrl = getDefaultScriptsDirectoryUrl() @SharedUserDefaults("EnableLogger") static var enableLogger = false + + @SharedUserDefaults("PromptLogger") + static var promptLogger = true + + @SharedUserDefaults("MaxLogFileSize") + static var maxLogFileSize = 500_000_000 // 500MB + + @SharedUserDefaults("FirstRunTime") + static var firstRunTime = 0 { + willSet { + print("willSet \(newValue)") + } + didSet { + print("didSet \(oldValue)") + } + } } diff --git a/xcode/Shared/Utilities.swift b/xcode/Shared/Utilities.swift index 093d0e0b..a60de5d2 100644 --- a/xcode/Shared/Utilities.swift +++ b/xcode/Shared/Utilities.swift @@ -7,20 +7,6 @@ let projectName = "Userscripts" //let projectName = Bundle.main.infoDictionary!["PROJECT_NAME"] as! String private let logger = USLogger(#fileID) -func getDocumentsDirectory() -> URL { - let fm = FileManager.default - let paths = fm.urls(for: .documentDirectory, in: .userDomainMask) - let documentsDirectory = paths[0] - return documentsDirectory -} - -func directoryExists(path: String) -> Bool { - var isDirectory = ObjCBool(true) - let exists = FileManager.default.fileExists(atPath: path, isDirectory: &isDirectory) - let inTrash = path.contains(".Trash") ? false : true - return exists && inTrash && isDirectory.boolValue -} - func getPlatform() -> String { #if os(macOS) return "macos" @@ -45,3 +31,138 @@ func getPlatform() -> String { } #endif } + +func directoryExists(path: String) -> Bool { + var isDirectory = ObjCBool(true) + let exists = FileManager.default.fileExists(atPath: path, isDirectory: &isDirectory) + let inTrash = path.contains(".Trash") ? false : true + return exists && inTrash && isDirectory.boolValue +} + +func directoryEmpty(at url: URL) -> Bool? { + // get a list of non-hidden files + guard let contents = try? FileManager.default.contentsOfDirectory( + at: url, + includingPropertiesForKeys: [], + options: .skipsHiddenFiles + ) else { + logger?.error("\(#function, privacy: .public) - failed get contentsOfDirectory") + return nil + } + return contents.isEmpty +} + +func getDocumentsDirectory() -> URL { + let fm = FileManager.default + let paths = fm.urls(for: .documentDirectory, in: .userDomainMask) + let documentsDirectory = paths[0] + return documentsDirectory +} + +func getProjectSharedDirectoryURL(path: String? = nil) -> URL? { + // https://developer.apple.com/documentation/foundation/filemanager/1412643-containerurl/ + guard let sharedContainerURL = FileManager.default.containerURL( + forSecurityApplicationGroupIdentifier: groupIdentifier + ) else { + logger?.error("\(#function, privacy: .public) - Failed get sharedContainerURL") + return nil + } + guard let path = path else { + return sharedContainerURL + } + if #available(macOS 13.0, iOS 16.0, *) { + return sharedContainerURL.appending(path: path, directoryHint: .isDirectory) + } else { + return sharedContainerURL.appendingPathComponent(path, isDirectory: true) + } +} + +func getDefaultScriptsDirectoryUrl() -> URL { +#if os(iOS) + return URL(string: "default://uninitialized")! +#elseif os(macOS) + var url: URL + if #available(macOS 13.0, iOS 16.0, *) { + url = getDocumentsDirectory().appending(path: "scripts") + } else { + url = getDocumentsDirectory().appendingPathComponent("scripts") + } + // if not in safari extension environment, replace with extension path + if bundleIdentifier != extIdentifier { + var path: String + if #available(macOS 13.0, iOS 16.0, *) { + path = url.path(percentEncoded: false) + } else { + path = url.path.removingPercentEncoding ?? url.path + } + let truePath = path.replacingOccurrences(of: bundleIdentifier, with: extIdentifier) + url = URL(fileURLWithPath: truePath, isDirectory: true) + } + return url +#endif +} + +#if os(iOS) +// Initialization directory is only required in iOS +func isCurrentDefaultScriptsDirectory() -> Bool { + return Preferences.scriptsDirectoryUrl == getDefaultScriptsDirectoryUrl() +} +#endif + +// For mac, the initial directory is Ext-Documents (default directory) +// For ios, the initial directory is App-Documents +// In ios only App-Documents can be displayed in Files App +func isCurrentInitialScriptsDirectory() -> Bool { + let url = Preferences.scriptsDirectoryUrl.standardizedFileURL +#if os(iOS) + return url == getDocumentsDirectory().standardizedFileURL +#elseif os(macOS) + return url == getDefaultScriptsDirectoryUrl().standardizedFileURL +#endif +} + +func getCurrentScriptsDirectoryString() -> String { + if isCurrentInitialScriptsDirectory() { + return "Userscripts App Documents" + } + let url = Preferences.scriptsDirectoryUrl.standardizedFileURL + if #available(macOS 13.0, iOS 16.0, *) { + return url.path(percentEncoded: false) + } else { + return url.path.removingPercentEncoding ?? url.path + } +} + +func getSaveLocation() -> URL? { +#if os(iOS) + if isCurrentDefaultScriptsDirectory() { + logger?.info("\(#function, privacy: .public) - Uninitialized save location") + return nil + } +#endif + let url = Preferences.scriptsDirectoryUrl + logger?.debug("\(#function, privacy: .public) - \(url, privacy: .public)") + return url +} + +func openSaveLocation() -> Bool { +#if os(macOS) + guard let saveLocation = getSaveLocation() else { + return false + } + let didStartAccessing = saveLocation.startAccessingSecurityScopedResource() + defer { + if didStartAccessing {saveLocation.stopAccessingSecurityScopedResource()} + } + NSWorkspace.shared.selectFile(nil, inFileViewerRootedAtPath: saveLocation.path) +#endif + return true +} + +func resetSaveLocation() { + logger?.info("\(#function, privacy: .public) - Reset save location") +#if os(iOS) + Preferences.scriptsDirectoryUrl = getDocumentsDirectory() +#elseif os(macOS) +#endif +} From f87ef9cbc651d06ba8050154c1312e69e5bcd319 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:28:50 +0800 Subject: [PATCH 005/110] feat: merge mac and ios app webview Mac app no longer uses storyboards and directly loads custom webview --- xcode/App-Mac/AppDelegate.swift | 32 +- xcode/App-Mac/Base.lproj/View.storyboard | 219 -------------- xcode/App-Shared/USchemeHandler.swift | 2 +- xcode/App-Shared/ViewController.swift | 320 ++++++++++++++++++-- xcode/App-iOS/AppDelegate.swift | 2 +- xcode/App-iOS/SceneDelegate.swift | 7 + xcode/Userscripts.xcodeproj/project.pbxproj | 40 ++- 7 files changed, 352 insertions(+), 270 deletions(-) delete mode 100644 xcode/App-Mac/Base.lproj/View.storyboard diff --git a/xcode/App-Mac/AppDelegate.swift b/xcode/App-Mac/AppDelegate.swift index 9fa68785..cf41daac 100644 --- a/xcode/App-Mac/AppDelegate.swift +++ b/xcode/App-Mac/AppDelegate.swift @@ -3,7 +3,7 @@ import Cocoa @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate { - private var window: NSWindow! + var window: NSWindow! private var windowForego = false private var windowLoaded = false private let logger = USLogger(#fileID) @@ -24,7 +24,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { if NSApplication.shared.keyWindow?.identifier?.rawValue == "changeSaveLocation" { return } if windowLoaded { let viewController = window.contentViewController as? ViewController - viewController?.changeSaveLocation(nil) + viewController?.changeSaveLocation() } else { windowForego = true schemeChangeSaveLocation() @@ -48,14 +48,22 @@ class AppDelegate: NSObject, NSApplicationDelegate { func applicationDidFinishLaunching(_ notification: Notification) { // Initialize menu items enbaleNativeLogger.state = Preferences.enableLogger ? .on : .off - // Whether to initialize the main view + // Whether to initialize the main window logger?.debug("\(#function, privacy: .public) - windowForego: \(self.windowForego, privacy: .public)") if windowForego { return } - let storyboard = NSStoryboard(name: "View", bundle: Bundle.main) - let windowController = storyboard.instantiateInitialController() as! NSWindowController -// let viewController = windowController.contentViewController as! ViewController - window = windowController.window + // https://developer.apple.com/documentation/appkit/nswindow/ + window = NSWindow() + window.styleMask = [.titled, .closable, .miniaturizable] +// window.styleMask = [.titled, .closable, .resizable, .miniaturizable] // DEBUG + window.titlebarAppearsTransparent = true + // Initialize webview + window.contentViewController = ViewController() + window.backgroundColor = .clear // DEBUG + window.center() window.setIsVisible(true) + window.makeMain() + window.makeKeyAndOrderFront(nil) +// window.level = NSWindow.Level.floating // DEBUG windowLoaded = true } @@ -73,13 +81,9 @@ class AppDelegate: NSObject, NSApplicationDelegate { } @IBAction func enableLogger(_ sender: NSMenuItem) { - if sender.state == .on { - Preferences.enableLogger = false - sender.state = .off - } else { - Preferences.enableLogger = true - sender.state = .on - } + let enable = sender.state == .on ? false : true + sender.state = enable ? .on : .off + USLoggerSwitch(enable) } @IBAction func applicationHelp(_ sender: NSMenuItem) { diff --git a/xcode/App-Mac/Base.lproj/View.storyboard b/xcode/App-Mac/Base.lproj/View.storyboard deleted file mode 100644 index 7da55c4b..00000000 --- a/xcode/App-Mac/Base.lproj/View.storyboard +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xcode/App-Shared/USchemeHandler.swift b/xcode/App-Shared/USchemeHandler.swift index 28fa301b..70bbd601 100644 --- a/xcode/App-Shared/USchemeHandler.swift +++ b/xcode/App-Shared/USchemeHandler.swift @@ -1,9 +1,9 @@ import WebKit import UniformTypeIdentifiers -private let logger = USLogger(#fileID) let AppWebViewUrlScheme = "userscriptsapp" let AppWebViewEntryPage = "entry-app-webview.html" +private let logger = USLogger(#fileID) // https://developer.apple.com/documentation/webkit/wkurlschemehandler // https://developer.apple.com/documentation/webkit/wkurlschemetask diff --git a/xcode/App-Shared/ViewController.swift b/xcode/App-Shared/ViewController.swift index ac0d457b..ba4a47e6 100644 --- a/xcode/App-Shared/ViewController.swift +++ b/xcode/App-Shared/ViewController.swift @@ -1,10 +1,31 @@ import WebKit +import SwiftUI + +#if os(iOS) +typealias PlatformViewController = UIViewController +#elseif os(macOS) +import SafariServices.SFSafariApplication +typealias PlatformViewController = NSViewController +#endif private let logger = USLogger(#fileID) -class ViewController: UIViewController, WKNavigationDelegate, WKScriptMessageHandlerWithReply, UIDocumentPickerDelegate { +class ViewController: PlatformViewController, WKNavigationDelegate, WKScriptMessageHandlerWithReply { @IBOutlet var webView: WKWebView! + + enum ExtensionState: String { + case unknow = "unknow" + case on = "enabled" + case off = "disabled" + case error = "error" + } + var extensionState: ExtensionState = .unknow +#if os(iOS) + var documentPickerHandler: ((URL) -> Void)? +#elseif os(macOS) + var timerExtensionStateCheck: Timer? +#endif // https://developer.apple.com/documentation/uikit/uiviewcontroller/1621454-loadview override func loadView() { @@ -16,6 +37,14 @@ class ViewController: UIViewController, WKNavigationDelegate, WKScriptMessageHan configuration.userContentController.addScriptMessageHandler(self, contentWorld: .page, name: "controller") // https://developer.apple.com/documentation/webkit/wkwebview self.webView = WKWebView(frame: .zero, configuration: configuration) +#if os(iOS) + self.webView.isOpaque = false + self.webView.backgroundColor = .clear +// self.webView.scrollView.isScrollEnabled = false +#elseif os(macOS) + self.webView.frame = NSRect(x: 0, y: 0, width: 600, height: 600) + self.webView.setValue(false, forKey: "drawsBackground") +#endif // https://developer.apple.com/documentation/webkit/wknavigationdelegate self.webView.navigationDelegate = self #if DEBUG @@ -26,18 +55,26 @@ class ViewController: UIViewController, WKNavigationDelegate, WKScriptMessageHan } logger?.debug("\(#function, privacy: .public) - DEBUG mode: isInspectable = true") #endif - view = webView -// self.webView.scrollView.isScrollEnabled = false - self.webView.isOpaque = false - let backgroundColor = UIColor.init(red: (47/255.0), green: (51/255.0), blue: (55/255.0), alpha: 1.0) - view.setValue(backgroundColor, forKey: "backgroundColor") - self.webView.backgroundColor = backgroundColor + self.view = self.webView } // https://developer.apple.com/documentation/uikit/uiviewcontroller/1621495-viewdidload override func viewDidLoad() { super.viewDidLoad() - webView.load(URLRequest(url: URL(string: "\(AppWebViewUrlScheme):///")!)) +#if VITE + let url = URL(string: "https://userscripts.test:55173/entry-app-webview.html")! +#else + let url = URL(string: "\(AppWebViewUrlScheme):///")! +#endif + self.webView.load(URLRequest(url: url)) +#if os(macOS) + NotificationCenter.default.addObserver( + self, + selector: #selector(handleOcclusionStateChange), + name: NSApplication.didChangeOcclusionStateNotification, + object: nil + ) +#endif } // https://developer.apple.com/documentation/webkit/wknavigationdelegate/1455629-webview @@ -68,49 +105,108 @@ class ViewController: UIViewController, WKNavigationDelegate, WKScriptMessageHan // } // } // open from external app like safari +#if os(iOS) if UIApplication.shared.canOpenURL(url) { UIApplication.shared.open(url) decisionHandler(.cancel) return } +#elseif os(macOS) + if let _ = NSWorkspace.shared.urlForApplication(toOpen: url) { + NSWorkspace.shared.open(url) + decisionHandler(.cancel) + return + } +#endif decisionHandler(.allow) } decisionHandler(.allow) } - func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) async -> ( - Any?, - String? - ) { + func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) async -> (Any?, String?) { guard let name = message.body as? String else { logger?.error("\(#function, privacy: .public) - Userscripts iOS received a message without a name") return (nil, "bad message body") } + logger?.debug("\(#function, privacy: .public) - Got message: \(name)") switch name { case "INIT": let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "0.0.0" let buildNumber = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "0" + let firstRunTime = Preferences.firstRunTime + if(firstRunTime == 0) { + Preferences.firstRunTime = Int(Date().timeIntervalSince1970 * 1000) + } + var useSettingsInsteadOfPreferences = false +#if os(iOS) + let platform = "ios" +#elseif os(macOS) + let platform = "mac" + do { + let state = try await SFSafariExtensionManager.stateOfSafariExtension(withIdentifier: extIdentifier) + self.extensionState = state.isEnabled ? .on : .off + } catch { + self.extensionState = .error + logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)") + } + if #available(macOS 13, *) { + useSettingsInsteadOfPreferences = true + } +#endif return ([ "build": buildNumber, "version": appVersion, + "platform": platform, "directory": getCurrentScriptsDirectoryString(), + "extStatus": self.extensionState.rawValue, + "useSettingsInsteadOfPreferences": useSettingsInsteadOfPreferences, + "enableLogger": Preferences.enableLogger, + "promptLogger": Preferences.promptLogger, + "maxLogFileSize": Preferences.maxLogFileSize, + "firstRunTime": firstRunTime, ], nil) case "CHANGE_DIRECTORY": - // https://developer.apple.com/documentation/uikit/view_controllers/providing_access_to_directories - logger?.info("\(#function, privacy: .public) - Userscripts iOS has requested to set the readLocation") - let documentPicker = UIDocumentPickerViewController(forOpeningContentTypes: [.folder]) - documentPicker.delegate = self - documentPicker.directoryURL = getDocumentsDirectory() - present(documentPicker, animated: true, completion: nil) + changeSaveLocation() break case "OPEN_DIRECTORY": - guard var components = URLComponents(url: Preferences.scriptsDirectoryUrl, resolvingAgainstBaseURL: true) else { +#if os(iOS) + guard let saveLocation = getSaveLocation() else { + return (nil, "Uninitialized save location") + } + guard var components = URLComponents(url: saveLocation, resolvingAgainstBaseURL: true) else { return (nil, "ScriptsDirectoryUrl malformed") } components.scheme = "shareddocuments" if let url = components.url, UIApplication.shared.canOpenURL(url) { await UIApplication.shared.open(url) } +#elseif os(macOS) + guard openSaveLocation() else { + return (nil, "ScriptsDirectoryUrl malformed") + } +#endif + break +#if os(macOS) + case "SHOW_PREFERENCES": + do { + try await SFSafariApplication.showPreferencesForExtension(withIdentifier: extIdentifier) + } catch { + logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)") + return (nil, error.localizedDescription) + } + break +#endif + case "EXPORT_LOG_FILES": + // write the logStore so far to log files (async, no guarantee) + USLogStoreToFile(prioritize: true) + // call the export func of different platforms + exportLogFiles() + break + case "DISABLE_LOGGER": + USLoggerSwitch(false) + break + case "DISMISS_LOGGER_PROMPT": + Preferences.promptLogger = false break default: return (nil, "Unexpected message body") @@ -118,8 +214,194 @@ class ViewController: UIViewController, WKNavigationDelegate, WKScriptMessageHan return (nil, nil) } + func updateEnableLoggerState() { + self.webView.evaluateJavaScript("webapp.switchLogger(\(Preferences.enableLogger),\(Preferences.promptLogger))") + } + +#if os(macOS) + deinit { + NotificationCenter.default.removeObserver( + self, + name: NSApplication.didChangeOcclusionStateNotification, + object: nil + ) + + DistributedNotificationCenter.default.removeObserver( + self, + name: NSNotification.Name("AppleInterfaceThemeChangedNotification"), + object: nil + ) + } +#endif + +} + +#if os(iOS) +// https://developer.apple.com/documentation/uikit/view_controllers/providing_access_to_directories +// https://developer.apple.com/documentation/uikit/uidocumentpickerviewcontroller +extension ViewController: UIDocumentPickerDelegate { + + // UIDocumentPickerDelegate + // https://developer.apple.com/documentation/uikit/uidocumentpickerdelegate/2902364-documentpicker func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentAt url: URL) { + guard let handler = documentPickerHandler else { + logger?.debug("\(#function, privacy: .public) - documentPickerHandler not set") + return + } + // call handler + handler(url) + // reset handler + documentPickerHandler = nil + } + + func changeSaveLocation() { + logger?.info("\(#function, privacy: .public) - Userscripts iOS has requested to set the readLocation") + // set handler + documentPickerHandler = changeSaveLocationHandler + let documentPicker = UIDocumentPickerViewController(forOpeningContentTypes: [.folder]) + documentPicker.delegate = self + documentPicker.directoryURL = getDocumentsDirectory() + present(documentPicker, animated: true) + } + + func changeSaveLocationHandler(_ url: URL) { Preferences.scriptsDirectoryUrl = url webView.evaluateJavaScript("webapp.updateDirectory('\(getCurrentScriptsDirectoryString())')") } + + func exportLogFiles() { + // set handler + documentPickerHandler = exportLogFilesHandler + let documentPicker = UIDocumentPickerViewController(forOpeningContentTypes: [.folder]) + documentPicker.delegate = self + present(documentPicker, animated: true) + } + + func exportLogFilesHandler(_ url: URL) { + guard url.startAccessingSecurityScopedResource() else { + logger?.error("\(#function, privacy: .public) - failed access url: \(url, privacy: .public)") + return + } + defer { url.stopAccessingSecurityScopedResource() } + // export log files and open output directory + do { + let outURL = try USLogFilesExportTo(url) + guard var components = URLComponents(url: outURL, resolvingAgainstBaseURL: true) else { + logger?.error("\(#function, privacy: .public) - url malformed: \(url, privacy: .public)") + return + } + components.scheme = "shareddocuments" + if let url = components.url, UIApplication.shared.canOpenURL(url) { + UIApplication.shared.open(url) + } + } catch { + logger?.error("\(#function, privacy: .public) - Export failed: \(error)") + let alert = UIAlertController( + title: "Export failed", + message: error.localizedDescription, + preferredStyle: .alert + ) + alert.addAction(UIAlertAction(title: "OK", style: .default)) + present(alert, animated: true) + } + } + +} + +#elseif os(macOS) +extension ViewController { + + // Only update the view when the window is visible + @objc func handleOcclusionStateChange() { + let occlusionState = NSApplication.shared.occlusionState + if occlusionState.contains(.visible) { + if timerExtensionStateCheck?.isValid != true { + timerExtensionStateCheck = Timer.scheduledTimer( + timeInterval: 0.2, + target: self, + selector: #selector(handleExtensionStateChange), + userInfo: nil, + repeats: true + ) + } + } else { + timerExtensionStateCheck?.invalidate() + } + } + + // Update webview extension status display via timer + @objc func handleExtensionStateChange() { + SFSafariExtensionManager.getStateOfSafariExtension(withIdentifier: extIdentifier) { (state, error) in + var status: ExtensionState; + if let state = state { + status = state.isEnabled ? .on : .off + } else { + status = .error + if let error = error { + logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)") + } else { + logger?.error("\(#function, privacy: .public) - couldn't get safari extension state in containing app") + } + } + if self.extensionState == status { return } + self.extensionState = status + DispatchQueue.main.async { + self.webView.evaluateJavaScript("webapp.updateExtStatus('\(status.rawValue)')") + } + } + } + + func changeSaveLocation() { + guard let window = self.view.window else { return } + let saveLocationURL = getSaveLocationURL() + let panel = changeSaveLocationPanel(directoryURL: saveLocationURL) + panel.beginSheetModal(for: window, completionHandler: { response in + // check if clicked open button and there is a valid result + guard response == .OK, let url: URL = panel.url else { return } + // revoke implicitly starts security-scoped access + defer { url.stopAccessingSecurityScopedResource() } + // check if path has indeed changed + if url.absoluteString == saveLocationURL.absoluteString { return } + // try set new save location path to bookmark + guard setSaveLocationURL(url: url) else { return } + // update user interface text display + self.webView.evaluateJavaScript("webapp.updateDirectory('\(getCurrentScriptsDirectoryString())')") + // notify browser extension of relevant updates + sendExtensionMessage( + name: "SAVE_LOCATION_CHANGED", + userInfo: [ + "saveLocation": url.absoluteString.removingPercentEncoding ?? url.absoluteString, + "returnApp": true + ] + ) + }) + } + + func exportLogFiles() { + guard let window = self.view.window else { return } + let panel = NSOpenPanel() + panel.allowsMultipleSelection = false + panel.canChooseDirectories = true + panel.canChooseFiles = false + panel.title = "Export Log Files" + panel.beginSheetModal(for: window, completionHandler: { response in + panel.close() + // check if clicked save button and there is a valid result + guard response == .OK, let url: URL = panel.url else { return } + // revoke implicitly starts security-scoped access + defer { url.stopAccessingSecurityScopedResource() } + // export log files and open output directory + do { + let outURL = try USLogFilesExportTo(url) + NSWorkspace.shared.selectFile(outURL.path, inFileViewerRootedAtPath: url.path) + } catch { + logger?.error("\(#function, privacy: .public) - Export failed: \(error)") + let alert = NSAlert() + alert.messageText = "Export failed - \(error)" + alert.runModal() + } + }) + } + } +#endif diff --git a/xcode/App-iOS/AppDelegate.swift b/xcode/App-iOS/AppDelegate.swift index 9da1b4c6..1ccbd9fa 100644 --- a/xcode/App-iOS/AppDelegate.swift +++ b/xcode/App-iOS/AppDelegate.swift @@ -7,7 +7,7 @@ // import UIKit -import os +//import os @main class AppDelegate: UIResponder, UIApplicationDelegate { diff --git a/xcode/App-iOS/SceneDelegate.swift b/xcode/App-iOS/SceneDelegate.swift index 06e2dfdb..d1544f61 100644 --- a/xcode/App-iOS/SceneDelegate.swift +++ b/xcode/App-iOS/SceneDelegate.swift @@ -8,6 +8,7 @@ import UIKit +// https://developer.apple.com/documentation/uikit/app_and_environment/managing_your_app_s_life_cycle class SceneDelegate: UIResponder, UIWindowSceneDelegate { var window: UIWindow? @@ -20,4 +21,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { USLogStoreToFile() } + func sceneWillEnterForeground(_ scene: UIScene) { + if let viewController = window?.rootViewController as? ViewController { + viewController.updateEnableLoggerState() + } + } + } diff --git a/xcode/Userscripts.xcodeproj/project.pbxproj b/xcode/Userscripts.xcodeproj/project.pbxproj index 18fb5942..10708e48 100644 --- a/xcode/Userscripts.xcodeproj/project.pbxproj +++ b/xcode/Userscripts.xcodeproj/project.pbxproj @@ -13,15 +13,24 @@ 030FCADC2B189AAB004D13CD /* UrlPolyfill.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030FCAD52B1851F8004D13CD /* UrlPolyfill.swift */; }; 030FCADD2B18BF70004D13CD /* UrlPolyfill.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030FCAD52B1851F8004D13CD /* UrlPolyfill.swift */; }; 030FCADF2B18BF72004D13CD /* UrlPolyfill.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030FCAD52B1851F8004D13CD /* UrlPolyfill.swift */; }; + 032CBD3C2CBCF19A00B31D5E /* dist in Resources */ = {isa = PBXBuildFile; fileRef = 039F59522AD9591C002E9977 /* dist */; }; + 032CBD3D2CBCF1AB00B31D5E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4CF6E9270A38BD00111584 /* ViewController.swift */; }; + 032CBD3E2CBCF1AB00B31D5E /* USchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039F59552ADA2FE2002E9977 /* USchemeHandler.swift */; }; 0336619F294DF7C900CFE179 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0336619E294DF7C900CFE179 /* Functions.swift */; }; - 033661A529510B7900CFE179 /* View.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033661A329510B7900CFE179 /* View.storyboard */; }; 039F59532AD9591C002E9977 /* dist in Resources */ = {isa = PBXBuildFile; fileRef = 039F59522AD9591C002E9977 /* dist */; }; 039F59562ADA2FE2002E9977 /* USchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039F59552ADA2FE2002E9977 /* USchemeHandler.swift */; }; + 03B81A152CB8466F00B3D17C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B81A142CB8466B00B3D17C /* Logger.swift */; }; + 03B81A162CB8466F00B3D17C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B81A142CB8466B00B3D17C /* Logger.swift */; }; + 03B81A172CB8466F00B3D17C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B81A142CB8466B00B3D17C /* Logger.swift */; }; + 03B81A182CB8466F00B3D17C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B81A142CB8466B00B3D17C /* Logger.swift */; }; + 03B81A192CB8466F00B3D17C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B81A142CB8466B00B3D17C /* Logger.swift */; }; 03C24F972ABD2CBB00F130F9 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C24F962ABD2CBB00F130F9 /* Preferences.swift */; }; 03C24F982ABD2CBB00F130F9 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C24F962ABD2CBB00F130F9 /* Preferences.swift */; }; 03C24F992ABD2CBB00F130F9 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C24F962ABD2CBB00F130F9 /* Preferences.swift */; }; 03C24F9A2ABD2CBB00F130F9 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C24F962ABD2CBB00F130F9 /* Preferences.swift */; }; 03C24F9B2ABD2CBB00F130F9 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C24F962ABD2CBB00F130F9 /* Preferences.swift */; }; + 03D4054B2CC66DC90091FE6F /* Shared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 03D405482CC66DC90091FE6F /* Shared.xcassets */; }; + 03D4054D2CC66DC90091FE6F /* Shared.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 03D405482CC66DC90091FE6F /* Shared.xcassets */; }; 03E20D06291E170000B4F692 /* dist in Resources */ = {isa = PBXBuildFile; fileRef = 03E20D05291E170000B4F692 /* dist */; }; 03E20D07291E170000B4F692 /* dist in Resources */ = {isa = PBXBuildFile; fileRef = 03E20D05291E170000B4F692 /* dist */; }; 4A143AAC279DE6FF0029BFD0 /* UserscriptsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A143AAB279DE6FF0029BFD0 /* UserscriptsTests.swift */; }; @@ -41,7 +50,6 @@ 4A4CF710270A38BF00111584 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A4CF6F1270A38BF00111584 /* Assets.xcassets */; }; 4A57B9F2227235CD008A9763 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A57B9F1227235CD008A9763 /* AppDelegate.swift */; }; 4A57B9F5227235CD008A9763 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A57B9F3227235CD008A9763 /* Main.storyboard */; }; - 4A57B9F7227235CD008A9763 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A57B9F6227235CD008A9763 /* ViewController.swift */; }; 4A57B9F9227235CE008A9763 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A57B9F8227235CE008A9763 /* Assets.xcassets */; }; 4A57BA00227235CE008A9763 /* Userscripts-Mac-Safari-Extension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 4A57B9FF227235CE008A9763 /* Userscripts-Mac-Safari-Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 4A57BA08227235CE008A9763 /* SafariWebExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A57BA07227235CE008A9763 /* SafariWebExtensionHandler.swift */; }; @@ -109,11 +117,12 @@ 030FCAD32B182008004D13CD /* UrlCodecTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlCodecTests.swift; sourceTree = ""; }; 030FCAD52B1851F8004D13CD /* UrlPolyfill.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlPolyfill.swift; sourceTree = ""; }; 0336619E294DF7C900CFE179 /* Functions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = ""; }; - 033661A429510B7900CFE179 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/View.storyboard; sourceTree = ""; }; 039F59522AD9591C002E9977 /* dist */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dist; sourceTree = ""; }; 039F59552ADA2FE2002E9977 /* USchemeHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = USchemeHandler.swift; sourceTree = ""; }; 039F59662B03AE5A002E9977 /* Userscripts-Vite.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Userscripts-Vite.xcconfig"; sourceTree = ""; }; + 03B81A142CB8466B00B3D17C /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; 03C24F962ABD2CBB00F130F9 /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = ""; }; + 03D405482CC66DC90091FE6F /* Shared.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Shared.xcassets; sourceTree = ""; }; 03E20D05291E170000B4F692 /* dist */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dist; sourceTree = ""; }; 4A143AA9279DE6FF0029BFD0 /* Mac-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Mac-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 4A143AAB279DE6FF0029BFD0 /* UserscriptsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserscriptsTests.swift; sourceTree = ""; }; @@ -133,7 +142,6 @@ 4A57B9EF227235CD008A9763 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = ""; }; 4A57B9F1227235CD008A9763 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 4A57B9F4227235CD008A9763 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 4A57B9F6227235CD008A9763 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 4A57B9F8227235CE008A9763 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 4A57B9FA227235CE008A9763 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4A57B9FF227235CE008A9763 /* Userscripts-Mac-Safari-Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Userscripts-Mac-Safari-Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -196,6 +204,7 @@ isa = PBXGroup; children = ( 039F59512AD95485002E9977 /* Resources */, + 03D405482CC66DC90091FE6F /* Shared.xcassets */, 4A4CF6E9270A38BD00111584 /* ViewController.swift */, 039F59552ADA2FE2002E9977 /* USchemeHandler.swift */, ); @@ -269,10 +278,8 @@ 4A57B9EF227235CD008A9763 /* App.entitlements */, 4A57B9F8227235CE008A9763 /* Assets.xcassets */, 4A57B9F1227235CD008A9763 /* AppDelegate.swift */, - 4A57B9F6227235CD008A9763 /* ViewController.swift */, 0336619E294DF7C900CFE179 /* Functions.swift */, 4A57B9F3227235CD008A9763 /* Main.storyboard */, - 033661A329510B7900CFE179 /* View.storyboard */, ); path = "App-Mac"; sourceTree = ""; @@ -319,6 +326,7 @@ 78B25581299D4C27000B2E9B /* Shared */ = { isa = PBXGroup; children = ( + 03B81A142CB8466B00B3D17C /* Logger.swift */, 78B25582299D4C27000B2E9B /* Utilities.swift */, 03C24F962ABD2CBB00F130F9 /* Preferences.swift */, 030FCAD52B1851F8004D13CD /* UrlPolyfill.swift */, @@ -492,6 +500,7 @@ files = ( 4A4CF6F0270A38BD00111584 /* Main.storyboard in Resources */, 4A4CF6ED270A38BD00111584 /* LaunchScreen.storyboard in Resources */, + 03D4054B2CC66DC90091FE6F /* Shared.xcassets in Resources */, 030C64F62AC62CC900548FBD /* Settings.bundle in Resources */, 4A4CF710270A38BF00111584 /* Assets.xcassets in Resources */, 039F59532AD9591C002E9977 /* dist in Resources */, @@ -513,7 +522,8 @@ buildActionMask = 2147483647; files = ( 4A57B9F9227235CE008A9763 /* Assets.xcassets in Resources */, - 033661A529510B7900CFE179 /* View.storyboard in Resources */, + 032CBD3C2CBCF19A00B31D5E /* dist in Resources */, + 03D4054D2CC66DC90091FE6F /* Shared.xcassets in Resources */, 4A57B9F5227235CD008A9763 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -610,6 +620,7 @@ 03C24F9B2ABD2CBB00F130F9 /* Preferences.swift in Sources */, 78B25587299D4C27000B2E9B /* Utilities.swift in Sources */, 4A143AAC279DE6FF0029BFD0 /* UserscriptsTests.swift in Sources */, + 03B81A152CB8466F00B3D17C /* Logger.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -624,6 +635,7 @@ 78B25585299D4C27000B2E9B /* Utilities.swift in Sources */, 4A4CF6E8270A38BD00111584 /* SceneDelegate.swift in Sources */, 039F59562ADA2FE2002E9977 /* USchemeHandler.swift in Sources */, + 03B81A162CB8466F00B3D17C /* Logger.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -632,6 +644,7 @@ buildActionMask = 2147483647; files = ( 78B25586299D4C27000B2E9B /* Utilities.swift in Sources */, + 03B81A182CB8466F00B3D17C /* Logger.swift in Sources */, 4A301B2A270A474400C7E9E1 /* SafariWebExtensionHandler.swift in Sources */, 030FCADD2B18BF70004D13CD /* UrlPolyfill.swift in Sources */, 03C24F9A2ABD2CBB00F130F9 /* Preferences.swift in Sources */, @@ -643,11 +656,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4A57B9F7227235CD008A9763 /* ViewController.swift in Sources */, + 03B81A172CB8466F00B3D17C /* Logger.swift in Sources */, 4A57B9F2227235CD008A9763 /* AppDelegate.swift in Sources */, 03C24F972ABD2CBB00F130F9 /* Preferences.swift in Sources */, 78B25583299D4C27000B2E9B /* Utilities.swift in Sources */, 0336619F294DF7C900CFE179 /* Functions.swift in Sources */, + 032CBD3D2CBCF1AB00B31D5E /* ViewController.swift in Sources */, + 032CBD3E2CBCF1AB00B31D5E /* USchemeHandler.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -656,6 +671,7 @@ buildActionMask = 2147483647; files = ( 78B25584299D4C27000B2E9B /* Utilities.swift in Sources */, + 03B81A192CB8466F00B3D17C /* Logger.swift in Sources */, 4A57BA08227235CE008A9763 /* SafariWebExtensionHandler.swift in Sources */, 030FCADF2B18BF72004D13CD /* UrlPolyfill.swift in Sources */, 03C24F982ABD2CBB00F130F9 /* Preferences.swift in Sources */, @@ -684,14 +700,6 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 033661A329510B7900CFE179 /* View.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 033661A429510B7900CFE179 /* Base */, - ); - name = View.storyboard; - sourceTree = ""; - }; 4A4CF6EB270A38BD00111584 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( From 87f620a9864dd19717a40f6eea474e08006fe09f Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:32:29 +0800 Subject: [PATCH 006/110] refactor: prepare for adaptive background colors --- xcode/App-Mac/AppDelegate.swift | 4 +- .../App-Shared/Shared.xcassets/Contents.json | 6 +++ .../USBackgroundColor.colorset/Contents.json | 38 +++++++++++++++++++ xcode/App-Shared/ViewController.swift | 4 +- 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 xcode/App-Shared/Shared.xcassets/Contents.json create mode 100644 xcode/App-Shared/Shared.xcassets/USBackgroundColor.colorset/Contents.json diff --git a/xcode/App-Mac/AppDelegate.swift b/xcode/App-Mac/AppDelegate.swift index cf41daac..79c286dc 100644 --- a/xcode/App-Mac/AppDelegate.swift +++ b/xcode/App-Mac/AppDelegate.swift @@ -58,7 +58,9 @@ class AppDelegate: NSObject, NSApplicationDelegate { window.titlebarAppearsTransparent = true // Initialize webview window.contentViewController = ViewController() - window.backgroundColor = .clear // DEBUG + // https://developer.apple.com/documentation/uikit/appearance_customization/supporting_dark_mode_in_your_interface#2993897 + window.backgroundColor = NSColor(named: NSColor.Name("USBackgroundColor")) +// window.backgroundColor = .clear // DEBUG window.center() window.setIsVisible(true) window.makeMain() diff --git a/xcode/App-Shared/Shared.xcassets/Contents.json b/xcode/App-Shared/Shared.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/xcode/App-Shared/Shared.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xcode/App-Shared/Shared.xcassets/USBackgroundColor.colorset/Contents.json b/xcode/App-Shared/Shared.xcassets/USBackgroundColor.colorset/Contents.json new file mode 100644 index 00000000..fad1a4bb --- /dev/null +++ b/xcode/App-Shared/Shared.xcassets/USBackgroundColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x39", + "green" : "0x36", + "red" : "0x32" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x39", + "green" : "0x36", + "red" : "0x32" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xcode/App-Shared/ViewController.swift b/xcode/App-Shared/ViewController.swift index ba4a47e6..61f98471 100644 --- a/xcode/App-Shared/ViewController.swift +++ b/xcode/App-Shared/ViewController.swift @@ -39,7 +39,9 @@ class ViewController: PlatformViewController, WKNavigationDelegate, WKScriptMess self.webView = WKWebView(frame: .zero, configuration: configuration) #if os(iOS) self.webView.isOpaque = false - self.webView.backgroundColor = .clear + // https://developer.apple.com/documentation/uikit/appearance_customization/supporting_dark_mode_in_your_interface#2993897 + self.webView.backgroundColor = UIColor(named: "USBackgroundColor") +// self.webView.backgroundColor = .clear // DEBUG // self.webView.scrollView.isScrollEnabled = false #elseif os(macOS) self.webView.frame = NSRect(x: 0, y: 0, width: 600, height: 600) From 13f0e39a53d620ba782918622121410a72bb2f77 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Mon, 23 Dec 2024 10:55:10 +0800 Subject: [PATCH 007/110] feat: add custom i18n implementation and l10n --- src/app/_locales/en/messages.json | 65 ++++++++++++ src/app/_locales/en/native-logger-caveat.md | 5 + src/app/_locales/en/quick-start-guide-ios.md | 21 ++++ src/app/_locales/en/quick-start-guide-mac.md | 16 +++ src/app/_locales/zh/messages.json | 65 ++++++++++++ src/app/_locales/zh/native-logger-caveat.md | 5 + src/app/_locales/zh/quick-start-guide-ios.md | 21 ++++ src/app/_locales/zh/quick-start-guide-mac.md | 16 +++ src/app/i18n.js | 105 +++++++++++++++++++ src/app/types.d.ts | 26 +++++ 10 files changed, 345 insertions(+) create mode 100644 src/app/_locales/en/messages.json create mode 100644 src/app/_locales/en/native-logger-caveat.md create mode 100644 src/app/_locales/en/quick-start-guide-ios.md create mode 100644 src/app/_locales/en/quick-start-guide-mac.md create mode 100644 src/app/_locales/zh/messages.json create mode 100644 src/app/_locales/zh/native-logger-caveat.md create mode 100644 src/app/_locales/zh/quick-start-guide-ios.md create mode 100644 src/app/_locales/zh/quick-start-guide-mac.md create mode 100644 src/app/i18n.js create mode 100644 src/app/types.d.ts diff --git a/src/app/_locales/en/messages.json b/src/app/_locales/en/messages.json new file mode 100644 index 00000000..f5e1b31c --- /dev/null +++ b/src/app/_locales/en/messages.json @@ -0,0 +1,65 @@ +{ + "enabled": { + "message": "Enabled" + }, + "disabled": { + "message": "Disabled" + }, + "unknown": { + "message": "Unknown" + }, + "error": { + "message": "Error" + }, + "button_ok": { + "message": "OK" + }, + "button_dismiss": { + "message": "Dismiss" + }, + "button_disable": { + "message": "Disable" + }, + "safari_extension_status": { + "message": "Safari Extension Status" + }, + "native_logger_enabled_title": { + "message": "Native Logger Enabled" + }, + "quick_start_guide_title": { + "message": "Quick Start Guide" + }, + "open_safari_settings": { + "message": "Open Safari Settings" + }, + "open_safari_preferences": { + "message": "Open Safari Preferences" + }, + "show_usage_guide": { + "message": "Show Usage Guide" + }, + "change_directory": { + "message": "Change Userscripts Directory" + }, + "current_directory": { + "message": "CURRENT DIRECTORY:" + }, + "documentation": { + "message": "Documentation" + }, + "discussions": { + "message": "Discussions" + }, + "report_an_issue": { + "message": "Report an Issue" + }, + "privacy_policy": { + "message": "Privacy Policy" + }, + "export_log_files": { + "message": "Export log files" + }, + "disable_logger": { + "message": "Disable Logger" + } +} diff --git a/src/app/_locales/en/native-logger-caveat.md b/src/app/_locales/en/native-logger-caveat.md new file mode 100644 index 00000000..f1ba6b62 --- /dev/null +++ b/src/app/_locales/en/native-logger-caveat.md @@ -0,0 +1,5 @@ +- The logger is for local debugging only and can be streamed through the macOS console while writing to a local file when enabled. +- You can repeat the steps to reproduce the issue after enabling it, then export the log files and inspect them in the app. +- There is no built-in upload function. If you need to submit it to developers, please manually attach the exported log files to your issue report. +- To reduce energy consumption and disk reading and writing, please disbale the logger promptly after debugging. +- If the log file exceeds $1, the logger will be automatically disbaled and the log files will be cleared. diff --git a/src/app/_locales/en/quick-start-guide-ios.md b/src/app/_locales/en/quick-start-guide-ios.md new file mode 100644 index 00000000..ca7632e9 --- /dev/null +++ b/src/app/_locales/en/quick-start-guide-ios.md @@ -0,0 +1,21 @@ +### Welcome to this project, you will need two main steps to make the extension work: + +- **Open the App and set a directory** + + - This directory is used to saving and loading your userscripts. + - A default local directory is already set when you first launch the App. + - Click the current directory to jump to the default directory or the one you set. + +- **Enable the extension in Safari** + + - Manage extensions from Settings App (Settings > Safari > Extensions) or Safari App (`AA` button on iPhone, `extension-icon` on iPad, also where you open the extension's `popup` interface) + - For optimal experience it's recommended that you `Always Allow` Userscripts for `All Websites`, but you could also allow only the sites you want, but please don't forget your settings when your script doesn't work. + +### So, how do you install a userscript? + +- Visit any `.user.js` URL in Safari, then open the extension popup and you will see an installation prompt, or it will pop up automatically if you have enhanced prompts turned on +- You can also save `.user.js` files directly to the Userscripts directory you set above, the script file must contain valid metadata block to match the page and be displayed in the extension popup + +### That’s it, start improving your quality of life now! + +_Hey, don't forget to read our detailed documentation to learn more._ diff --git a/src/app/_locales/en/quick-start-guide-mac.md b/src/app/_locales/en/quick-start-guide-mac.md new file mode 100644 index 00000000..aebf2665 --- /dev/null +++ b/src/app/_locales/en/quick-start-guide-mac.md @@ -0,0 +1,16 @@ +### Welcome to this project, you will need two main steps to make the extension work: + +- **Open the App and set a directory** + + - This directory is used to saving and loading your userscripts. + - A default local directory is already set when you first launch the App. + - Click the current directory to jump to the default directory or the one you set. + +- **Enable the extension in Safari** + + - Enable Userscripts in Safari extensions list + - For optimal experience it's recommended that you `Always Allow` Userscripts for `All Websites`, but you could also allow only the sites you want, but please don't forget your settings when your script doesn't work. + +That’s it, start improving your quality of life now! + +_Hey, don't forget to read our detailed documentation to learn more._ diff --git a/src/app/_locales/zh/messages.json b/src/app/_locales/zh/messages.json new file mode 100644 index 00000000..1bb714d2 --- /dev/null +++ b/src/app/_locales/zh/messages.json @@ -0,0 +1,65 @@ +{ + "enabled": { + "message": "已启用" + }, + "disabled": { + "message": "已停用" + }, + "unknown": { + "message": "未知" + }, + "error": { + "message": "错误" + }, + "button_ok": { + "message": "确定" + }, + "button_dismiss": { + "message": "关闭" + }, + "button_disable": { + "message": "停用" + }, + "safari_extension_status": { + "message": "Safari 扩展状态" + }, + "native_logger_enabled_title": { + "message": "本地日志记录器已启用" + }, + "quick_start_guide_title": { + "message": "快速入门指南" + }, + "open_safari_settings": { + "message": "打开 Safari 设置" + }, + "open_safari_preferences": { + "message": "打开 Safari 偏好" + }, + "show_usage_guide": { + "message": "显示使用指南" + }, + "change_directory": { + "message": "更改用户脚本目录" + }, + "current_directory": { + "message": "当前目录：" + }, + "documentation": { + "message": "详细文档" + }, + "discussions": { + "message": "交流讨论" + }, + "report_an_issue": { + "message": "报告问题" + }, + "privacy_policy": { + "message": "隐私政策" + }, + "export_log_files": { + "message": "导出日志文件" + }, + "disable_logger": { + "message": "停用日志记录" + } +} diff --git a/src/app/_locales/zh/native-logger-caveat.md b/src/app/_locales/zh/native-logger-caveat.md new file mode 100644 index 00000000..005723d0 --- /dev/null +++ b/src/app/_locales/zh/native-logger-caveat.md @@ -0,0 +1,5 @@ +- 日志记录器仅用于本地调试，开启期间可通过 macOS 控制台流式传输，同时写入本地文件。 +- 您可以在开启后重复复现问题的相关操作，然后在 App 中导出日志文件和检查它们。 +- 没有内建的上传功能，如需提交给开发者，请手动将导出的日志文件附加到您的问题报告中。 +- 为减少能耗和磁盘读写，请调试结束后及时关闭日志记录器。 +- 如日志文件超过 $1 将自动关闭日志记录器并清除日志。 diff --git a/src/app/_locales/zh/quick-start-guide-ios.md b/src/app/_locales/zh/quick-start-guide-ios.md new file mode 100644 index 00000000..507fb523 --- /dev/null +++ b/src/app/_locales/zh/quick-start-guide-ios.md @@ -0,0 +1,21 @@ +### 欢迎来到这个项目，您需要两个主要步骤来使扩展工作： + +- **打开 App 并设置目录** + + - 该目录用于保存和加载您的用户脚本 + - 首次启动 App 时已为您设置默认本地目录 + - 点击当前目录可跳转到默认目录或您设置的目录 + +- **在 Safari 中启用扩展** + + - 从设置应用程序（设置 > Safari > 扩展程序）或 Safari 应用程序（iPhone 上的“AA”按钮，iPad 上的“扩展图标”，也是您打开扩展程序的“弹出”界面的位置）管理扩展程序 + - 为了获得最佳体验，建议您“始终允许” Userscripts 为“所有网站”，但您也可以仅允许您想要的网站，但当您的脚本不起作用时，请不要忘记您的设置 + +### 那么，如何安装用户脚本？ + +- 在 Safari 中访问任何 `.user.js` 网址，然后打开扩展弹出窗口，您将看到安装提示；如果您启用了增强提示，它会自动弹出 +- 您还可以将 `.user.js` 文件直接保存到您上面设置的 Userscripts 目录中，脚本文件必须包含有效的元数据块以匹配页面并显示在扩展弹出窗口中 + +### 就这样，现在就开始改善您的生活质量吧！ + +_嘿，不要忘记阅读我们的详细文档以了解更多信息。_ diff --git a/src/app/_locales/zh/quick-start-guide-mac.md b/src/app/_locales/zh/quick-start-guide-mac.md new file mode 100644 index 00000000..22dc6831 --- /dev/null +++ b/src/app/_locales/zh/quick-start-guide-mac.md @@ -0,0 +1,16 @@ +### 欢迎来到这个项目，您需要两个主要步骤来使扩展工作： + +- **打开 App 并设置目录** + + - 该目录用于保存和加载您的用户脚本 + - 首次启动 App 时已为您设置默认本地目录 + - 点击当前目录可跳转到默认目录或您设置的目录 + +- **在 Safari 中启用扩展** + + - 在 Safari 扩展列表中启用 Userscripts + - 为了获得最佳体验，建议您“始终允许” Userscripts 为“所有网站”，但您也可以仅允许您想要的网站，但当您的脚本不起作用时，请不要忘记您的设置 + +就这样，现在就开始改善您的生活质量吧！ + +_嘿，不要忘记阅读我们的详细文档以了解更多信息。_ diff --git a/src/app/i18n.js b/src/app/i18n.js new file mode 100644 index 00000000..d582dc7f --- /dev/null +++ b/src/app/i18n.js @@ -0,0 +1,105 @@ +import messages_en from "./_locales/en/messages.json?url"; +import messages_zh from "./_locales/zh/messages.json?url"; + +import nativeLoggerCaveat_en from "./_locales/en/native-logger-caveat.md?url"; +import nativeLoggerCaveat_zh from "./_locales/zh/native-logger-caveat.md?url"; + +import quickStartGuide_mac_en from "./_locales/en/quick-start-guide-mac.md?url"; +import quickStartGuide_mac_zh from "./_locales/zh/quick-start-guide-mac.md?url"; +import quickStartGuide_ios_en from "./_locales/en/quick-start-guide-ios.md?url"; +import quickStartGuide_ios_zh from "./_locales/zh/quick-start-guide-ios.md?url"; + +/** @type {Types.MessagesL10n} */ +const messagesL10n = { + en: messages_en, + zh: messages_zh, +}; + +/** @type {Types.MarkdownL10n} */ +const markdownL10n = { + md_native_logger_caveat: { + en: nativeLoggerCaveat_en, + zh: nativeLoggerCaveat_zh, + }, + md_quick_start_guide: { + en: { mac: quickStartGuide_mac_en, ios: quickStartGuide_ios_en }, + zh: { mac: quickStartGuide_mac_zh, ios: quickStartGuide_ios_zh }, + }, +}; + +/** + * @param {Object} messages + * @param {string} messageName + * @param {string | string[]} substitutions + * @returns {string} + */ +function getLangFrom(messages, messageName, substitutions = undefined) { + if (!(messageName in messages)) { + console.warn(`i18n - "${messageName}" not found`, messages); + return ""; + } + /** @type {string} message */ + let text = messages[messageName].message; + // handle substitutions + if (typeof substitutions === "string") { + text = text.replace("$1", substitutions); + } else if (Array.isArray(substitutions)) { + for (let i = 0; i < substitutions.length; i++) { + text = text.replace(`$${i + 1}`, substitutions[i]); + } + } + if (import.meta.env.MODE === "development") { + console.debug("i18n", messages[messageName].message, text, substitutions); + } + return text; +} + +/** @type {Types.I18n} */ +export async function i18n(platform) { + /** @type {string} */ + let lang; + if (navigator.language in messagesL10n) { + lang = navigator.language; + } else { + const language = navigator.language.split("-").at(0); + lang = language in messagesL10n ? language : "en"; + } + if (import.meta.env.MODE === "development") { + // lang = "en"; // DEBUG + // lang = "zh"; // DEBUG + } + /** @type {Object} */ + let messages; + /** @type {Object} */ + let markdown = {}; + /** @type {() => Promise} */ + const fetchMessages = async () => { + const response = await fetch(messagesL10n[lang]); + messages = await response.json(); + }; + const promises = [fetchMessages()]; + /** @type {(name: string, url: string) => Promise} */ + const fetchMarkdown = async (name, url) => { + const response = await fetch(url); + markdown[name] = { message: await response.text() }; + }; + for (const [k, v] of Object.entries(markdownL10n)) { + const vl = v[lang]; + if (typeof vl === "string") { + promises.push(fetchMarkdown(k, vl)); + } else if (typeof vl === "object" && "mac" in vl && "ios" in vl) { + promises.push(fetchMarkdown(k, vl[platform])); + } + } + try { + await Promise.all(promises); + } catch (error) { + console.error(error); + } + if (import.meta.env.MODE === "development") { + console.debug(promises, messages, markdown); + } + return { + gl: (n, s) => getLangFrom({ ...messages, ...markdown }, n, s), + }; +} diff --git a/src/app/types.d.ts b/src/app/types.d.ts new file mode 100644 index 00000000..69eb0500 --- /dev/null +++ b/src/app/types.d.ts @@ -0,0 +1,26 @@ +declare namespace Types { + type L10nLanguages = "en" | "zh"; + + type MessagesL10n = { + [x in L10nLanguages]: string; + }; + + type MarkdownL10n = { + [x: string]: { + [x in L10nLanguages]: string | { [x in SystemPlatform]: string }; + }; + }; + + type GetLang = ( + messageName: string, + substitutions?: string | string[], + ) => string; + + type I18n = (platform: SystemPlatform) => Promise; + + interface I18nObject { + gl: GetLang; + } + + type SystemPlatform = "mac" | "ios"; +} From 69d53c437ad0c86c2fb17b6175c938f134fe8b15 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Fri, 27 Dec 2024 03:07:01 +0800 Subject: [PATCH 008/110] refactor: type-based i18n and l10n implementation --- src/app/_locales/en/messages.js | 85 +++++++++++++++++++++++++ src/app/_locales/en/messages.json | 65 ------------------- src/app/_locales/zh/messages.js | 85 +++++++++++++++++++++++++ src/app/_locales/zh/messages.json | 65 ------------------- src/app/i18n.js | 100 ++++++++---------------------- src/app/types.d.ts | 23 +++---- 6 files changed, 204 insertions(+), 219 deletions(-) create mode 100644 src/app/_locales/en/messages.js delete mode 100644 src/app/_locales/en/messages.json create mode 100644 src/app/_locales/zh/messages.js delete mode 100644 src/app/_locales/zh/messages.json diff --git a/src/app/_locales/en/messages.js b/src/app/_locales/en/messages.js new file mode 100644 index 00000000..4cee3c24 --- /dev/null +++ b/src/app/_locales/en/messages.js @@ -0,0 +1,85 @@ +import nativeLoggerCaveat from "./native-logger-caveat.md?raw"; +import quickStartGuideMac from "./quick-start-guide-mac.md?raw"; +import quickStartGuideIos from "./quick-start-guide-ios.md?raw"; + +import { marked } from "marked"; + +/** @satisfies {Types.I18nMessages} */ +export const markdown = { + native_logger_caveat: { + message: await marked.parse(nativeLoggerCaveat), + }, + quick_start_guide_mac: { + message: await marked.parse(quickStartGuideMac), + }, + quick_start_guide_ios: { + message: await marked.parse(quickStartGuideIos), + }, +}; + +/** @satisfies {Types.I18nMessages} */ +export const messages = { + enabled: { + message: "Enabled", + }, + disabled: { + message: "Disabled", + }, + unknown: { + message: "Unknown", + }, + error: { + message: "Error", + }, + button_ok: { + message: "OK", + }, + button_dismiss: { + message: "Dismiss", + }, + button_disable: { + message: "Disable", + }, + safari_extension_status: { + message: "Safari Extension Status", + }, + native_logger_enabled_title: { + message: "Native Logger Enabled", + }, + quick_start_guide_title: { + message: "Quick Start Guide", + }, + open_safari_settings: { + message: "Open Safari Settings", + }, + open_safari_preferences: { + message: "Open Safari Preferences", + }, + show_usage_guide: { + message: "Show Usage Guide", + }, + change_directory: { + message: "Change Userscripts Directory", + }, + current_directory: { + message: "CURRENT DIRECTORY:", + }, + documentation: { + message: "Documentation", + }, + discussions: { + message: "Discussions", + }, + report_an_issue: { + message: "Report an Issue", + }, + privacy_policy: { + message: "Privacy Policy", + }, + export_log_files: { + message: "Export log files", + }, + disable_logger: { + message: "Disable Logger", + }, +}; diff --git a/src/app/_locales/en/messages.json b/src/app/_locales/en/messages.json deleted file mode 100644 index f5e1b31c..00000000 --- a/src/app/_locales/en/messages.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "enabled": { - "message": "Enabled" - }, - "disabled": { - "message": "Disabled" - }, - "unknown": { - "message": "Unknown" - }, - "error": { - "message": "Error" - }, - "button_ok": { - "message": "OK" - }, - "button_dismiss": { - "message": "Dismiss" - }, - "button_disable": { - "message": "Disable" - }, - "safari_extension_status": { - "message": "Safari Extension Status" - }, - "native_logger_enabled_title": { - "message": "Native Logger Enabled" - }, - "quick_start_guide_title": { - "message": "Quick Start Guide" - }, - "open_safari_settings": { - "message": "Open Safari Settings" - }, - "open_safari_preferences": { - "message": "Open Safari Preferences" - }, - "show_usage_guide": { - "message": "Show Usage Guide" - }, - "change_directory": { - "message": "Change Userscripts Directory" - }, - "current_directory": { - "message": "CURRENT DIRECTORY:" - }, - "documentation": { - "message": "Documentation" - }, - "discussions": { - "message": "Discussions" - }, - "report_an_issue": { - "message": "Report an Issue" - }, - "privacy_policy": { - "message": "Privacy Policy" - }, - "export_log_files": { - "message": "Export log files" - }, - "disable_logger": { - "message": "Disable Logger" - } -} diff --git a/src/app/_locales/zh/messages.js b/src/app/_locales/zh/messages.js new file mode 100644 index 00000000..e69057b0 --- /dev/null +++ b/src/app/_locales/zh/messages.js @@ -0,0 +1,85 @@ +import nativeLoggerCaveat from "./native-logger-caveat.md?raw"; +import quickStartGuideMac from "./quick-start-guide-mac.md?raw"; +import quickStartGuideIos from "./quick-start-guide-ios.md?raw"; + +import { marked } from "marked"; + +/** @satisfies {typeof import("../en/messages.js").markdown} */ +export const markdown = { + native_logger_caveat: { + message: await marked.parse(nativeLoggerCaveat), + }, + quick_start_guide_mac: { + message: await marked.parse(quickStartGuideMac), + }, + quick_start_guide_ios: { + message: await marked.parse(quickStartGuideIos), + }, +}; + +/** @satisfies {typeof import("../en/messages.js").messages} */ +export const messages = { + enabled: { + message: "已启用", + }, + disabled: { + message: "已停用", + }, + unknown: { + message: "未知", + }, + error: { + message: "错误", + }, + button_ok: { + message: "确定", + }, + button_dismiss: { + message: "关闭", + }, + button_disable: { + message: "停用", + }, + safari_extension_status: { + message: "Safari 扩展状态", + }, + native_logger_enabled_title: { + message: "本地日志记录器已启用", + }, + quick_start_guide_title: { + message: "快速入门指南", + }, + open_safari_settings: { + message: "打开 Safari 设置", + }, + open_safari_preferences: { + message: "打开 Safari 偏好", + }, + show_usage_guide: { + message: "显示使用指南", + }, + change_directory: { + message: "更改用户脚本目录", + }, + current_directory: { + message: "当前目录：", + }, + documentation: { + message: "详细文档", + }, + discussions: { + message: "交流讨论", + }, + report_an_issue: { + message: "报告问题", + }, + privacy_policy: { + message: "隐私政策", + }, + export_log_files: { + message: "导出日志文件", + }, + disable_logger: { + message: "停用日志记录", + }, +}; diff --git a/src/app/_locales/zh/messages.json b/src/app/_locales/zh/messages.json deleted file mode 100644 index 1bb714d2..00000000 --- a/src/app/_locales/zh/messages.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "enabled": { - "message": "已启用" - }, - "disabled": { - "message": "已停用" - }, - "unknown": { - "message": "未知" - }, - "error": { - "message": "错误" - }, - "button_ok": { - "message": "确定" - }, - "button_dismiss": { - "message": "关闭" - }, - "button_disable": { - "message": "停用" - }, - "safari_extension_status": { - "message": "Safari 扩展状态" - }, - "native_logger_enabled_title": { - "message": "本地日志记录器已启用" - }, - "quick_start_guide_title": { - "message": "快速入门指南" - }, - "open_safari_settings": { - "message": "打开 Safari 设置" - }, - "open_safari_preferences": { - "message": "打开 Safari 偏好" - }, - "show_usage_guide": { - "message": "显示使用指南" - }, - "change_directory": { - "message": "更改用户脚本目录" - }, - "current_directory": { - "message": "当前目录：" - }, - "documentation": { - "message": "详细文档" - }, - "discussions": { - "message": "交流讨论" - }, - "report_an_issue": { - "message": "报告问题" - }, - "privacy_policy": { - "message": "隐私政策" - }, - "export_log_files": { - "message": "导出日志文件" - }, - "disable_logger": { - "message": "停用日志记录" - } -} diff --git a/src/app/i18n.js b/src/app/i18n.js index d582dc7f..8ed34019 100644 --- a/src/app/i18n.js +++ b/src/app/i18n.js @@ -1,34 +1,10 @@ -import messages_en from "./_locales/en/messages.json?url"; -import messages_zh from "./_locales/zh/messages.json?url"; - -import nativeLoggerCaveat_en from "./_locales/en/native-logger-caveat.md?url"; -import nativeLoggerCaveat_zh from "./_locales/zh/native-logger-caveat.md?url"; - -import quickStartGuide_mac_en from "./_locales/en/quick-start-guide-mac.md?url"; -import quickStartGuide_mac_zh from "./_locales/zh/quick-start-guide-mac.md?url"; -import quickStartGuide_ios_en from "./_locales/en/quick-start-guide-ios.md?url"; -import quickStartGuide_ios_zh from "./_locales/zh/quick-start-guide-ios.md?url"; - -/** @type {Types.MessagesL10n} */ -const messagesL10n = { - en: messages_en, - zh: messages_zh, -}; - -/** @type {Types.MarkdownL10n} */ -const markdownL10n = { - md_native_logger_caveat: { - en: nativeLoggerCaveat_en, - zh: nativeLoggerCaveat_zh, - }, - md_quick_start_guide: { - en: { mac: quickStartGuide_mac_en, ios: quickStartGuide_ios_en }, - zh: { mac: quickStartGuide_mac_zh, ios: quickStartGuide_ios_zh }, - }, -}; +/** + * @typedef {typeof import("./_locales/en/messages.js").messages} MessagesT + * @typedef {typeof import("./_locales/en/messages.js").markdown} MarkdownT + */ /** - * @param {Object} messages + * @param {Types.I18nMessages} messages * @param {string} messageName * @param {string | string[]} substitutions * @returns {string} @@ -54,52 +30,30 @@ function getLangFrom(messages, messageName, substitutions = undefined) { return text; } -/** @type {Types.I18n} */ -export async function i18n(platform) { - /** @type {string} */ - let lang; - if (navigator.language in messagesL10n) { - lang = navigator.language; - } else { - const language = navigator.language.split("-").at(0); - lang = language in messagesL10n ? language : "en"; +export async function i18nInit() { + const languages = [navigator.language.replace("-", "_")]; + if (["zh-HK", "zh-MO", "zh-TW"].includes(navigator.language)) { + languages.unshift("zh_Hant"); } + languages.push(navigator.language.split("-")[0]); + languages.push("en"); // fallback if (import.meta.env.MODE === "development") { - // lang = "en"; // DEBUG - // lang = "zh"; // DEBUG - } - /** @type {Object} */ - let messages; - /** @type {Object} */ - let markdown = {}; - /** @type {() => Promise} */ - const fetchMessages = async () => { - const response = await fetch(messagesL10n[lang]); - messages = await response.json(); - }; - const promises = [fetchMessages()]; - /** @type {(name: string, url: string) => Promise} */ - const fetchMarkdown = async (name, url) => { - const response = await fetch(url); - markdown[name] = { message: await response.text() }; - }; - for (const [k, v] of Object.entries(markdownL10n)) { - const vl = v[lang]; - if (typeof vl === "string") { - promises.push(fetchMarkdown(k, vl)); - } else if (typeof vl === "object" && "mac" in vl && "ios" in vl) { - promises.push(fetchMarkdown(k, vl[platform])); + // languages.unshift("en"); // DEBUG + } + for (const language of languages) { + try { + /** @type {{messages: MessagesT, markdown: MarkdownT}} */ + const module = await import(`./_locales/${language}/messages.js`); + const { messages, markdown } = module; + return { + /** @type {Types.GetLang} */ + gl: (n, s) => getLangFrom(messages, n, s), + /** @type {Types.GetLang} */ + md: (n, s) => getLangFrom(markdown, n, s), + }; + } catch (error) { + console.debug(error); } } - try { - await Promise.all(promises); - } catch (error) { - console.error(error); - } - if (import.meta.env.MODE === "development") { - console.debug(promises, messages, markdown); - } - return { - gl: (n, s) => getLangFrom({ ...messages, ...markdown }, n, s), - }; + throw Error("I18n initialization failed"); } diff --git a/src/app/types.d.ts b/src/app/types.d.ts index 69eb0500..e93b88d2 100644 --- a/src/app/types.d.ts +++ b/src/app/types.d.ts @@ -1,26 +1,17 @@ declare namespace Types { - type L10nLanguages = "en" | "zh"; - - type MessagesL10n = { - [x in L10nLanguages]: string; - }; - - type MarkdownL10n = { + /** @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/i18n/Locale-Specific_Message_reference} */ + type I18nMessages = { [x: string]: { - [x in L10nLanguages]: string | { [x in SystemPlatform]: string }; + message: string; + description?: string; + placeholders?: Object; }; }; - type GetLang = ( - messageName: string, + type GetLang = ( + messageName: T, substitutions?: string | string[], ) => string; - type I18n = (platform: SystemPlatform) => Promise; - - interface I18nObject { - gl: GetLang; - } - type SystemPlatform = "mac" | "ios"; } From 51febf61d3754690986901d21c4213b98da03126 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Fri, 27 Dec 2024 04:22:32 +0800 Subject: [PATCH 009/110] build: improve build processes and scripts --- .github/workflows/deployment.yaml | 6 +-- package.json | 17 +++----- scripts/build-app.js | 26 ----------- ...ld-ext-safari-15.js => build-safari-15.js} | 43 +++++++++++++------ ...xt-safari-16.4.js => build-safari-16.4.js} | 41 +++++++++++++----- scripts/{dev-ext-safari.js => dev-safari.js} | 14 +++--- scripts/utils.js | 6 +-- 7 files changed, 80 insertions(+), 73 deletions(-) delete mode 100644 scripts/build-app.js rename scripts/{build-ext-safari-15.js => build-safari-15.js} (69%) rename scripts/{build-ext-safari-16.4.js => build-safari-16.4.js} (72%) rename scripts/{dev-ext-safari.js => dev-safari.js} (93%) diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index e534bb34..62df6d21 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -30,12 +30,12 @@ jobs: [ -n "${{ steps.semver.outputs.prerelease }}" ] && exit 14 exit 0 fi - - run: npm install + - run: npm ci - run: npm run lint:js - run: npm run lint:css - - run: npm run build:${{ matrix.platform }}-beta + - run: BETA=1 npm run build:${{ matrix.platform }}-safari-15 if: ${{ github.event.release.prerelease }} - - run: npm run build:${{ matrix.platform }} + - run: npm run build:${{ matrix.platform }}-safari-15 if: ${{ ! github.event.release.prerelease }} - name: Set xcode version run: sudo xcode-select -s "/Applications/Xcode_15.4.app" # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md#xcode diff --git a/package.json b/package.json index 7c144e9c..6b9be72f 100644 --- a/package.json +++ b/package.json @@ -5,17 +5,12 @@ "sideEffects": false, "scripts": { "dev": "vite", - "dev:ext-safari-mac": "SAFARI_PLATFORM=mac node scripts/dev-ext-safari.js", - "dev:ext-safari-ios": "SAFARI_PLATFORM=ios node scripts/dev-ext-safari.js", - "build:mac": "npm run build:app && npm run build:ext-safari-mac", - "build:ios": "npm run build:app && npm run build:ext-safari-ios", - "build:mac-beta": "npm run build:app && BETA=1 npm run build:ext-safari-mac", - "build:ios-beta": "npm run build:app && BETA=1 npm run build:ext-safari-ios", - "build:app": "node scripts/build-app.js", - "build:ext-safari-mac": "SAFARI_PLATFORM=mac node scripts/build-ext-safari-15.js", - "build:ext-safari-ios": "SAFARI_PLATFORM=ios node scripts/build-ext-safari-15.js", - "build:ext-safari-mac-16.4": "SAFARI_PLATFORM=mac node scripts/build-ext-safari-16.4.js", - "build:ext-safari-ios-16.4": "SAFARI_PLATFORM=ios node scripts/build-ext-safari-16.4.js", + "dev:mac-safari": "SAFARI_PLATFORM=mac node scripts/dev-safari.js", + "dev:ios-safari": "SAFARI_PLATFORM=ios node scripts/dev-safari.js", + "build:mac-safari-15": "SAFARI_PLATFORM=mac node scripts/build-safari-15.js", + "build:ios-safari-15": "SAFARI_PLATFORM=ios node scripts/build-safari-15.js", + "build:mac-safari-16.4": "SAFARI_PLATFORM=mac node scripts/build-safari-16.4.js", + "build:ios-safari-16.4": "SAFARI_PLATFORM=ios node scripts/build-safari-16.4.js", "lint:js": "eslint . && prettier --check . --plugin prettier-plugin-svelte", "lint:css": "stylelint '**/*.{css,html,svelte}'", "prettier": "prettier --write . --plugin prettier-plugin-svelte" diff --git a/scripts/build-app.js b/scripts/build-app.js deleted file mode 100644 index 55fc3103..00000000 --- a/scripts/build-app.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file Build App WebView resources using the Vite JavaScript API - * @see {@link https://vitejs.dev/guide/api-javascript.html JavaScript API} - * - * All build processes start at the same time due to asynchronous calls - * The assets name is irrelevant, just need to determine the entry path - */ - -import { build } from "vite"; -import { svelte } from "@sveltejs/vite-plugin-svelte"; -import { baseConfig } from "./utils.js"; - -/** - * Build App-Shared WebView resources to xcode dist - */ -build({ - ...baseConfig, - plugins: [svelte()], - build: { - outDir: "xcode/App-Shared/Resources/dist/", - copyPublicDir: false, - rollupOptions: { - input: "entry-app-webview.html", - }, - }, -}); diff --git a/scripts/build-ext-safari-15.js b/scripts/build-safari-15.js similarity index 69% rename from scripts/build-ext-safari-15.js rename to scripts/build-safari-15.js index 56cd7fc8..7fe6c9c1 100644 --- a/scripts/build-ext-safari-15.js +++ b/scripts/build-safari-15.js @@ -1,11 +1,11 @@ /** - * @file Build Safari extension resources using the Vite JavaScript API + * @file Build App-WebView and Safari-Extension resources using the Vite JavaScript API * @see {@link https://vitejs.dev/guide/api-javascript.html JavaScript API} * * Safari supports for modules in background since 16.4 * @see {@link https://developer.apple.com/documentation/safari-release-notes/safari-16_4-release-notes#Safari-Extensions} * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/background#browser_compatibility} - * To ensure forward compatibility, background script use independent builds in v4 + * To ensure forward compatibility, background script use independent builds for safari 15 * * Content scripts not support import modules, and due to their privileges and the * speed of injecting user scripts, use a independent build currently @@ -25,16 +25,35 @@ const sharedConfig = { ...Utils.baseConfig.define, "import.meta.env.SAFARI_VERSION": JSON.stringify(15), }, + build: { + sourcemap: process.env.BETA ? true : false, + target: "safari15", + }, }; -const sourcemap = process.env.BETA ? true : false; + +/** + * Build App-Shared WebView resources to xcode dist + */ +build({ + ...Utils.baseConfig, + plugins: [svelte()], + build: { + ...sharedConfig.build, + outDir: `${Utils.APP_SHARED_RESOURCES}/dist/`, + copyPublicDir: false, + rollupOptions: { + input: "entry-app-webview.html", + }, + }, +}); /** * Empty resources directory * Copy public static assets */ -await Utils.emptyBuildDir(Utils.SAFARI_EXT_RESOURCES); -Utils.cp("public/ext/shared", Utils.SAFARI_EXT_RESOURCES); -Utils.cp("public/ext/safari-15", Utils.SAFARI_EXT_RESOURCES); +await Utils.emptyBuildDir(Utils.EXT_SAFARI_RESOURCES); +Utils.cp("public/ext/shared", Utils.EXT_SAFARI_RESOURCES); +Utils.cp("public/ext/safari-15", Utils.EXT_SAFARI_RESOURCES); /** Build content scripts */ [ @@ -45,10 +64,10 @@ Utils.cp("public/ext/safari-15", Utils.SAFARI_EXT_RESOURCES); build({ ...sharedConfig, build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/content-scripts/`, + ...sharedConfig.build, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/content-scripts/`, emptyOutDir: false, copyPublicDir: false, - sourcemap, rollupOptions: { input, output: { entryFileNames: "[name].js" }, @@ -61,10 +80,10 @@ Utils.cp("public/ext/safari-15", Utils.SAFARI_EXT_RESOURCES); build({ ...sharedConfig, build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/`, + ...sharedConfig.build, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/`, emptyOutDir: false, copyPublicDir: false, - sourcemap, rollupOptions: { input: { background: "src/ext/background/main.js" }, output: { entryFileNames: "[name].js" }, @@ -78,9 +97,9 @@ build({ plugins: [svelte()], publicDir: "public/ext/vendor/", build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/`, + ...sharedConfig.build, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/`, emptyOutDir: false, - sourcemap, rollupOptions: { input: ["entry-ext-action-popup.html", "entry-ext-extension-page.html"], }, diff --git a/scripts/build-ext-safari-16.4.js b/scripts/build-safari-16.4.js similarity index 72% rename from scripts/build-ext-safari-16.4.js rename to scripts/build-safari-16.4.js index f8278e1b..390b880a 100644 --- a/scripts/build-ext-safari-16.4.js +++ b/scripts/build-safari-16.4.js @@ -1,5 +1,5 @@ /** - * @file Build Safari extension resources using the Vite JavaScript API + * @file Build App-WebView and Safari-Extension resources using the Vite JavaScript API * @see {@link https://vitejs.dev/guide/api-javascript.html JavaScript API} * * Safari supports for modules in background since 16.4 @@ -24,16 +24,35 @@ const sharedConfig = { ...Utils.baseConfig.define, "import.meta.env.SAFARI_VERSION": JSON.stringify(16.4), }, + build: { + sourcemap: process.env.BETA ? true : false, + target: "safari16.4", + }, }; -const sourcemap = process.env.BETA ? true : false; + +/** + * Build App-Shared WebView resources to xcode dist + */ +build({ + ...Utils.baseConfig, + plugins: [svelte()], + build: { + ...sharedConfig.build, + outDir: `${Utils.APP_SHARED_RESOURCES}/dist/`, + copyPublicDir: false, + rollupOptions: { + input: "entry-app-webview.html", + }, + }, +}); /** * Empty resources directory * Copy public static assets */ -await Utils.emptyBuildDir(Utils.SAFARI_EXT_RESOURCES); -Utils.cp("public/ext/shared", Utils.SAFARI_EXT_RESOURCES); -Utils.cp("public/ext/safari-16.4", Utils.SAFARI_EXT_RESOURCES); +await Utils.emptyBuildDir(Utils.EXT_SAFARI_RESOURCES); +Utils.cp("public/ext/shared", Utils.EXT_SAFARI_RESOURCES); +Utils.cp("public/ext/safari-16.4", Utils.EXT_SAFARI_RESOURCES); /** Build content scripts */ [ @@ -44,10 +63,10 @@ Utils.cp("public/ext/safari-16.4", Utils.SAFARI_EXT_RESOURCES); build({ ...sharedConfig, build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/content-scripts/`, + ...sharedConfig.build, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/content-scripts/`, emptyOutDir: false, copyPublicDir: false, - sourcemap, rollupOptions: { input, output: { entryFileNames: "[name].js" }, @@ -64,10 +83,10 @@ Utils.cp("public/ext/safari-16.4", Utils.SAFARI_EXT_RESOURCES); build({ ...sharedConfig, build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/`, + ...sharedConfig.build, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/`, emptyOutDir: false, copyPublicDir: false, - sourcemap, rollupOptions: { input: { background: "src/ext/background/main.js" }, output: { entryFileNames: "[name].js" }, @@ -81,9 +100,9 @@ build({ plugins: [svelte()], publicDir: "public/ext/vendor/", build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/`, + ...sharedConfig.build, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/`, emptyOutDir: false, - sourcemap, rollupOptions: { input: { // background: "src/ext/background/main.js", diff --git a/scripts/dev-ext-safari.js b/scripts/dev-safari.js similarity index 93% rename from scripts/dev-ext-safari.js rename to scripts/dev-safari.js index 13e884f3..34943850 100644 --- a/scripts/dev-ext-safari.js +++ b/scripts/dev-safari.js @@ -33,18 +33,18 @@ async function buildResources(server, origin) { * copy public static assets */ await Utils.emptyBuildDir("dist"); - await Utils.emptyBuildDir(Utils.SAFARI_EXT_RESOURCES); - Utils.cp("public/ext/shared", Utils.SAFARI_EXT_RESOURCES); - Utils.cp("public/ext/shared-dev", Utils.SAFARI_EXT_RESOURCES); + await Utils.emptyBuildDir(Utils.EXT_SAFARI_RESOURCES); + Utils.cp("public/ext/shared", Utils.EXT_SAFARI_RESOURCES); + Utils.cp("public/ext/shared-dev", Utils.EXT_SAFARI_RESOURCES); if (process.env.SAFARI_PLATFORM === "ios") { Utils.cp( "public/ext/safari-dev/manifest-ios.json", - `${Utils.SAFARI_EXT_RESOURCES}/manifest.json`, + `${Utils.EXT_SAFARI_RESOURCES}/manifest.json`, ); } else { Utils.cp( "public/ext/safari-dev/manifest-mac.json", - `${Utils.SAFARI_EXT_RESOURCES}/manifest.json`, + `${Utils.EXT_SAFARI_RESOURCES}/manifest.json`, ); } @@ -81,7 +81,7 @@ async function buildResources(server, origin) { }, ], build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/content-scripts/`, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/content-scripts/`, emptyOutDir: false, copyPublicDir: false, rollupOptions: { @@ -128,7 +128,7 @@ async function buildResources(server, origin) { }, ], build: { - outDir: `${Utils.SAFARI_EXT_RESOURCES}/dist/`, + outDir: `${Utils.EXT_SAFARI_RESOURCES}/dist/`, emptyOutDir: false, rollupOptions: { input: { diff --git a/scripts/utils.js b/scripts/utils.js index f88bd921..4b7d04c1 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -35,8 +35,8 @@ import { const execFileAsync = promisify(execFile); /** Define shared constants */ -export const SAFARI_APP_RESOURCES = "xcode/App-Shared/Resources"; -export const SAFARI_EXT_RESOURCES = "xcode/Ext-Safari/Resources"; +export const APP_SHARED_RESOURCES = "xcode/App-Shared/Resources"; +export const EXT_SAFARI_RESOURCES = "xcode/Ext-Safari/Resources"; /** * If not then cd to root dir and returns the path @@ -59,7 +59,7 @@ export async function rootDir() { * @returns {Promise} */ export async function emptyBuildDir(dir) { - const buildPaths = ["dist", SAFARI_APP_RESOURCES, SAFARI_EXT_RESOURCES]; + const buildPaths = ["dist", EXT_SAFARI_RESOURCES]; if (!buildPaths.includes(dir)) { console.error("Non-build path, cannot be empty."); return false; From 4f767078748c9605e142ba1c6c59b2c10a7824b5 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Fri, 27 Dec 2024 04:34:06 +0800 Subject: [PATCH 010/110] build: update dependencies --- package-lock.json | 466 +++++++++++++++++++++++++--------------------- package.json | 7 +- 2 files changed, 258 insertions(+), 215 deletions(-) diff --git a/package-lock.json b/package-lock.json index a2460b76..d12d3e01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "userscripts", "devDependencies": { - "@sveltejs/vite-plugin-svelte": "^5.0.2", + "@sveltejs/vite-plugin-svelte": "^5.0.3", "@types/webextension-polyfill": "^0.12.1", "autoprefixer": "^10.4.20", "cm-show-invisibles": "^3.1.0", @@ -14,13 +14,14 @@ "eslint": "^9.17.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-svelte": "^2.46.1", + "marked": "^15.0.4", "prettier": "3.3.3", "prettier-plugin-svelte": "3.3.2", "stylelint": "^16.12.0", "stylelint-config-html": "^1.1.0", "stylelint-config-standard": "^36.0.0", - "svelte": "^5.14.0", - "vite": "^6.0.3" + "svelte": "^5.16.0", + "vite": "^6.0.6" } }, "node_modules/@ampproject/remapping": { @@ -148,9 +149,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz", - "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", + "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", "cpu": [ "ppc64" ], @@ -165,9 +166,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz", - "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", + "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", "cpu": [ "arm" ], @@ -182,9 +183,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz", - "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", + "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", "cpu": [ "arm64" ], @@ -199,9 +200,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz", - "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", + "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", "cpu": [ "x64" ], @@ -216,9 +217,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz", - "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", + "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", "cpu": [ "arm64" ], @@ -233,9 +234,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz", - "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", + "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", "cpu": [ "x64" ], @@ -250,9 +251,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz", - "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", + "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", "cpu": [ "arm64" ], @@ -267,9 +268,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz", - "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", + "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", "cpu": [ "x64" ], @@ -284,9 +285,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz", - "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", + "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", "cpu": [ "arm" ], @@ -301,9 +302,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz", - "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", + "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", "cpu": [ "arm64" ], @@ -318,9 +319,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz", - "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", + "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", "cpu": [ "ia32" ], @@ -335,9 +336,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz", - "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", + "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", "cpu": [ "loong64" ], @@ -352,9 +353,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz", - "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", + "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", "cpu": [ "mips64el" ], @@ -369,9 +370,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz", - "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", + "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", "cpu": [ "ppc64" ], @@ -386,9 +387,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz", - "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", + "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", "cpu": [ "riscv64" ], @@ -403,9 +404,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz", - "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", + "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", "cpu": [ "s390x" ], @@ -420,9 +421,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz", - "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", + "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==", "cpu": [ "x64" ], @@ -436,10 +437,27 @@ "node": ">=18" } }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", + "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz", - "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", + "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", "cpu": [ "x64" ], @@ -454,9 +472,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz", - "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", + "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", "cpu": [ "arm64" ], @@ -471,9 +489,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz", - "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", + "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", "cpu": [ "x64" ], @@ -488,9 +506,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz", - "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", + "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", "cpu": [ "x64" ], @@ -505,9 +523,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz", - "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", + "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", "cpu": [ "arm64" ], @@ -522,9 +540,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz", - "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", + "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", "cpu": [ "ia32" ], @@ -539,9 +557,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz", - "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", + "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", "cpu": [ "x64" ], @@ -840,9 +858,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz", - "integrity": "sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz", + "integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==", "cpu": [ "arm" ], @@ -854,9 +872,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz", - "integrity": "sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz", + "integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==", "cpu": [ "arm64" ], @@ -868,9 +886,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz", - "integrity": "sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz", + "integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==", "cpu": [ "arm64" ], @@ -882,9 +900,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz", - "integrity": "sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz", + "integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==", "cpu": [ "x64" ], @@ -896,9 +914,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz", - "integrity": "sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz", + "integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==", "cpu": [ "arm64" ], @@ -910,9 +928,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz", - "integrity": "sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz", + "integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==", "cpu": [ "x64" ], @@ -924,9 +942,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz", - "integrity": "sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz", + "integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==", "cpu": [ "arm" ], @@ -938,9 +956,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz", - "integrity": "sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz", + "integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==", "cpu": [ "arm" ], @@ -952,9 +970,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz", - "integrity": "sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz", + "integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==", "cpu": [ "arm64" ], @@ -966,9 +984,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz", - "integrity": "sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz", + "integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==", "cpu": [ "arm64" ], @@ -980,9 +998,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz", - "integrity": "sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz", + "integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==", "cpu": [ "loong64" ], @@ -994,9 +1012,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz", - "integrity": "sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz", + "integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==", "cpu": [ "ppc64" ], @@ -1008,9 +1026,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz", - "integrity": "sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz", + "integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==", "cpu": [ "riscv64" ], @@ -1022,9 +1040,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz", - "integrity": "sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz", + "integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==", "cpu": [ "s390x" ], @@ -1036,9 +1054,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz", - "integrity": "sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz", + "integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==", "cpu": [ "x64" ], @@ -1050,9 +1068,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz", - "integrity": "sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz", + "integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==", "cpu": [ "x64" ], @@ -1064,9 +1082,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz", - "integrity": "sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz", + "integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==", "cpu": [ "arm64" ], @@ -1078,9 +1096,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz", - "integrity": "sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz", + "integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==", "cpu": [ "ia32" ], @@ -1092,9 +1110,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz", - "integrity": "sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz", + "integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==", "cpu": [ "x64" ], @@ -1106,9 +1124,9 @@ ] }, "node_modules/@sveltejs/vite-plugin-svelte": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-5.0.2.tgz", - "integrity": "sha512-GElAxQMlznx1pRdodtkmiyBZcjlaJntJ8APa2hBhnbUAJqKAFGdmwjRPJhh+2DMxwARRLBzQIs/iZ5EbR4X/og==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-5.0.3.tgz", + "integrity": "sha512-MCFS6CrQDu1yGwspm4qtli0e63vaPCehf6V7pIMP15AsWgMKrqDGCPFF/0kn4SP0ii4aySu4Pa62+fIRGFMjgw==", "dev": true, "license": "MIT", "dependencies": { @@ -1402,9 +1420,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001688", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz", - "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==", + "version": "1.0.30001690", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", + "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", "dev": true, "funding": [ { @@ -1439,6 +1457,16 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/cm-show-invisibles": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cm-show-invisibles/-/cm-show-invisibles-3.1.0.tgz", @@ -1662,9 +1690,9 @@ } }, "node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.1.tgz", + "integrity": "sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==", "dev": true, "license": "BSD-2-Clause", "peer": true, @@ -1678,9 +1706,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.73", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz", - "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg==", + "version": "1.5.76", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz", + "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==", "dev": true, "license": "ISC" }, @@ -1726,9 +1754,9 @@ } }, "node_modules/esbuild": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz", - "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz", + "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1739,30 +1767,31 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.24.0", - "@esbuild/android-arm": "0.24.0", - "@esbuild/android-arm64": "0.24.0", - "@esbuild/android-x64": "0.24.0", - "@esbuild/darwin-arm64": "0.24.0", - "@esbuild/darwin-x64": "0.24.0", - "@esbuild/freebsd-arm64": "0.24.0", - "@esbuild/freebsd-x64": "0.24.0", - "@esbuild/linux-arm": "0.24.0", - "@esbuild/linux-arm64": "0.24.0", - "@esbuild/linux-ia32": "0.24.0", - "@esbuild/linux-loong64": "0.24.0", - "@esbuild/linux-mips64el": "0.24.0", - "@esbuild/linux-ppc64": "0.24.0", - "@esbuild/linux-riscv64": "0.24.0", - "@esbuild/linux-s390x": "0.24.0", - "@esbuild/linux-x64": "0.24.0", - "@esbuild/netbsd-x64": "0.24.0", - "@esbuild/openbsd-arm64": "0.24.0", - "@esbuild/openbsd-x64": "0.24.0", - "@esbuild/sunos-x64": "0.24.0", - "@esbuild/win32-arm64": "0.24.0", - "@esbuild/win32-ia32": "0.24.0", - "@esbuild/win32-x64": "0.24.0" + "@esbuild/aix-ppc64": "0.24.2", + "@esbuild/android-arm": "0.24.2", + "@esbuild/android-arm64": "0.24.2", + "@esbuild/android-x64": "0.24.2", + "@esbuild/darwin-arm64": "0.24.2", + "@esbuild/darwin-x64": "0.24.2", + "@esbuild/freebsd-arm64": "0.24.2", + "@esbuild/freebsd-x64": "0.24.2", + "@esbuild/linux-arm": "0.24.2", + "@esbuild/linux-arm64": "0.24.2", + "@esbuild/linux-ia32": "0.24.2", + "@esbuild/linux-loong64": "0.24.2", + "@esbuild/linux-mips64el": "0.24.2", + "@esbuild/linux-ppc64": "0.24.2", + "@esbuild/linux-riscv64": "0.24.2", + "@esbuild/linux-s390x": "0.24.2", + "@esbuild/linux-x64": "0.24.2", + "@esbuild/netbsd-arm64": "0.24.2", + "@esbuild/netbsd-x64": "0.24.2", + "@esbuild/openbsd-arm64": "0.24.2", + "@esbuild/openbsd-x64": "0.24.2", + "@esbuild/sunos-x64": "0.24.2", + "@esbuild/win32-arm64": "0.24.2", + "@esbuild/win32-ia32": "0.24.2", + "@esbuild/win32-x64": "0.24.2" } }, "node_modules/escalade": { @@ -1981,14 +2010,13 @@ } }, "node_modules/esrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/esrap/-/esrap-1.2.3.tgz", - "integrity": "sha512-ZlQmCCK+n7SGoqo7DnfKaP1sJZa49P01/dXzmjCASSo04p72w8EksT2NMK8CEX8DhKsfJXANioIw8VyHNsBfvQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/esrap/-/esrap-1.3.2.tgz", + "integrity": "sha512-C4PXusxYhFT98GjLSmb20k9PREuUdporer50dhzGuJu9IJXktbMddVCMLAERl5dAHyAi73GWWCE4FVHGP1794g==", "dev": true, "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15", - "@types/estree": "^1.0.1" + "@jridgewell/sourcemap-codec": "^1.4.15" } }, "node_modules/esrecurse": { @@ -2093,9 +2121,9 @@ } }, "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz", + "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==", "dev": true, "license": "ISC", "dependencies": { @@ -2610,15 +2638,28 @@ "license": "MIT" }, "node_modules/magic-string": { - "version": "0.30.15", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.15.tgz", - "integrity": "sha512-zXeaYRgZ6ldS1RJJUrMrYgNJ4fdwnyI6tVqoiIhyCyv5IVTK9BU8Ic2l253GGETQHxI4HNUwhJ3fjDhKqEoaAw==", + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } }, + "node_modules/marked": { + "version": "15.0.4", + "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.4.tgz", + "integrity": "sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==", + "dev": true, + "license": "MIT", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 18" + } + }, "node_modules/mathml-tag-names": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", @@ -3137,9 +3178,9 @@ } }, "node_modules/rollup": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.28.1.tgz", - "integrity": "sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==", + "version": "4.29.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz", + "integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==", "dev": true, "license": "MIT", "dependencies": { @@ -3153,25 +3194,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.28.1", - "@rollup/rollup-android-arm64": "4.28.1", - "@rollup/rollup-darwin-arm64": "4.28.1", - "@rollup/rollup-darwin-x64": "4.28.1", - "@rollup/rollup-freebsd-arm64": "4.28.1", - "@rollup/rollup-freebsd-x64": "4.28.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.28.1", - "@rollup/rollup-linux-arm-musleabihf": "4.28.1", - "@rollup/rollup-linux-arm64-gnu": "4.28.1", - "@rollup/rollup-linux-arm64-musl": "4.28.1", - "@rollup/rollup-linux-loongarch64-gnu": "4.28.1", - "@rollup/rollup-linux-powerpc64le-gnu": "4.28.1", - "@rollup/rollup-linux-riscv64-gnu": "4.28.1", - "@rollup/rollup-linux-s390x-gnu": "4.28.1", - "@rollup/rollup-linux-x64-gnu": "4.28.1", - "@rollup/rollup-linux-x64-musl": "4.28.1", - "@rollup/rollup-win32-arm64-msvc": "4.28.1", - "@rollup/rollup-win32-ia32-msvc": "4.28.1", - "@rollup/rollup-win32-x64-msvc": "4.28.1", + "@rollup/rollup-android-arm-eabi": "4.29.1", + "@rollup/rollup-android-arm64": "4.29.1", + "@rollup/rollup-darwin-arm64": "4.29.1", + "@rollup/rollup-darwin-x64": "4.29.1", + "@rollup/rollup-freebsd-arm64": "4.29.1", + "@rollup/rollup-freebsd-x64": "4.29.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.29.1", + "@rollup/rollup-linux-arm-musleabihf": "4.29.1", + "@rollup/rollup-linux-arm64-gnu": "4.29.1", + "@rollup/rollup-linux-arm64-musl": "4.29.1", + "@rollup/rollup-linux-loongarch64-gnu": "4.29.1", + "@rollup/rollup-linux-powerpc64le-gnu": "4.29.1", + "@rollup/rollup-linux-riscv64-gnu": "4.29.1", + "@rollup/rollup-linux-s390x-gnu": "4.29.1", + "@rollup/rollup-linux-x64-gnu": "4.29.1", + "@rollup/rollup-linux-x64-musl": "4.29.1", + "@rollup/rollup-win32-arm64-msvc": "4.29.1", + "@rollup/rollup-win32-ia32-msvc": "4.29.1", + "@rollup/rollup-win32-x64-msvc": "4.29.1", "fsevents": "~2.3.2" } }, @@ -3605,9 +3646,9 @@ } }, "node_modules/svelte": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.14.0.tgz", - "integrity": "sha512-xHrS9dd2Ci9GJd2sReNFqJztoe515wB4OzsPw4A8L2M6lddLFkREkWDJnM5DAND30Zyvjwc1icQVzH0F+Sdx5A==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.16.0.tgz", + "integrity": "sha512-Ygqsiac6UogVED2ruKclU+pOeMThxWtp9LG+li7BXeDKC2paVIsRTMkNmcON4Zejerd1s5sZHWx6ZtU85xklVg==", "dev": true, "license": "MIT", "dependencies": { @@ -3618,8 +3659,9 @@ "acorn-typescript": "^1.4.13", "aria-query": "^5.3.1", "axobject-query": "^4.1.0", + "clsx": "^2.1.1", "esm-env": "^1.2.1", - "esrap": "^1.2.3", + "esrap": "^1.3.2", "is-reference": "^3.0.3", "locate-character": "^3.0.0", "magic-string": "^0.30.11", @@ -3827,13 +3869,13 @@ "license": "MIT" }, "node_modules/vite": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz", - "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.6.tgz", + "integrity": "sha512-NSjmUuckPmDU18bHz7QZ+bTYhRR0iA72cs2QAxCqDpafJ0S6qetco0LB3WW2OxlMHS0JmAv+yZ/R3uPmMyGTjQ==", "dev": true, "license": "MIT", "dependencies": { - "esbuild": "^0.24.0", + "esbuild": "^0.24.2", "postcss": "^8.4.49", "rollup": "^4.23.0" }, diff --git a/package.json b/package.json index 6b9be72f..66da7865 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "prettier": "prettier --write . --plugin prettier-plugin-svelte" }, "devDependencies": { - "@sveltejs/vite-plugin-svelte": "^5.0.2", + "@sveltejs/vite-plugin-svelte": "^5.0.3", "@types/webextension-polyfill": "^0.12.1", "autoprefixer": "^10.4.20", "cm-show-invisibles": "^3.1.0", @@ -24,12 +24,13 @@ "eslint": "^9.17.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-svelte": "^2.46.1", + "marked": "^15.0.4", "prettier": "3.3.3", "prettier-plugin-svelte": "3.3.2", "stylelint": "^16.12.0", "stylelint-config-html": "^1.1.0", "stylelint-config-standard": "^36.0.0", - "svelte": "^5.14.0", - "vite": "^6.0.3" + "svelte": "^5.16.0", + "vite": "^6.0.6" } } From 9cac6ea039cd1757e98cc5209791a9335c929f59 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Fri, 27 Dec 2024 04:40:54 +0800 Subject: [PATCH 011/110] refactor: app and ext share style variables --- src/app/main.js | 2 +- src/ext/action-popup/main.js | 2 +- src/ext/extension-page/main.js | 2 +- src/ext/shared/variables.css | 51 ------------------------------- src/{app => shared}/variables.css | 0 5 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 src/ext/shared/variables.css rename src/{app => shared}/variables.css (100%) diff --git a/src/app/main.js b/src/app/main.js index 70c8f3a5..5dd79b20 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -1,5 +1,5 @@ import "./reset.css"; -import "./variables.css"; +import "../shared/variables.css"; import "./app.css"; import { mount } from "svelte"; import App from "./App.svelte"; diff --git a/src/ext/action-popup/main.js b/src/ext/action-popup/main.js index aa4dd8c8..37e7d5d3 100644 --- a/src/ext/action-popup/main.js +++ b/src/ext/action-popup/main.js @@ -1,5 +1,5 @@ import "../shared/reset.css"; -import "../shared/variables.css"; +import "../../shared/variables.css"; import "./app.css"; import { mount } from "svelte"; import App from "./App.svelte"; diff --git a/src/ext/extension-page/main.js b/src/ext/extension-page/main.js index 1635df3c..fb80f034 100644 --- a/src/ext/extension-page/main.js +++ b/src/ext/extension-page/main.js @@ -1,5 +1,5 @@ import "../shared/reset.css"; -import "../shared/variables.css"; +import "../../shared/variables.css"; import "./app.css"; import { mount } from "svelte"; import App from "./App.svelte"; diff --git a/src/ext/shared/variables.css b/src/ext/shared/variables.css deleted file mode 100644 index 04ab9458..00000000 --- a/src/ext/shared/variables.css +++ /dev/null @@ -1,51 +0,0 @@ -:root { - --border-radius: 0.188rem; - --box-shadow: 0 0.5rem 1rem 0 rgb(0 0 0 / 0.25); - --color-bg-primary: #323639; - --color-bg-secondary: #2f3337; - --color-script-highlighted: #364049; /* rgba(116, 178, 235, 0.1); */ - --color-black: #1d2023; - --color-blue: #74b1eb; - --color-green: #60f36c; - --color-grey: rgb(255 255 255 / 0.15); - --color-red: #ff453a; - --color-yellow: #e4f360; - --letter-spacing-large: -0.031rem; - --letter-spacing-default: -0.029rem; - --letter-spacing-medium: -0.018rem; - --letter-spacing-small: -0.008rem; - --opacity-disabled: 0.3; - --text-color-primary: rgb(255 255 255); - --text-color-secondary: rgb(255 255 255 / 0.65); - --text-color-disabled: rgb(255 255 255 / 0.4); - --font-family: -apple-system, "Helvetica Neue", "Helvetica", sans-serif; - --text-default: 1rem/1.5rem var(--font-family); - --text-large: 1.25rem/1.5rem var(--font-family); - --text-medium: 0.875rem/1.313rem var(--font-family); - --text-small: 0.719rem/1rem var(--font-family); - - /* editor variables */ - --editor-font: monaco, monospace; - --editor-font-size: 14px; - --editor-line-height: 24px; - --editor-invisible: rgb(255 255 255 / 0.15); - --editor-active-line: var(--color-bg-secondary); - --editor-selected-bg: rgb(116 178 235 / 0.35); - --editor-matched-highlight: rgb(116 178 235 / 0.2); - --editor-search-highlight: rgb(255 166 0 / 0.3); - --editor-number: #77e26a; - --editor-comment: rgb(255 255 255 / 0.35); - --editor-def: #efc371; - --editor-default: #cdcfd1; - --editor-keyword: #96c3ed; - --editor-atom: #59ebf5; - --editor-operator: #8c99a7; - --editor-property: #e86c8a; - --editor-string: #f5eea2; - --editor-string-2: #cdabff; - --editor-error: var(--color-red); - --editor-cursor: #e3e7eb; - --editor-matching-bracket-color: #fff; - --editor-matching-bracket-border: var(--editor-number); - --editor-non-matching-bracket: var(--editor-error); -} diff --git a/src/app/variables.css b/src/shared/variables.css similarity index 100% rename from src/app/variables.css rename to src/shared/variables.css From 8c51eac7b8401e171744be9c6248ae1acbbe8bd3 Mon Sep 17 00:00:00 2001 From: ACTCD <101378590+ACTCD@users.noreply.github.com> Date: Sat, 28 Dec 2024 14:51:34 +0800 Subject: [PATCH 012/110] feat: native logger interaction in webview and better OOBE --- src/app/App.svelte | 326 ++++++++++++++++--- src/app/_locales/en/quick-start-guide-ios.md | 2 +- src/app/_locales/en/quick-start-guide-mac.md | 2 +- src/app/app.css | 100 ++++-- src/app/global.d.ts | 8 +- src/app/reset.css | 2 - src/app/types.d.ts | 26 ++ src/ext/shared/Components/Dropdown.svelte | 9 +- src/ext/shared/img/icon-bug.svg | 1 + 9 files changed, 392 insertions(+), 84 deletions(-) create mode 100644 src/ext/shared/img/icon-bug.svg diff --git a/src/app/App.svelte b/src/app/App.svelte index 1c6e2973..26c0df01 100644 --- a/src/app/App.svelte +++ b/src/app/App.svelte @@ -1,19 +1,82 @@ + +
{#await initialize() then app} -
+ {#if OOBE} +
+
{gl("quick_start_guide_title")}
+ + {@html OOBEText} + +
+ {/if} + {#if promptLogger} +
+
+
{gl("native_logger_enabled_title")}
+ + {@html promptLoggerText} +
+ + +
+
+
+ {/if} + {#if enableLogger} +
+ + + + +
+ {/if} +
Userscripts App Icon {import.meta.env.GIT_TAG} - ( - {import.meta.env.GIT_COMMIT.slice(0, 7)} - ) + ( + {import.meta.env.GIT_COMMIT.slice(0, 7)} + ) {:else} v{app.version} ({app.build}) {/if}
+ {#if platform === "mac"} +
+ + {gl("safari_extension_status")}: + {gl(extStatus)} +
+ + {/if}
-

- You can turn on the Userscripts iOS Safari extension in Settings or - Safari, then use the extension in Safari. Please refer to the "Usage" - section in the - README of this version. -

+
- -
CURRENT DIRECTORY:
- +
{gl("current_directory")}
+
+
+
+ {gl("documentation")} + {gl("discussions")} + {gl("report_an_issue")} + {gl("privacy_policy")} +
+
{:catch error}
{error}
{/await} - -
-
- Documentation - Discussions - Report an Issue - Privacy Policy -
-
diff --git a/src/app/_locales/en/quick-start-guide-ios.md b/src/app/_locales/en/quick-start-guide-ios.md index ca7632e9..81b3c128 100644 --- a/src/app/_locales/en/quick-start-guide-ios.md +++ b/src/app/_locales/en/quick-start-guide-ios.md @@ -9,7 +9,7 @@ - **Enable the extension in Safari** - Manage extensions from Settings App (Settings > Safari > Extensions) or Safari App (`AA` button on iPhone, `extension-icon` on iPad, also where you open the extension's `popup` interface) - - For optimal experience it's recommended that you `Always Allow` Userscripts for `All Websites`, but you could also allow only the sites you want, but please don't forget your settings when your script doesn't work. + - For optimal experience it's recommended that you "Always Allow" Userscripts for "All Websites", but you could also allow only the sites you want, but please don't forget your settings when your script doesn't work. ### So, how do you install a userscript? diff --git a/src/app/_locales/en/quick-start-guide-mac.md b/src/app/_locales/en/quick-start-guide-mac.md index aebf2665..fd2eb836 100644 --- a/src/app/_locales/en/quick-start-guide-mac.md +++ b/src/app/_locales/en/quick-start-guide-mac.md @@ -9,7 +9,7 @@ - **Enable the extension in Safari** - Enable Userscripts in Safari extensions list - - For optimal experience it's recommended that you `Always Allow` Userscripts for `All Websites`, but you could also allow only the sites you want, but please don't forget your settings when your script doesn't work. + - For optimal experience it's recommended that you "Always Allow" Userscripts for "All Websites", but you could also allow only the sites you want, but please don't forget your settings when your script doesn't work. That’s it, start improving your quality of life now! diff --git a/src/app/app.css b/src/app/app.css index a5d041a3..1ecc5f9b 100644 --- a/src/app/app.css +++ b/src/app/app.css @@ -1,28 +1,20 @@ html { - font-size: 100%; - height: 100vh; - overflow: hidden; + height: auto; + overflow: visible; + overscroll-behavior: none; } body { - background-color: var(--color-bg-secondary); + background-color: var(--color-bg-primary); color: var(--text-color-primary); - font: var(--text-medium); - height: 100%; + font: var(--text-default); letter-spacing: var(--letter-spacing-medium); - position: relative; text-rendering: optimizelegibility; -webkit-font-smoothing: antialiased; } /* ios */ @supports (-webkit-touch-callout: none) { - html { - height: auto; - overflow: visible; - overscroll-behavior: none; - } - /** * Dynamic Type * https://support.apple.com/102453 @@ -45,25 +37,23 @@ body { } } -@media screen and (height <= 400px) { - html { - font-size: 80%; - } - - p { - font: var(--text-large); - letter-spacing: var(--letter-spacing-large); - } -} - -@media screen and (height >= 700px) and (width >= 600px) { - html { - font-size: 150%; - } +#app { + flex-direction: column; } -#app { - height: 100%; +address, +article, +aside, +button, +div, +footer, +header, +hgroup, +main, +nav, +search, +section { + display: flex; } button { @@ -73,9 +63,59 @@ button { user-select: none; } +button:disabled { + opacity: var(--opacity-disabled); + pointer-events: none; +} + +a, .link { background: none; color: var(--color-blue); cursor: pointer; text-decoration: underline; } + +.truncate { + flex-grow: 1; + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.flexible_space { + flex-grow: 1; +} + +x-markdown { + display: flex; + flex-direction: column; + overflow: scroll; + text-align: left; + gap: var(--gap); + padding: 0 3rem; + --gap: 0.75rem; +} + +@media (width < 500px) { + x-markdown { + padding: 0 1.5rem; + } +} + +x-markdown :is(h1, h2, h3, h4, h5, h6) { + padding: 0; + margin: 0; +} + +x-markdown ul { + display: flex; + flex-direction: column; + gap: var(--gap); + padding-left: 1.5rem; +} + +x-markdown > ul ul { + margin-top: var(--gap); +} diff --git a/src/app/global.d.ts b/src/app/global.d.ts index 6a83a4d5..b3f9487f 100644 --- a/src/app/global.d.ts +++ b/src/app/global.d.ts @@ -7,6 +7,8 @@ declare global { interface Window { webapp: { updateDirectory: (directory: string) => void; + updateExtStatus: (extStatus: ExtensionStatus) => void; + switchLogger: (enableLogger: boolean, promptLogger: boolean) => void; }; webkit: { messageHandlers: { @@ -20,10 +22,4 @@ declare global { } } -type MessageBody = "INIT" | "CHANGE_DIRECTORY" | "OPEN_DIRECTORY"; - -type MessageReply = T extends "INIT" - ? { build: string; version: string; directory: string } - : void; - export {}; diff --git a/src/app/reset.css b/src/app/reset.css index 5748075f..0b8335ad 100644 --- a/src/app/reset.css +++ b/src/app/reset.css @@ -10,9 +10,7 @@ p { } ul { - list-style: none; margin: 0; - padding: 0; } button, diff --git a/src/app/types.d.ts b/src/app/types.d.ts index e93b88d2..f282812b 100644 --- a/src/app/types.d.ts +++ b/src/app/types.d.ts @@ -14,4 +14,30 @@ declare namespace Types { ) => string; type SystemPlatform = "mac" | "ios"; + + type ExtensionStatus = "unknown" | "disabled" | "enabled" | "error"; + + type MessageBody = + | "INIT" + | "CHANGE_DIRECTORY" + | "OPEN_DIRECTORY" + | "SHOW_PREFERENCES" + | "EXPORT_LOG_FILES" + | "DISABLE_LOGGER" + | "DISMISS_LOGGER_PROMPT"; + + type MessageReply = T extends "INIT" + ? { + build: string; + version: string; + platform: SystemPlatform; + directory: string; + extStatus: ExtensionStatus; + useSettingsInsteadOfPreferences: boolean; + enableLogger: boolean; + promptLogger: boolean; + maxLogFileSize: number; + firstRunTime: number; + } + : void; } diff --git a/src/ext/shared/Components/Dropdown.svelte b/src/ext/shared/Components/Dropdown.svelte index 7acb0fcc..992a9a4b 100644 --- a/src/ext/shared/Components/Dropdown.svelte +++ b/src/ext/shared/Components/Dropdown.svelte @@ -4,6 +4,7 @@ export let icon = "plus"; export let disabled = false; export let title; + export let right = false; let active = false; @@ -37,7 +38,7 @@
-