Update rebuild script

Author: domesticmouse

generate_crossword/codelab_rebuild.yaml

@@ -206,7 +206,6 @@ steps:
 
           import 'package:built_collection/built_collection.dart';
           import 'package:flutter/services.dart';
-          import 'package:riverpod/riverpod.dart';
           import 'package:riverpod_annotation/riverpod_annotation.dart';
 
           part 'providers.g.dart';
@@ -49383,7 +49382,7 @@ steps:
         patch: |
           --- b/generate_crossword/step_04/lib/providers.dart
           +++ a/generate_crossword/step_04/lib/providers.dart
-          @@ -3,12 +3,17 @@
+          @@ -3,11 +3,16 @@
            // found in the LICENSE file.
 
            import 'dart:convert';
@@ -49392,7 +49391,6 @@ steps:
            import 'package:built_collection/built_collection.dart';
           +import 'package:flutter/foundation.dart';
            import 'package:flutter/services.dart';
-           import 'package:riverpod/riverpod.dart';
            import 'package:riverpod_annotation/riverpod_annotation.dart';
 
           +import 'model.dart' as model;
@@ -49401,7 +49399,7 @@ steps:
            part 'providers.g.dart';
 
            /// A provider for the wordlist to use when generating the crossword.
-          @@ -31,3 +36,77 @@ Future<BuiltSet<String>> wordList(Ref ref) async {
+          @@ -30,3 +35,77 @@ Future<BuiltSet<String>> wordList(Ref ref) async {
                      ..where((word) => re.hasMatch(word)),
                  );
            }
@@ -50188,7 +50186,7 @@ steps:
         patch: |
           --- b/generate_crossword/step_05_a/lib/providers.dart
           +++ a/generate_crossword/step_05_a/lib/providers.dart
-          @@ -90,13 +90,19 @@ Stream<model.Crossword> crossword(Ref ref) async* {
+          @@ -89,13 +89,19 @@ Stream<model.Crossword> crossword(Ref ref) async* {
                      _random.nextInt(size.height),
                    );
 
@@ -50236,7 +50234,7 @@ steps:
         patch: |
           --- b/generate_crossword/step_05_b/lib/providers.dart
           +++ a/generate_crossword/step_05_b/lib/providers.dart
-          @@ -89,19 +89,24 @@ Stream<model.Crossword> crossword(Ref ref) async* {
+          @@ -88,19 +88,24 @@ Stream<model.Crossword> crossword(Ref ref) async* {
                      _random.nextInt(size.width),
                      _random.nextInt(size.height),
                    );
@@ -50346,16 +50344,15 @@ steps:
         patch: |
           --- b/generate_crossword/step_05_c/lib/providers.dart
           +++ a/generate_crossword/step_05_c/lib/providers.dart
-          @@ -3,7 +3,6 @@
+          @@ -3,15 +3,14 @@
            // found in the LICENSE file.
 
            import 'dart:convert';
           -import 'dart:math';
 
            import 'package:built_collection/built_collection.dart';
            import 'package:flutter/foundation.dart';
-          @@ -11,8 +10,8 @@ import 'package:flutter/services.dart';
-           import 'package:riverpod/riverpod.dart';
+           import 'package:flutter/services.dart';
            import 'package:riverpod_annotation/riverpod_annotation.dart';
 
           +import 'isolates.dart';
@@ -50364,7 +50361,7 @@ steps:
 
            part 'providers.g.dart';
 
-          @@ -66,58 +65,27 @@ class Size extends _$Size {
+          @@ -65,58 +64,27 @@ class Size extends _$Size {
              }
            }
 
@@ -50974,7 +50971,7 @@ steps:
 
            import 'package:built_collection/built_collection.dart';
            import 'package:flutter/foundation.dart';
-          @@ -66,14 +67,21 @@ class Size extends _$Size {
+          @@ -65,14 +66,21 @@ class Size extends _$Size {
            }
 
            @riverpod
@@ -50998,7 +50995,7 @@ steps:
 
              yield* wordListAsync.when(
                data: (wordList) => exploreCrosswordSolutions(
-          @@ -82,10 +90,103 @@ Stream<model.Crossword> crossword(Ref ref) async* {
+          @@ -81,10 +89,103 @@ Stream<model.Crossword> crossword(Ref ref) async* {
                ),
                error: (error, stackTrace) async* {
                  debugPrint('Error loading word list: $error');
@@ -51578,23 +51575,23 @@ steps:
         patch: |
           --- b/generate_crossword/step_08/lib/providers.dart
           +++ a/generate_crossword/step_08/lib/providers.dart
-          @@ -68,6 +68,7 @@ class Size extends _$Size {
+          @@ -67,6 +67,7 @@ class Size extends _$Size {
 
            @riverpod
            Stream<model.WorkQueue> workQueue(Ref ref) async* {
           +  final workers = ref.watch(workerCountProvider);
              final size = ref.watch(sizeProvider);
              final wordListAsync = ref.watch(wordListProvider);
              final emptyCrossword = model.Crossword.crossword(
-          @@ -87,6 +88,7 @@ Stream<model.WorkQueue> workQueue(Ref ref) async* {
+          @@ -86,6 +87,7 @@ Stream<model.WorkQueue> workQueue(Ref ref) async* {
                data: (wordList) => exploreCrosswordSolutions(
                  crossword: emptyCrossword,
                  wordList: wordList,
           +      maxWorkerCount: workers.count,
                ),
                error: (error, stackTrace) async* {
                  debugPrint('Error loading word list: $error');
-          @@ -190,3 +192,33 @@ class DisplayInfo extends _$DisplayInfo {
+          @@ -189,3 +191,33 @@ class DisplayInfo extends _$DisplayInfo {
                    loading: () => model.DisplayInfo.empty,
                  );
            }
@@ -52280,7 +52277,7 @@ steps:
 
            import 'package:built_collection/built_collection.dart';
            import 'package:flutter/foundation.dart';
-          @@ -16,6 +15,8 @@ import 'model.dart' as model;
+          @@ -15,6 +14,8 @@ import 'model.dart' as model;
 
            part 'providers.g.dart';
 
@@ -52289,15 +52286,15 @@ steps:
            /// A provider for the wordlist to use when generating the crossword.
            @riverpod
            Future<BuiltSet<String>> wordList(Ref ref) async {
-          @@ -68,7 +69,6 @@ class Size extends _$Size {
+          @@ -67,7 +68,6 @@ class Size extends _$Size {
 
            @riverpod
            Stream<model.WorkQueue> workQueue(Ref ref) async* {
           -  final workers = ref.watch(workerCountProvider);
              final size = ref.watch(sizeProvider);
              final wordListAsync = ref.watch(wordListProvider);
              final emptyCrossword = model.Crossword.crossword(
-          @@ -81,14 +81,11 @@ Stream<model.WorkQueue> workQueue(Ref ref) async* {
+          @@ -80,14 +80,11 @@ Stream<model.WorkQueue> workQueue(Ref ref) async* {
                startLocation: model.Location.at(0, 0),
              );
 
@@ -52313,7 +52310,7 @@ steps:
                ),
                error: (error, stackTrace) async* {
                  debugPrint('Error loading word list: $error');
-          @@ -98,127 +95,80 @@ Stream<model.WorkQueue> workQueue(Ref ref) async* {
+          @@ -97,127 +94,80 @@ Stream<model.WorkQueue> workQueue(Ref ref) async* {
                  yield emptyWorkQueue;
                },
              );