Skip to content

Commit 36115a1

Browse files
authored
build: bump riverpod to 3.0 (#611)
1 parent 00b220b commit 36115a1

File tree

70 files changed

+218
-1598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+218
-1598
lines changed

.cspell/framework-words.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ lerp
2828
ltrb
2929
LTWH
3030
mockito
31+
mocktail
3132
nullsafety
3233
pbcopy
3334
Podfile
3435
podhelper
3536
postbootstrap
3637
postclean
38+
psql
3739
pubspec
3840
Reorderable
3941
revenuecat

packages/flutter_app/build.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,3 @@ targets:
3939
# ネストされたリストに対してtoJson/fromJsonをメソッド生成する
4040
explicit_to_json: true
4141
field_rename: snake
42-
riverpod_generator:
43-
generate_for:
44-
include:
45-
- "**/*provider.dart"
46-
- lib/**/riverpod_example_page/**/*.dart
47-
options:
48-
provider_name_suffix: "Provider" # (default)

packages/flutter_app/lib/environment/src/flavor_provider.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import 'package:hooks_riverpod/hooks_riverpod.dart';
2-
import 'package:riverpod_annotation/riverpod_annotation.dart';
3-
4-
part 'flavor_provider.g.dart';
52

63
/// Provide current Flavor.
74
///
85
/// Need override in top-level ProviderScope.
9-
@Riverpod(keepAlive: true)
10-
Flavor flavor(Ref ref) {
11-
throw UnimplementedError();
12-
}
6+
final flavorProvider = Provider<Flavor>((ref) => throw UnimplementedError());
137

148
/// Flavor of the app.
159
enum Flavor {

packages/flutter_app/lib/environment/src/flavor_provider.g.dart

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import 'package:hooks_riverpod/hooks_riverpod.dart';
2+
import 'package:hooks_riverpod/misc.dart';
23
import 'package:pub_dev_api_client/pub_dev_api_client.dart';
3-
import 'package:riverpod_annotation/riverpod_annotation.dart';
44

55
import '../../../package_adaptor/pub_dev_api_client_provider.dart';
66

7-
part 'pub_dev_package_details_provider.g.dart';
8-
97
/// Provider for pub.dev package details by package name.
10-
@riverpod
11-
Future<GetPackageDetailsResponseBody> pubDevPackageDetails(
12-
Ref ref, {
13-
required String packageName,
14-
}) async {
15-
final client = ref.watch(pubDevApiClientProvider);
16-
final response = await client.getPackageDetails(packageName: packageName);
17-
return response;
18-
}
8+
final FutureProviderFamily<GetPackageDetailsResponseBody, String>
9+
pubDevPackageDetailsProvider = FutureProvider.autoDispose
10+
.family<GetPackageDetailsResponseBody, String>(
11+
(ref, packageName) async {
12+
final client = ref.watch(pubDevApiClientProvider);
13+
final response = await client.getPackageDetails(
14+
packageName: packageName,
15+
);
16+
return response;
17+
},
18+
);

packages/flutter_app/lib/features/pub_dev_packages/query/pub_dev_package_details_provider.g.dart

Lines changed: 0 additions & 178 deletions
This file was deleted.

packages/flutter_app/lib/features/pub_dev_packages/query/pub_dev_packages_page_state_provider.dart

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
import 'package:hooks_riverpod/hooks_riverpod.dart';
12
import 'package:pub_dev_api_client/pub_dev_api_client.dart';
2-
import 'package:riverpod_annotation/riverpod_annotation.dart';
33

44
import '../../../package_adaptor/pub_dev_api_client_provider.dart';
55

6-
part 'pub_dev_packages_page_state_provider.g.dart';
7-
86
/// Provider for the search word of pub.dev packages.
9-
@Riverpod(keepAlive: true)
10-
class PubDevPackageSearchWordState extends _$PubDevPackageSearchWordState {
7+
class PubDevPackageSearchWordState extends Notifier<String> {
118
@override
129
String build() => '';
1310

@@ -23,8 +20,13 @@ class PubDevPackageSearchWordState extends _$PubDevPackageSearchWordState {
2320
}
2421
}
2522

26-
@Riverpod(keepAlive: true)
27-
class PubDevPackagesPageState extends _$PubDevPackagesPageState {
23+
final pubDevPackageSearchWordStateProvider =
24+
NotifierProvider<PubDevPackageSearchWordState, String>(
25+
PubDevPackageSearchWordState.new,
26+
);
27+
28+
class PubDevPackagesPageState
29+
extends AsyncNotifier<GetSearchedPackagesResponseBody> {
2830
@override
2931
Future<GetSearchedPackagesResponseBody> build() async {
3032
final searchWord = ref.watch(pubDevPackageSearchWordStateProvider);
@@ -35,6 +37,8 @@ class PubDevPackagesPageState extends _$PubDevPackagesPageState {
3537

3638
Future<void> loadNext(int nextPage) async {
3739
state = const AsyncLoading<GetSearchedPackagesResponseBody>()
40+
// Note: This is a workaround to avoid the error.
41+
// ignore: invalid_use_of_internal_member
3842
.copyWithPrevious(state);
3943

4044
final searchWord = ref.read(pubDevPackageSearchWordStateProvider);
@@ -54,3 +58,9 @@ class PubDevPackagesPageState extends _$PubDevPackagesPageState {
5458
);
5559
}
5660
}
61+
62+
final pubDevPackagesPageStateProvider =
63+
AsyncNotifierProvider<
64+
PubDevPackagesPageState,
65+
GetSearchedPackagesResponseBody
66+
>(PubDevPackagesPageState.new);

packages/flutter_app/lib/features/pub_dev_packages/query/pub_dev_packages_page_state_provider.g.dart

Lines changed: 0 additions & 52 deletions
This file was deleted.

packages/flutter_app/lib/features/pub_dev_packages/view/pub_dev_packages_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class _PackageCard extends StatelessWidget {
127127
builder: (_) => Consumer(
128128
builder: (context, ref, child) {
129129
final asyncValue = ref.watch(
130-
pubDevPackageDetailsProvider(packageName: packageName),
130+
pubDevPackageDetailsProvider(packageName),
131131
);
132132

133133
return AlertDialog(

0 commit comments

Comments
 (0)