From 9a8c050ad8400ea2419fdbd917a8bc97c105abcf Mon Sep 17 00:00:00 2001
From: JohnE <git@malloc.io>
Date: Tue, 11 Jun 2019 13:47:05 -0700
Subject: [PATCH] MOD: updating for flutter_web support

---
 .gitignore                                    | 14 +++++++
 .../cloud_firestore/lib/cloud_firestore.dart  |  4 +-
 packages/cloud_firestore/pubspec.yaml         | 38 +++++++++++--------
 packages/firebase_core/lib/firebase_core.dart |  2 +-
 packages/firebase_core/pubspec.yaml           | 25 ++++++++----
 5 files changed, 57 insertions(+), 26 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7215e5a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# Files and directories created by pub
+.dart_tool/
+.packages
+# Remove the following pattern if you wish to check in your lock file
+pubspec.lock
+
+# Conventional directory for build outputs
+build/
+
+# Directory created by dartdoc
+doc/api/
+
+# OSX Files
+.DS_Store
diff --git a/packages/cloud_firestore/lib/cloud_firestore.dart b/packages/cloud_firestore/lib/cloud_firestore.dart
index ec4a21a..2a38803 100755
--- a/packages/cloud_firestore/lib/cloud_firestore.dart
+++ b/packages/cloud_firestore/lib/cloud_firestore.dart
@@ -11,8 +11,8 @@ import 'dart:ui' show hashValues, hashList;
 
 import 'package:collection/collection.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
-import 'package:flutter/services.dart';
+import 'package:flutter_web/foundation.dart' show ReadBuffer, WriteBuffer;
+import 'package:flutter_web/services.dart';
 import 'package:meta/meta.dart';
 
 import 'src/utils/push_id_generator.dart';
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
index fc10833..e3e2cc6 100755
--- a/packages/cloud_firestore/pubspec.yaml
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -5,26 +5,32 @@ author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
 version: 0.12.5
 
-flutter:
-  plugin:
-    androidPackage: io.flutter.plugins.firebase.cloudfirestore
-    iosPrefix: FLT
-    pluginClass: CloudFirestorePlugin
+environment:
+  # You must be using Flutter >=1.5.0 or Dart >=2.3.0
+  sdk: '>=2.3.0-dev.0.1 <3.0.0'
 
 dependencies:
-  flutter:
-    sdk: flutter
+  flutter_web: any
+  flutter_web_ui: any
+  firebase_core: any
   meta: "^1.0.5"
   collection: "^1.14.3"
-  firebase_core: "^0.4.0"
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
-  flutter_driver:
-    sdk: flutter
-  test: any
+  build_runner: ^1.4.0
+  build_web_compilers: ^2.0.0
+  pedantic: ^1.0.0
 
-environment:
-  sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=1.5.0 <2.0.0"
+dependency_overrides:
+  flutter_web:
+    git:
+      url: https://github.com/flutter/flutter_web
+      path: packages/flutter_web
+  flutter_web_ui:
+    git:
+      url: https://github.com/flutter/flutter_web
+      path: packages/flutter_web_ui
+  firebase_core:
+    git:
+      url: https://github.com/j3g/flutter_web_plugins.git
+      path: packages/firebase_core
diff --git a/packages/firebase_core/lib/firebase_core.dart b/packages/firebase_core/lib/firebase_core.dart
index 7972063..ff6ea4e 100644
--- a/packages/firebase_core/lib/firebase_core.dart
+++ b/packages/firebase_core/lib/firebase_core.dart
@@ -8,7 +8,7 @@ import 'dart:async';
 import 'dart:io' show Platform;
 import 'dart:ui' show hashValues;
 
-import 'package:flutter/services.dart';
+import 'package:flutter_web/services.dart';
 import 'package:meta/meta.dart';
 
 part 'src/firebase_app.dart';
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
index 504e44f..d2a94c4 100644
--- a/packages/firebase_core/pubspec.yaml
+++ b/packages/firebase_core/pubspec.yaml
@@ -5,6 +5,10 @@ author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_core
 version: 0.4.0+3
 
+environment:
+  # You must be using Flutter >=1.5.0 or Dart >=2.3.0
+  sdk: '>=2.3.0-dev.0.1 <3.0.0'
+
 flutter:
   plugin:
     androidPackage: io.flutter.plugins.firebase.core
@@ -12,14 +16,21 @@ flutter:
     pluginClass: FirebaseCorePlugin
 
 dependencies:
-  flutter:
-    sdk: flutter
+  flutter_web: any
+  flutter_web_ui: any
   meta: "^1.0.5"
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
+  build_runner: ^1.4.0
+  build_web_compilers: ^2.0.0
+  pedantic: ^1.0.0
 
-environment:
-  sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=1.5.0 <2.0.0"
+dependency_overrides:
+  flutter_web:
+    git:
+      url: https://github.com/flutter/flutter_web
+      path: packages/flutter_web
+  flutter_web_ui:
+    git:
+      url: https://github.com/flutter/flutter_web
+      path: packages/flutter_web_ui