From d790ea7d533c3c48b09a2f16f3fef549aa96be78 Mon Sep 17 00:00:00 2001
From: Yiyu Lin <linyiyu1992@gmail.com>
Date: Thu, 13 Apr 2023 09:08:01 +0800
Subject: refactor(cli,ext,ops): cleanup `regex` with `lazy-regex` (#17296)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- bump deps: the newest `lazy-regex` need newer `oncecell` and
`regex`
- reduce `unwrap`
- remove dep `lazy_static`
- make more regex cached

---------

Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>
---
 ext/node/Cargo.toml    | 1 +
 ext/node/resolution.rs | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ext/node')

diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml
index d63956c2e..75d85ac0b 100644
--- a/ext/node/Cargo.toml
+++ b/ext/node/Cargo.toml
@@ -24,6 +24,7 @@ hex.workspace = true
 hkdf.workspace = true
 idna = "0.3.0"
 indexmap.workspace = true
+lazy-regex.workspace = true
 libz-sys = { version = "1.1.8", features = ["static"] }
 md-5 = "0.10.5"
 md4 = "0.10.2"
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs
index 3f9c5da26..1422ba6b0 100644
--- a/ext/node/resolution.rs
+++ b/ext/node/resolution.rs
@@ -10,7 +10,6 @@ use deno_core::serde_json::Map;
 use deno_core::serde_json::Value;
 use deno_core::url::Url;
 use deno_core::ModuleSpecifier;
-use regex::Regex;
 
 use crate::errors;
 use crate::package_json::PackageJson;
@@ -342,8 +341,8 @@ fn resolve_package_target_string<Fs: NodeFs>(
     ));
   }
   let invalid_segment_re =
-    Regex::new(r"(^|\\|/)(\.\.?|node_modules)(\\|/|$)").expect("bad regex");
-  let pattern_re = Regex::new(r"\*").expect("bad regex");
+    lazy_regex::regex!(r"(^|\\|/)(\.\.?|node_modules)(\\|/|$)");
+  let pattern_re = lazy_regex::regex!(r"\*");
   if !target.starts_with("./") {
     if internal && !target.starts_with("../") && !target.starts_with('/') {
       let is_url = Url::parse(&target).is_ok();
-- 
cgit v1.2.3