Split ui.import() to re-order code to align between extension/userscript

Author: adamlui

chatgpt-widescreen/chromium/extension/content.js

@@ -11,23 +11,23 @@
         'components/buttons.js', 'components/modals.js', 'components/tooltip.js'
     ]) await import(chrome.runtime.getURL(resource))
 
-    // Import DATA
-    const { app } = await chrome.storage.sync.get('app'),
-          { sites } = await chrome.storage.sync.get('sites')
-
     // Init ENV context
     const env = {
         browser: { isMobile: chatgpt.browser.isMobile() }, site: /([^.]+)\.[^.]+$/.exec(location.hostname)[1], ui: {}}
     env.browser.isPortrait = env.browser.isMobile && (window.innerWidth < window.innerHeight)
-    ui.import({ site: env.site, sites }) // for ui.isFullWin() logic + sidebar selector/flag
-    env.ui.scheme = ui.getScheme()
+    ui.import({ site: env.site }) ; env.ui.scheme = ui.getScheme()
+
+    // Import DATA
+    const { app } = await chrome.storage.sync.get('app'),
+          { sites } = await chrome.storage.sync.get('sites')
 
     // Export DEPENDENCIES to imported resources
     chatbar.import({ site: env.site, sites }) // for conditional logic + sites.selectors
     dom.import({ scheme: env.ui.scheme }) // for dom.addRisingParticles()
     modals.import({ app, env }) // for app data + env.<browser|ui> flags
     settings.import({ site: env.site }) // to load/save active tab's settings
     tooltip.import({ site: env.site, sites }) // for tooltip.update() position logic
+    ui.import({ sites }) // for ui.isFullWin() sidebar selector/flag
 
     // Init SETTINGS
     const firstRunKey = `${env.site}_isFirstRun`

chatgpt-widescreen/firefox/extension/content.js

@@ -11,23 +11,23 @@
         'components/buttons.js', 'components/modals.js', 'components/tooltip.js'
     ]) await import(chrome.runtime.getURL(resource))
 
-    // Import DATA
-    const { app } = await chrome.storage.sync.get('app'),
-          { sites } = await chrome.storage.sync.get('sites')
-
     // Init ENV context
     const env = {
         browser: { isMobile: chatgpt.browser.isMobile() }, site: /([^.]+)\.[^.]+$/.exec(location.hostname)[1], ui: {}}
     env.browser.isPortrait = env.browser.isMobile && (window.innerWidth < window.innerHeight)
-    ui.import({ site: env.site, sites }) // for ui.isFullWin() logic + sidebar selector/flag
-    env.ui.scheme = ui.getScheme()
+    ui.import({ site: env.site }) ; env.ui.scheme = ui.getScheme()
+
+    // Import DATA
+    const { app } = await chrome.storage.sync.get('app'),
+          { sites } = await chrome.storage.sync.get('sites')
 
     // Export DEPENDENCIES to imported resources
     chatbar.import({ site: env.site, sites }) // for conditional logic + sites.selectors
     dom.import({ scheme: env.ui.scheme }) // for dom.addRisingParticles()
     modals.import({ app, env }) // for app data + env.<browser|ui> flags
     settings.import({ site: env.site }) // to load/save active tab's settings
     tooltip.import({ site: env.site, sites }) // for tooltip.update() position logic
+    ui.import({ sites }) // for ui.isFullWin() sidebar selector/flag
 
     // Init SETTINGS
     const firstRunKey = `${env.site}_isFirstRun`

chatgpt-widescreen/greasemonkey/chatgpt-widescreen-mode.user.js

@@ -235,7 +235,7 @@
 // @description:zu      Thuthukisa iChatGPT ngemodi zesikrini ezibanzi/egcwele/ephezulu + imodi yokuvimbela i-spam. Futhi isebenza ku-perplexity.ai + poe.com!
 // @author              Adam Lui
 // @namespace           https://github.com/adamlui
-// @version             2025.2.10.5
+// @version             2025.2.10.6
 // @license             MIT
 // @icon                https://assets.chatgptwidescreen.com/images/icons/widescreen-robot-emoji/icon48.png?v=844b16e
 // @icon64              https://assets.chatgptwidescreen.com/images/icons/widescreen-robot-emoji/icon64.png?v=844b16e
@@ -299,6 +299,7 @@
     env.browser.isPortrait = env.browser.isMobile && (window.innerWidth < window.innerHeight)
     env.scriptManager.supportsTooltips = env.scriptManager.name == 'Tampermonkey'
                                       && parseInt(env.scriptManager.version.split('.')[0]) >= 5
+    ui.import({ site: env.site }) ; env.ui.scheme = ui.getScheme()
     const xhr = typeof GM != 'undefined' && GM.xmlHttpRequest || GM_xmlhttpRequest
 
     // Init APP data
@@ -425,16 +426,13 @@
     modals.import({ app, env, updateCheck }) // for app data + env.<browser|ui> flags + modals.about() update btn
     settings.import({ app }) // for app.<msgs.configKeyPrefix>
     tooltip.import({ msgs: app.msgs, site: env.site, sites }) // for tooltip.update() i18n + position logic
-    ui.import({ site: env.site, sites }) // for ui.isFullWin() logic + sidebar selector/flag
+    ui.import({ sites }) // for ui.isFullWin() sidebar selector/flag
 
     // Init SETTINGS
     if (GM_getValue(`${app.configKeyPrefix}_isFirstRun`) == undefined) { // activate widescreen on install
         settings.save('wideScreen', true) ; settings.save('isFirstRun', false) }
     settings.load(sites[env.site].availFeatures)
 
-    // Init SCHEME
-    env.ui.scheme = ui.getScheme()
-
     // Define FUNCTIONS
 
     const menu = {