Skip to content

Commit 7da6856

Browse files
geoextradshukertjr
andauthored
fix: Upgrade web_socket_channel for supporting web: ^1.0.0 and therefore WASM compilation on web (#992)
* Upgrade `web_socket_channel` and linting dependency of `realtime_client` * Migrate test in `supabase` package as well * Allow wider version range for compatibility * Upgrade linting for all packages in a non-breaking manner * Update packages/supabase/lib/src/auth_user.dart * Update packages/supabase/pubspec.yaml * Apply suggestions from code review * fix: minor type fix --------- Co-authored-by: Tyler <dshukertjr@gmail.com>
1 parent 9655652 commit 7da6856

File tree

17 files changed

+43
-67
lines changed

17 files changed

+43
-67
lines changed

packages/functions_client/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies:
1313
yet_another_json_isolate: 2.0.1
1414

1515
dev_dependencies:
16-
lints: ^2.1.1
16+
lints: ^3.0.0
1717
test: ^1.16.4

packages/gotrue/lib/src/types/auth_exception.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AuthException implements Exception {
2222
}
2323

2424
class AuthPKCEGrantCodeExchangeError extends AuthException {
25-
AuthPKCEGrantCodeExchangeError(String message) : super(message);
25+
AuthPKCEGrantCodeExchangeError(super.message);
2626
}
2727

2828
class AuthSessionMissingException extends AuthException {
@@ -38,8 +38,7 @@ class AuthRetryableFetchException extends AuthException {
3838
}
3939

4040
class AuthApiException extends AuthException {
41-
AuthApiException(String message, {String? statusCode})
42-
: super(message, statusCode: statusCode);
41+
AuthApiException(super.message, {super.statusCode});
4342
}
4443

4544
class AuthUnknownException extends AuthException {

packages/gotrue/lib/src/types/user_attributes.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ class AdminUserAttributes extends UserAttributes {
7777
final String? banDuration;
7878

7979
AdminUserAttributes({
80-
String? email,
81-
String? phone,
82-
String? password,
83-
Object? data,
80+
super.email,
81+
super.phone,
82+
super.password,
83+
super.data,
8484
this.userMetadata,
8585
this.appMetadata,
8686
this.emailConfirm,
8787
this.phoneConfirm,
8888
this.banDuration,
89-
}) : super(email: email, phone: phone, password: password, data: data);
89+
});
9090

9191
@override
9292
Map<String, dynamic> toJson() {

packages/gotrue/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
dev_dependencies:
2121
dart_jsonwebtoken: ^2.4.1
2222
dotenv: ^4.1.0
23-
lints: ^2.1.1
23+
lints: ^3.0.0
2424
test: ^1.16.4
2525
otp: ^3.1.3
2626

packages/postgrest/lib/src/postgrest_filter_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
part of 'postgrest_builder.dart';
22

33
class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder<T> {
4-
PostgrestFilterBuilder(PostgrestBuilder<T, T, T> builder) : super(builder);
4+
PostgrestFilterBuilder(super.builder);
55

66
@override
77
PostgrestFilterBuilder<T> copyWithUrl(Uri url) =>

packages/postgrest/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies:
1515

1616
dev_dependencies:
1717
collection: ^1.16.0
18-
lints: ^2.1.1
18+
lints: ^3.0.0
1919
test: ^1.21.4

packages/realtime_client/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ dependencies:
1212
collection: ^1.15.0
1313
http: '>=0.13.0 <2.0.0'
1414
meta: ^1.7.0
15-
web_socket_channel: ^2.3.0
15+
web_socket_channel: '>=2.3.0 <4.0.0'
1616

1717
dev_dependencies:
18-
lints: ^2.1.1
18+
lints: ^3.0.0
1919
mocktail: ^1.0.0
2020
test: ^1.16.5

packages/realtime_client/test/socket_test_stubs.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class MockChannel extends Mock implements RealtimeChannel {}
1313
class MockPush extends Mock implements Push {}
1414

1515
class SocketWithMockedChannel extends RealtimeClient {
16-
SocketWithMockedChannel(String endPoint) : super(endPoint);
16+
SocketWithMockedChannel(super.endPoint);
1717

1818
Map<String, RealtimeChannel> mockedChannelLooker = {};
1919

packages/storage_client/lib/src/types.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,10 @@ class SignedUploadURLResponse extends SignedUrl {
212212
final String token;
213213

214214
const SignedUploadURLResponse({
215-
required String signedUrl,
216-
required String path,
215+
required super.signedUrl,
216+
required super.path,
217217
required this.token,
218-
}) : super(
219-
signedUrl: signedUrl,
220-
path: path,
221-
);
218+
});
222219
}
223220

224221
class StorageException implements Exception {

packages/storage_client/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ dependencies:
1717

1818
dev_dependencies:
1919
test: ^1.21.4
20-
lints: ^2.1.1
20+
lints: ^3.0.0
2121
path: ^1.8.2

packages/supabase/lib/src/auth_user.dart

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,18 @@ import 'package:gotrue/gotrue.dart' show User;
22

33
class AuthUser extends User {
44
AuthUser({
5-
required String id,
6-
required Map<String, dynamic> appMetadata,
7-
required Map<String, dynamic> userMetadata,
8-
required String aud,
9-
required String? email,
10-
required String? phone,
11-
required String createdAt,
12-
String? confirmedAt,
13-
String? emailConfirmedAt,
14-
String? phoneConfirmedAt,
15-
String? lastSignInAt,
16-
required String role,
17-
required String updatedAt,
18-
}) : super(
19-
id: id,
20-
appMetadata: appMetadata,
21-
userMetadata: userMetadata,
22-
aud: aud,
23-
email: email,
24-
phone: phone,
25-
createdAt: createdAt,
26-
// ignore: deprecated_member_use
27-
confirmedAt: confirmedAt,
28-
emailConfirmedAt: emailConfirmedAt,
29-
phoneConfirmedAt: phoneConfirmedAt,
30-
lastSignInAt: lastSignInAt,
31-
role: role,
32-
updatedAt: updatedAt,
33-
);
5+
required super.id,
6+
required super.appMetadata,
7+
required super.userMetadata,
8+
required super.aud,
9+
required super.email,
10+
required super.phone,
11+
required super.createdAt,
12+
super.confirmedAt,
13+
super.emailConfirmedAt,
14+
super.phoneConfirmedAt,
15+
super.lastSignInAt,
16+
required super.role,
17+
required super.updatedAt,
18+
});
3419
}

packages/supabase/lib/src/supabase_query_builder.dart

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import 'package:http/http.dart';
21
import 'package:supabase/supabase.dart';
3-
import 'package:yet_another_json_isolate/yet_another_json_isolate.dart';
42

53
class SupabaseQueryBuilder extends PostgrestQueryBuilder {
64
final RealtimeClient _realtime;
@@ -11,22 +9,18 @@ class SupabaseQueryBuilder extends PostgrestQueryBuilder {
119
SupabaseQueryBuilder(
1210
String url,
1311
RealtimeClient realtime, {
14-
Map<String, String> headers = const {},
15-
required String schema,
12+
super.headers = const {},
13+
required String super.schema,
1614
required String table,
17-
Client? httpClient,
15+
super.httpClient,
1816
required int incrementId,
19-
required YAJsonIsolate isolate,
17+
required super.isolate,
2018
}) : _realtime = realtime,
2119
_schema = schema,
2220
_table = table,
2321
_incrementId = incrementId,
2422
super(
2523
url: Uri.parse(url),
26-
headers: headers,
27-
schema: schema,
28-
httpClient: httpClient,
29-
isolate: isolate,
3024
);
3125

3226
/// Returns real-time data from your table as a `Stream`.

packages/supabase/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ dependencies:
1919
yet_another_json_isolate: 2.0.1
2020

2121
dev_dependencies:
22-
lints: ^2.1.1
22+
lints: ^3.0.0
2323
test: ^1.17.9
24-
web_socket_channel: ^2.2.0
24+
web_socket_channel: '>=2.2.0 <4.0.0'

packages/supabase_flutter/example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dev_dependencies:
1717
flutter_test:
1818
sdk: flutter
1919

20-
flutter_lints: ^1.0.4
20+
flutter_lints: ^3.0.1
2121

2222
flutter:
2323
uses-material-design: true

packages/supabase_flutter/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dev_dependencies:
2626
dart_jsonwebtoken: ^2.4.1
2727
flutter_test:
2828
sdk: flutter
29-
flutter_lints: ^2.0.2
29+
flutter_lints: ^3.0.1
3030
path: ^1.8.3
3131

3232
platforms:

packages/supabase_flutter/test/widget_test_stubs.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:supabase_flutter/supabase_flutter.dart';
1010
import 'utils.dart';
1111

1212
class MockWidget extends StatefulWidget {
13-
const MockWidget({Key? key}) : super(key: key);
13+
const MockWidget({super.key});
1414

1515
@override
1616
State<MockWidget> createState() => _MockWidgetState();
@@ -127,6 +127,7 @@ void mockAppLink({
127127
const StandardMethodCodec().encodeSuccessEnvelope(initialLink),
128128
(ByteData? data) {},
129129
);
130+
return null;
130131
},
131132
);
132133
}

packages/yet_another_json_isolate/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ dependencies:
1010
async: ^2.8.0
1111

1212
dev_dependencies:
13-
lints: ^2.1.1
13+
lints: ^3.0.0
1414
test: ^1.16.0

0 commit comments

Comments
 (0)