Просмотр исходного кода

feat: support abs. URLs in resources.json

Sv443 1 год назад
Родитель
Сommit
9e4c4d55e9
4 измененных файлов с 9 добавлено и 6 удалено
  1. 2 2
      dist/BetterYTM.user.js
  2. 2 1
      package.json
  3. 1 1
      src/features/menu/menu_old.ts
  4. 4 2
      src/tools/post-build.ts

+ 2 - 2
dist/BetterYTM.user.js

@@ -499,7 +499,7 @@ const scriptInfo = {
     name: GM.info.script.name,
     version: GM.info.script.version,
     namespace: GM.info.script.namespace,
-    lastCommit: "16f0145", // assert as generic string instead of literal
+    lastCommit: "bc43991", // assert as generic string instead of literal
 };
 
 
@@ -1914,7 +1914,7 @@ function addMenu() {
             linksCont.appendChild(anchorElem);
         };
         addLink(yield (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getResourceUrl)("github"), _constants__WEBPACK_IMPORTED_MODULE_2__.scriptInfo.namespace, `${_constants__WEBPACK_IMPORTED_MODULE_2__.scriptInfo.name} on GitHub`);
-        addLink(yield (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getResourceUrl)("greasyfork"), "https://greasyfork.org/xyz", `${_constants__WEBPACK_IMPORTED_MODULE_2__.scriptInfo.name} on GreasyFork`);
+        addLink(yield (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getResourceUrl)("greasyfork"), "https://greasyfork.org/TODO", `${_constants__WEBPACK_IMPORTED_MODULE_2__.scriptInfo.name} on GreasyFork`);
         const closeElem = document.createElement("img");
         closeElem.id = "betterytm-menu-close";
         closeElem.src = yield (0,_utils__WEBPACK_IMPORTED_MODULE_4__.getResourceUrl)("close");

+ 2 - 1
package.json

@@ -67,6 +67,7 @@
   "nodemonConfig": {
     "watch": [
       "src/**",
+      "assets/**",
       "webpack.config.js",
       ".env"
     ],
@@ -76,4 +77,4 @@
       "dev/*"
     ]
   }
-}
+}

+ 1 - 1
src/features/menu/menu_old.ts

@@ -74,7 +74,7 @@ export async function addMenu() {
   };
 
   addLink(await getResourceUrl("github"), scriptInfo.namespace, `${scriptInfo.name} on GitHub`);
-  addLink(await getResourceUrl("greasyfork"), "https://greasyfork.org/xyz", `${scriptInfo.name} on GreasyFork`);
+  addLink(await getResourceUrl("greasyfork"), "https://greasyfork.org/TODO", `${scriptInfo.name} on GreasyFork`);
 
   const closeElem = document.createElement("img");
   closeElem.id = "betterytm-menu-close";

+ 4 - 2
src/tools/post-build.ts

@@ -192,8 +192,10 @@ async function getResourceDirectives() {
     const resourcesFile = String(await readFile(join(assetFolderPath, "resources.json")));
     const resources = JSON.parse(resourcesFile) as Record<string, string>;
 
-    for(const [name, path] of Object.entries(resources))
-      directives.push(`// @resource        ${name} https://raw.githubusercontent.com/Sv443/BetterYTM/${branch}/assets/${path}`);
+    for(const [name, path] of Object.entries(resources)) {
+      const url = path.match(/^https?:\/\//) ? path : `https://raw.githubusercontent.com/Sv443/BetterYTM/${branch}/assets/${path}`;
+      directives.push(`// @resource        ${name} ${url}`);
+    }
 
     return directives.join("\n");
   }