import from upstream/master

Author: dimaslanjaka

lib/box/index.ts

@@ -160,8 +160,10 @@ class Box extends EventEmitter {
       if (!params) return count;
 
       const file = new File({
+        // source is used for filesystem path, keep backslashes on Windows
         source: join(base, path),
-        path,
+        // path is used for URL path, replace backslashes on Windows
+        path: escapeBackslash(path),
         params,
         type
       });

lib/models/post_asset.ts

@@ -1,14 +1,14 @@
 import warehouse from 'warehouse';
-import { join, dirname } from 'path';
+import { join, posix } from 'path';
 import type Hexo from '../hexo';
 
 export = (ctx: Hexo) => {
   const PostAsset = new warehouse.Schema({
-    _id: { type: String, required: true },
-    slug: { type: String, required: true },
-    modified: { type: Boolean, default: true },
-    post: { type: warehouse.Schema.Types.CUID, ref: 'Post' },
-    renderable: { type: Boolean, default: true }
+    _id: {type: String, required: true},
+    slug: {type: String, required: true},
+    modified: {type: Boolean, default: true},
+    post: {type: warehouse.Schema.Types.CUID, ref: 'Post'},
+    renderable: {type: Boolean, default: true}
   });
 
   PostAsset.virtual('path').get(function() {
@@ -18,8 +18,9 @@ export = (ctx: Hexo) => {
 
     // PostAsset.path is file path relative to `public_dir`
     // no need to urlescape, #1562
-    // strip extensions better on permalink, #2134
-    return join(dirname(post.path), post.slug, this.slug);
+    // strip /\.html?$/ extensions on permalink, #2134
+    // Use path.posix.join to avoid path.join introducing unwanted backslashes on Windows.
+    return posix.join(post.path.replace(/\.html?$/, ''), this.slug);
   });
 
   PostAsset.virtual('source').get(function() {

lib/plugins/tag/asset_img.ts

@@ -18,6 +18,7 @@ export = (ctx: Hexo) => {
     for (let i = 0; i < len; i++) {
       const asset = PostAsset.findOne({post: this._id, slug: args[i]});
       if (asset) {
+        // img tag will call url_for so no need to call it here
         args[i] = encodeURL(new URL(asset.path, ctx.config.url).pathname);
         return img(ctx)(args);
       }

lib/plugins/tag/asset_link.ts

@@ -1,4 +1,4 @@
-import { encodeURL, escapeHTML } from 'hexo-util';
+import { url_for, escapeHTML } from 'hexo-util';
 import type Hexo from '../../hexo';
 
 /**
@@ -28,7 +28,7 @@ export = (ctx: Hexo) => {
     const attrTitle = escapeHTML(title);
     if (escape === 'true') title = attrTitle;
 
-    const link = encodeURL(new URL(asset.path, ctx.config.url).pathname);
+    const link = url_for.call(ctx, asset.path);
 
     return `<a href="${link}" title="${attrTitle}">${title}</a>`;
   };

lib/plugins/tag/asset_path.ts

@@ -1,4 +1,4 @@
-import { encodeURL } from 'hexo-util';
+import { url_for } from 'hexo-util';
 import type Hexo from '../../hexo';
 
 /**
@@ -17,7 +17,7 @@ export = (ctx: Hexo) => {
     const asset = PostAsset.findOne({post: this._id, slug});
     if (!asset) return;
 
-    const path = encodeURL(new URL(asset.path, ctx.config.url).pathname);
+    const path = url_for.call(ctx, asset.path);
 
     return path;
   };

lib/plugins/tag/post_link.ts

@@ -1,4 +1,4 @@
-import { encodeURL, escapeHTML } from 'hexo-util';
+import { url_for, escapeHTML } from 'hexo-util';
 import { postFindOneFactory } from './';
 import type Hexo from '../../hexo';
 
@@ -41,14 +41,7 @@ export = (ctx: Hexo) => {
     const attrTitle = escapeHTML(post.title || post.slug);
     if (escape === 'true') title = escapeHTML(title);
 
-    // guarantee the base url ends with a slash. (case of using a subdirectory in the url of the site)
-    let baseUrl = ctx.config.url;
-    if (!baseUrl.endsWith('/')) {
-      baseUrl += '/';
-    }
-
-    const url = new URL(post.path, baseUrl).pathname + (hash ? `#${hash}` : '');
-    const link = encodeURL(url);
+    const link = url_for.call(ctx, post.path + (hash ? `#${hash}` : ''));
 
     return `<a href="${link}" title="${attrTitle}">${title}</a>`;
   };

lib/plugins/tag/post_path.ts

@@ -1,4 +1,4 @@
-import { encodeURL } from 'hexo-util';
+import { url_for } from 'hexo-util';
 import { postFindOneFactory } from './';
 import type Hexo from '../../hexo';
 
@@ -17,7 +17,7 @@ export = (ctx: Hexo) => {
     const post = factory({ slug }) || factory({ title: slug });
     if (!post) return;
 
-    const link = encodeURL(new URL(post.path, ctx.config.url).pathname);
+    const link = url_for.call(ctx, post.path);
 
     return link;
   };

test/scripts/models/post_asset.ts

@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join, posix } from 'path';
 import Hexo from '../../../lib/hexo';
 import defaults from '../../../lib/hexo/default_config';
 
@@ -54,7 +54,7 @@ describe('PostAsset', () => {
       slug: 'foo.jpg',
       post: post._id
     });
-    data.path.should.eql(join(post.path, data.slug));
+    data.path.should.eql(posix.join(post.path, data.slug));
 
     PostAsset.removeById(data._id);
   });
@@ -66,7 +66,7 @@ describe('PostAsset', () => {
       slug: 'foo.htm',
       post: post._id
     });
-    data.path.should.eql(join(post.path, data.slug));
+    data.path.should.eql(posix.join(post.path, data.slug));
 
     PostAsset.removeById(data._id);
   });
@@ -78,7 +78,7 @@ describe('PostAsset', () => {
       slug: 'foo.htm',
       post: post._id
     });
-    data.path.should.eql(join(post.path, data.slug));
+    data.path.should.eql(posix.join(post.path, data.slug));
 
     PostAsset.removeById(data._id);
   });

test/scripts/tags/post_link.ts

@@ -81,7 +81,7 @@ describe('post_link', () => {
   });
 
   it('should keep subdir', () => {
-    hexo.config.url = 'http://example.com/subdir';
+    hexo.config.root = '/subdir/';
     postLink(['foo']).should.eql('<a href="/subdir/foo/" title="Hello world">Hello world</a>');
   });
 });