fix(deps): parse pre-relelease versions

google · Aug 17, 2023 · 8d86755 · 8d86755
1 parent 7a592aa
commit 8d86755
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/deps.ts b/src/deps.ts
@@ -94,10 +94,9 @@ const importRe = [
   /\brequire\(['"](?<path>[^'"]+)['"]\)/,
   /\bfrom\s+['"](?<path>[^'"]+)['"]/,
 ]
-// Adapted from https://github.com/dword-design/package-name-regex/blob/5d8bfe9b6e140e3e114833e68dc1fbf500991f2c/src/index.js#L1C22-L1C22
 const nameRe =
   /^(?<name>(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*)\/?.*$/i
-const versionRe = /(\/\/|\/\*)\s*@(?<version>[~^]?([\dvx*]+([-.][\dx*]+)*))/i
+const versionRe = /(\/\/|\/\*)\s*@(?<version>[~^]?(v?[\dx*]+([-.][\d*a-z-]+)*))/i
 
 export function parseDeps(content: Buffer): Record<string, string> {
   const deps: Record<string, string> = {}

diff --git a/test/deps.test.js b/test/deps.test.js
@@ -99,6 +99,7 @@ test('parseDeps(): multiline', () => {
   import bar from "bar" /* @1.0.0 */
   import baz from "baz" //    @^2.0
   import qux from "@qux/pkg/entry" //    @^3.0
+  import {api as alias} from "qux/entry/index.js" // @^4.0.0-beta.0
 
   const cpy = await import('cpy')
   const { pick } = require("lodash") //  @4.17.15
@@ -119,6 +120,7 @@ test('parseDeps(): multiline', () => {
     bar: '1.0.0',
     baz: '^2.0',
     '@qux/pkg': '^3.0',
+    qux: '^4.0.0-beta.0',
     cpy: 'latest',
     lodash: '4.17.15',
   })