Upgrade deps, format, fix web/filipino_cuisine (#898)

fixes: https://github.com/flutter/samples/issues/897

web/_tool/fix_base_tags.dart

@@ -31,9 +31,7 @@ Future<void> fixBaseTags() async {
         throw ('no index.html file found in ${builtSample.path}');
       }
 
-      var sampleDirName = p
-          .split(builtSample.path)
-          .last;
+      var sampleDirName = p.split(builtSample.path).last;
 
       if (await index.exists()) {
         final regex = RegExp('<base href="(.*)">');

web/_tool/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   charcode:
     dependency: transitive
     description:

web/charts/pubspec.lock

@@ -47,7 +47,7 @@ packages:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   meta:
     dependency: "direct main"
     description:

web/filipino_cuisine/.gitignore

@@ -0,0 +1,46 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

web/filipino_cuisine/.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: ffb2ecea5223acdd139a5039be2f9c796962833d
+  channel: stable
+
+project_type: app

web/filipino_cuisine/lib/flutter_swiper.dart

@@ -3,8 +3,8 @@
 
 import 'dart:async';
 
-import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'flutter_page_indicator.dart';
 import 'transformer_page_view.dart';

web/filipino_cuisine/lib/main.dart

@@ -8,13 +8,19 @@ import 'flutter_swiper.dart';
 void main() => runApp(MyApp());
 
 class MyApp extends StatelessWidget {
+  final _themeData = ThemeData(
+    brightness: Brightness.light,
+    iconTheme: const IconThemeData(color: Colors.red),
+  );
+
   @override
   Widget build(context) {
     return MaterialApp(
-        theme: ThemeData(
-            brightness: Brightness.light,
-            accentColor: Colors.red,
-            iconTheme: const IconThemeData(color: Colors.red)),
+        theme: _themeData.copyWith(
+          colorScheme: _themeData.colorScheme.copyWith(
+            secondary: Colors.red,
+          ),
+        ),
         title: "Filipino Cuisine",
         home: Home());
   }
@@ -123,7 +129,7 @@ class HState extends State<Home> {
             context,
             MaterialPageRoute(
                 builder: (cx) => Cook(
-                      fi['in'] as List<String>,
+                      (fi['in'] as List).cast(),
                       fi['pf'] as String,
                       fi['fn'] as String,
                     ))),

web/filipino_cuisine/pubspec.lock

@@ -14,7 +14,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   collection:
     dependency: transitive
     description:
@@ -33,7 +33,7 @@ packages:
       name: flutter_lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   flutter_page_indicator:
     dependency: transitive
     description:
@@ -89,7 +89,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   sky_engine:
     dependency: transitive
     description: flutter

web/filipino_cuisine/web/index.html

@@ -1,11 +1,101 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title></title>
-  <script defer src="main.dart.js" type="application/javascript"></script>
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="filipino_cuisine">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <title>filipino_cuisine</title>
+  <link rel="manifest" href="manifest.json">
 </head>
 <body>
+  <!-- This script installs service_worker.js to provide PWA functionality to
+       application. For more information, see:
+       https://developers.google.com/web/fundamentals/primers/service-workers -->
+  <script>
+    var serviceWorkerVersion = null;
+    var scriptLoaded = false;
+    function loadMainDartJs() {
+      if (scriptLoaded) {
+        return;
+      }
+      scriptLoaded = true;
+      var scriptTag = document.createElement('script');
+      scriptTag.src = 'main.dart.js';
+      scriptTag.type = 'application/javascript';
+      document.body.append(scriptTag);
+    }
+
+    if ('serviceWorker' in navigator) {
+      // Service workers are supported. Use them.
+      window.addEventListener('load', function () {
+        // Wait for registration to finish before dropping the <script> tag.
+        // Otherwise, the browser will load the script multiple times,
+        // potentially different versions.
+        var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
+        navigator.serviceWorker.register(serviceWorkerUrl)
+          .then((reg) => {
+            function waitForActivation(serviceWorker) {
+              serviceWorker.addEventListener('statechange', () => {
+                if (serviceWorker.state == 'activated') {
+                  console.log('Installed new service worker.');
+                  loadMainDartJs();
+                }
+              });
+            }
+            if (!reg.active && (reg.installing || reg.waiting)) {
+              // No active web worker and we have installed or are installing
+              // one for the first time. Simply wait for it to activate.
+              waitForActivation(reg.installing || reg.waiting);
+            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
+              // When the app updates the serviceWorkerVersion changes, so we
+              // need to ask the service worker to update.
+              console.log('New service worker available.');
+              reg.update();
+              waitForActivation(reg.installing);
+            } else {
+              // Existing service worker is still good.
+              console.log('Loading app from service worker.');
+              loadMainDartJs();
+            }
+          });
+
+        // If service worker doesn't succeed in a reasonable amount of time,
+        // fallback to plaint <script> tag.
+        setTimeout(() => {
+          if (!scriptLoaded) {
+            console.warn(
+              'Failed to load app from service worker. Falling back to plain <script> tag.',
+            );
+            loadMainDartJs();
+          }
+        }, 4000);
+      });
+    } else {
+      // Service workers not supported. Just drop the <script> tag.
+      loadMainDartJs();
+    }
+  </script>
 </body>
 </html>

web/filipino_cuisine/web/manifest.json

@@ -0,0 +1,35 @@
+{
+    "name": "filipino_cuisine",
+    "short_name": "filipino_cuisine",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}

web/github_dataviz/pubspec.lock

@@ -14,7 +14,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   collection:
     dependency: transitive
     description:
@@ -68,7 +68,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   sky_engine:
     dependency: transitive
     description: flutter

web/particle_background/pubspec.lock

@@ -26,7 +26,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -47,4 +47,4 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0-0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"

web/samples_index/lib/samples_index.dart

@@ -18,7 +18,7 @@ Future<List<Sample>> getSamples() async {
   var index = checkedYamlDecode(
       contents, (m) => m != null ? Index.fromJson(m) : null,
       sourceUrl: yamlFile.uri);
-  if (index == null) throw('unable to get load from ${yamlFile.uri}');
+  if (index == null) throw ('unable to get load from ${yamlFile.uri}');
   var cookbookIndex =
       Index.fromJson(json.decode(cookbookContents) as Map<dynamic, dynamic>);
   return index.samples..addAll(cookbookIndex.samples);

web/samples_index/test/samples_index_test.dart

@@ -4,10 +4,10 @@
 
 import 'dart:io';
 
-import 'package:samples_index/samples_index.dart';
-import 'package:samples_index/browser.dart';
-import 'package:test/test.dart';
 import 'package:checked_yaml/checked_yaml.dart';
+import 'package:samples_index/browser.dart';
+import 'package:samples_index/samples_index.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('YAML', () {
@@ -16,10 +16,11 @@ void main() {
       var contents = await file.readAsString();
       expect(contents, isNotEmpty);
 
-      var index = checkedYamlDecode(contents, (m) => m != null ? Index.fromJson(m) : null,
+      var index = checkedYamlDecode(
+          contents, (m) => m != null ? Index.fromJson(m) : null,
           sourceUrl: file.uri);
       if (index == null) {
-        throw('unable to load YAML from $file');
+        throw ('unable to load YAML from $file');
       }
       expect(index.samples, isNotEmpty);
 
@@ -52,10 +53,11 @@ void main() {
       var contents = await file.readAsString();
       expect(contents, isNotEmpty);
 
-      var index = checkedYamlDecode(contents, (m) => m != null ? Index.fromJson(m) : null,
+      var index = checkedYamlDecode(
+          contents, (m) => m != null ? Index.fromJson(m) : null,
           sourceUrl: file.uri);
       if (index == null) {
-        throw('unable to load YAML from $file');
+        throw ('unable to load YAML from $file');
       }
       var sample = index.samples.first;
       expect(