Revert "Merge pull request #14 from mathieuleclaire/pm"

These changes broke the release process. This reverts commit 2a80f41, reversing changes made to 213bfce.
cibotech · Nov 8, 2018 · 8da56dc · 8da56dc
1 parent 2a80f41
commit 8da56dc
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 339 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,4 @@
 import ReleaseTransformations._
-import execnpm.NpmDeps
-import execnpm.NpmDeps.Dep
 
 
 homepage := Some(url("https://github.com/cibotech/leaflet-facade"))
@@ -48,9 +46,19 @@ lazy val globalSettings = Seq(
   bintrayOrganization := Some("cibotech"),
   bintrayRepository := "public",
   bintrayPackageLabels := Seq("scala", "scala.js", "leaflet"),
+  requiresDOM := true,
   licenses += ("BSD Simplified", url("https://opensource.org/licenses/BSD-3-Clause"))
 )
 
+lazy val root = project.in(file("."))
+  .aggregate(`leaflet-facade`, `leaflet-draw`)
+  .settings(
+    crossScalaVersions := Seq("2.11.8", "2.12.4"),
+    releaseCrossBuild := true,
+    publishArtifact := false,
+    publish := {}
+  )
+
 lazy val `leaflet-facade` = project.in(file("leaflet"))
   .settings(globalSettings)
   .settings(
@@ -60,43 +68,18 @@ lazy val `leaflet-facade` = project.in(file("leaflet"))
     libraryDependencies ++= Seq(
       "org.scala-js" %%% "scalajs-dom" % "0.9.4"
     ),
-    npmDeps in Compile += Dep("leaflet", "1.3.4", List("leaflet.js"))
-  ) enablePlugins (ExecNpmPlugin)
+    jsDependencies ++= Seq(
+      "org.webjars.npm" % "leaflet" % "1.3.1" / "1.3.1/dist/leaflet.js"
+    )
+  ) enablePlugins (ScalaJSPlugin)
 
 lazy val `leaflet-draw` = project.in(file("leaflet-draw"))
   .settings(globalSettings)
   .settings(
     crossScalaVersions := Seq("2.11.8", "2.12.4"),
     releaseCrossBuild := true,
     name := "leaflet-draw-facade",
-    npmDeps in Compile += Dep("leaflet-draw", "1.0.4", List("leaflet.draw.js"))
-  ) dependsOn (`leaflet-facade`) enablePlugins (ExecNpmPlugin)
-
-lazy val `leaflet-pm` = project.in(file("leaflet-pm"))
-  .settings(globalSettings)
-  .settings(
-    crossScalaVersions := Seq("2.11.8", "2.12.4"),
-    releaseCrossBuild := true,
-    name := "leaflet-pm",
-    npmDeps in Compile += Dep("leaflet.pm", "0.25.0", List("leaflet.pm.min.js"), true)
-  ) dependsOn (`leaflet-facade`) enablePlugins (ExecNpmPlugin)
-
-
-lazy val buildExample = taskKey[Unit]("build")
-lazy val example = project.in(file("example"))
-  .settings(
-    crossScalaVersions := Seq("2.11.8", "2.12.4"),
-    releaseCrossBuild := true,
-    publishArtifact := false,
-    name := "leaflet-example",
-    publish := {},
-    buildExample := {
-      val exampleTarget = (target in Compile).value
-      val exampleResource = (resourceDirectory in Compile).value
-      val buildJS = (fullOptJS in Compile).value
-
-      // Copy js and deps files and resource directory in exemple target
-      IO.copyFile(buildJS.data, exampleTarget / "js/leaflet-facade.js")
-      IO.copyFile(dependencyFile.value, exampleTarget / "js/leaflet-facade-deps.js")
-      IO.copyDirectory(exampleResource, exampleTarget)
-    }) enablePlugins (ExecNpmPlugin) dependsOn(`leaflet-pm`, `leaflet-draw`)
+    jsDependencies ++= Seq(
+      "org.webjars.npm" % "leaflet-draw" % "1.0.2" / "leaflet.draw.js"
+    )
+  ) dependsOn (`leaflet-facade`) enablePlugins (ScalaJSPlugin)
diff --git a/example/src/main/resources/index.html → example/index.html b/example/src/main/resources/index.html → example/index.html
@@ -4,18 +4,17 @@
     <meta charset="UTF-8">
     <title>Leaflet Facade Demo</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.2/leaflet.css">
-    <link rel="stylesheet" type="text/css" href="css/styles.css">
-    <link rel="stylesheet" type="text/css" href="css/leaflet.pm.css">
+    <link rel="stylesheet" type="text/css" href="./styles.css">
 </head>
 <body>
 
     <div id="demo-map"></div>
 
-    <script type="text/javascript" src="js/leaflet-facade.js"></script>
-    <script type="text/javascript" src="js/leaflet-facade-deps.js"></script>
+    <script type="text/javascript" src="./leaflet-facade-jsdeps.js"></script>
+    <script type="text/javascript" src="./leaflet-facade-opt.js"></script>
 
     <script type="text/javascript">
-          example();
+          demo.LeafletExample().main();
     </script>
 </body>
 

diff --git a/example/leaflet-facade-jsdeps.js b/example/leaflet-facade-jsdeps.js
diff --git a/example/leaflet-facade-opt.js b/example/leaflet-facade-opt.js
diff --git a/example/src/main/resources/css/leaflet.pm.css b/example/src/main/resources/css/leaflet.pm.css
diff --git a/example/src/main/scala/demo/LeafletExample.scala b/example/src/main/scala/demo/LeafletExample.scala
@@ -1,20 +1,16 @@
 package demo
 
 
-import com.cibo.leaflet.pm._
-import com.cibo.leaflet.pm.PM._
-import com.cibo.leaflet._
+import com.cibo.leaflet.{LatLng, Leaflet}
 
 import scala.scalajs.js
-import scala.scalajs.js.annotation.JSExportTopLevel
 
 
-object LeafletExample {
+object LeafletExample extends js.JSApp {
 
   import js.JSConverters._
 
-  @JSExportTopLevel("example")
-  def example(): Unit = {
+  def main(): Unit = {
 
     val leafletMap = Leaflet.map("demo-map").setView(LatLng(51.505, -0.09), 13)
 
@@ -29,8 +25,5 @@ object LeafletExample {
     ).toJSArray
 
     Leaflet.polygon(js.Array(coords)).addTo(leafletMap)
-
-    // PM
-    leafletMap.pm.addControls(ToolbarOptions.drawPolygon(false).drawMarker(true))
   }
 }
diff --git a/example/src/main/resources/css/styles.css → example/styles.css b/example/src/main/resources/css/styles.css → example/styles.css
diff --git a/leaflet-pm/src/main/scala/com/cibo/leaflet/Pm.scala b/leaflet-pm/src/main/scala/com/cibo/leaflet/Pm.scala
diff --git a/leaflet/src/main/scala/com/cibo/leaflet/package.scala b/leaflet/src/main/scala/com/cibo/leaflet/package.scala
@@ -9,8 +9,6 @@
 
 package com.cibo
 
-import scalajs.js
-
 package object leaflet {
 
   /**
@@ -21,6 +19,4 @@ package object leaflet {
   type OptMap = scala.collection.Map[String, Any]
 
   val noOpts = Map.empty[String, Any]
-
-  implicit def jsOptionBuilderToUndefOr[A <: js.Object ,B <: JSOptionBuilder[A, _]](builder: JSOptionBuilder[A, B]): js.UndefOr[A] = builder.build
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,5 @@
-resolvers += Resolver.sonatypeRepo("releases")
-
 addSbtPlugin("org.scala-js"      % "sbt-scalajs" % "0.6.25")
 addSbtPlugin("de.heikoseeberger" % "sbt-header"  % "5.0.0")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9")
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
-addSbtPlugin("org.scalastyle"    %% "scalastyle-sbt-plugin" % "1.0.0")
-addSbtPlugin("fr.iscpif" % "scalajs-execnpm" % "0.1")
+addSbtPlugin("org.scalastyle"    %% "scalastyle-sbt-plugin" % "1.0.0")