fix($markdown): support path without file extension when importing co…

…de snippets (#2677)
vuejs · Feb 18, 2021 · bb4ae4e · bb4ae4e
1 parent 3ab9fca
commit bb4ae4e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/packages/@vuepress/markdown/__tests__/__snapshots__/snippet.spec.js.snap b/packages/@vuepress/markdown/__tests__/__snapshots__/snippet.spec.js.snap
@@ -5,6 +5,10 @@ exports[`snippet import snippet 1`] = `
   // ..
 }
 </code></pre>
+<pre><code># Sample snippet file with no filename extension.
+FROM ubuntu:latest
+CMD echo hello!
+</code></pre>
 `;
 
 exports[`snippet import snippet with highlight multiple lines 1`] = `

diff --git a/packages/@vuepress/markdown/__tests__/fragments/Dockerfile b/packages/@vuepress/markdown/__tests__/fragments/Dockerfile
@@ -0,0 +1,3 @@
+# Sample snippet file with no filename extension.
+FROM ubuntu:latest
+CMD echo hello!
diff --git a/packages/@vuepress/markdown/__tests__/fragments/code-snippet.md b/packages/@vuepress/markdown/__tests__/fragments/code-snippet.md
@@ -1 +1,3 @@
 <<< @/packages/@vuepress/markdown/__tests__/fragments/snippet.js
+
+<<< @/packages/@vuepress/markdown/__tests__/fragments/Dockerfile
diff --git a/packages/@vuepress/markdown/lib/snippet.js b/packages/@vuepress/markdown/lib/snippet.js
@@ -137,7 +137,7 @@ module.exports = function snippet (md, options = {}) {
      *
      * captures: ['/path/to/file.extension', 'extension', '#region', '{meta}']
      */
-    const rawPathRegexp = /^(.+(?:\.([a-z]+)))(?:(#[\w-]+))?(?: ?({\d+(?:[,-]\d+)*}))?$/
+    const rawPathRegexp = /^(.+?(?:\.([a-z]+))?)(?:(#[\w-]+))?(?: ?({\d+(?:[,-]\d+)*}))?$/
 
     const rawPath = state.src.slice(start, end).trim().replace(/^@/, root).trim()
     const [filename = '', extension = '', region = '', meta = ''] = (rawPathRegexp.exec(rawPath) || []).slice(1)