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(globe_cli): Add whoami command and graphql support #148

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ command once.

> You do not need to run `dart pub get` once bootstrap has been completed.

After bootstrapping, run the follwing command to get the latest graphql schema.

```shell
melos run download-schema
```

To activate the Globe CLI for local development, run the following command inside the package directory:

```sh
Expand All @@ -96,10 +102,10 @@ dart pub global activate --source="path" . --executable="globe"
1. Switch to `main` branch locally.
2. Run `git pull origin main`.
3. Run `git pull --tags` to make sure all tags are fetched.
5. Run `melos version` to automatically version packages and update Changelogs.
6. Run `melos publish` to dry run and confirm all packages are publishable.
7. Run `melos publish --no-dry-run`
8. Run `git push --follow-tags` to ensure the release is pushed to GitHub.
4. Run `melos version` to automatically version packages and update Changelogs.
5. Run `melos publish` to dry run and confirm all packages are publishable.
6. Run `melos publish --no-dry-run`
7. Run `git push --follow-tags` to ensure the release is pushed to GitHub.

### Open a pull request

Expand Down
74 changes: 37 additions & 37 deletions examples/flutter_web/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,42 @@ packages:
dependency: transitive
description:
name: async
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.12.0"
version: "2.11.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.3.0"
clock:
dependency: transitive
description:
name: clock
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.2"
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
url: "https://pub.dev"
source: hosted
version: "1.19.1"
version: "1.19.0"
cupertino_icons:
dependency: "direct main"
description:
Expand All @@ -53,10 +53,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.3.2"
version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -79,18 +79,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
url: "https://pub.dev"
source: hosted
version: "10.0.8"
version: "10.0.7"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
url: "https://pub.dev"
source: hosted
version: "3.0.9"
version: "3.0.8"
leak_tracker_testing:
dependency: transitive
description:
Expand All @@ -111,10 +111,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.17"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
Expand All @@ -127,18 +127,18 @@ packages:
dependency: transitive
description:
name: meta
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.15.0"
path:
dependency: transitive
description:
name: path
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.9.0"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -148,50 +148,50 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.10.1"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
url: "https://pub.dev"
source: hosted
version: "1.12.1"
version: "1.12.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
name: string_scanner
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev"
source: hosted
version: "1.4.1"
version: "1.3.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.2"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
url: "https://pub.dev"
source: hosted
version: "0.7.4"
version: "0.7.3"
vector_math:
dependency: transitive
description:
Expand All @@ -204,10 +204,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
url: "https://pub.dev"
source: hosted
version: "14.3.1"
version: "14.3.0"
sdks:
dart: ">=3.7.0-0 <4.0.0"
dart: ">=3.4.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
6 changes: 6 additions & 0 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,9 @@ scripts:
description: Run `dart format` checks for all packages.

test: melos exec --no-flutter --dir-exists="test" -- "dart test ."

download-schema:
exec: dart run lib/src/graphql/download_schema.dart
packageFilters:
fileExists: lib/src/graphql/download_schema.dart
description: Download the GraphQL schema from the specified endpoint.
16 changes: 16 additions & 0 deletions packages/globe_cli/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
targets:
$default:
builders:
graphql_codegen:
options:
# Configure GraphQL code generation
clients:
- graphql
# Add __typename field to all selection sets for better caching
addTypename: true
# Ignore lint warnings in generated files
generatedFileHeader: "// ignore_for_file: type=lint\n// ignore_for_file: deprecated_member_use, deprecated_member_use_from_same_package\n"
# Custom scalar mappings
scalars:
DateTime:
type: DateTime
2 changes: 1 addition & 1 deletion packages/globe_cli/lib/src/command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ abstract class BaseGlobeCommand extends Command<int> {
final session = auth.currentSession;
if (session == null) {
logger
..err('Please login to deploy a project.')
..err('Please login to run this command.')
..err('Run `globe login` to login.');

exitOverride(1);
Expand Down
12 changes: 9 additions & 3 deletions packages/globe_cli/lib/src/command_runner.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'commands/create_project_command.dart';
import 'commands/project_command.dart';
import 'commands/update.dart';
import 'get_it.dart';
import 'graphql/client.dart';
import 'package_info.dart' as package_info;
import 'utils/api.dart';
import 'utils/auth.dart';
Expand Down Expand Up @@ -74,6 +75,7 @@ class GlobeCliCommandRunner extends CompletionCommandRunner<int> {
addCommand(TokenCommand());
addCommand(ProjectCommand());
addCommand(CreateProjectFromTemplate());
addCommand(WhoamiCommand());
}

final Logger _logger;
Expand Down Expand Up @@ -125,8 +127,9 @@ class GlobeCliCommandRunner extends CompletionCommandRunner<int> {
logger: _logger,
);

GetIt.instance.registerSingleton<GlobeMetadata>(metadata);
GetIt.instance.registerSingleton<GlobeScope>(scope);
GetIt.instance
..registerSingleton<GlobeScope>(scope)
..registerSingleton<GlobeMetadata>(metadata);

final maybeProjectIdOrSlug = topLevelResults['project'] as String?;
final maybeToken = topLevelResults['token'] as String?;
Expand All @@ -138,7 +141,7 @@ class GlobeCliCommandRunner extends CompletionCommandRunner<int> {
Organization? org;

if (maybeToken != null) {
api.auth.loginWithApiToken(jwt: maybeToken);
auth.loginWithApiToken(jwt: maybeToken);
org = await selectOrganization(
logger: _logger,
api: api,
Expand Down Expand Up @@ -168,6 +171,9 @@ class GlobeCliCommandRunner extends CompletionCommandRunner<int> {
);
}

GetIt.instance
.registerSingleton<GlobeGraphQLClient>(GlobeGraphQLClient());

return await runCommand(topLevelResults) ?? ExitCode.success.code;
// TODO(rrousselGit) why are we checking FormatExceptions here?
} on FormatException catch (e, stackTrace) {
Expand Down
1 change: 1 addition & 0 deletions packages/globe_cli/lib/src/commands/commands.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ export 'login_command.dart';
export 'logout_command.dart';
export 'token_command.dart';
export 'unlink_command.dart';
export 'whoami_command.dart';
Loading