Browse Source

Merge pull request #554 from nextcloud/dependabot/pub/packages/neon/neon/go_router-10.0.0

chore(deps): bump go_router from 9.1.1 to 10.0.0
pull/559/head
Kate 1 year ago committed by GitHub
parent
commit
5d512dff1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      packages/neon/neon/lib/src/router.dart
  2. 26
      packages/neon/neon/lib/src/router.g.dart
  3. 2
      packages/neon/neon/pubspec.yaml
  4. 2
      packages/neon/neon_files/pubspec.yaml
  5. 2
      packages/neon/neon_news/pubspec.yaml
  6. 2
      packages/neon/neon_notes/pubspec.yaml
  7. 2
      packages/neon/neon_notifications/pubspec.yaml

4
packages/neon/neon/lib/src/router.dart

@ -34,7 +34,7 @@ class AppRouter extends GoRouter {
navigatorKey: navigatorKey,
initialLocation: const HomeRoute().location,
redirect: (final context, final state) {
final loginQrcode = LoginQrcode.tryParse(state.location);
final loginQrcode = LoginQrcode.tryParse(state.uri.toString());
if (loginQrcode != null) {
return LoginCheckServerStatusRoute.withCredentials(
serverUrl: loginQrcode.serverURL,
@ -44,7 +44,7 @@ class AppRouter extends GoRouter {
}
// redirect to loginscreen when no account is logged in
if (!accountsBloc.hasAccounts && !state.location.startsWith(const LoginRoute().location)) {
if (!accountsBloc.hasAccounts && !state.uri.toString().startsWith(const LoginRoute().location)) {
return const LoginRoute().location;
}

26
packages/neon/neon/lib/src/router.g.dart

@ -78,7 +78,7 @@ extension $HomeRouteExtension on HomeRoute {
extension $SettingsRouteExtension on SettingsRoute {
static SettingsRoute _fromState(GoRouterState state) => SettingsRoute(
initialCategory:
_$convertMapValue('initial-category', state.queryParameters, _$SettingsCageoriesEnumMap._$fromName),
_$convertMapValue('initial-category', state.uri.queryParameters, _$SettingsCageoriesEnumMap._$fromName),
);
String get location => GoRouteData.$location(
@ -144,7 +144,7 @@ extension $_AddAccountRouteExtension on _AddAccountRoute {
extension $_AddAccountFlowRouteExtension on _AddAccountFlowRoute {
static _AddAccountFlowRoute _fromState(GoRouterState state) => _AddAccountFlowRoute(
serverUrl: state.queryParameters['server-url']!,
serverUrl: state.uri.queryParameters['server-url']!,
);
String get location => GoRouteData.$location(
@ -181,7 +181,7 @@ extension $_AddAccountQrcodeRouteExtension on _AddAccountQrcodeRoute {
extension $_AddAccountCheckServerStatusRouteExtension on _AddAccountCheckServerStatusRoute {
static _AddAccountCheckServerStatusRoute _fromState(GoRouterState state) => _AddAccountCheckServerStatusRoute(
serverUrl: state.queryParameters['server-url']!,
serverUrl: state.uri.queryParameters['server-url']!,
);
String get location => GoRouteData.$location(
@ -202,9 +202,9 @@ extension $_AddAccountCheckServerStatusRouteExtension on _AddAccountCheckServerS
extension $_AddAccountCheckAccountRouteExtension on _AddAccountCheckAccountRoute {
static _AddAccountCheckAccountRoute _fromState(GoRouterState state) => _AddAccountCheckAccountRoute(
serverUrl: state.queryParameters['server-url']!,
loginName: state.queryParameters['login-name']!,
password: state.queryParameters['password']!,
serverUrl: state.uri.queryParameters['server-url']!,
loginName: state.uri.queryParameters['login-name']!,
password: state.uri.queryParameters['password']!,
);
String get location => GoRouteData.$location(
@ -298,7 +298,7 @@ extension $LoginRouteExtension on LoginRoute {
extension $LoginFlowRouteExtension on LoginFlowRoute {
static LoginFlowRoute _fromState(GoRouterState state) => LoginFlowRoute(
serverUrl: state.queryParameters['server-url']!,
serverUrl: state.uri.queryParameters['server-url']!,
);
String get location => GoRouteData.$location(
@ -335,9 +335,9 @@ extension $LoginQrcodeRouteExtension on LoginQrcodeRoute {
extension $LoginCheckServerStatusRouteExtension on LoginCheckServerStatusRoute {
static LoginCheckServerStatusRoute _fromState(GoRouterState state) => LoginCheckServerStatusRoute(
serverUrl: state.queryParameters['server-url']!,
loginName: state.queryParameters['login-name'],
password: state.queryParameters['password'],
serverUrl: state.uri.queryParameters['server-url']!,
loginName: state.uri.queryParameters['login-name'],
password: state.uri.queryParameters['password'],
);
String get location => GoRouteData.$location(
@ -360,9 +360,9 @@ extension $LoginCheckServerStatusRouteExtension on LoginCheckServerStatusRoute {
extension $LoginCheckAccountRouteExtension on LoginCheckAccountRoute {
static LoginCheckAccountRoute _fromState(GoRouterState state) => LoginCheckAccountRoute(
serverUrl: state.queryParameters['server-url']!,
loginName: state.queryParameters['login-name']!,
password: state.queryParameters['password']!,
serverUrl: state.uri.queryParameters['server-url']!,
loginName: state.uri.queryParameters['login-name']!,
password: state.uri.queryParameters['password']!,
);
String get location => GoRouteData.$location(

2
packages/neon/neon/pubspec.yaml

@ -21,7 +21,7 @@ dependencies:
flutter_native_splash: ^2.2.19
flutter_svg: ^2.0.5
flutter_zxing: ^1.1.2 # ^1.2.0 downgrades to image ^3.0.0 which breaks our dependencies. See https://github.com/khoren93/flutter_zxing/issues/94
go_router: ^9.0.3
go_router: ^10.0.0
http: ^1.1.0
image: ^4.0.17
intersperse: ^2.0.0

2
packages/neon/neon_files/pubspec.yaml

@ -16,7 +16,7 @@ dependencies:
filesize: ^2.0.1
flutter:
sdk: flutter
go_router: ^9.0.3
go_router: ^10.0.0
image_picker: ^0.8.7+5
intersperse: ^2.0.0
material_design_icons_flutter: ^7.0.7296

2
packages/neon/neon_news/pubspec.yaml

@ -10,7 +10,7 @@ dependencies:
flutter:
sdk: flutter
flutter_html: ^3.0.0-alpha.6
go_router: ^9.0.3
go_router: ^10.0.0
html: ^0.15.3
material_design_icons_flutter: ^7.0.7296
neon:

2
packages/neon/neon_notes/pubspec.yaml

@ -12,7 +12,7 @@ dependencies:
flutter:
sdk: flutter
flutter_markdown: ^0.6.14
go_router: ^9.0.3
go_router: ^10.0.0
material_design_icons_flutter: ^7.0.7296
neon:
git:

2
packages/neon/neon_notifications/pubspec.yaml

@ -9,7 +9,7 @@ environment:
dependencies:
flutter:
sdk: flutter
go_router: ^9.0.3
go_router: ^10.0.0
material_design_icons_flutter: ^7.0.7296
neon:
git:

Loading…
Cancel
Save