Open jakemac53 opened 4 months ago
Should work better with IDE and other tooling (debugging from IDE, running individual tests, etc). cc @DanTup
Yes please! :)
Dart-Code might require some changes (because we have some assumptions about having a .dart_tool/package_config.json
alongside a pubspec.yaml
then disable a bunch of things in the Dart SDK where those assumptions aren't true), but I had always hoped (assumed?) that once this is done, we'd be able to use dart run
and dart test
in the SDK without breaking things and we can stop special-casing the SDK (who knows how many other repos there are that don't get special treatment in Dart-Code and have wonky behaviour).
There are some other minor niggles for some tests in VS Code (for ex. we don't understand package:test_reflective_loader
tests) that I think are solvable but I haven't dug into them too much yet because not being able to run dart test
has been the major blocker.
(FWIW, how the package_config is generated is less important to me/Dart-Code, as long as the SDK is flagged in a way that means dart test
doesn't break things - which is what https://github.com/dart-lang/pub/issues/4022 was about)
because we have some assumptions about having a
.dart_tool/package_config.json
alongside apubspec.yaml
Have you tried the pub workspaces feature? Does it have the same issue or no? It would be worth fixing it to work with workspaces if it doesn't currently because that is now a more general feature.
We would be able to use standard tools such as
dart run
anddart test
(anddart pub get
) in SDK packages without negative consequence.
💯
I haven't looked at the impl. tool closely. The SDK+gclient is (mostly? completely?) hermetic currently. Can this work with running a pub get --offline
after gclient setup? Is there enough info encoded in the pubspec for pub get to work with only the info in the repo - w/o having to download other packages?
You may try replacing this bootstrap into the dart setup code with the dart pub get --offline
equivalent: https://github.com/dart-lang/sdk/blob/main/DEPS#L805.
Have you tried the pub workspaces feature?
No, I thought it was still being designed/work in progress 😄 Are there instructions for trying it out? Does it need flags and/or a specific SDK version?
Can this work with running a
pub get --offline after gclient
setup?
If all dependencies are workspace packages I would think: yes.
I don't even think you need to do --offline
since it will never go online to check for package versions, if all dependencies of all packages are workspace packages (or overridden with a path-dependency).
There could be corner cases, but it's worth testing, and possibly fixing if it doesn't work.
@jonasfj Would it be possible to add an offline: true
option to the pubspec.yaml
to enforce that no pub get
for that package should ever reach out to pub?
No, I thought it was still being designed/work in progress 😄 Are there instructions for trying it out? Does it need flags and/or a specific SDK version?
I am not sure on instructions, but you can look at the build repo. Or the branch of the SDK I linked above.
tldr;
workspace: ["pkg/a", "pkg/b", ...]
.resolution: workspace
to the pubspeccc @athomas I hear you might be a good person to discuss this with?
@jakemac53 Happy to, I've wanted to use pub for a while to generate the package config and discussed it with sigurdm in the past (though this was pre-workspaces and never high enough priority).
I see in DEPS you didn't remove the old package_config generator. It should be replaced running pub get from the checked-in SDK. We'd also need to ensure the bots manage their pub cache but that's a relatively simple change (we should do anyway).
I would suggest we split "use workspaces" from the "run tests with the package:test runner". I'm broadly supportive of removing bespoke things, but I don't think these need to be coupled. I would assume that generating the package config in a different way can be made compatible with the SDK test runner relatively easily.
I see in DEPS you didn't remove the old package_config generator. It should be replaced running pub get from the checked-in SDK. We'd also need to ensure the bots manage their pub cache but that's a relatively simple change (we should do anyway).
Correct, my CL is not complete, just enough to get basic functionality working to test things out. I would be happy to complete it though if we want to move forward.
I would suggest we split "use workspaces" from the "run tests with the package:test runner".
Agreed, I think running actual tests using the test runner on the bots might not be a task worth investing in. In particular I am not sure how that would interact with the test database.
But, developers would be able to use the test runner locally still to run tests more easily. And the IDE tooling could use it to run tests, which would enable some nice functionality there.
I would assume that generating the package config in a different way can be made compatible with the SDK test runner relatively easily.
Yes I don't believe anything has to be changed here, it should just work.
@jakemac53
I am not sure on instructions, but you can look at the build repo. Or the branch of the SDK I linked above.
Thanks! I grabbed build
and can see that we definitely aren't doing the right thing - we are treated all projects without their own package_config as "needing to have pub get
run.
I'll work on this (tracked via https://github.com/Dart-Code/Dart-Code/issues/5067).
[3:33:54 PM] [General] [Info] Version last used for Pub is 3.2.2 (3.2.0), current is 3.6.0-edge.81d13ed904cc2d2c5c673df8114d80ac0c2a622c (3.6.0)
[3:33:54 PM] [General] [Info] Found 7 folders requiring "pub get" or "pub upgrade":
C:\Dev\Google\build (get: true, upgrade: false, reason: package_config.json is missing)
C:\Dev\Google\build\example (get: true, upgrade: true, reason: The current SDK version (3.6.0) is newer than the one last used to run "pub get" (3.2.0))
C:\Dev\Google\build\scratch_space (get: true, upgrade: false, reason: package_config.json is missing)
C:\Dev\Google\build\tool (get: true, upgrade: false, reason: package_config.json is missing)
C:\Dev\Google\build\_test (get: true, upgrade: false, reason: package_config.json is missing)
C:\Dev\Google\build\_test_common (get: true, upgrade: false, reason: package_config.json is missing)
C:\Dev\Google\build\_test\pkgs\provides_builder (get: true, upgrade: false, reason: package_config.json is missing)
I updated my PR to change how gclient runhooks
works, setting a custom pub cache and also a fake pub repository URL to ensure we never reach out to pub.
I ran into a separate issue, which is mockito
has a regular dependency on source_gen
for the builder that it implements. That builder was not used internally, and so we never actually had the dependency (sort of similar issue to node_preamble
, but more pervasive).
This ends up needing many more transitive deps because source_gen
depends on build
.
In general, in the old world we had the ability to pull in only the transitive deps of packages that were used, which was a subset of their dependencies
in some cases. We no longer have that option if we go this route, and it looks like that would result in a fair number of additional deps.
cc @srawlins have you considered splitting it out a mockito_builder
package?
I have not, I guess the primary benefit would be smaller, more targeted dependencies
sets?
I am mostly surprised that mockito is in DEPS, and would 100% support an effort to get it out.
$ git grep 'package:mockito'
pkg/js/README.md:You can also use `package:mockito` to do the mocking with this API, by providing
pkg/js/README.md:a generated mocking object from `package:mockito` to `createStaticInteropMock`.
pkg/vm_service_interface/test/server_test.dart:import 'package:mockito/mockito.dart';
tests/lib/js/export/static_interop_mock/mockito_test.dart:import 'package:mockito/mockito.dart';
Those seem reconcilable...
I have not, I guess the primary benefit would be smaller, more targeted
dependencies
sets?
Right, it may not be worth it, idk. I didn't think mockito was useful for much without the codegen nowadays.
I am mostly surprised that mockito is in DEPS, and would 100% support an effort to get it out.
Yeah, this would be another approach, just don't allow it in the SDK.
cc @srujzs for the question of whether we can write around using mockito in tests/lib/js/export/static_interop_mock/mockito_test.dart
, and @bkonyi for pkg/vm_service_interface/test/server_test.dart
.
whether we can write around using mockito in
tests/lib/js/export/static_interop_mock/mockito_test.dart
I don't have the full context here, but if we can't use mockito
in our tests, then this test should be deleted. The point of this test was to provide a proof of concept in using mockito
to work with the export functionalities we added, but it isn't directly testing our implementation, so it's okay to delete.
@bkonyi for
pkg/vm_service_interface/test/server_test.dart
.
I think we should be able to rewrite this test to not rely on mockito if we need to.
@jonasfj Would it be possible to add an
offline: true
option to thepubspec.yaml
to enforce that nopub get
for that package should ever reach out to pub?
I had a similar-ish request here: https://github.com/dart-lang/pub/issues/4328
Note that I realized offline: true
isn't enough because it will still search for previously downloaded package versions in the pub cache. So you also need to override the pub cache dir.
I should probably know more about workspaces than I do, because maybe then I wouldn't have any questions. But ...
Is there any problem with a package like analyzer
having different version constraints when shipping than the workspace it's contained in?
Is there any problem with a package like analyzer having different version constraints when shipping than the workspace it's contained in?
If the workspace contains package:analyzer and package:foo, and package:analyzer depends on package:foo, then the version of foo in the workspace must satisfy the version constraint in package analyzer when resolving the workspace.
When analyzer and foo are published, and some app depends on analyzer, they will get the published version of foo.
@jonasfj Would it be possible to add an
offline: true
option to thepubspec.yaml
to enforce that nopub get
for that package should ever reach out to pub?I had a similar-ish request here: dart-lang/pub#4328
I think pubspec.yaml
could have a policies
section where different policies can be declared and enforced: SLSA L3 required, allowed publishers, etc.
So I think we should do that some day, unless there is a lot of pull for such feature, I propose prioritizing on other things.
For the Dart SDK, it might be better to just make a test in CI that runs dart pub deps --json
and checks that all entries have "source": "path"
or "source": "root"
.
If the workspace contains package:analyzer and package:foo, and package:analyzer depends on package:foo ...
That makes sense, thanks. I hadn't considered that issue. I don't think that will be a problem, though, because we generally bump the version of _fe_analyzer_shared
and publish it at the same time we bump the version of analyzer
.
But I was thinking about differences between analyzer
's pubspec.yaml
and the workspace's pubspec.yaml
. I'm guessing that the workspace's pubspec.yaml
would have very tight constraints on third-part packages, similar to (or identical to) the pinned versions in the DEPS
file today. When we ship a version of the analyzer
package we want the constraints to be as broad as possible in order to reduce conflicts when resolving client packages. I'm guessing that as long as the constraints in analyzer
include the pinned version in the workspace that everything is fine, but wanted to verify.
But I was thinking about differences between
analyzer
'spubspec.yaml
and the workspace'spubspec.yaml
. I'm guessing that the workspace'spubspec.yaml
would have very tight constraints on third-part packages, similar to (or identical to) the pinned versions in theDEPS
file today.
The workspace pubspec would have path dependency overrides (see my WIP one).
Dependency constraints are still expressed at the per-package level, although there is the constraint that there must be some common version solves which is possible for the entire workspace. However, this would actually not be enforced due to the dependency overrides (afaik at least). In other words, there would be no change from how the SDK works today, no version enforcement or solving when developing in the SDK.
I've played a bit with this too.
I've found a few further observations:
tools/sdks/dart-sdk/bin/dart
is v. 3.6.0-2.0.dev
but package:analysis_server
requires >=3.7.0-edge <4.0.0
I think in general we need to use the checked in dart to generate the .dart_tools/package_config.json
(or we would require building the vm before any editing that requires a resolution.
That makes it hard to require a bleeding edge sdk version from a package.
Several packages in third_party/pkg depend on packages that are not currently in package_config.json.
Eg. third_party/pkg/mockito/pubspec.yaml depends on package:build
and package:source_gen
. Those are not in deps.
I think fixing these could be a side-benefit of the migration - but it will be some work to put in.
fwiw, I'm in the process of removing the mockito dep; https://dart-review.googlesource.com/c/sdk/+/392465 and https://dart-review.googlesource.com/c/sdk/+/392402.
tools/sdks/dart-sdk/bin/dart
is v.3.6.0-2.0.dev
butpackage:analysis_server
requires>=3.7.0-edge <4.0.0
Is the effect of this basically that packages in the SDK won't be able to set their minimum bound to anything higher than the precompiled (checked in) SDK? Ultimately that is probably acceptable if so, assuming it is fairly trivial to update the checked in SDK.
tools/sdks/dart-sdk/bin/dart
is v.3.6.0-2.0.dev
butpackage:analysis_server
requires>=3.7.0-edge <4.0.0
Is the effect of this basically that packages in the SDK won't be able to set their minimum bound to anything higher than the precompiled (checked in) SDK? Ultimately that is probably acceptable if so, assuming it is fairly trivial to update the checked in SDK.
Yes, if we use the checked in sdk to make the resolution (which I suggest doing)
Perhaps it is not a big issue, but I think it might make a few things harder than it currently is.
It probably means that part of changing the SDK version to the next minor version will be building the SDK as that version, uploading the result, and using that as the checked-in SDK. More process, but only when changing the SDK version.
It probably means that part of changing the SDK version to the next minor version will be building the SDK as that version, uploading the result, and using that as the checked-in SDK.
I don't think it has to happen as a part of that PR, just shortly afterwords. Really it will need to happen any time a package starts depending on new features from the SDK, which is newer than the precompiled SDK, which could happen at any time.
Although, I am actually surprised this would be an issue because we will need path dependency overrides for all packages anyways? That should bypass the check.
We don't need path overrides for the pkg/
packages.
We don't need path overrides for the
pkg/
packages.
Oh right because they are in the workspace already so they implicitly come from there. IIRC pub doesn't actually even allow path overrides for those?
This does bring up a larger issue - for package:macros (or any other SDK vendored package), this will be much more problematic. A new precompiled SDK might have to be included in the same CL as any change to package:_macros (if that change is not backwards compatible for the analyzer/cfe). We are looking to move away from the SDK vendored package approach for that package though.
Oh right because they are in the workspace already so they implicitly come from there. IIRC pub doesn't actually even allow path overrides for those?
That's right - you cannot override the workspace packages.
We are looking to move away from the SDK vendored package approach for that package though.
Looking forward to this :) . It is wrecking all kinds of havoc...
For context on workspaces, see flutter.dev/go/pub-workspace. cc @jonasfj @sigurdm in case you all had considered this, or think I am off my rocker 🤣.
Proposal
See my WIP branch, which gets package:analyzer working. More packages would have to be added to complete it.
Benefits
dart run
anddart test
(anddart pub get
) in SDK packages without negative consequence.Risks
pub get
, and also wouldn't be able to build a new SDK that is compatible, because that requires apub get
.pub get
ingclient runhooks
to resolve this issue.Additional work required
gclient runhooks
to runpub get
instead of invoking the custom tool.pub get
just like today.Other ideas
Trying out the example
Run
gclient sync -D
(need some extra deps for the test runner)Run
pub get
from the root of the SDK (creates the package config). Note that you should not rungclient runhooks
, that will currently bash over this package config.Note: You can also now run this from any workspace package, and it will not create a new package config for that package. It will only update the root one.
Actually, you will see some tests fail because they take command line arguments which isn't allowed in the test runner, this is called out above. It is rare but we would have to look into these.