[FB] Workflow | ESM Migration

Floorp-Projects · May 4, 2024 · 60e846d · 60e846d
1 parent 3736131
commit 60e846d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 24 deletions.
diff --git a/.github/workflows/user-agent_scrape.yml b/.github/workflows/user-agent_scrape.yml
@@ -134,7 +134,7 @@ jobs:
           '  "linux": "${{ needs.linux.outputs.msedge_stable_ua }}",'
           "  \"mac\": \"$(echo "${{ needs.linux.outputs.msedge_stable_ua }}" | sed "s/X11; Linux x86_64/Macintosh; Intel Mac OS X 10_15_7/")\","
           '};'
-          "// First Aid for ESM migration"
+          "// ESM Migration"
           "window.FIREFOX_STABLE_UA = FIREFOX_STABLE_UA;"
           "window.CHROME_STABLE_UA = CHROME_STABLE_UA;"
           "window.MSEDGE_STABLE_UA = MSEDGE_STABLE_UA;"
@@ -153,7 +153,7 @@ jobs:
       - name: Commit & Push
         run: |
           cp ~/ua_data.js browser/extensions/webextensions/floorp-system/shared/ua_data.js
-          cp ~/ua_data.js browser/base/content/ua_data.js
+          cp ~/ua_data.js browser/base/content/browser-ua-data.mjs
           if [ "$(git diff HEAD)" != "" ]; then
             git config --global user.name "github-actions[bot]"
             git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"

diff --git a/browser/base/content/floorp-scripts.inc b/browser/base/content/floorp-scripts.inc
@@ -10,9 +10,9 @@ var { FloorpAppConstants } = ChromeUtils.importESModule(
     "resource:///modules/FloorpAppConstants.sys.mjs"
 );
 
-Services.scriptloader.loadSubScript("chrome://browser/content/ua_data.js", this);
-
+import("chrome://browser/content/browser-ua-data.mjs");
 import("chrome://browser/content/browser-overrides.mjs");
+
 import("chrome://browser/content/browser-commands.mjs").then(({ gFloorpCommands }) => {
     window.gFloorpCommands = gFloorpCommands
 });

diff --git a/browser/base/content/ua_data.js b/browser/base/content/ua_data.js
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
@@ -24,6 +24,7 @@ browser.jar:
   content/browser/browser-ssb-manager.mjs             (content/browser-ssb-manager.mjs)
   content/browser/browser-ssb-window.mjs              (content/browser-ssb-window.mjs)
   content/browser/browser-tabbar.mjs                  (content/browser-tabbar.mjs)
+  content/browser/browser-ua-data.mjs                 (content/browser-ua-data.mjs)
   content/browser/browser-UI-custom.mjs               (content/browser-UI-custom.mjs)
   content/browser/browser-verticaltabs.mjs            (content/browser-verticaltabs.mjs)
 
@@ -45,5 +46,4 @@ browser.jar:
 # library
   content/browser/BMS-extension-needs-white-bg.txt    (sidebar-extension/BMS-extension-needs-white-bg.txt)
   content/browser/qr-code-styling/qr-code-styling.js  (library/qr-code-styling/[email protected])
-  content/browser/ua_data.js                          (content/ua_data.js)