0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-10-29 08:58:01 -04:00

fix(cli): Explicitly cache NPM packages during deno install (#24190)

Fixes a regression introduced in
https://github.com/denoland/deno/pull/24170, where we wouldn't actually
set up the node modules dir on `deno install` if there was an up to date
deno lockfile present.

Previously we were relying on the fact that resolving pending module
resolution called `cache_packages` (which sets up the node modules dir).
When pending resolutions were removed, and the `resolve_pending`
function with it, we also removed the `cache_packages` call needed to
set up node modules.
This commit is contained in:
Nathan Whitaker 2024-06-12 16:06:41 -07:00 committed by Nathan Whitaker
parent 5bc78de808
commit 4af7fb8b81
No known key found for this signature in database
4 changed files with 44 additions and 0 deletions

View file

@ -75,6 +75,9 @@ pub async fn load_top_level_deps(factory: &CliFactory) -> Result<(), AnyError> {
let npm_resolver = factory.npm_resolver().await?; let npm_resolver = factory.npm_resolver().await?;
if let Some(npm_resolver) = npm_resolver.as_managed() { if let Some(npm_resolver) = npm_resolver.as_managed() {
npm_resolver.ensure_top_level_package_json_install().await?; npm_resolver.ensure_top_level_package_json_install().await?;
// TODO(nathanwhit): we call `cache_packages` if the lockfile is modified,
// so by calling it here it's possible we end up calling it twice
npm_resolver.cache_packages().await?;
} }
// cache as many entries in the import map as we can // cache as many entries in the import map as we can
if let Some(import_map) = factory.maybe_import_map().await? { if let Some(import_map) = factory.maybe_import_map().await? {

View file

@ -25,6 +25,44 @@
} }
] ]
}, },
"install_sets_up_node_modules_with_lockfile": {
"tempDir": true,
"envs": {
"DENO_FUTURE": "1"
},
"steps": [
{
"args": "install",
"output": "install.out"
},
{
// check for lockfile
"args": [
"eval",
"console.log(Deno.readTextFileSync('./deno.lock').trim())"
],
"output": "deno.lock.out"
},
{
// remove the lockfile
"args": [
"eval",
"Deno.removeSync('node_modules', {recursive: true});"
],
"output": ""
},
{
// install, this time should use the lockfile
"args": "install",
"output": "install_lockfile.out"
},
{
// make sure we created the node_modules dir
"args": ["eval", "Deno.statSync('node_modules')"],
"output": ""
}
]
},
"install_errors_corrupted_lockfile": { "install_errors_corrupted_lockfile": {
"tempDir": true, "tempDir": true,
"envs": { "envs": {

View file

@ -0,0 +1,2 @@
⚠️ `deno install` behavior will change in Deno 2. To preserve the current behavior use the `-g` or `--global` flag.
Initialize @denotest/esm-basic@1.0.0

View file

@ -4,3 +4,4 @@
[WILDCARD] [WILDCARD]
Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz
Initialize @denotest/esm-basic@1.0.0 Initialize @denotest/esm-basic@1.0.0
[WILDCARD]