fix(store): do not resolve emails (#500)

gridsome · Jul 5, 2019 · 6105069 · 6105069
1 parent 9a10a37
commit 6105069
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/gridsome/lib/store/__tests__/PluginStore.spec.js b/gridsome/lib/store/__tests__/PluginStore.spec.js
@@ -524,6 +524,7 @@ test('resolve file paths', () => {
     url3: 'git@github.com:gridsome/gridsome.git',
     url4: 'ftp://ftp.example.com',
     email: 'email@example.com',
+    email2: 'mailto:email@example.me',
     text: 'Lorem ipsum dolor sit amet.',
     text2: 'example.com',
     text3: 'md',
@@ -541,6 +542,7 @@ test('resolve file paths', () => {
   expect(node.url3).toEqual('git@github.com:gridsome/gridsome.git')
   expect(node.url4).toEqual('ftp://ftp.example.com')
   expect(node.email).toEqual('email@example.com')
+  expect(node.email2).toEqual('mailto:email@example.me')
   expect(node.text).toEqual('Lorem ipsum dolor sit amet.')
   expect(node.text2).toEqual('example.com')
   expect(node.text3).toEqual('md')

diff --git a/gridsome/lib/store/utils.js b/gridsome/lib/store/utils.js
@@ -4,6 +4,7 @@ const isUrl = require('is-url')
 const mime = require('mime-types')
 const camelCase = require('camelcase')
 const isRelative = require('is-relative')
+const { isResolvablePath } = require('../utils')
 
 const nonValidCharsRE = new RegExp('[^a-zA-Z0-9_]', 'g')
 const leadingNumberRE = new RegExp('^([0-9])')
@@ -34,10 +35,13 @@ exports.resolvePath = function (origin, toPath, options = {}) {
 
   if (typeof toPath !== 'string') return toPath
   if (typeof origin !== 'string') return toPath
-  if (path.extname(toPath).length <= 1) return toPath
   if (isUrl(toPath)) return toPath
-  if (mime.lookup(toPath) === 'application/x-msdownload') return toPath
-  if (!mime.lookup(toPath)) return toPath
+  if (!isResolvablePath(toPath)) return toPath
+
+  const mimeType = mime.lookup(toPath)
+
+  if (!mimeType) return toPath
+  if (mimeType === 'application/x-msdownload') return toPath
 
   const url = isUrl(origin) ? exports.parseUrl(origin) : null
   const contextPath = url && resolveAbsolute === true ? url.baseUrl : context