diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-10-25 14:39:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-25 14:39:00 -0400 |
commit | be97170a193e8cecc5ce03ecd3c1d0add4a06bf7 (patch) | |
tree | fab7d266e208db93dcf0870dda70f7da56ade735 /cli/args/mod.rs | |
parent | 093b3eee58181ec45839d0fe10b8157326a102b2 (diff) |
feat(unstable): ability to `npm install` then `deno run main.ts` (#20967)
This PR adds a new unstable "bring your own node_modules" (BYONM)
functionality currently behind a `--unstable-byonm` flag (`"unstable":
["byonm"]` in a deno.json).
This enables users to run a separate install command (ex. `npm install`,
`pnpm install`) then run `deno run main.ts` and Deno will respect the
layout of the node_modules directory as setup by the separate install
command. It also works with npm/yarn/pnpm workspaces.
For this PR, the behaviour is opted into by specifying
`--unstable-byonm`/`"unstable": ["byonm"]`, but in the future we may
make this the default behaviour as outlined in
https://github.com/denoland/deno/issues/18967#issuecomment-1761248941
This is an extremely rough initial implementation. Errors are
terrible in this and the LSP requires frequent restarts. Improvements
will be done in follow up PRs.
Diffstat (limited to 'cli/args/mod.rs')
-rw-r--r-- | cli/args/mod.rs | 68 |
1 files changed, 43 insertions, 25 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 390e16698..ab8d6b503 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -76,25 +76,29 @@ use deno_config::FmtConfig; use deno_config::LintConfig; use deno_config::TestConfig; -static NPM_REGISTRY_DEFAULT_URL: Lazy<Url> = Lazy::new(|| { - let env_var_name = "NPM_CONFIG_REGISTRY"; - if let Ok(registry_url) = std::env::var(env_var_name) { - // ensure there is a trailing slash for the directory - let registry_url = format!("{}/", registry_url.trim_end_matches('/')); - match Url::parse(®istry_url) { - Ok(url) => { - return url; - } - Err(err) => { - log::debug!("Invalid {} environment variable: {:#}", env_var_name, err,); +pub fn npm_registry_default_url() -> &'static Url { + static NPM_REGISTRY_DEFAULT_URL: Lazy<Url> = Lazy::new(|| { + let env_var_name = "NPM_CONFIG_REGISTRY"; + if let Ok(registry_url) = std::env::var(env_var_name) { + // ensure there is a trailing slash for the directory + let registry_url = format!("{}/", registry_url.trim_end_matches('/')); + match Url::parse(®istry_url) { + Ok(url) => { + return url; + } + Err(err) => { + log::debug!( + "Invalid {} environment variable: {:#}", + env_var_name, + err, + ); + } } } - } - Url::parse("https://registry.npmjs.org").unwrap() -}); + Url::parse("https://registry.npmjs.org").unwrap() + }); -pub fn npm_registry_default_url() -> &'static Url { &NPM_REGISTRY_DEFAULT_URL } @@ -570,10 +574,16 @@ pub fn get_root_cert_store( /// State provided to the process via an environment variable. #[derive(Clone, Debug, Serialize, Deserialize)] pub struct NpmProcessState { - pub snapshot: deno_npm::resolution::SerializedNpmResolutionSnapshot, + pub kind: NpmProcessStateKind, pub local_node_modules_path: Option<String>, } +#[derive(Clone, Debug, Serialize, Deserialize)] +pub enum NpmProcessStateKind { + Snapshot(deno_npm::resolution::SerializedNpmResolutionSnapshot), + Byonm, +} + const RESOLUTION_STATE_ENV_VAR_NAME: &str = "DENO_DONT_USE_INTERNAL_NODE_COMPAT_STATE"; @@ -875,9 +885,11 @@ impl CliOptions { pub fn resolve_npm_resolution_snapshot( &self, ) -> Result<Option<ValidSerializedNpmResolutionSnapshot>, AnyError> { - if let Some(state) = &*NPM_PROCESS_STATE { + if let Some(NpmProcessStateKind::Snapshot(snapshot)) = + NPM_PROCESS_STATE.as_ref().map(|s| &s.kind) + { // TODO(bartlomieju): remove this clone - Ok(Some(state.snapshot.clone().into_valid()?)) + Ok(Some(snapshot.clone().into_valid()?)) } else { Ok(None) } @@ -926,13 +938,6 @@ impl CliOptions { }) } - pub fn node_modules_dir_specifier(&self) -> Option<ModuleSpecifier> { - self - .maybe_node_modules_folder - .as_ref() - .map(|path| ModuleSpecifier::from_directory_path(path).unwrap()) - } - pub fn vendor_dir_path(&self) -> Option<&PathBuf> { self.maybe_vendor_folder.as_ref() } @@ -1226,6 +1231,19 @@ impl CliOptions { .unwrap_or(false) } + pub fn unstable_byonm(&self) -> bool { + self.flags.unstable_byonm + || NPM_PROCESS_STATE + .as_ref() + .map(|s| matches!(s.kind, NpmProcessStateKind::Byonm)) + .unwrap_or(false) + || self + .maybe_config_file() + .as_ref() + .map(|c| c.json.unstable.iter().any(|c| c == "byonm")) + .unwrap_or(false) + } + pub fn v8_flags(&self) -> &Vec<String> { &self.flags.v8_flags } |