Skip to content

fix: Upgrade web_socket_channel for supporting web: ^1.0.0 and therefore WASM compilation on web #992

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

Merged
merged 8 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
4 changes: 2 additions & 2 deletions packages/realtime_client/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ dependencies:
collection: ^1.15.0
http: '>=0.13.0 <2.0.0'
meta: ^1.7.0
web_socket_channel: ^2.3.0
web_socket_channel: ^3.0.1

dev_dependencies:
lints: ^2.1.1
lints: ^4.0.0
mocktail: ^1.0.0
test: ^1.16.5
2 changes: 1 addition & 1 deletion packages/realtime_client/test/socket_test_stubs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MockChannel extends Mock implements RealtimeChannel {}
class MockPush extends Mock implements Push {}

class SocketWithMockedChannel extends RealtimeClient {
SocketWithMockedChannel(String endPoint) : super(endPoint);
SocketWithMockedChannel(super.endPoint);

Map<String, RealtimeChannel> mockedChannelLooker = {};

Expand Down
43 changes: 14 additions & 29 deletions packages/supabase/lib/src/auth_user.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,18 @@ import 'package:gotrue/gotrue.dart' show User;

class AuthUser extends User {
AuthUser({
required String id,
required Map<String, dynamic> appMetadata,
required Map<String, dynamic> userMetadata,
required String aud,
required String? email,
required String? phone,
required String createdAt,
String? confirmedAt,
String? emailConfirmedAt,
String? phoneConfirmedAt,
String? lastSignInAt,
required String role,
required String updatedAt,
}) : super(
id: id,
appMetadata: appMetadata,
userMetadata: userMetadata,
aud: aud,
email: email,
phone: phone,
createdAt: createdAt,
// ignore: deprecated_member_use
confirmedAt: confirmedAt,
emailConfirmedAt: emailConfirmedAt,
phoneConfirmedAt: phoneConfirmedAt,
lastSignInAt: lastSignInAt,
role: role,
updatedAt: updatedAt,
);
required super.id,
required super.appMetadata,
required Map<String, dynamic> super.userMetadata,
required super.aud,
required super.email,
required super.phone,
required super.createdAt,
super.confirmedAt,
super.emailConfirmedAt,
super.phoneConfirmedAt,
super.lastSignInAt,
required String super.role,
required String super.updatedAt,
});
}
13 changes: 4 additions & 9 deletions packages/supabase/lib/src/supabase_query_builder.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:http/http.dart';
import 'package:supabase/supabase.dart';
import 'package:yet_another_json_isolate/yet_another_json_isolate.dart';

Expand All @@ -11,22 +10,18 @@ class SupabaseQueryBuilder extends PostgrestQueryBuilder {
SupabaseQueryBuilder(
String url,
RealtimeClient realtime, {
Map<String, String> headers = const {},
required String schema,
Map<String, String> super.headers = const {},
required String super.schema,
required String table,
Client? httpClient,
super.httpClient,
required int incrementId,
required YAJsonIsolate isolate,
required YAJsonIsolate super.isolate,
}) : _realtime = realtime,
_schema = schema,
_table = table,
_incrementId = incrementId,
super(
url: Uri.parse(url),
headers: headers,
schema: schema,
httpClient: httpClient,
isolate: isolate,
);

/// Returns real-time data from your table as a `Stream`.
Expand Down
4 changes: 2 additions & 2 deletions packages/supabase/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ dependencies:
yet_another_json_isolate: 2.0.1

dev_dependencies:
lints: ^2.1.1
lints: ^4.0.0
test: ^1.17.9
web_socket_channel: ^2.2.0
web_socket_channel: ^3.0.1
Loading