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

Add a "pub workspace" to the root of the engine repository #53539

Merged
merged 35 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
54d1ca6
Move one package to a workspace.
matanlurey Jun 24, 2024
2068ba1
++
matanlurey Jun 24, 2024
fcde54c
++
matanlurey Jun 24, 2024
50fa853
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jun 25, 2024
144ec4a
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jun 26, 2024
d78b88a
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jul 1, 2024
9f49e49
++
matanlurey Jul 1, 2024
ff2aa36
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jul 3, 2024
7812873
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jul 11, 2024
a467fb6
Modify pub_get_offline.py to respect resolution: workspace.
matanlurey Jul 11, 2024
901b47f
++
matanlurey Jul 11, 2024
4f99625
++
matanlurey Jul 11, 2024
d1ba509
Use pyyaml.
matanlurey Jul 11, 2024
b4c4186
++
matanlurey Jul 11, 2024
9485af8
Oops.
matanlurey Jul 11, 2024
2638753
++
matanlurey Jul 11, 2024
627d84c
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jul 11, 2024
46853e1
++
matanlurey Jul 11, 2024
339abd3
++
matanlurey Jul 11, 2024
3ed2f04
++
matanlurey Jul 11, 2024
d889220
++|
matanlurey Jul 11, 2024
2ba6436
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jul 17, 2024
eb2303a
Update pubspec.yaml
matanlurey Jul 17, 2024
ef6605d
Update pubspec.yaml
matanlurey Jul 17, 2024
2d727a6
Update pubspec.yaml
matanlurey Jul 17, 2024
8ee0c85
Fix DEPS merge.
matanlurey Jul 17, 2024
d2aa032
++
matanlurey Jul 17, 2024
d1a92b4
++
matanlurey Jul 17, 2024
d4fa1df
++
matanlurey Jul 17, 2024
7703083
Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…
matanlurey Jul 17, 2024
e0c31a8
++
matanlurey Jul 17, 2024
784b9d8
Exempt a folder.
matanlurey Jul 17, 2024
77f04a8
Add // ignores for https://github.com/flutter/flutter/issues/151917.
matanlurey Jul 17, 2024
da0d118
More lintos.
matanlurey Jul 17, 2024
9ee12d0
++
matanlurey Jul 18, 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
180 changes: 180 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
# This file represents a "workspace" that applies to the whole repository.
#
# See <https://flutter.dev/go/pub-workspace> for details.
#
# The `flutter/engine` repository is a quasi-monorepo, with multiple Dart tools
# and packages that are all interdependent. Third party dependencies are managed
# by the `DEPS` file in the root of the repository, and are synced to either the
# `third_party` (i.e. `//flutter/third_party`) or `../third_party` (i.e.
# `//third_party`) directories by `gclient sync`.
#
# Every dependency declared here are dependencies used by _one or more_ of the
# packages in the repository (though there is no enforcement of this). This file
# then generates a `.dart_tool/package_config.json` file that is used by the
# rest of the repository to resolve dependencies.
#
# ==============================================================================
# WORKFLOWS
# ==============================================================================
#
# ------------------------------------------------------------------------------
# (1) ADDING A NEW DEPENDENCY
# ------------------------------------------------------------------------------
# Dependencies need to be added either via the DEPS file, or by checking the are
Copy link

@navaronbracke navaronbracke Jul 4, 2024

Choose a reason for hiding this comment

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

by checking the are available seems like a typo? Should this not be by checking they are available, like in the last phrase of this paragraph?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

# available in the vendored Dart SDK (see notes below on library locations). If
# they are available, do the following.
#
# See (4) for how to add dependencies to a package in the workspace.
#
# ------------------------------------------------------------------------------
# (2) CREATING A NEW PACKAGE
# ------------------------------------------------------------------------------
# If creating a package, say in ./tools or ./tools/pkg, ensure the following
# header in it's respective `pubspec.yaml`:
matanlurey marked this conversation as resolved.
Show resolved Hide resolved
# ```
# # We don't publish packages to pub.dev from the engine repository.
# publish_to: none
#
# # Required for workspace support.
# environment:
# sdk: ^3.5.0-294.0.dev
#
# # This package is managed as part of the engine workspace.
# resolution: workspace
# ```
#
# See (4) for how to add dependencies to a package in the workspace.
#
# ------------------------------------------------------------------------------
# (3) MIGRATING A NON-WORKSPACE PACKAGE TO USING THE WORKSPACE
# ------------------------------------------------------------------------------
# Many packages in this repo are still using a pre-workspace style pubspec.yaml,
# either with manuallu declared `dependency_overrides` (much of ./tools) or by
Copy link
Contributor

Choose a reason for hiding this comment

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

s/manuallu/manually

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

# using pub (./web_sdk, ./lib/web_ui). To migrate a package to the workspace:
#
# A. Add the `resolution: workspace` field to the pubspec.yaml.
# B. Update the minimum SDK version to at least `^3.5.0-294.0.dev`.
# C. Add the package to the `workspace` field in this file.
# D. Ensure every dependency in the package is added to the `dependencies` field
# in this file, following instructions in (4).
#
# Once `dart pub get` is run on the workspace, the package will be resolved as
# part of the workspace, and the `dependency_overrides` in this file will be
# applied to the package.
#
# ------------------------------------------------------------------------------
# (4) ADDING DEPENDENCIES TO A PACKAGE IN THIS WORKSPACE
# ------------------------------------------------------------------------------
# When adding a dependency to a package in the workspace, add the dependency to
# the `dependencies` field in this file. If the dependency is located within
# the repository, use the `path` field to point to the package.
#
# If the dependency is a third party package, add it to the
# `dependency_overrides` field in this file. The `any` version constraint is
# used to indicate that the version of the package is not important, as it is
# managed by the `DEPS` file.
Copy link
Member

Choose a reason for hiding this comment

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

These comments are phenomenal, excellent work!


name: _engine_workspace

# Required for workspace support.
environment:
sdk: ^3.5.0-294.0.dev

# Declare all packages that are part of the workspace.
workspace:
- tools/engine_tool

# Declare all dependencies that are used by one or more packages.
#
# A few notes:
# 1. There is no distinction between "dependencies" and "dev_dependencies";
# those notions are for *publishing* packages, not for managing a workspace.
# Specific packages in the workspace itself will declare whether they are
# dependencies or dev_dependencies, but here it is a union of both.
#
# 2. The `any` version constraint is used to indicate that the version of the
# package is not important, as it is managed by the `DEPS` file. In other
# words, "if the test pass, ship it".
#
# 3. The `path` field is used to indicate the location of the package in the
# local repository itself. This is to *only* be used for local packages that
# are part of the workspace. Third party dependencies are managed by the
# `DEPS` file: they get a "any" version constraint and are overridden in the
# `dependency_overrides` section below.
#
# While not enforced by tooling, try to keep this list in alphabetical order.
Copy link
Contributor

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.

Added a TODO for now, thanks!

dependencies:
args: any
async_helper: any
engine_build_configs:
path: ./tools/pkg/engine_build_configs
engine_repo_tools:
path: ./tools/pkg/engine_repo_tools
expect: any
file: any
litetest:
Copy link
Contributor

Choose a reason for hiding this comment

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

move litetest and process_fakes to dependency_overrides and the sub-packages don't need to include redundant paths.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great suggestion, done!

path: ./testing/litetest
logging: any
meta: any
path: any
platform: any
process_fakes:
path: ./tools/pkg/process_fakes
process_runner: any
smith: any

# Instructs pub on how to resolve the dependencies that are part of "DEPS".
#
# For historic reasons, there are ~3 or so places packages might be located:
#
# - `./third_party/pkg/{name}`: for packages vended directly as part of "DEPS".
# Usually these are Flutter engine specific packages, i.e. they did not exist
# in the Dart vended SDK (the other options below). Typically these originate
# from pub (https://pub.dev) and are mirrored into a Google Git repository:
# <https://flutter.googlesource.com/>.
#
# - `./third_party/dart/pkg/{name}`: for packages that lives *in* the Dart SDK,
# which is in turn vendored into the Flutter engine repository. You can see
# a full list of available packages here:
# <https://github.com/dart-lang/sdk/tree/main/pkg>.
#
# - `./third_party/dart/third_party/pkg/{name}`: for packages that are vendored
# into the Dart SDK from pub.dev. These are often first-party packages from
# the Dart team, but not part of the Dart SDK itself. You can see a full list
# of available packages here:
# <https://github.com/dart-lang/sdk/blob/main/DEPS>.
dependency_overrides:
jtmcdole marked this conversation as resolved.
Show resolved Hide resolved
args:
path: ./third_party/dart/third_party/pkg/args
async:
path: ./third_party/dart/third_party/pkg/async
async_helper:
path: ./third_party/dart/pkg/async_helper
collection:
path: ./third_party/dart/third_party/pkg/collection
expect:
path: ./third_party/dart/pkg/expect
file:
path: ./third_party/dart/third_party/pkg/file/packages/file
logging:
path: ./third_party/dart/third_party/pkg/logging
meta:
path: ./third_party/dart/pkg/meta
path:
path: ./third_party/dart/third_party/pkg/path
platform:
path: ./third_party/pkg/platform
process:
path: ./third_party/pkg/process
process_runner:
path: ./third_party/pkg/process_runner
smith:
path: ./third_party/dart/pkg/smith
source_span:
path: ./third_party/dart/third_party/pkg/source_span
string_scanner:
path: ./third_party/dart/third_party/pkg/string_scanner
term_glyph:
path: ./third_party/dart/third_party/pkg/term_glyph
yaml:
path: ./third_party/dart/third_party/pkg/yaml
59 changes: 7 additions & 52 deletions tools/engine_tool/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,13 @@

name: engine_tool
publish_to: none
environment:
# Required for extension types.
sdk: ^3.3.0

# Do not add any dependencies that require more than what is provided in
# //third_party/pkg, //third_party/dart/pkg, or
# //third_party/dart/third_party/pkg. In particular, package:test is not usable
# here.
# Required for workspace support.
environment:
sdk: ^3.5.0-294.0.dev

# If you do add packages here, make sure you can run `pub get --offline`, and
# check the .packages and .package_config to make sure all the paths are
# relative to this directory into //third_party/dart
# This package is managed as part of the engine workspace.
resolution: workspace

dependencies:
args: any
Expand All @@ -31,47 +26,7 @@ dependencies:
process_runner: any

dev_dependencies:
async_helper: any
expect: any
litetest: any
process_fakes:
path: ../pkg/process_fakes
smith: any

dependency_overrides:
args:
path: ../../third_party/dart/third_party/pkg/args
async:
path: ../../third_party/dart/third_party/pkg/async
async_helper:
path: ../../third_party/dart/pkg/async_helper
collection:
path: ../../third_party/dart/third_party/pkg/collection
expect:
path: ../../third_party/dart/pkg/expect
file:
path: ../../third_party/dart/third_party/pkg/file/packages/file
litetest:
path: ../../testing/litetest
logging:
path: ../../third_party/dart/third_party/pkg/logging
meta:
path: ../../third_party/dart/pkg/meta
path:
path: ../../third_party/dart/third_party/pkg/path
platform:
path: ../../third_party/pkg/platform
process:
path: ../../third_party/pkg/process
process_runner:
path: ../../third_party/pkg/process_runner
smith:
path: ../../third_party/dart/pkg/smith
source_span:
path: ../../third_party/dart/third_party/pkg/source_span
string_scanner:
path: ../../third_party/dart/third_party/pkg/string_scanner
term_glyph:
path: ../../third_party/dart/third_party/pkg/term_glyph
yaml:
path: ../../third_party/dart/third_party/pkg/yaml
process_fakes:
jtmcdole marked this conversation as resolved.
Show resolved Hide resolved
path: ../pkg/process_fakes