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

Delete directories between workspace package and workspace root #4446

Merged
merged 5 commits into from
Dec 2, 2024

Conversation

sigurdm
Copy link
Contributor

@sigurdm sigurdm commented Nov 26, 2024

Fixes #4445
Also makes resolution error if there are any pubspec.yaml's in such directories.

@sigurdm sigurdm requested review from jonasfj and szakarias November 26, 2024 11:26
lib/src/entrypoint.dart Outdated Show resolved Hide resolved
@sigurdm sigurdm requested a review from jonasfj November 29, 2024 13:15
}
}
if (deletedAny) {
log.warning(
'See https://dart.dev/go/workspaces-no-inbetween-packages for details.',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'See https://dart.dev/go/workspaces-no-inbetween-packages for details.',
'See https://dart.dev/go/workspace-packages-in-other-package for details.',

I'm not sure this is better, just an idea.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we are also talking pubspec.lock and pubspec.yaml

lib/src/package.dart Outdated Show resolved Hide resolved
@sigurdm sigurdm merged commit 30bfc43 into dart-lang:master Dec 2, 2024
23 checks passed
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request Dec 17, 2024
Bump pub to e6704cc5219f3767ca5680ef8691c55133250664

Changes:
```
> git log --format="%C(auto) %h %s" ab8b269..e6704cc
 https://dart.googlesource.com/pub.git/+/e6704cc5 Don't iterate above the root dir when finding stray pubspecs (4469)
 https://dart.googlesource.com/pub.git/+/43c19297 Fix stray files check (4464)
 https://dart.googlesource.com/pub.git/+/52812073 Delete directories between workspace package and workspace root (4446)

```
Diff: https://dart.googlesource.com/pub.git/+/ab8b269..e6704cc5219f3767ca5680ef8691c55133250664/

Change-Id: Ib0eb3564b18304c1dd4626cbede359c57f253321
Cherry-pick: dart-lang/pub#4446, dart-lang/pub#4464
Cherry-pick-request: #59650
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/399906
Reviewed-by: Christopher Fujino <[email protected]>
Commit-Queue: Alexander Thomas <[email protected]>
Reviewed-by: Alexander Thomas <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Delete stray .dart_tool/package_config.json files between root and package dirs.
2 participants