Merge pull request #6 from EddyVerbruggen/master

took pull

Author: milansar

CHANGELOG.md

@@ -3,6 +3,10 @@
 - [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
 - [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
+## 10.2.0 (2019, Nov 18)
+[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/116?closed=1)
+
+
 ## 10.1.1 (2019, Oct 29)
 [Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/114?closed=1)
 

demo-ng/app/App_Resources/iOS/Info.plist

@@ -22,6 +22,9 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+  <!-- Making sure Dark Mode is not applied -->
+  <key>UIUserInterfaceStyle</key>
+  <string>Light</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiresFullScreen</key>

demo-ng/app/tabs/firestore/firestore.component.html

@@ -27,7 +27,7 @@
     <Button text="Stop listening" (tap)="firestoreStopListening()" class="button"></Button>
     <Button text="Where (by reference)" (tap)="firestoreWhere()" class="button"></Button>
     <Button text="Where, Order, Limit" (tap)="firestoreWhereOrderLimit()" class="button"></Button>
-    <Button text="Where array_contains" (tap)="firestoreWhereCityHasALake()" class="button"></Button>
+    <Button text="Where array_contains" (tap)="firestoreWhereCityHasALakeAndOrMountain()" class="button"></Button>
     <Button text="Start at 'LA'" (tap)="firestoreStartAt()" class="button"></Button>
     <Button text="Start after 'LA'" (tap)="firestoreStartAfter()" class="button"></Button>
     <Button text="Delete" (tap)="firestoreDelete()" class="button"></Button>

demo-ng/app/tabs/firestore/firestore.component.ts

@@ -277,7 +277,7 @@ export class FirestoreComponent {
   }
 
   firestoreDocumentObservable(): void {
-    this.myCity$ = Observable.create(subscriber => {
+    this.myCity$ = new Observable(subscriber => {
       const docRef: firestore.DocumentReference = firebase.firestore().collection("cities").doc("SF");
       docRef.onSnapshot(
           {includeMetadataChanges: true},
@@ -289,14 +289,15 @@ export class FirestoreComponent {
 
             this.zone.run(() => {
               this.city = <City>doc.data();
+              console.log("City name: " + this.city.name);
               subscriber.next(this.city);
             });
           });
     });
   }
 
   firestoreCollectionObservable(): void {
-    this.myCities$ = Observable.create(subscriber => {
+    this.myCities$ = new Observable(subscriber => {
       const colRef: firestore.CollectionReference = firebase.firestore().collection("cities");
       colRef.onSnapshot(
           {includeMetadataChanges: true},
@@ -357,24 +358,25 @@ export class FirestoreComponent {
 
   firestoreWhereOrderLimit(): void {
     const query: firestore.Query = firebase.firestore().collection("cities")
-        .where("state", "==", "CA")
+        // .where("state", "==", "CA")
+        .where("state", "in", ["CA", "WA"])
         .where("population", "<", 99999999)
         .orderBy("population", "desc")
-        .limit(2);
+        .limit(4);
 
     query
         .get()
         .then((querySnapshot: firestore.QuerySnapshot) => {
           querySnapshot.forEach(doc => {
-            console.log(`Large Californian city: ${doc.id} => ${JSON.stringify(doc.data())}`);
+            console.log(`Large CA/WA city: ${doc.id} => ${JSON.stringify(doc.data())}`);
           });
         })
         .catch(err => console.log("firestoreWhereOrderLimit failed, error: " + err));
   }
 
-  firestoreWhereCityHasALake(): void {
+  firestoreWhereCityHasALakeAndOrMountain(): void {
     const query: firestore.Query = firebase.firestore().collection("cities")
-        .where("landmarks", "array-contains", "lake");
+        .where("landmarks", "array-contains-any", ["mountain", "lake"]);
 
     query
         .get()

demo-ng/package.json

@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.firebasedemo.firestore",
     "tns-android": {
-      "version": "6.1.0"
+      "version": "6.2.0"
     },
     "tns-ios": {
-      "version": "6.1.0"
+      "version": "6.2.0"
     }
   },
   "dependencies": {
@@ -25,11 +25,11 @@
     "nativescript-angular": "~8.0.3",
     "nativescript-camera": "~4.5.0",
     "nativescript-imagepicker": "~6.2.0",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.2.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "reflect-metadata": "~0.1.13",
     "rxjs": "~6.5.2",
-    "tns-core-modules": "~6.1.1",
+    "tns-core-modules": "~6.2.0",
     "zone.js": "~0.10.0"
   },
   "devDependencies": {
@@ -39,7 +39,7 @@
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
     "lazy": "1.0.11",
-    "nativescript-dev-webpack": "~1.2.0",
+    "nativescript-dev-webpack": "~1.3.0",
     "typescript": "3.4.5"
   }
 }

demo-ng/webpack.config.js

@@ -7,6 +7,7 @@ const { nsReplaceBootstrap } = require("nativescript-dev-webpack/transformers/ns
 const { nsReplaceLazyLoader } = require("nativescript-dev-webpack/transformers/ns-replace-lazy-loader");
 const { nsSupportHmrNg } = require("nativescript-dev-webpack/transformers/ns-support-hmr-ng");
 const { getMainModulePath } = require("nativescript-dev-webpack/utils/ast-utils");
+const { getNoEmitOnErrorFromTSConfig } = require("nativescript-dev-webpack/utils/tsconfig-utils");
 const CleanWebpackPlugin = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
@@ -35,8 +36,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "src",
         appResourcesPath = "App_Resources",
 
@@ -51,8 +51,12 @@ module.exports = env => {
         hmr, // --env.hmr,
         unitTesting, // --env.unitTesting
         verbose, // --env.verbose
+        snapshotInDocker, // --env.snapshotInDocker
+        skipSnapshotTools, // --env.skipSnapshotTools
+        compileSnapshot // --env.compileSnapshot
     } = env;
 
+    const useLibs = compileSnapshot;
     const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
     const externals = nsWebpack.getConvertedExternals(env.externals);
     const appFullPath = resolve(projectRoot, appPath);
@@ -108,6 +112,8 @@ module.exports = env => {
         itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
     }
 
+    const noEmitOnErrorFromTSConfig = getNoEmitOnErrorFromTSConfig(join(projectRoot, tsConfigName));
+
     nsWebpack.processAppComponents(appComponents, platform);
     const config = {
         mode: production ? "production" : "development",
@@ -159,6 +165,7 @@ module.exports = env => {
         devtool: hiddenSourceMap ? "hidden-source-map" : (sourceMap ? "inline-source-map" : "none"),
         optimization: {
             runtimeChunk: "single",
+            noEmitOnErrors: noEmitOnErrorFromTSConfig,
             splitChunks: {
                 cacheGroups: {
                     vendor: {
@@ -221,19 +228,24 @@ module.exports = env => {
 
                 { test: /\.html$|\.xml$/, use: "raw-loader" },
 
-                // tns-core-modules reads the app.css and its imports using css-loader
                 {
                     test: /[\/|\\]app\.css$/,
                     use: [
                         "nativescript-dev-webpack/style-hot-loader",
-                        { loader: "css-loader", options: { url: false } }
+                        {
+                            loader: "nativescript-dev-webpack/css2json-loader",
+                            options: { useForImports: true }
+                        }
                     ]
                 },
                 {
                     test: /[\/|\\]app\.scss$/,
                     use: [
                         "nativescript-dev-webpack/style-hot-loader",
-                        { loader: "css-loader", options: { url: false } },
+                        {
+                            loader: "nativescript-dev-webpack/css2json-loader",
+                            options: { useForImports: true }
+                        },
                         "sass-loader"
                     ]
                 },
@@ -272,7 +284,6 @@ module.exports = env => {
                 { from: { glob: "fonts/**" } },
                 { from: { glob: "**/*.jpg" } },
                 { from: { glob: "**/*.png" } },
-                { from: { glob: "custommodel/**" } },
             ], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
             new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"),
             // For instructions on how to set up workers with webpack
@@ -310,6 +321,9 @@ module.exports = env => {
             ],
             projectRoot,
             webpackConfig: config,
+            snapshotInDocker,
+            skipSnapshotTools,
+            useLibs
         }));
     }
 

demo-push/app_resources/iOS/Info.plist

@@ -22,6 +22,9 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+  <!-- Making sure Dark Mode is not applied -->
+  <key>UIUserInterfaceStyle</key>
+  <string>Light</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiresFullScreen</key>

demo-push/package.json

@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.2.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "nativescript-unit-test-runner": "0.7.0",
     "tns-core-modules": "~6.1.1"

demo-vue/app/App_Resources/iOS/Info.plist

@@ -22,6 +22,9 @@
 	<string>1.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+  <!-- Making sure Dark Mode is not applied -->
+  <key>UIUserInterfaceStyle</key>
+  <string>Light</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiresFullScreen</key>

demo-vue/package.json

@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.2.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "nativescript-vue": "~2.4.0",
     "tns-core-modules": "~6.1.1"