chore: migrate to pub workspaces and Melos 8

Author: spydon

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
           if [ -z "$BASE" ]; then
             FORCE_ALL=true
           elif git diff --name-only "$BASE...HEAD" \
-              | grep -qE '^(\.github/workflows/build\.yml|melos\.yaml|pubspec\.lock|supabase/)'; then
+              | grep -qE '^(\.github/workflows/build\.yml|pubspec\.yaml|pubspec\.lock|supabase/)'; then
             FORCE_ALL=true
           fi
 

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       dart-matrix: ${{ steps.detect.outputs.dart-matrix }}
-      sdk-matrix: ${{ steps.detect.outputs.sdk-matrix }}
+      channel-matrix: ${{ steps.detect.outputs.channel-matrix }}
       flutter: ${{ steps.detect.outputs.flutter }}
     steps:
       - name: Checkout repository
@@ -49,7 +49,7 @@ jobs:
           if [ -z "$BASE" ] || [ "$BASE" = "0000000000000000000000000000000000000000" ]; then
             FORCE_ALL=true
           elif git diff --name-only "$BASE...HEAD" \
-              | grep -qE '^(\.github/workflows/test\.yml|melos\.yaml|pubspec\.lock|supabase/)'; then
+              | grep -qE '^(\.github/workflows/test\.yml|pubspec\.yaml|pubspec\.lock|supabase/)'; then
             FORCE_ALL=true
           fi
 
@@ -88,13 +88,10 @@ jobs:
           fi
           echo "dart-matrix=$DART_MATRIX" >> "$GITHUB_OUTPUT"
 
-          # Only exercise beta/dev SDKs on pushes to main. On pull requests we
-          # test stable only to keep the matrix small; upcoming-SDK breakage is
-          # caught on merge.
           if [ "${{ github.event_name }}" = "push" ]; then
-            echo 'sdk-matrix=["stable","beta","dev"]' >> "$GITHUB_OUTPUT"
+            echo 'channel-matrix=["stable","beta","master"]' >> "$GITHUB_OUTPUT"
           else
-            echo 'sdk-matrix=["stable"]' >> "$GITHUB_OUTPUT"
+            echo 'channel-matrix=["stable"]' >> "$GITHUB_OUTPUT"
           fi
 
           if echo "$CHANGED" | grep -qx "supabase_flutter"; then
@@ -104,7 +101,7 @@ jobs:
           fi
 
   test-dart:
-    name: Dart ${{ matrix.package.name }} (${{ matrix.sdk }})
+    name: Dart ${{ matrix.package.name }} (${{ matrix.channel }})
     needs: changes
     if: ${{ needs.changes.outputs.dart-matrix != '[]' }}
     timeout-minutes: 20
@@ -113,40 +110,33 @@ jobs:
       fail-fast: false
       matrix:
         package: ${{ fromJSON(needs.changes.outputs.dart-matrix) }}
-        sdk: ${{ fromJSON(needs.changes.outputs.sdk-matrix) }}
+        channel: ${{ fromJSON(needs.changes.outputs.channel-matrix) }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - name: Setup Dart
-        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c # v1.7.1
+      - name: Setup Flutter
+        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2.23.0
         with:
-          sdk: ${{ matrix.sdk }}
+          channel: ${{ matrix.channel }}
+          cache: false
 
-      - name: Cache pub dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
-        with:
-          path: |
-            ${{ env.PUB_CACHE }}
-            ~/.pub-cache
-          key: ${{ runner.os }}-pub-${{ matrix.sdk }}-${{ hashFiles('**/pubspec.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pub-${{ matrix.sdk }}-
-            ${{ runner.os }}-pub-
+      - name: Show Flutter version
+        run: flutter --version
 
       - name: Bootstrap workspace
         run: |
           dart pub global activate melos
-          melos bootstrap --no-flutter
+          melos bootstrap
 
       - name: Format
-        if: ${{ matrix.sdk == 'stable' }}
+        if: ${{ matrix.channel == 'stable' }}
         working-directory: packages/${{ matrix.package.name }}
         run: dart format lib test -l 80 --set-exit-if-changed
 
       - name: Analyze
-        if: ${{ matrix.sdk == 'stable' }}
+        if: ${{ matrix.channel == 'stable' }}
         working-directory: packages/${{ matrix.package.name }}
         run: dart analyze --fatal-infos .
 
@@ -201,18 +191,18 @@ jobs:
           if [ "${{ matrix.package.concurrency }}" = "1" ]; then
             CONCURRENCY="--concurrency=1"
           fi
-          if [ "${{ matrix.sdk }}" = "stable" ]; then
+          if [ "${{ matrix.channel }}" = "stable" ]; then
             dart pub global activate coverage
             dart test $CONCURRENCY --coverage=coverage
             dart pub global run coverage:format_coverage \
-              --packages=.dart_tool/package_config.json \
+              --packages=../../.dart_tool/package_config.json \
               --report-on=lib --lcov -o coverage/lcov.info -i coverage
           else
             dart test $CONCURRENCY
           fi
 
       - name: Upload coverage to Coveralls
-        if: ${{ matrix.sdk == 'stable' }}
+        if: ${{ matrix.channel == 'stable' }}
         uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

AGENTS.md

@@ -43,14 +43,11 @@ melos bs
 ### Linting and Formatting
 
 ```bash
-# Run all static analysis checks (analyze + format)
-melos run lint:all
+# Run the analyzer across the whole workspace
+melos analyze
 
-# Run analyzer on all packages
-melos run analyze
-
-# Format code (80 char line length)
-melos run format
+# Format code (80 char line length, configured in the root pubspec.yaml)
+melos format
 ```
 
 ### Testing
@@ -83,11 +80,19 @@ cd packages/<package>
 dart test
 ```
 
-**Run tests with coverage:**
+**Run every package's tests at once:**
+
+```bash
+# Runs `dart test`/`flutter test` in each package that has a test/ directory.
+# Start the local Supabase stack first (see above) so the backend packages pass.
+melos test
+```
+
+**Run tests with coverage (from a package directory):**
 
 ```bash
-# From root or package directory
-melos run test:coverage
+cd packages/<package>
+dart test --coverage=coverage
 ```
 
 ### Running a Single Test File
@@ -103,11 +108,11 @@ dart test test/specific_test.dart -n "test name pattern"
 ### Package Management
 
 ```bash
-# Upgrade dependencies across all packages
-melos run upgrade
+# Upgrade dependencies across the whole workspace (run at the repository root)
+dart pub upgrade
 
 # Check for outdated dependencies
-melos run outdated
+dart pub outdated
 ```
 
 ### Version Management
@@ -203,7 +208,7 @@ await Supabase.initialize(
 ## Contributing Guidelines
 
 - Fork the repo and create feature branches
-- Run `melos run lint:all` before committing
+- Run `melos analyze` and `melos format` before committing
 - Ensure tests pass for modified packages
 - Update package changelogs if making notable changes
 - Line length limit is 80 characters

examples/launcher/lib/launcher.dart

@@ -120,9 +120,9 @@ Future<int> run(List<String> args) async {
 
     // Forward Ctrl-C to flutter so it shuts down and control returns here,
     // letting the cleanup below stop Supabase, rather than killing the launcher.
-    final sigint = ProcessSignal.sigint
-        .watch()
-        .listen((_) => process.kill(ProcessSignal.sigint));
+    final sigint = ProcessSignal.sigint.watch().listen(
+      (_) => process.kill(ProcessSignal.sigint),
+    );
     final code = await process.exitCode;
     await sigint.cancel();
     return code;
@@ -157,10 +157,9 @@ Directory? _findExamplesRoot() {
 
 Future<bool> _hasCommand(String command) async {
   try {
-    final result = await Process.run(
-      Platform.isWindows ? 'where' : 'which',
-      [command],
-    );
+    final result = await Process.run(Platform.isWindows ? 'where' : 'which', [
+      command,
+    ]);
     return result.exitCode == 0;
   } on ProcessException {
     return false;
@@ -169,10 +168,11 @@ Future<bool> _hasCommand(String command) async {
 
 Future<bool> _startSupabase(Directory root) async {
   final progress = _logger.progress('Starting the local Supabase stack');
-  final result = await Process.run(
-    'supabase',
-    ['start', '--workdir', root.path],
-  );
+  final result = await Process.run('supabase', [
+    'start',
+    '--workdir',
+    root.path,
+  ]);
   if (result.exitCode == _ok) {
     progress.complete('Local Supabase is running');
     return true;
@@ -191,10 +191,11 @@ Future<bool> _startSupabase(Directory root) async {
 
 Future<void> _stopSupabase(Directory root) async {
   final progress = _logger.progress('Stopping the local Supabase stack');
-  final result = await Process.run(
-    'supabase',
-    ['stop', '--workdir', root.path],
-  );
+  final result = await Process.run('supabase', [
+    'stop',
+    '--workdir',
+    root.path,
+  ]);
   if (result.exitCode == _ok) {
     progress.complete('Stopped the local Supabase stack');
   } else {
@@ -204,10 +205,13 @@ Future<void> _stopSupabase(Directory root) async {
 }
 
 Future<Map<String, String>> _supabaseStatus(Directory root) async {
-  final result = await Process.run(
-    'supabase',
-    ['status', '-o', 'env', '--workdir', root.path],
-  );
+  final result = await Process.run('supabase', [
+    'status',
+    '-o',
+    'env',
+    '--workdir',
+    root.path,
+  ]);
   if (result.exitCode != _ok) return {};
   return _parseEnv('${result.stdout}');
 }

examples/launcher/pubspec.yaml

@@ -6,7 +6,9 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: '>=3.9.0 <4.0.0'
+
+resolution: workspace
 
 dependencies:
   mason_logger: ^0.3.0

examples/passkeys/lib/main.dart

@@ -1,12 +1,16 @@
 import 'package:flutter/material.dart';
+import 'package:passkeys/authenticator.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 const supabaseUrl = String.fromEnvironment('SUPABASE_URL');
-const supabasePublishableKey =
-    String.fromEnvironment('SUPABASE_PUBLISHABLE_KEY');
+const supabasePublishableKey = String.fromEnvironment(
+  'SUPABASE_PUBLISHABLE_KEY',
+);
 
 final messengerKey = GlobalKey<ScaffoldMessengerState>();
 
+final _passkeyAuthenticator = PasskeyAuthenticator();
+
 Future<void> main() async {
   await Supabase.initialize(
     url: supabaseUrl,
@@ -109,7 +113,7 @@ class _SignInViewState extends State<SignInView> {
   Future<void> _signInWithPasskey() async {
     setState(() => _busy = true);
     try {
-      await supabase.auth.signInWithPasskey();
+      await supabase.auth.signInWithPasskey(_passkeyAuthenticator);
     } catch (error) {
       _showError(error);
     } finally {
@@ -187,7 +191,7 @@ class _SignedInViewState extends State<SignedInView> {
   /// whole ceremony, including the platform prompt.
   Future<void> _registerPasskey() async {
     try {
-      await supabase.auth.registerPasskey();
+      await supabase.auth.registerPasskey(_passkeyAuthenticator);
       await _refresh();
     } catch (error) {
       _showError(error);
@@ -268,36 +272,36 @@ class _SignedInViewState extends State<SignedInView> {
           child: _loading
               ? const Center(child: CircularProgressIndicator())
               : _passkeys.isEmpty
-                  ? const Center(child: Text('No passkeys yet.'))
-                  : RefreshIndicator(
-                      onRefresh: _refresh,
-                      child: ListView.builder(
-                        itemCount: _passkeys.length,
-                        itemBuilder: (context, index) {
-                          final passkey = _passkeys[index];
-                          return ListTile(
-                            leading: const Icon(Icons.vpn_key),
-                            title: Text(passkey.friendlyName ?? passkey.id),
-                            subtitle: Text(
-                              'Created ${passkey.createdAt.toLocal()}',
+              ? const Center(child: Text('No passkeys yet.'))
+              : RefreshIndicator(
+                  onRefresh: _refresh,
+                  child: ListView.builder(
+                    itemCount: _passkeys.length,
+                    itemBuilder: (context, index) {
+                      final passkey = _passkeys[index];
+                      return ListTile(
+                        leading: const Icon(Icons.vpn_key),
+                        title: Text(passkey.friendlyName ?? passkey.id),
+                        subtitle: Text(
+                          'Created ${passkey.createdAt.toLocal()}',
+                        ),
+                        trailing: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            IconButton(
+                              icon: const Icon(Icons.edit),
+                              onPressed: () => _rename(passkey),
                             ),
-                            trailing: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                IconButton(
-                                  icon: const Icon(Icons.edit),
-                                  onPressed: () => _rename(passkey),
-                                ),
-                                IconButton(
-                                  icon: const Icon(Icons.delete),
-                                  onPressed: () => _delete(passkey),
-                                ),
-                              ],
+                            IconButton(
+                              icon: const Icon(Icons.delete),
+                              onPressed: () => _delete(passkey),
                             ),
-                          );
-                        },
-                      ),
-                    ),
+                          ],
+                        ),
+                      );
+                    },
+                  ),
+                ),
         ),
       ],
     );

examples/passkeys/pubspec.yaml

@@ -9,11 +9,13 @@ environment:
   sdk: '>=3.9.0 <4.0.0'
   flutter: '>=3.35.0'
 
+resolution: workspace
+
 dependencies:
   flutter:
     sdk: flutter
-  supabase_flutter:
-    path: ../../packages/supabase_flutter
+  passkeys: ^2.21.1
+  supabase_flutter: ^2.15.4
 
 dev_dependencies:
   flutter_lints: ^4.0.0