comparing 3faec24277a1b08c8e002a84301b5fb5a5b985db and main on notnite.com/moonlight

+16

.github/workflows/nix.yml

···

       1
       1
       +
       name: Check Nix flake

     

       2
       2
       +
       on: [push, pull_request]

     

       3
       3
       +
       

     

       4
       4
       +
       permissions:

     

       5
       5
       +
         checks: write

     

       6
       6
       +
       

     

       7
       7
       +
       jobs:

     

       8
       8
       +
         nix:

     

       9
       9
       +
           name: Check Nix flake

     

       10
       10
       +
           runs-on: ubuntu-latest

     

       11
       11
       +
           steps:

     

       12
       12
       +
             - uses: actions/checkout@v4

     

       13
       13
       +
             - uses: DeterminateSystems/nix-installer-action@main

     

       14
       14
       +
       

     

       15
       15
       +
             - name: Build default flake output

     

       16
       16
       +
               run: nix build

+1

.github/workflows/types.yml

···

       17
       17
        
               with:

     

       18
       18
        
                 node-version: 22

     

       19
       19
        
                 cache: pnpm

     

       20
       20
       +
                 registry-url: https://registry.npmjs.org

     

       20
       21
        
       

     

       21
       22
        
             - name: Install dependencies

     

       22
       23
        
               run: pnpm install --frozen-lockfile

+2 -8

CHANGELOG.md

···

       1
       1
        
       ## Core

     

       2
       2
        
       

     

       3
       3
       -
       - Updated moonmap, now logs when remapped exports fail

     

       4
       4
       -
       - Updated mappings to fix Moonbase

     

       5
       5
       -
       

     

       6
       6
       -
       ## Core extensions

     

       7
       7
       -
       

     

       8
       8
       -
       - Extensions: Visual Refresh support for staff help button (devtools)

     

       9
       9
       -
       - Native Fixes: Added flag to enable HEVC on Linux (your mileage may vary)

     

       10
       10
       -
       - Moonbase: Added error boundaries, should no longer crash in most cases when things break

     

       3
       3
       +
       - Updated mappings

     

       4
       4
       +
       - Fixed using remapped paths as patch finds not working

+4 -73

flake.lock

···

       18
       18
        
               "type": "github"

     

       19
       19
        
             }

     

       20
       20
        
           },

     

       21
       21
       -
           "flake-utils_2": {

     

       22
       22
       -
             "inputs": {

     

       23
       23
       -
               "systems": "systems_2"

     

       24
       24
       -
             },

     

       25
       25
       -
             "locked": {

     

       26
       26
       -
               "lastModified": 1701680307,

     

       27
       27
       -
               "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",

     

       28
       28
       -
               "owner": "numtide",

     

       29
       29
       -
               "repo": "flake-utils",

     

       30
       30
       -
               "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",

     

       31
       31
       -
               "type": "github"

     

       32
       32
       -
             },

     

       33
       33
       -
             "original": {

     

       34
       34
       -
               "owner": "numtide",

     

       35
       35
       -
               "repo": "flake-utils",

     

       36
       36
       -
               "type": "github"

     

       37
       37
       -
             }

     

       38
       38
       -
           },

     

       39
       21
        
           "nixpkgs": {

     

       40
       22
        
             "locked": {

     

       41
       41
       -
               "lastModified": 1728067476,

     

       42
       42
       -
               "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",

     

       23
       23
       +
               "lastModified": 1744232761,

     

       24
       24
       +
               "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",

     

       43
       25
        
               "owner": "NixOS",

     

       44
       26
        
               "repo": "nixpkgs",

     

       45
       45
       -
               "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",

     

       27
       27
       +
               "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",

     

       46
       28
        
               "type": "github"

     

       47
       29
        
             },

     

       48
       30
        
             "original": {

     

       49
       31
        
               "owner": "NixOS",

     

       50
       50
       -
               "ref": "nixos-24.05",

     

       51
       51
       -
               "repo": "nixpkgs",

     

       52
       52
       -
               "type": "github"

     

       53
       53
       -
             }

     

       54
       54
       -
           },

     

       55
       55
       -
           "nixpkgs_2": {

     

       56
       56
       -
             "locked": {

     

       57
       57
       -
               "lastModified": 1736344531,

     

       58
       58
       -
               "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",

     

       59
       59
       -
               "owner": "nixos",

     

       60
       60
       -
               "repo": "nixpkgs",

     

       61
       61
       -
               "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",

     

       62
       62
       -
               "type": "github"

     

       63
       63
       -
             },

     

       64
       64
       -
             "original": {

     

       65
       65
       -
               "owner": "nixos",

     

       66
       32
        
               "ref": "nixos-unstable",

     

       67
       33
        
               "repo": "nixpkgs",

     

       68
       34
        
               "type": "github"

     

       69
       35
        
             }

     

       70
       36
        
           },

     

       71
       71
       -
           "pnpm2nix": {

     

       72
       72
       -
             "inputs": {

     

       73
       73
       -
               "flake-utils": "flake-utils_2",

     

       74
       74
       -
               "nixpkgs": "nixpkgs_2"

     

       75
       75
       -
             },

     

       76
       76
       -
             "locked": {

     

       77
       77
       -
               "lastModified": 1736457458,

     

       78
       78
       -
               "narHash": "sha256-eiw+hAsxavEgBfhwrktNI2hwvgeVDzBDYClx/yqka78=",

     

       79
       79
       -
               "owner": "NotNite",

     

       80
       80
       -
               "repo": "pnpm2nix-nzbr",

     

       81
       81
       -
               "rev": "4ac61c6a50623da937dca005e3dbcb8862aafb83",

     

       82
       82
       -
               "type": "github"

     

       83
       83
       -
             },

     

       84
       84
       -
             "original": {

     

       85
       85
       -
               "owner": "NotNite",

     

       86
       86
       -
               "repo": "pnpm2nix-nzbr",

     

       87
       87
       -
               "type": "github"

     

       88
       88
       -
             }

     

       89
       89
       -
           },

     

       90
       37
        
           "root": {

     

       91
       38
        
             "inputs": {

     

       92
       39
        
               "flake-utils": "flake-utils",

     

       93
       93
       -
               "nixpkgs": "nixpkgs",

     

       94
       94
       -
               "pnpm2nix": "pnpm2nix"

     

       40
       40
       +
               "nixpkgs": "nixpkgs"

     

       95
       41
        
             }

     

       96
       42
        
           },

     

       97
       43
        
           "systems": {

     

       98
       98
       -
             "locked": {

     

       99
       99
       -
               "lastModified": 1681028828,

     

       100
       100
       -
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       101
       101
       -
               "owner": "nix-systems",

     

       102
       102
       -
               "repo": "default",

     

       103
       103
       -
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       104
       104
       -
               "type": "github"

     

       105
       105
       -
             },

     

       106
       106
       -
             "original": {

     

       107
       107
       -
               "owner": "nix-systems",

     

       108
       108
       -
               "repo": "default",

     

       109
       109
       -
               "type": "github"

     

       110
       110
       -
             }

     

       111
       111
       -
           },

     

       112
       112
       -
           "systems_2": {

     

       113
       44
        
             "locked": {

     

       114
       45
        
               "lastModified": 1681028828,

     

       115
       46
        
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

+3 -4

flake.nix

···

       2
       2
        
         description = "Yet another Discord mod";

     

       3
       3
        
       

     

       4
       4
        
         inputs = {

     

       5
       5
       -
           nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";

     

       5
       5
       +
           nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

     

       6
       6
        
           flake-utils.url = "github:numtide/flake-utils";

     

       7
       7
       -
           pnpm2nix.url = "github:NotNite/pnpm2nix-nzbr";

     

       8
       7
        
         };

     

       9
       8
        
       

     

       10
       10
       -
         outputs = { self, nixpkgs, flake-utils, pnpm2nix }:

     

       11
       11
       -
           let overlay = import ./nix/overlay.nix { inherit pnpm2nix; };

     

       9
       9
       +
         outputs = { self, nixpkgs, flake-utils }:

     

       10
       10
       +
           let overlay = import ./nix/overlay.nix { };

     

       12
       11
        
           in flake-utils.lib.eachDefaultSystem (system:

     

       13
       12
        
             let

     

       14
       13
        
               pkgs = import nixpkgs {

+40 -17

nix/default.nix

···

       1
       1
       -
       { pkgs, mkPnpmPackage }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         nodejs_22,

     

       5
       5
       +
         pnpm_10,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
       +
         pname = "moonlight";

     

       10
       10
       +
         version = (builtins.fromJSON (builtins.readFile ./../package.json)).version;

     

       2
       11
        
       

     

       3
       3
       -
       mkPnpmPackage rec {

     

       4
       4
       -
         workspace = ./..;

     

       5
       12
        
         src = ./..;

     

       6
       13
        
       

     

       7
       7
       -
         # Work around a bug with how it expects dist

     

       8
       8
       -
         components = [

     

       9
       9
       -
           "packages/core"

     

       10
       10
       -
           "packages/core-extensions"

     

       11
       11
       -
           "packages/injector"

     

       12
       12
       -
           "packages/node-preload"

     

       13
       13
       -
           "packages/types"

     

       14
       14
       -
           "packages/web-preload"

     

       14
       14
       +
         nativeBuildInputs = [

     

       15
       15
       +
           nodejs_22

     

       16
       16
       +
           pnpm_10.configHook

     

       15
       17
        
         ];

     

       16
       16
       -
         distDirs = [ "dist" ];

     

       18
       18
       +
       

     

       19
       19
       +
         pnpmDeps = pnpm_10.fetchDeps {

     

       20
       20
       +
           inherit (finalAttrs) pname version src;

     

       21
       21
       +
           hash = "sha256-I+zRCUqJabpGJRFBGW0NrM9xzyzeCjioF54zlCpynBU=";

     

       22
       22
       +
         };

     

       17
       23
        
       

     

       18
       18
       -
         copyNodeModules = true;

     

       19
       19
       -
         buildPhase = "pnpm run build";

     

       20
       20
       -
         installPhase = "cp -r dist $out";

     

       24
       24
       +
         env = {

     

       25
       25
       +
           NODE_ENV = "production";

     

       26
       26
       +
           MOONLIGHT_VERSION = "v${finalAttrs.version}";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         buildPhase = ''

     

       30
       30
       +
           runHook preBuild

     

       21
       31
        
       

     

       22
       22
       -
         meta = with pkgs.lib; {

     

       32
       32
       +
           pnpm run build

     

       33
       33
       +
       

     

       34
       34
       +
           runHook postBuild

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         installPhase = ''

     

       38
       38
       +
           runHook preInstall

     

       39
       39
       +
       

     

       40
       40
       +
           cp -r dist $out

     

       41
       41
       +
       

     

       42
       42
       +
           runHook postInstall

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       23
       46
        
           description = "Yet another Discord mod";

     

       24
       47
        
           homepage = "https://moonlight-mod.github.io/";

     

       25
       48
        
           license = licenses.lgpl3;

     

       26
       49
        
           maintainers = with maintainers; [ notnite ];

     

       27
       50
        
         };

     

       28
       28
       -
       }

     

       51
       51
       +
       })

+3 -6

nix/overlay.nix

···

       1
       1
       -
       { pnpm2nix }:

     

       1
       1
       +
       { ... }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         nameTable = {

     
···

       29
       29
        
               '';

     

       30
       30
        
       

     

       31
       31
        
               packageJson = ''

     

       32
       32
       -
                 {"name":"discord","main":"./injector.js","private":true}

     

       32
       32
       +
                 {"name":"${name}","main":"./injector.js","private":true}

     

       33
       33
        
               '';

     

       34
       34
        
       

     

       35
       35
        
             in old.installPhase + "\n" + ''

     
···

       49
       49
        
             '';

     

       50
       50
        
           });

     

       51
       51
        
       in final: prev: rec {

     

       52
       52
       -
         moonlight-mod = final.callPackage ./default.nix {

     

       53
       53
       -
           pkgs = final;

     

       54
       54
       -
           mkPnpmPackage = pnpm2nix.packages.${final.system}.mkPnpmPackage;

     

       55
       55
       -
         };

     

       52
       52
       +
         moonlight-mod = final.callPackage ./default.nix { };

     

       56
       53
        
         discord = mkOverride prev moonlight-mod "discord";

     

       57
       54
        
         discord-ptb = mkOverride prev moonlight-mod "discord-ptb";

     

       58
       55
        
         discord-canary = mkOverride prev moonlight-mod "discord-canary";

+1 -1

package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "moonlight",

     

       3
       3
       -
         "version": "1.3.11",

     

       3
       3
       +
         "version": "1.3.14",

     

       4
       4
        
         "packageManager": "pnpm@10.7.1",

     

       5
       5
        
         "description": "Yet another Discord mod",

     

       6
       6
        
         "license": "LGPL-3.0-or-later",

+2 -1

packages/browser/blockLoading.json

···

       6
       6
        
             "type": "block"

     

       7
       7
        
           },

     

       8
       8
        
           "condition": {

     

       9
       9
       -
             "urlFilter": "*://discord.com/assets/*.js",

     

       9
       9
       +
             "requestDomains": ["discord.com", "discordapp.com"],

     

       10
       10
       +
             "urlFilter": "*/assets/*.js",

     

       10
       11
        
             "resourceTypes": ["script"]

     

       11
       12
        
           }

     

       12
       13
        
         }

+9 -4

packages/browser/manifest.json

···

       3
       3
        
         "manifest_version": 3,

     

       4
       4
        
         "name": "moonlight",

     

       5
       5
        
         "description": "Yet another Discord mod",

     

       6
       6
       -
         "version": "1.3.11",

     

       6
       6
       +
         "version": "1.3.14",

     

       7
       7
        
         "permissions": ["declarativeNetRequestWithHostAccess", "webRequest", "scripting", "webNavigation"],

     

       8
       8
       -
         "host_permissions": ["https://moonlight-mod.github.io/*", "https://api.github.com/*", "https://*.discord.com/*"],

     

       8
       8
       +
         "host_permissions": [

     

       9
       9
       +
           "https://moonlight-mod.github.io/*",

     

       10
       10
       +
           "https://api.github.com/*",

     

       11
       11
       +
           "https://*.discord.com/*",

     

       12
       12
       +
           "https://*.discordapp.com/*"

     

       13
       13
       +
         ],

     

       9
       14
        
         "content_scripts": [

     

       10
       15
        
           {

     

       11
       16
        
             "js": ["index.js"],

     

       12
       12
       -
             "matches": ["https://*.discord.com/*"],

     

       17
       17
       +
             "matches": ["https://*.discord.com/*", "https://*.discordapp.com/*"],

     

       13
       18
        
             "run_at": "document_start",

     

       14
       19
        
             "world": "MAIN"

     

       15
       20
        
           }

     
···

       35
       40
        
         "web_accessible_resources": [

     

       36
       41
        
           {

     

       37
       42
        
             "resources": ["index.js"],

     

       38
       38
       -
             "matches": ["https://*.discord.com/*"]

     

       43
       43
       +
             "matches": ["https://*.discord.com/*", "https://*.discordapp.com/*"]

     

       39
       44
        
           }

     

       40
       45
        
         ]

     

       41
       46
        
       }

+5 -5

packages/browser/manifestv2.json

···

       3
       3
        
         "manifest_version": 2,

     

       4
       4
        
         "name": "moonlight",

     

       5
       5
        
         "description": "Yet another Discord mod",

     

       6
       6
       -
         "version": "1.3.11",

     

       6
       6
       +
         "version": "1.3.14",

     

       7
       7
        
         "permissions": [

     

       8
       8
        
           "webRequest",

     

       9
       9
        
           "webRequestBlocking",

     

       10
       10
        
           "scripting",

     

       11
       11
        
           "webNavigation",

     

       12
       12
       -
           "https://*.discord.com/assets/*.js",

     

       12
       12
       +
           "https://*.discord.com/*",

     

       13
       13
       +
           "https://*.discordapp.com/*",

     

       13
       14
        
           "https://moonlight-mod.github.io/*",

     

       14
       14
       -
           "https://api.github.com/*",

     

       15
       15
       -
           "https://*.discord.com/*"

     

       15
       15
       +
           "https://api.github.com/*"

     

       16
       16
        
         ],

     

       17
       17
        
         "background": {

     

       18
       18
        
           "scripts": ["background.js"]

     
···

       20
       20
        
         "content_scripts": [

     

       21
       21
        
           {

     

       22
       22
        
             "js": ["index.js"],

     

       23
       23
       -
             "matches": ["https://*.discord.com/*"],

     

       23
       23
       +
             "matches": ["https://*.discord.com/*", "https://*.discordapp.com/*"],

     

       24
       24
        
             "run_at": "document_start",

     

       25
       25
        
             "world": "MAIN"

     

       26
       26
        
           }

+55 -70

packages/browser/src/background-mv2.js

···

       1
       1
        
       /* eslint-disable no-console */

     

       2
       2
        
       /* eslint-disable no-undef */

     

       3
       3
        
       

     

       4
       4
       -
       const starterUrls = ["web.", "sentry."];

     

       5
       5
       -
       let blockLoading = true;

     

       6
       6
       -
       let doing = false;

     

       7
       7
       -
       let collectedUrls = new Set();

     

       4
       4
       +
       const scriptUrls = ["web.", "sentry."];

     

       5
       5
       +
       let blockedScripts = new Set();

     

       8
       6
        
       

     

       9
       9
       -
       chrome.webNavigation.onBeforeNavigate.addListener(async (details) => {

     

       10
       10
       -
         const url = new URL(details.url);

     

       11
       11
       -
         if (!blockLoading && url.hostname.endsWith("discord.com")) {

     

       12
       12
       -
           console.log("Blocking", details.url);

     

       13
       13
       -
           blockLoading = true;

     

       14
       14
       -
           collectedUrls.clear();

     

       15
       15
       -
         }

     

       16
       16
       -
       });

     

       7
       7
       +
       chrome.webRequest.onBeforeRequest.addListener(

     

       8
       8
       +
         async (details) => {

     

       9
       9
       +
           if (details.tabId === -1) return;

     

       17
       10
        
       

     

       18
       18
       -
       async function doTheThing(urls, tabId) {

     

       19
       19
       -
         console.log("Doing", urls, tabId);

     

       11
       11
       +
           const url = new URL(details.url);

     

       12
       12
       +
           const hasUrl = scriptUrls.some((scriptUrl) => {

     

       13
       13
       +
             return (

     

       14
       14
       +
               details.url.includes(scriptUrl) &&

     

       15
       15
       +
               !url.searchParams.has("inj") &&

     

       16
       16
       +
               (url.host.endsWith("discord.com") || url.host.endsWith("discordapp.com"))

     

       17
       17
       +
             );

     

       18
       18
       +
           });

     

       19
       19
       +
           if (hasUrl) blockedScripts.add(details.url);

     

       20
       20
        
       

     

       21
       21
       -
         blockLoading = false;

     

       21
       21
       +
           if (blockedScripts.size === scriptUrls.length) {

     

       22
       22
       +
             const blockedScriptsCopy = Array.from(blockedScripts);

     

       23
       23
       +
             blockedScripts.clear();

     

       22
       24
        
       

     

       23
       23
       -
         try {

     

       24
       24
       -
           await chrome.scripting.executeScript({

     

       25
       25
       -
             target: { tabId },

     

       26
       26
       -
             world: "MAIN",

     

       27
       27
       -
             args: [urls],

     

       28
       28
       -
             func: async (urls) => {

     

       29
       29
       -
               try {

     

       30
       30
       -
                 await window._moonlightBrowserInit();

     

       31
       31
       -
               } catch (e) {

     

       32
       32
       -
                 console.log(e);

     

       33
       33
       -
               }

     

       25
       25
       +
             setTimeout(async () => {

     

       26
       26
       +
               console.log("Starting moonlight");

     

       27
       27
       +
               await chrome.scripting.executeScript({

     

       28
       28
       +
                 target: { tabId: details.tabId },

     

       29
       29
       +
                 world: "MAIN",

     

       30
       30
       +
                 args: [blockedScriptsCopy],

     

       31
       31
       +
                 func: async (blockedScripts) => {

     

       32
       32
       +
                   console.log("Initializing moonlight");

     

       33
       33
       +
                   try {

     

       34
       34
       +
                     await window._moonlightBrowserInit();

     

       35
       35
       +
                   } catch (e) {

     

       36
       36
       +
                     console.error(e);

     

       37
       37
       +
                   }

     

       34
       38
        
       

     

       35
       35
       -
               const scripts = [...document.querySelectorAll("script")].filter(

     

       36
       36
       -
                 (script) => script.src && urls.some((url) => url.includes(script.src))

     

       37
       37
       -
               );

     

       39
       39
       +
                   console.log("Readding scripts");

     

       40
       40
       +
                   try {

     

       41
       41
       +
                     const scripts = [...document.querySelectorAll("script")].filter(

     

       42
       42
       +
                       (script) => script.src && blockedScripts.some((url) => url.includes(script.src))

     

       43
       43
       +
                     );

     

       38
       44
        
       

     

       39
       39
       -
               // backwards

     

       40
       40
       -
               urls.reverse();

     

       41
       41
       -
               for (const url of urls) {

     

       42
       42
       -
                 const script = scripts.find((script) => url.includes(script.src));

     

       43
       43
       -
                 console.log("adding new script", script);

     

       45
       45
       +
                     blockedScripts.reverse();

     

       46
       46
       +
                     for (const url of blockedScripts) {

     

       47
       47
       +
                       if (url.includes("/sentry.")) continue;

     

       44
       48
        
       

     

       45
       45
       -
                 const newScript = document.createElement("script");

     

       46
       46
       -
                 for (const { name, value } of script.attributes) {

     

       47
       47
       -
                   newScript.setAttribute(name, value);

     

       49
       49
       +
                       const script = scripts.find((script) => url.includes(script.src));

     

       50
       50
       +
                       const newScript = document.createElement("script");

     

       51
       51
       +
                       for (const attr of script.attributes) {

     

       52
       52
       +
                         if (attr.name === "src") attr.value += "?inj";

     

       53
       53
       +
                         newScript.setAttribute(attr.name, attr.value);

     

       54
       54
       +
                       }

     

       55
       55
       +
                       script.remove();

     

       56
       56
       +
                       document.documentElement.appendChild(newScript);

     

       57
       57
       +
                     }

     

       58
       58
       +
                   } catch (e) {

     

       59
       59
       +
                     console.error(e);

     

       60
       60
       +
                   }

     

       48
       61
        
                 }

     

       49
       49
       -
       

     

       50
       50
       -
                 script.remove();

     

       51
       51
       -
                 document.documentElement.appendChild(newScript);

     

       52
       52
       -
               }

     

       53
       53
       -
             }

     

       54
       54
       -
           });

     

       55
       55
       -
         } catch (e) {

     

       56
       56
       -
           console.log(e);

     

       57
       57
       -
         }

     

       58
       58
       -
       

     

       59
       59
       -
         doing = false;

     

       60
       60
       -
         collectedUrls.clear();

     

       61
       61
       -
       }

     

       62
       62
       -
       

     

       63
       63
       -
       chrome.webRequest.onBeforeRequest.addListener(

     

       64
       64
       -
         async (details) => {

     

       65
       65
       -
           if (starterUrls.some((url) => details.url.includes(url))) {

     

       66
       66
       -
             console.log("Adding", details.url);

     

       67
       67
       -
             collectedUrls.add(details.url);

     

       62
       62
       +
               });

     

       63
       63
       +
             }, 0);

     

       68
       64
        
           }

     

       69
       65
        
       

     

       70
       70
       -
           if (collectedUrls.size === starterUrls.length) {

     

       71
       71
       -
             if (doing) return;

     

       72
       72
       -
             if (!blockLoading) return;

     

       73
       73
       -
             doing = true;

     

       74
       74
       -
             const urls = [...collectedUrls];

     

       75
       75
       -
             const tabId = details.tabId;

     

       76
       76
       -
       

     

       77
       77
       -
             // yes this is a load-bearing sleep

     

       78
       78
       -
             setTimeout(() => doTheThing(urls, tabId), 0);

     

       79
       79
       -
           }

     

       80
       80
       -
       

     

       81
       81
       -
           if (blockLoading) return { cancel: true };

     

       66
       66
       +
           if (hasUrl) return { cancel: true };

     

       82
       67
        
         },

     

       83
       68
        
         {

     

       84
       84
       -
           urls: ["https://*.discord.com/assets/*.js"]

     

       69
       69
       +
           urls: ["https://*.discord.com/assets/*.js", "https://*.discordapp.com/assets/*.js"]

     

       85
       70
        
         },

     

       86
       71
        
         ["blocking"]

     

       87
       72
        
       );

     
···

       94
       79
        
             )

     

       95
       80
        
           };

     

       96
       81
        
         },

     

       97
       97
       -
         { urls: ["https://*.discord.com/*"] },

     

       82
       82
       +
         { urls: ["https://*.discord.com/*", "https://*.discordapp.com/*"] },

     

       98
       83
        
         ["blocking", "responseHeaders"]

     

       99
       84
        
       );

+37 -39

packages/browser/src/background.js

···

       1
       1
        
       /* eslint-disable no-console */

     

       2
       2
        
       /* eslint-disable no-undef */

     

       3
       3
        
       

     

       4
       4
       -
       const starterUrls = ["web.", "sentry."];

     

       5
       5
       -
       let blockLoading = true;

     

       6
       6
       -
       let doing = false;

     

       7
       7
       -
       let collectedUrls = new Set();

     

       4
       4
       +
       const scriptUrls = ["web.", "sentry."];

     

       5
       5
       +
       let blockedScripts = new Set();

     

       8
       6
        
       

     

       9
       7
        
       chrome.webNavigation.onBeforeNavigate.addListener(async (details) => {

     

       10
       8
        
         const url = new URL(details.url);

     

       11
       11
       -
         if (!blockLoading && url.hostname.endsWith("discord.com")) {

     

       9
       9
       +
         if (

     

       10
       10
       +
           !url.searchParams.has("inj") &&

     

       11
       11
       +
           (url.hostname.endsWith("discord.com") || url.hostname.endsWith("discordapp.com"))

     

       12
       12
       +
         ) {

     

       13
       13
       +
           console.log("Enabling block ruleset");

     

       12
       14
        
           await chrome.declarativeNetRequest.updateEnabledRulesets({

     

       13
       15
        
             enableRulesetIds: ["modifyResponseHeaders", "blockLoading"]

     

       14
       16
        
           });

     

       15
       15
       -
           blockLoading = true;

     

       16
       16
       -
           collectedUrls.clear();

     

       17
       17
        
         }

     

       18
       18
        
       });

     

       19
       19
        
       

     

       20
       20
        
       chrome.webRequest.onBeforeRequest.addListener(

     

       21
       21
        
         async (details) => {

     

       22
       22
        
           if (details.tabId === -1) return;

     

       23
       23
       -
           if (starterUrls.some((url) => details.url.includes(url))) {

     

       24
       24
       -
             console.log("Adding", details.url);

     

       25
       25
       -
             collectedUrls.add(details.url);

     

       26
       26
       -
           }

     

       27
       23
        
       

     

       28
       28
       -
           if (collectedUrls.size === starterUrls.length) {

     

       29
       29
       -
             if (doing) return;

     

       30
       30
       -
             if (!blockLoading) return;

     

       31
       31
       -
             doing = true;

     

       32
       32
       -
             const urls = [...collectedUrls];

     

       33
       33
       -
             console.log("Doing", urls);

     

       24
       24
       +
           const url = new URL(details.url);

     

       25
       25
       +
           const hasUrl = scriptUrls.some((scriptUrl) => {

     

       26
       26
       +
             return (

     

       27
       27
       +
               details.url.includes(scriptUrl) &&

     

       28
       28
       +
               !url.searchParams.has("inj") &&

     

       29
       29
       +
               (url.hostname.endsWith("discord.com") || url.hostname.endsWith("discordapp.com"))

     

       30
       30
       +
             );

     

       31
       31
       +
           });

     

       32
       32
       +
       

     

       33
       33
       +
           if (hasUrl) blockedScripts.add(details.url);

     

       34
       34
       +
       

     

       35
       35
       +
           if (blockedScripts.size === scriptUrls.length) {

     

       36
       36
       +
             const blockedScriptsCopy = Array.from(blockedScripts);

     

       37
       37
       +
             blockedScripts.clear();

     

       34
       38
        
       

     

       35
       39
        
             console.log("Running moonlight script");

     

       36
       40
        
             try {

     
···

       40
       44
        
                 files: ["index.js"]

     

       41
       45
        
               });

     

       42
       46
        
             } catch (e) {

     

       43
       43
       -
               console.log(e);

     

       47
       47
       +
               console.error(e);

     

       44
       48
        
             }

     

       45
       49
        
       

     

       46
       50
        
             console.log("Initializing moonlight");

     
···

       52
       56
        
                   try {

     

       53
       57
        
                     await window._moonlightBrowserInit();

     

       54
       58
        
                   } catch (e) {

     

       55
       55
       -
                     console.log(e);

     

       59
       59
       +
                     console.error(e);

     

       56
       60
        
                   }

     

       57
       61
        
                 }

     

       58
       62
        
               });

     
···

       60
       64
        
               console.log(e);

     

       61
       65
        
             }

     

       62
       66
        
       

     

       63
       63
       -
             console.log("Updating rulesets");

     

       67
       67
       +
             console.log("Disabling block ruleset");

     

       64
       68
        
             try {

     

       65
       65
       -
               blockLoading = false;

     

       66
       69
        
               await chrome.declarativeNetRequest.updateEnabledRulesets({

     

       67
       70
        
                 disableRulesetIds: ["blockLoading"],

     

       68
       71
        
                 enableRulesetIds: ["modifyResponseHeaders"]

     

       69
       72
        
               });

     

       70
       73
        
             } catch (e) {

     

       71
       71
       -
               console.log(e);

     

       74
       74
       +
               console.error(e);

     

       72
       75
        
             }

     

       73
       76
        
       

     

       74
       77
        
             console.log("Readding scripts");

     
···

       76
       79
        
               await chrome.scripting.executeScript({

     

       77
       80
        
                 target: { tabId: details.tabId },

     

       78
       81
        
                 world: "MAIN",

     

       79
       79
       -
                 args: [urls],

     

       80
       80
       -
                 func: async (urls) => {

     

       82
       82
       +
                 args: [blockedScriptsCopy],

     

       83
       83
       +
                 func: async (blockedScripts) => {

     

       81
       84
        
                   const scripts = [...document.querySelectorAll("script")].filter(

     

       82
       82
       -
                     (script) => script.src && urls.some((url) => url.includes(script.src))

     

       85
       85
       +
                     (script) => script.src && blockedScripts.some((url) => url.includes(script.src))

     

       83
       86
        
                   );

     

       84
       87
        
       

     

       85
       85
       -
                   // backwards

     

       86
       86
       -
                   urls.reverse();

     

       87
       87
       -
                   for (const url of urls) {

     

       88
       88
       -
                     const script = scripts.find((script) => url.includes(script.src));

     

       89
       89
       -
                     console.log("adding new script", script);

     

       88
       88
       +
                   blockedScripts.reverse();

     

       89
       89
       +
                   for (const url of blockedScripts) {

     

       90
       90
       +
                     if (url.includes("/sentry.")) continue;

     

       90
       91
        
       

     

       92
       92
       +
                     const script = scripts.find((script) => url.includes(script.src));

     

       91
       93
        
                     const newScript = document.createElement("script");

     

       92
       92
       -
                     for (const { name, value } of script.attributes) {

     

       93
       93
       -
                       newScript.setAttribute(name, value);

     

       94
       94
       +
                     for (const attr of script.attributes) {

     

       95
       95
       +
                       if (attr.name === "src") attr.value += "?inj";

     

       96
       96
       +
                       newScript.setAttribute(attr.name, attr.value);

     

       94
       97
        
                     }

     

       95
       95
       -
       

     

       96
       98
        
                     script.remove();

     

       97
       99
        
                     document.documentElement.appendChild(newScript);

     

       98
       100
        
                   }

     

       99
       101
        
                 }

     

       100
       102
        
               });

     

       101
       103
        
             } catch (e) {

     

       102
       102
       -
               console.log(e);

     

       104
       104
       +
               console.error(e);

     

       103
       105
        
             }

     

       104
       104
       -
       

     

       105
       105
       -
             console.log("Done");

     

       106
       106
       -
             doing = false;

     

       107
       107
       -
             collectedUrls.clear();

     

       108
       106
        
           }

     

       109
       107
        
         },

     

       110
       108
        
         {

     

       111
       111
       -
           urls: ["*://*.discord.com/assets/*.js"]

     

       109
       109
       +
           urls: ["*://*.discord.com/assets/*.js", "*://*.discordapp.com/assets/*.js"]

     

       112
       110
        
         }

     

       113
       111
        
       );

+1 -1

packages/core/src/patch.ts

···

       116
       116
        
           const origModuleString = moduleCache[id];

     

       117
       117
        
           let moduleString = origModuleString;

     

       118
       118
        
           const patchedStr = [];

     

       119
       119
       -
           const mappedName = moonlight.moonmap.modules[id];

     

       119
       119
       +
           const mappedName = Object.entries(moonlight.moonmap.modules).find((m) => m[1] === id)?.[0];

     

       120
       120
        
           let modified = false;

     

       121
       121
        
           let swappedModule = false;

     

       122
       122

+12 -3

packages/core-extensions/src/commands/index.ts

···

       53
       53
        
           }

     

       54
       54
        
         },

     

       55
       55
        
         {

     

       56
       56
       -
           find: ".icon,bot:null===",

     

       56
       56
       +
           find: ".icon,bot:null==",

     

       57
       57
        
           replace: {

     

       58
       58
       -
             match: /(\.useMemo\(\(\)=>{)(if\((\i)\.type)/,

     

       59
       59
       -
             replacement: (_, before, after, section) => `${before}

     

       58
       58
       +
             match: /(\.useMemo\(\(\)=>{(var \i;)?)((return |if\()(\i)\.type)/,

     

       59
       59
       +
             replacement: (_, before, beforeVar, after, afterIf, section) => `${before}

     

       60
       60
        
             if (${section}.id==="${APPLICATION_ID}") return "https://moonlight-mod.github.io/favicon.png";

     

       61
       61
        
             ${after}`

     

       62
       62
        
           }

     
···

       67
       67
        
           replace: {

     

       68
       68
        
             match: /(\i)\.type===\i\.\i\.BUILT_IN/,

     

       69
       69
        
             replacement: (orig, section) => `${section}.id!=="${APPLICATION_ID}"&&${orig}`

     

       70
       70
       +
           }

     

       71
       71
       +
         },

     

       72
       72
       +
       

     

       73
       73
       +
         // tell it this app id is authorized

     

       74
       74
       +
         {

     

       75
       75
       +
           find: /let{customInstallUrl:\i,installParams:\i,integrationTypesConfig:\i}/,

     

       76
       76
       +
           replace: {

     

       77
       77
       +
             match: /\|\|(\i)===\i\.\i\.BUILT_IN/,

     

       78
       78
       +
             replacement: (orig, id) => `${orig}||${id}==="${APPLICATION_ID}"`

     

       70
       79
        
           }

     

       71
       80
        
         }

     

       72
       81
        
       ];

+3

packages/core-extensions/src/common/index.ts

···

       6
       6
        
         },

     

       7
       7
        
         ErrorBoundary: {

     

       8
       8
        
           dependencies: [{ id: "react" }]

     

       9
       9
       +
         },

     

       10
       10
       +
         icons: {

     

       11
       11
       +
           dependencies: [{ id: "react" }, { id: "discord/components/common/index" }]

     

       9
       12
        
         }

     

       10
       13
        
       };

+1 -1

packages/core-extensions/src/common/manifest.json

···

       4
       4
        
         "apiLevel": 2,

     

       5
       5
        
         "meta": {

     

       6
       6
        
           "name": "Common",

     

       7
       7
       -
           "tagline": "A *lot* of common clientmodding utilities from the Discord client",

     

       7
       7
       +
           "tagline": "Common client modding utilities for the Discord client",

     

       8
       8
        
           "authors": ["Cynosphere", "NotNite"],

     

       9
       9
        
           "tags": ["library"]

     

       10
       10
        
         },

+31

packages/core-extensions/src/common/webpackModules/icons.ts

···

       1
       1
       +
       import { Icons, IconSize } from "@moonlight-mod/types/coreExtensions/common";

     

       2
       2
       +
       import { tokens } from "@moonlight-mod/wp/discord/components/common/index";

     

       3
       3
       +
       

     

       4
       4
       +
       // This is defined in a Webpack module but we copy it here to be less breakage-prone

     

       5
       5
       +
       const sizes: Partial<Record<IconSize, number>> = {

     

       6
       6
       +
         xxs: 12,

     

       7
       7
       +
         xs: 16,

     

       8
       8
       +
         sm: 18,

     

       9
       9
       +
         md: 24,

     

       10
       10
       +
         lg: 32,

     

       11
       11
       +
         refresh_sm: 20

     

       12
       12
       +
       };

     

       13
       13
       +
       

     

       14
       14
       +
       export const icons: Icons = {

     

       15
       15
       +
         parseProps(props) {

     

       16
       16
       +
           // NOTE: var() fallback is non-standard behavior, just for safety reasons

     

       17
       17
       +
           const color = props?.color ?? tokens?.colors?.["INTERACTIVE_NORMAL"] ?? "var(--interactive-normal)";

     

       18
       18
       +
       

     

       19
       19
       +
           const size = sizes[props?.size ?? "md"];

     

       20
       20
       +
       

     

       21
       21
       +
           return {

     

       22
       22
       +
             // note: this default size is also non-standard behavior, just for safety

     

       23
       23
       +
             width: size ?? props?.width ?? sizes.md!,

     

       24
       24
       +
             height: size ?? props?.width ?? sizes.md!,

     

       25
       25
       +
       

     

       26
       26
       +
             fill: typeof color === "string" ? color : color.css,

     

       27
       27
       +
             className: props?.colorClass ?? ""

     

       28
       28
       +
           };

     

       29
       29
       +
         }

     

       30
       30
       +
       };

     

       31
       31
       +
       export default icons;

+6

packages/core-extensions/src/moonbase/index.tsx

···

       42
       42
        
             { id: "react" },

     

       43
       43
        
             { id: "discord/components/common/index" },

     

       44
       44
        
             { ext: "moonbase", id: "stores" },

     

       45
       45
       +
             { ext: "moonbase", id: "ThemeDarkIcon" },

     

       45
       46
        
             { id: "discord/modules/guild_settings/web/AppCard.css" },

     

       46
       47
        
             { ext: "contextMenu", id: "contextMenu" },

     

       47
       48
        
             { id: "discord/modules/modals/Modals" },

     
···

       49
       50
        
             '"Missing channel in Channel.openChannelContextMenu"',

     

       50
       51
        
             ".forumOrHome]:"

     

       51
       52
        
           ]

     

       53
       53
       +
         },

     

       54
       54
       +
       

     

       55
       55
       +
         ThemeDarkIcon: {

     

       56
       56
       +
           dependencies: [{ ext: "common", id: "icons" }, { id: "react" }]

     

       52
       57
        
         },

     

       53
       58
        
       

     

       54
       59
        
         settings: {

     
···

       67
       72
        
           dependencies: [

     

       68
       73
        
             { id: "react" },

     

       69
       74
        
             { ext: "moonbase", id: "stores" },

     

       75
       75
       +
             { ext: "moonbase", id: "ThemeDarkIcon" },

     

       70
       76
        
             { ext: "notices", id: "notices" },

     

       71
       77
        
             {

     

       72
       78
        
               ext: "spacepack",

+12 -21

packages/core-extensions/src/moonbase/native.ts

···

       15
       15
        
       

     

       16
       16
        
       export const userAgent = `moonlight/${moonlightGlobal.version} (https://github.com/moonlight-mod/moonlight)`;

     

       17
       17
        
       

     

       18
       18
       +
       // User-Agent header causes trouble on Firefox

     

       19
       19
       +
       const isBrowser = globalThis.moonlightNode != null && globalThis.moonlightNode.isBrowser;

     

       20
       20
       +
       const sharedHeaders: Record<string, string> = {};

     

       21
       21
       +
       if (!isBrowser) sharedHeaders["User-Agent"] = userAgent;

     

       22
       22
       +
       

     

       18
       23
        
       async function getStableRelease(): Promise<{

     

       19
       24
        
         name: string;

     

       20
       25
        
         assets: {

     
···

       24
       29
        
       }> {

     

       25
       30
        
         const req = await fetch(githubApiUrl, {

     

       26
       31
        
           cache: "no-store",

     

       27
       27
       -
           headers: {

     

       28
       28
       -
             "User-Agent": userAgent

     

       29
       29
       -
           }

     

       32
       32
       +
           headers: sharedHeaders

     

       30
       33
        
         });

     

       31
       34
        
         return await req.json();

     

       32
       35
        
       }

     
···

       43
       46
        
               } else if (moonlightGlobal.branch === MoonlightBranch.NIGHTLY) {

     

       44
       47
        
                 const req = await fetch(nightlyRefUrl, {

     

       45
       48
        
                   cache: "no-store",

     

       46
       46
       -
                   headers: {

     

       47
       47
       -
                     "User-Agent": userAgent

     

       48
       48
       -
                   }

     

       49
       49
       +
                   headers: sharedHeaders

     

       49
       50
        
                 });

     

       50
       51
        
                 const ref = (await req.text()).split("\n")[0];

     

       51
       52
        
                 return ref !== moonlightGlobal.version ? ref : null;

     
···

       71
       72
        
               logger.debug(`Downloading ${asset.browser_download_url}`);

     

       72
       73
        
               const req = await fetch(asset.browser_download_url, {

     

       73
       74
        
                 cache: "no-store",

     

       74
       74
       -
                 headers: {

     

       75
       75
       -
                   "User-Agent": userAgent

     

       76
       76
       -
                 }

     

       75
       75
       +
                 headers: sharedHeaders

     

       77
       76
        
               });

     

       78
       77
        
       

     

       79
       78
        
               return [await req.arrayBuffer(), json.name];

     
···

       83
       82
        
               logger.debug(`Downloading ${nightlyZipUrl}`);

     

       84
       83
        
               const zipReq = await fetch(nightlyZipUrl, {

     

       85
       84
        
                 cache: "no-store",

     

       86
       86
       -
                 headers: {

     

       87
       87
       -
                   "User-Agent": userAgent

     

       88
       88
       -
                 }

     

       85
       85
       +
                 headers: sharedHeaders

     

       89
       86
        
               });

     

       90
       87
        
       

     

       91
       88
        
               const refReq = await fetch(nightlyRefUrl, {

     

       92
       89
        
                 cache: "no-store",

     

       93
       93
       -
                 headers: {

     

       94
       94
       -
                   "User-Agent": userAgent

     

       95
       95
       -
                 }

     

       90
       90
       +
                 headers: sharedHeaders

     

       96
       91
        
               });

     

       97
       92
        
               const ref = (await refReq.text()).split("\n")[0];

     

       98
       93
        
       

     
···

       139
       134
        
               try {

     

       140
       135
        
                 const req = await fetch(repo, {

     

       141
       136
        
                   cache: "no-store",

     

       142
       142
       -
                   headers: {

     

       143
       143
       -
                     "User-Agent": userAgent

     

       144
       144
       -
                   }

     

       137
       137
       +
                   headers: sharedHeaders

     

       145
       138
        
                 });

     

       146
       139
        
                 const json = await req.json();

     

       147
       140
        
                 ret[repo] = json;

     
···

       156
       149
        
           async installExtension(manifest, url, repo) {

     

       157
       150
        
             const req = await fetch(url, {

     

       158
       151
        
               cache: "no-store",

     

       159
       159
       -
               headers: {

     

       160
       160
       -
                 "User-Agent": userAgent

     

       161
       161
       -
               }

     

       152
       152
       +
               headers: sharedHeaders

     

       162
       153
        
             });

     

       163
       154
        
       

     

       164
       155
        
             const dir = moonlightGlobal.getExtensionDir(manifest.id);

+36

packages/core-extensions/src/moonbase/webpackModules/ThemeDarkIcon.tsx

···

       1
       1
       +
       // RIP to ThemeDarkIcon ????-2025

     

       2
       2
       +
       // <Cynthia> Failed to remap "ThemeDarkIcon" in "discord/components/common/index"

     

       3
       3
       +
       // <NotNite> bro are you fucking kidding me

     

       4
       4
       +
       // <NotNite> that's literally the icon we use for the update banner

     

       5
       5
       +
       

     

       6
       6
       +
       import React from "@moonlight-mod/wp/react";

     

       7
       7
       +
       import icons from "@moonlight-mod/wp/common_icons";

     

       8
       8
       +
       import type { IconProps } from "@moonlight-mod/types/coreExtensions/common";

     

       9
       9
       +
       

     

       10
       10
       +
       export default function ThemeDarkIcon(props?: IconProps) {

     

       11
       11
       +
         const parsed = icons.parseProps(props);

     

       12
       12
       +
       

     

       13
       13
       +
         return (

     

       14
       14
       +
           <svg

     

       15
       15
       +
             aria-hidden="true"

     

       16
       16
       +
             role="img"

     

       17
       17
       +
             xmlns="http://www.w3.org/2000/svg"

     

       18
       18
       +
             width={parsed.width}

     

       19
       19
       +
             height={parsed.height}

     

       20
       20
       +
             fill="none"

     

       21
       21
       +
             viewBox="0 0 24 24"

     

       22
       22
       +
           >

     

       23
       23
       +
             <path

     

       24
       24
       +
               fill={parsed.fill}

     

       25
       25
       +
               className={parsed.className}

     

       26
       26
       +
               d="M20.52 18.96c.32-.4-.01-.96-.52-.96A11 11 0 0 1 9.77 2.94c.31-.78-.3-1.68-1.1-1.43a11 11 0 1 0 11.85 17.45Z"

     

       27
       27
       +
             />

     

       28
       28
       +
       

     

       29
       29
       +
             <path

     

       30
       30
       +
               fill={parsed.fill}

     

       31
       31
       +
               className={parsed.className}

     

       32
       32
       +
               d="m17.73 9.27-.76-2.02a.5.5 0 0 0-.94 0l-.76 2.02-2.02.76a.5.5 0 0 0 0 .94l2.02.76.76 2.02a.5.5 0 0 0 .94 0l.76-2.02 2.02-.76a.5.5 0 0 0 0-.94l-2.02-.76ZM19.73 2.62l.45 1.2 1.2.45c.21.08.21.38 0 .46l-1.2.45-.45 1.2a.25.25 0 0 1-.46 0l-.45-1.2-1.2-.45a.25.25 0 0 1 0-.46l1.2-.45.45-1.2a.25.25 0 0 1 .46 0Z"

     

       33
       33
       +
             />

     

       34
       34
       +
           </svg>

     

       35
       35
       +
         );

     

       36
       36
       +
       }

+1 -1

packages/core-extensions/src/moonbase/webpackModules/ui/update.tsx

···

       7
       7
        
       import MarkupUtils from "@moonlight-mod/wp/discord/modules/markup/MarkupUtils";

     

       8
       8
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       9
       9
        
       import {

     

       10
       10
       -
         ThemeDarkIcon,

     

       11
       10
        
         Button,

     

       12
       11
        
         Text,

     

       13
       12
        
         ModalRoot,

     
···

       19
       18
        
         openModal

     

       20
       19
        
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       21
       20
        
       import MarkupClasses from "@moonlight-mod/wp/discord/modules/messages/web/Markup.css";

     

       21
       21
       +
       import ThemeDarkIcon from "@moonlight-mod/wp/moonbase_ThemeDarkIcon";

     

       22
       22
        
       

     

       23
       23
        
       const strings: Record<UpdateState, string> = {

     

       24
       24
        
         [UpdateState.Ready]: "A new version of moonlight is available.",

+1 -1

packages/core-extensions/src/moonbase/webpackModules/updates.tsx

···

       3
       3
        
       import Notices from "@moonlight-mod/wp/notices_notices";

     

       4
       4
        
       import { MoonlightBranch } from "@moonlight-mod/types";

     

       5
       5
        
       import React from "@moonlight-mod/wp/react";

     

       6
       6
       -
       import { ThemeDarkIcon } from "@moonlight-mod/wp/discord/components/common/index";

     

       6
       6
       +
       import ThemeDarkIcon from "@moonlight-mod/wp/moonbase_ThemeDarkIcon";

     

       7
       7
        
       

     

       8
       8
        
       function plural(str: string, num: number) {

     

       9
       9
        
         return `${str}${num > 1 ? "s" : ""}`;

+5

packages/core-extensions/src/moonbase/wp.d.ts

···

       5
       5
        
       declare module "@moonlight-mod/wp/moonbase_stores" {

     

       6
       6
        
         export * from "core-extensions/src/moonbase/webpackModules/stores";

     

       7
       7
        
       }

     

       8
       8
       +
       

     

       9
       9
       +
       declare module "@moonlight-mod/wp/moonbase_ThemeDarkIcon" {

     

       10
       10
       +
         import ThemeDarkIcon from "core-extensions/src/moonbase/webpackModules/ThemeDarkIcon";

     

       11
       11
       +
         export = ThemeDarkIcon;

     

       12
       12
       +
       }

+1 -1

packages/core-extensions/src/settings/index.ts

···

       12
       12
        
         {

     

       13
       13
        
           find: 'navId:"user-settings-cog",',

     

       14
       14
        
           replace: {

     

       15
       15
       -
             match: /children:\[(.)\.map\(.+?\),children:.\((.)\)/,

     

       15
       15
       +
             match: /children:\[(\i)\.map\(.+?\),.*?children:\i\((\i)\)/,

     

       16
       16
        
             replacement: (orig, sections, section) =>

     

       17
       17
        
               `${orig.replace(

     

       18
       18
        
                 /Object\.values\(.\..+?\)/,

+2 -2

packages/types/package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "@moonlight-mod/types",

     

       3
       3
       -
         "version": "1.3.14",

     

       3
       3
       +
         "version": "1.3.17",

     

       4
       4
        
         "exports": {

     

       5
       5
        
           ".": "./src/index.ts",

     

       6
       6
        
           "./import": "./src/import.d.ts",

     
···

       17
       17
        
         },

     

       18
       18
        
         "dependencies": {

     

       19
       19
        
           "@moonlight-mod/lunast": "^1.0.1",

     

       20
       20
       -
           "@moonlight-mod/mappings": "^1.1.22",

     

       20
       20
       +
           "@moonlight-mod/mappings": "^1.1.25",

     

       21
       21
        
           "@moonlight-mod/moonmap": "^1.0.5",

     

       22
       22
        
           "@types/react": "^18.3.10",

     

       23
       23
        
           "csstype": "^3.1.3",

+22

packages/types/src/coreExtensions/common.ts

···

       1
       1
       +
       import type { IconProps, IconSize } from "@moonlight-mod/mappings/discord/components/common/index";

     

       2
       2
       +
       

     

       1
       3
        
       export type ErrorBoundaryProps = React.PropsWithChildren<{

     

       2
       4
        
         noop?: boolean;

     

       3
       5
        
         fallback?: React.FC<any>;

     
···

       9
       11
        
         error?: Error;

     

       10
       12
        
         componentStack?: string;

     

       11
       13
        
       };

     

       14
       14
       +
       

     

       15
       15
       +
       export type ErrorBoundary = React.ComponentClass<ErrorBoundaryProps, ErrorBoundaryState>;

     

       16
       16
       +
       

     

       17
       17
       +
       export type ParsedIconProps = {

     

       18
       18
       +
         width: number;

     

       19
       19
       +
         height: number;

     

       20
       20
       +
         fill: string;

     

       21
       21
       +
         className: string;

     

       22
       22
       +
       };

     

       23
       23
       +
       

     

       24
       24
       +
       export interface Icons {

     

       25
       25
       +
         /**

     

       26
       26
       +
          * Parse icon props into their actual width/height.

     

       27
       27
       +
          * @param props The icon props

     

       28
       28
       +
          */

     

       29
       29
       +
         parseProps(props?: IconProps): ParsedIconProps;

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       // Re-export so extension developers don't need to depend on mappings

     

       33
       33
       +
       export type { IconProps, IconSize };

+4

packages/types/src/discord/require.ts

···

       1
       1
        
       import { AppPanels } from "../coreExtensions/appPanels";

     

       2
       2
        
       import { Commands } from "../coreExtensions/commands";

     

       3
       3
       +
       import { ErrorBoundary, Icons } from "../coreExtensions/common";

     

       3
       4
        
       import { DMList, MemberList, Messages } from "../coreExtensions/componentEditor";

     

       4
       5
        
       import { ContextMenu, EvilItemParser } from "../coreExtensions/contextMenu";

     

       5
       6
        
       import { Markdown } from "../coreExtensions/markdown";

     
···

       13
       14
        
       declare function WebpackRequire(id: "appPanels_appPanels"): AppPanels;

     

       14
       15
        
       

     

       15
       16
        
       declare function WebpackRequire(id: "commands_commands"): Commands;

     

       17
       17
       +
       

     

       18
       18
       +
       declare function WebpackRequire(id: "common_ErrorBoundary"): ErrorBoundary;

     

       19
       19
       +
       declare function WebpackRequire(id: "common_icons"): Icons;

     

       16
       20
        
       

     

       17
       21
        
       declare function WebpackRequire(id: "componentEditor_dmList"): DMList;

     

       18
       22
        
       declare function WebpackRequire(id: "componentEditor_memberList"): MemberList;

+10 -1

packages/types/src/import.d.ts

···

       10
       10
        
         export default commands;

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
       -
       declare module "@moonlight-mod/wp/common_ErrorBoundary";

     

       13
       13
       +
       declare module "@moonlight-mod/wp/common_ErrorBoundary" {

     

       14
       14
       +
         import { CoreExtensions } from "@moonlight-mod/types";

     

       15
       15
       +
         const ErrorBoundary: CoreExtensions.Common.ErrorBoundary;

     

       16
       16
       +
         export = ErrorBoundary;

     

       17
       17
       +
       }

     

       18
       18
       +
       declare module "@moonlight-mod/wp/common_icons" {

     

       19
       19
       +
         import { CoreExtensions } from "@moonlight-mod/types";

     

       20
       20
       +
         export const icons: CoreExtensions.Common.Icons;

     

       21
       21
       +
         export default icons;

     

       22
       22
       +
       }

     

       14
       23
        
       declare module "@moonlight-mod/wp/common_stores";

     

       15
       24
        
       

     

       16
       25
        
       declare module "@moonlight-mod/wp/componentEditor_dmList" {

-1

packages/types/src/mappings.d.ts

···

       229
       229
        
         export const ScienceIcon: MappedModules["discord/components/common/index"]["ScienceIcon"];

     

       230
       230
        
         export const ScreenIcon: MappedModules["discord/components/common/index"]["ScreenIcon"];

     

       231
       231
        
         export const StarIcon: MappedModules["discord/components/common/index"]["StarIcon"];

     

       232
       232
       -
         export const ThemeDarkIcon: MappedModules["discord/components/common/index"]["ThemeDarkIcon"];

     

       233
       232
        
         export const TrashIcon: MappedModules["discord/components/common/index"]["TrashIcon"];

     

       234
       233
        
         export const WarningIcon: MappedModules["discord/components/common/index"]["WarningIcon"];

     

       235
       234
        
         export const WindowLaunchIcon: MappedModules["discord/components/common/index"]["WindowLaunchIcon"];

+16 -9

pnpm-lock.yaml

···

       41
       41
        
             specifier: ^1.0.1

     

       42
       42
        
             version: 1.0.1

     

       43
       43
        
           '@moonlight-mod/mappings':

     

       44
       44
       -
             specifier: ^1.1.22

     

       45
       45
       -
             version: 1.1.22

     

       44
       44
       +
             specifier: ^1.1.25

     

       45
       45
       +
             version: 1.1.25

     

       46
       46
        
           '@moonlight-mod/moonmap':

     

       47
       47
        
             specifier: ^1.0.5

     

       48
       48
        
             version: 1.0.5

     
···

       158
       158
        
               specifier: ^1.0.1

     

       159
       159
        
               version: 1.0.1

     

       160
       160
        
             '@moonlight-mod/mappings':

     

       161
       161
       -
               specifier: ^1.1.22

     

       162
       162
       -
               version: 1.1.22(@moonlight-mod/lunast@1.0.1)(@moonlight-mod/moonmap@1.0.5)

     

       161
       161
       +
               specifier: ^1.1.25

     

       162
       162
       +
               version: 1.1.25(@moonlight-mod/lunast@1.0.1)(@moonlight-mod/moonmap@1.0.5)

     

       163
       163
        
             '@moonlight-mod/moonmap':

     

       164
       164
        
               specifier: ^1.0.5

     

       165
       165
        
               version: 1.0.5

     
···

       183
       183
        
               version: 1.0.1

     

       184
       184
        
             '@moonlight-mod/mappings':

     

       185
       185
        
               specifier: catalog:prod

     

       186
       186
       -
               version: 1.1.22(@moonlight-mod/lunast@1.0.1)(@moonlight-mod/moonmap@1.0.5)

     

       186
       186
       +
               version: 1.1.25(@moonlight-mod/lunast@1.0.1)(@moonlight-mod/moonmap@1.0.5)

     

       187
       187
        
             '@moonlight-mod/moonmap':

     

       188
       188
        
               specifier: catalog:prod

     

       189
       189
        
               version: 1.0.5

     
···

       405
       405
        
         '@moonlight-mod/lunast@1.0.1':

     

       406
       406
        
           resolution: {integrity: sha512-K3vxzDlfFuYKjciIW2FMlcZ1qrrkAGDGpSBlNqYGtJ0sMt9bRCd2lpSpg6AX/giSljDtmAUXa/5mOfUoDQxjBA==}

     

       407
       407
        
       

     

       408
       408
       -
         '@moonlight-mod/mappings@1.1.22':

     

       409
       409
       -
           resolution: {integrity: sha512-GJjAz/DwaVg724vzOWbEzANbXVIWX8zWAohIh7y6eXCxvwAgq2KuP27iiFmx4RboHQvhWP0nwyqTuKF3A1Ttgw==}

     

       408
       408
       +
         '@moonlight-mod/mappings@1.1.25':

     

       409
       409
       +
           resolution: {integrity: sha512-bgnSN9H/IBdMGxGev6RQKXuzhQxwo1090NhIDHnflguZnjiu2pg/usPfh76bqyhxRuX4SS7tiZSNTwBoSflCLg==}

     

       410
       410
       +
           engines: {node: '>=22', npm: pnpm, pnpm: '>=10', yarn: pnpm}

     

       410
       411
        
           peerDependencies:

     

       411
       412
        
             '@moonlight-mod/lunast': ^1.0.1

     

       412
       413
        
             '@moonlight-mod/moonmap': ^1.0.5

     
···

       448
       449
        
       

     

       449
       450
        
         '@types/estree@1.0.6':

     

       450
       451
        
           resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}

     

       452
       452
       +
       

     

       453
       453
       +
         '@types/estree@1.0.7':

     

       454
       454
       +
           resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}

     

       451
       455
        
       

     

       452
       456
        
         '@types/fbemitter@2.0.35':

     

       453
       457
        
           resolution: {integrity: sha512-Xem6d7qUfmouCHntCrRYgDBwbf+WWRd6G+7WEFlEZFZ67LZXiYRvT2LV8wcZa6mIaAil95+ABQdKgB6hPIsnng==}

     
···

       1736
       1740
        
             estree-toolkit: 1.7.8

     

       1737
       1741
        
             meriyah: 6.0.1

     

       1738
       1742
        
       

     

       1739
       1739
       -
         '@moonlight-mod/mappings@1.1.22(@moonlight-mod/lunast@1.0.1)(@moonlight-mod/moonmap@1.0.5)':

     

       1743
       1743
       +
         '@moonlight-mod/mappings@1.1.25(@moonlight-mod/lunast@1.0.1)(@moonlight-mod/moonmap@1.0.5)':

     

       1740
       1744
        
           dependencies:

     

       1741
       1745
        
             '@moonlight-mod/lunast': 1.0.1

     

       1742
       1746
        
             '@moonlight-mod/moonmap': 1.0.5

     
···

       1782
       1786
        
       

     

       1783
       1787
        
         '@types/eslint@9.6.1':

     

       1784
       1788
        
           dependencies:

     

       1785
       1785
       -
             '@types/estree': 1.0.6

     

       1789
       1789
       +
             '@types/estree': 1.0.7

     

       1786
       1790
        
             '@types/json-schema': 7.0.15

     

       1787
       1791
        
           optional: true

     

       1788
       1792
        
       

     
···

       1791
       1795
        
             '@types/estree': 1.0.6

     

       1792
       1796
        
       

     

       1793
       1797
        
         '@types/estree@1.0.6': {}

     

       1798
       1798
       +
       

     

       1799
       1799
       +
         '@types/estree@1.0.7':

     

       1800
       1800
       +
           optional: true

     

       1794
       1801
        
       

     

       1795
       1802
        
         '@types/fbemitter@2.0.35': {}

     

       1796
       1803

+1 -1

pnpm-workspace.yaml

···

       15
       15
        
           taze: ^19.0.4

     

       16
       16
        
         prod:

     

       17
       17
        
           "@moonlight-mod/lunast": ^1.0.1

     

       18
       18
       -
           "@moonlight-mod/mappings": ^1.1.22

     

       18
       18
       +
           "@moonlight-mod/mappings": ^1.1.25

     

       19
       19
        
           "@moonlight-mod/moonmap": ^1.0.5

     

       20
       20
        
           microdiff: ^1.5.0

     

       21
       21
        
           nanotar: ^0.1.1

Compare changes