🐛 fix updateURL resolution

Fix #82
momocow · Mar 9, 2023 · 4f9f9cc · 4f9f9cc
1 parent aa441fd
commit 4f9f9cc
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 14 deletions.
diff --git a/lib/features/resolve-base-urls.ts b/lib/features/resolve-base-urls.ts
@@ -32,11 +32,10 @@ export class ResolveBaseURLs extends Feature<ResolveBaseURLsOptions> {
         if (headers.updateURL === undefined) {
           headers = {
             ...headers,
-            updateURL: metajs
-              ? new URL(metajsFile, updateBaseURL).toString()
-              : updateBaseURL !== undefined
-              ? new URL(userjsFile, updateBaseURL).toString()
-              : headers.downloadURL,
+            updateURL: new URL(
+              metajs ? metajsFile : userjsFile,
+              updateBaseURL ?? downloadBaseURL,
+            ).toString(),
           };
         }
 

diff --git a/test/integration/resolve-base-urls/fixtures.ts b/test/integration/resolve-base-urls/fixtures.ts
@@ -1,12 +1,15 @@
 import { GlobalFixtures } from '../fixtures';
 
 export class Fixtures extends GlobalFixtures {
-  public static readonly downloadURL =
+  public static readonly downloadURLWithUserjs =
     'http://download.example.com/output.user.js';
 
-  public static readonly updateURLByMetajs =
+  public static readonly downloadURLWithMetajs =
+    'http://download.example.com/output.meta.js';
+
+  public static readonly updateURLWithMetajs =
     'http://update.example.com/output.meta.js';
 
-  public static readonly updateURLByUserjs =
+  public static readonly updateURLWithUserjs =
     'http://update.example.com/output.user.js';
 }
diff --git a/test/integration/resolve-base-urls/index.test.ts b/test/integration/resolve-base-urls/index.test.ts
@@ -12,7 +12,7 @@ describe('resolve base urls', () => {
   const findDownloadURL = findTags.bind(
     undefined,
     'downloadURL',
-    Fixtures.downloadURL,
+    Fixtures.downloadURLWithUserjs,
   );
 
   beforeEach(async () => {
@@ -26,7 +26,7 @@ describe('resolve base urls', () => {
     const findUpdateURLByMetajs = findTags.bind(
       undefined,
       'updateURL',
-      Fixtures.updateURLByMetajs,
+      Fixtures.updateURLWithMetajs,
     );
 
     const output = await compile(input, {
@@ -53,11 +53,11 @@ describe('resolve base urls', () => {
     expect(findUpdateURLByMetajs(metaJs)).toHaveLength(1);
   });
 
-  it('should resolve updateURL by userjs', async () => {
+  it('should resolve updateURL with updateBaseURL and userjs', async () => {
     const findUpdateURLByUserjs = findTags.bind(
       undefined,
       'updateURL',
-      Fixtures.updateURLByUserjs,
+      Fixtures.updateURLWithUserjs,
     );
 
     const output = await compile(input, {
@@ -79,11 +79,11 @@ describe('resolve base urls', () => {
     expect(findUpdateURLByUserjs(userJs)).toHaveLength(1);
   });
 
-  it('should resolve updateURL by downloadURL', async () => {
+  it('should resolve updateURL by downloadBaseURL and userjs', async () => {
     const findUpdateURLByDownloadURL = findTags.bind(
       undefined,
       'updateURL',
-      Fixtures.downloadURL,
+      Fixtures.downloadURLWithUserjs,
     );
 
     const output = await compile(input, {
@@ -103,4 +103,29 @@ describe('resolve base urls', () => {
     expect(findDownloadURL(userJs)).toHaveLength(1);
     expect(findUpdateURLByDownloadURL(userJs)).toHaveLength(1);
   });
+
+  it('should resolve updateURL by downloadBaseURL and metajs', async () => {
+    const findUpdateURLByDownloadURL = findTags.bind(
+      undefined,
+      'updateURL',
+      Fixtures.downloadURLWithMetajs,
+    );
+
+    const output = await compile(input, {
+      ...Fixtures.webpackConfig,
+      plugins: [
+        new UserscriptPlugin({
+          downloadBaseURL: new URL('http://download.example.com'),
+          metajs: true,
+        }),
+      ],
+    });
+
+    const userJs = output
+      .readFileSync('/dist/output.user.js')
+      .toString('utf-8');
+
+    expect(findDownloadURL(userJs)).toHaveLength(1);
+    expect(findUpdateURLByDownloadURL(userJs)).toHaveLength(1);
+  });
 });