fix(full_url_for): handle config.url with a trailing slash

hexojs · Jul 1, 2020 · 2917f4b · 2917f4b
1 parent 14fa817
commit 2917f4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/full_url_for.js b/lib/full_url_for.js
@@ -24,7 +24,7 @@ function fullUrlForHelper(path = '/') {
     // Exit if input is an external link or a data url
     if (data.hostname !== sitehost || data.origin === 'null') return path;
 
-    path = encodeURL(config.url + `/${path}`.replace(/\/{2,}/g, '/'));
+    path = encodeURL((config.url + `/${path}`).replace(/\/{2,}/g, '/'));
     path = prettyUrls(path, prettyUrlsOptions);
 
     return path;

diff --git a/test/full_url_for.spec.js b/test/full_url_for.spec.js
@@ -21,6 +21,12 @@ describe('full_url_for', () => {
     fullUrlFor('/').should.eql(ctx.config.url + '/');
   });
 
+  it('internal url - subdirectory with trailing slash', () => {
+    ctx.config.url = 'https://example.com/blog/';
+    fullUrlFor('index.html').should.eql(ctx.config.url + 'index.html');
+    fullUrlFor('/').should.eql(ctx.config.url);
+  });
+
   it('internal url - no duplicate slash', () => {
     ctx.config.url = 'https://example.com';
     fullUrlFor('/index.html').should.eql('https://example.com/index.html');