From 12c6e62e0a2d5c68a9e6372490ba880a3391f27b Mon Sep 17 00:00:00 2001
From: girst <girst@users.noreply.github.com>
Date: Mon, 5 Jun 2023 18:30:02 +0200
Subject: [PATCH] PathUtils not available in parent process

this allows us to revert to setting minimalVersion to 68; compat shims
will be reinstated in the next commit.

https://searchfox.org/mozilla-central/rev/346a76bee7dc0e60f8f2ae9690785e818bd05cec/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js#131
---
 extension/lib/config.coffee | 7 +++++--
 package.json                | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/extension/lib/config.coffee b/extension/lib/config.coffee
index a3bb267..220b68c 100644
--- a/extension/lib/config.coffee
+++ b/extension/lib/config.coffee
@@ -5,6 +5,8 @@ messageManager = require('./message-manager')
 utils = require('./utils')
 prefs = require('./prefs')
 
+{FileUtils} = ChromeUtils.import('resource://gre/modules/FileUtils.jsm')
+
 load = (vimfx, options = null, callback = ->) ->
   configDir = vimfx.options.config_file_directory
 
@@ -44,11 +46,12 @@ checkSandbox = (expandedDir) ->
 
 loadFile = (dir, file, scope) ->
   expandedDir = utils.expandPath(dir)
-  uri = PathUtils.toFileURI(PathUtils.join(expandedDir, file))
+  expandedFile = expandedDir + '/' + file
+  uri = Services.io.newFileURI(new FileUtils.File(expandedFile)).spec
   try
     Services.scriptloader.loadSubScriptWithOptions(uri, {
       target: Object.assign({
-        __dirname: PathUtils.toFileURI(expandedDir),
+        __dirname: Services.io.newFileURI(new FileUtils.File(expandedDir)).spec,
         Services: Services
       }, scope)
       charset: 'UTF-8'
diff --git a/package.json b/package.json
index 384482b..12d340b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "VimFx",
   "version": "0.26.0",
   "firefoxVersions": {
-    "min": "84.0",
+    "min": "68.0",
     "max": "*"
   },
   "license": "MIT",
-- 
2.39.3