diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-09-04 16:00:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 14:00:44 +0000 |
| commit | c6d1b0a1ccf45b7819b1e6f1efe8687b240f495a (patch) | |
| tree | 6be2c0c611e4aee950402a34aaedd1c9b6bcaac3 /cli/npm/managed/resolvers/mod.rs | |
| parent | 13911eb8efb77bd14a80412072aecb664aa55fd5 (diff) | |
fix(byonm): resolve npm deps of jsr deps (#25399)
This allows using npm deps of jsr deps without having to add them to the
root package.json.
Works by taking the package requirement and scanning the
`node_modules/.deno` directory for the best matching package, so it
relies on deno's node_modules structure.
Additionally to make the transition from package.json to deno.json
easier, Deno now:
1. Installs npm deps in a deno.json at the same time as installing npm
deps from a package.json.
2. Uses the alias in the import map for `node_modules/<alias>` for
better package.json compatiblity.
Diffstat (limited to 'cli/npm/managed/resolvers/mod.rs')
| -rw-r--r-- | cli/npm/managed/resolvers/mod.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cli/npm/managed/resolvers/mod.rs b/cli/npm/managed/resolvers/mod.rs index 2dfc323e9..f5d9e4b05 100644 --- a/cli/npm/managed/resolvers/mod.rs +++ b/cli/npm/managed/resolvers/mod.rs @@ -11,10 +11,11 @@ use deno_npm::NpmSystemInfo; use deno_runtime::deno_fs::FileSystem; use crate::args::LifecycleScriptsConfig; -use crate::args::PackageJsonInstallDepsProvider; +use crate::args::NpmInstallDepsProvider; use crate::util::progress_bar::ProgressBar; pub use self::common::NpmPackageFsResolver; +pub use self::local::normalize_pkg_name_for_node_modules_deno_folder; use self::global::GlobalNpmPackageResolver; use self::local::LocalNpmPackageResolver; @@ -27,7 +28,7 @@ use super::resolution::NpmResolution; pub fn create_npm_fs_resolver( fs: Arc<dyn FileSystem>, npm_cache: Arc<NpmCache>, - pkg_json_deps_provider: &Arc<PackageJsonInstallDepsProvider>, + npm_install_deps_provider: &Arc<NpmInstallDepsProvider>, progress_bar: &ProgressBar, resolution: Arc<NpmResolution>, tarball_cache: Arc<TarballCache>, @@ -39,7 +40,7 @@ pub fn create_npm_fs_resolver( Some(node_modules_folder) => Arc::new(LocalNpmPackageResolver::new( npm_cache, fs, - pkg_json_deps_provider.clone(), + npm_install_deps_provider.clone(), progress_bar.clone(), resolution, tarball_cache, |