Added adjustments to bring things more in-line (#48)

* Added adjustments to bring things more in-line

* Removed repo dependency

Author: Reedyuk

build.gradle.kts

@@ -64,7 +64,6 @@ subprojects {
         mavenCentral()
         google()
         jcenter()
-        
     }
 
     var shouldSign = true
@@ -86,14 +85,22 @@ subprojects {
             into(file("$buildDir/node_module"))
         }
 
+        val unzipJar by registering(Copy::class) {
+            val zipFile = File("$buildDir/libs", "${project.name}-js-${project.version}.jar")
+            from(this.project.zipTree(zipFile))
+            into("$buildDir/classes/kotlin/js/main/")
+        }
+
         val copyJS by registering {
+            mustRunAfter("unzipJar", "copyPackageJson")
             doLast {
-                val from = File("$buildDir/classes/kotlin/js/main/${project.name}.js")
+                val from = File("$buildDir/classes/kotlin/js/main/${rootProject.name}-${project.name}.js")
                 val into = File("$buildDir/node_module/${project.name}.js")
                 into.createNewFile()
-                into.writeText(from.readText()
-                    .replace("require('firebase-", "require('@gitlive/firebase-")
-//                .replace("require('kotlinx-serialization-kotlinx-serialization-runtime')", "require('@gitlive/kotlinx-serialization-runtime')")
+                into.writeText(
+                    from.readText()
+                        .replace("require('firebase-", "require('@gitlive/firebase-")
+                    //                .replace("require('kotlinx-serialization-kotlinx-serialization-runtime')", "require('@gitlive/kotlinx-serialization-runtime')")
                 )
             }
         }
@@ -103,17 +110,19 @@ subprojects {
             into(file("$buildDir/node_module"))
         }
 
-
-        val publishToNpm by creating(Exec::class) {
-
+        val prepareForNpmPublish by registering {
             dependsOn(
+                unzipJar,
                 copyPackageJson,
-                copyJS,
                 copySourceMap,
-                copyReadMe
+                copyReadMe,
+                copyJS
             )
+        }
 
+        val publishToNpm by creating(Exec::class) {
             workingDir("$buildDir/node_module")
+            isIgnoreExitValue = true
             if(Os.isFamily(Os.FAMILY_WINDOWS)) {
                 commandLine("cmd", "/c", "npm publish")
             } else {

firebase-database/build.gradle.kts

@@ -42,6 +42,8 @@ kotlin {
                 moduleKind = "commonjs"
             }
         }
+        nodejs()
+        browser()
     }
     android {
         publishLibraryVariants("release", "debug")

firebase-firestore/build.gradle.kts

@@ -38,6 +38,8 @@ kotlin {
                 moduleKind = "commonjs"
             }
         }
+        nodejs()
+        browser()
     }
     android {
         publishLibraryVariants("release", "debug")

firebase-functions/build.gradle.kts

@@ -36,6 +36,8 @@ kotlin {
                 moduleKind = "commonjs"
             }
         }
+        nodejs()
+        browser()
     }
     android {
         publishLibraryVariants("release", "debug")