Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: npm workspace and better Deno workspace support #24334

Merged
merged 101 commits into from
Jul 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit Hold shift click to select a range
3660270
Start on workspace refactor.
dsherret Jun 17, 2024
2c591ef
Some work on tasks
dsherret Jun 18, 2024
81dc4a8
Switching more to workspace
dsherret Jun 18, 2024
271df70
More.
dsherret Jun 18, 2024
b155d9a
Remove cli/args/package_json.rs
dsherret Jun 18, 2024
c1d52f8
some work on deno compile
dsherret Jun 18, 2024
c8dbbb1
tasks
dsherret Jun 19, 2024
04fd3c6
update publishing
dsherret Jun 19, 2024
03b30f4
Adding fmting
dsherret Jun 19, 2024
1e8b196
Merge branch 'main' into workspace_start
dsherret Jun 19, 2024
cb6b545
some work on linting
dsherret Jun 19, 2024
5e9fd3f
finish lint
dsherret Jun 20, 2024
4fe5441
Some work on lsp and installing from all the packages
dsherret Jun 20, 2024
19ad5c4
separate out test options from workspace test options
dsherret Jun 20, 2024
6eed364
finish up test
dsherret Jun 20, 2024
c04afc7
Add bench
dsherret Jun 20, 2024
49b1a23
compiling
dsherret Jun 20, 2024
76dcc18
handle base properly
dsherret Jun 20, 2024
4205667
fix slow types linting
dsherret Jun 20, 2024
2033d89
Use SharedLocal and fix some vendor tests.
dsherret Jun 21, 2024
297d191
Start making import map optional
dsherret Jun 21, 2024
8583651
Start investigating @types issue
dsherret Jun 21, 2024
df4e20e
Fix. Wasn't thinking.
dsherret Jun 21, 2024
a7b5857
fix info
dsherret Jun 21, 2024
c5df354
fix watcher tests
dsherret Jun 21, 2024
77c0977
working npm tests
dsherret Jun 21, 2024
d38c216
some import specifier fixes
dsherret Jun 22, 2024
ffa9bb1
Fix some lsp issues.
dsherret Jun 24, 2024
e887d93
Fix test
dsherret Jun 24, 2024
64c20ac
We understand the npm workspace now
dsherret Jun 24, 2024
171bed6
Make deno compile work with relative specifiers
dsherret Jun 24, 2024
5c330c1
Fix in import_map/deno_emit
dsherret Jun 25, 2024
2b4247c
Compile fixes
dsherret Jun 25, 2024
3c9fec7
Fix some byonm stuff
dsherret Jun 25, 2024
e691125
Merge branch 'main' into workspace_start
dsherret Jun 25, 2024
4d3ac9e
Update to actual deps
dsherret Jun 26, 2024
e844ee1
refactor: move `PackageJson` to deno_config
dsherret Jun 26, 2024
5770c6b
Update
dsherret Jun 26, 2024
1ca7b82
fix failing tests
dsherret Jun 26, 2024
6b65431
Update deno_config
dsherret Jun 26, 2024
25439b0
fix failing test by clearing package json cache
dsherret Jun 26, 2024
c72410e
fix formatting
dsherret Jun 26, 2024
f41a348
Merge branch 'main' into workspace_start
dsherret Jun 26, 2024
b1e4645
Merge branch 'package_json_deno_config' into workspace_start
dsherret Jun 26, 2024
11eb6ff
Fixes for latest changes
dsherret Jun 26, 2024
1e28b4e
clippy
dsherret Jun 26, 2024
f626f10
Resolve todo
dsherret Jun 26, 2024
3fe1853
update from what will be main
dsherret Jun 26, 2024
c4b55bf
Resolve some todos
dsherret Jun 26, 2024
698d9aa
Merge branch 'main' into workspace_start
dsherret Jun 26, 2024
1281f76
Merge branch 'main' into workspace_start
dsherret Jun 26, 2024
217a217
fix failing tests
dsherret Jun 26, 2024
163bef4
npm workspace resolution
dsherret Jun 27, 2024
05ce93e
handle going to npm workspace deps for npm specifiers too
dsherret Jun 27, 2024
de1b298
Add test for workspace
dsherret Jun 27, 2024
2fd7ffa
add an npm specifier referencing a workspace package
dsherret Jun 27, 2024
0a9e1c3
move this down to deno_config
dsherret Jun 27, 2024
33ab587
updates for latest
dsherret Jun 27, 2024
2c35049
update to new Workspace::discover signature
dsherret Jun 28, 2024
6e9c118
Support `@workspace` tag in an npm specifier
dsherret Jun 28, 2024
a063f9a
Support pkg json "workspace:" specifiers
dsherret Jun 28, 2024
91c3c1b
Move test
dsherret Jun 28, 2024
8851529
Initialize node_modules dir with used workspace members
dsherret Jun 28, 2024
8dd40a9
Fix some tests and update var names
dsherret Jun 29, 2024
66c863b
Update workspace basic test
dsherret Jun 29, 2024
5df7730
Merge branch 'main' into workspace_start
dsherret Jun 29, 2024
44c189e
Merge branch 'main' into workspace_start
dsherret Jun 29, 2024
07a57b4
Update for failing compile
dsherret Jun 29, 2024
ebfe959
Merge branch 'main' of https://github.com/denoland/deno into workspac…
dsherret Jul 1, 2024
9a1e921
improve resolving root dir for deno compile
dsherret Jul 1, 2024
497c22d
Resolve more todos about errors in sub path resolution
dsherret Jul 1, 2024
b0fc65d
Add tests for and fix formatting
dsherret Jul 1, 2024
914be64
Fix some issues and add tests for linting
dsherret Jul 1, 2024
bb1988e
Add no slow types workspace lint test
dsherret Jul 1, 2024
36c1ca0
Merge branch 'main' into workspace_start
dsherret Jul 1, 2024
7fee5f6
Format and ignore some files from formatting
dsherret Jul 1, 2024
ea41334
Add tests for exports not found in npm workspace
dsherret Jul 1, 2024
59fb3db
Merge branch 'main' into workspace_start
dsherret Jul 1, 2024
f8cf42a
diagnostics
dsherret Jul 1, 2024
57fdbde
Add tests for lockfile going to the workspace root
dsherret Jul 1, 2024
8a97d8c
Add test for check
dsherret Jul 2, 2024
9ce4caa
Update deno_config
dsherret Jul 2, 2024
803b097
Add bench tests
dsherret Jul 2, 2024
754b308
add test
dsherret Jul 2, 2024
9d38ecf
Merge branch 'main' into workspace_start
dsherret Jul 2, 2024
6aaac91
fix specs
dsherret Jul 2, 2024
1448564
was using a backslash in a path
dsherret Jul 2, 2024
3f7569f
Bump ci cache
dsherret Jul 2, 2024
7e6644f
Switch back to resolving based on multiple args.
dsherret Jul 3, 2024
db95f58
update some tests
dsherret Jul 3, 2024
43f1f5f
Merge branch 'main' into workspace_start
dsherret Jul 3, 2024
372ceed
update tests
dsherret Jul 3, 2024
0c98628
fix copyright
dsherret Jul 3, 2024
51bed91
add tests for vendor
dsherret Jul 3, 2024
8ac81df
update test for pkg with no deps in lockfile in workspace
dsherret Jul 3, 2024
2a957e0
Merge branch 'main' into workspace_start
dsherret Jul 3, 2024
650a43d
- Fix private registries not working with auto-install in deno compile
dsherret Jul 3, 2024
ae7ebec
maybe fix windows tests
dsherret Jul 3, 2024
4d0d459
Updates from review
dsherret Jul 3, 2024
21673a3
Merge branch 'main' into workspace_start
dsherret Jul 3, 2024
b282f75
Upgrade deno_unsync. Remove fatal diagnostic test because it's in den…
dsherret Jul 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix info
  • Loading branch information
dsherret committed Jun 21, 2024
commit a7b585746b44898b4f7e20fbca73dbb58e29ddde
26 changes: 17 additions & 9 deletions cli/tools/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 45,23 @@ pub async fn info(flags: Flags, info_flags: InfoFlags) -> Result<(), AnyError> {
let maybe_lockfile = factory.maybe_lockfile();
let resolver = factory.workspace_resolver().await?;

let specifier = resolver
.resolve(
&specifier,
&ModuleSpecifier::from_directory_path(
cli_options.initial_cwd().join("deno.json"),
)
.unwrap(),
)?
.into_url()?;
let maybe_import_specifier =
if let Some(import_map) = resolver.maybe_import_map() {
if let Ok(imports_specifier) =
import_map.resolve(&specifier, import_map.base_url())
{
Some(imports_specifier)
} else {
None
}
} else {
None
};

let specifier = match maybe_import_specifier {
Some(specifier) => specifier,
None => resolve_url_or_path(&specifier, cli_options.initial_cwd())?,
};

let mut loader = module_graph_builder.create_graph_loader();
loader.enable_loading_cache_info(); // for displaying the cache information
Expand Down