Merge pull request #2 from mscharley/multi-project

Multi project
mscharley · May 20, 2016 · cbd480c · cbd480c
2 parents ac35414 + 3393536
commit cbd480c
Show file tree

Hide file tree

Showing 22 changed files with 78 additions and 265 deletions.
diff --git a/.ctags b/.ctags
@@ -0,0 +1,12 @@
+--langdef=scala
+--langmap=scala:.scala
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*class[ \t]+([a-zA-Z0-9_]+)/\4/c,classes/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*object[ \t]+([a-zA-Z0-9_]+)/\4/c,objects/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*case class[ \t]+([a-zA-Z0-9_]+)/\4/c,case classes/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*case object[ \t]+([a-zA-Z0-9_]+)/\4/c,case objects/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*(private|protected)?[ \t]*trait[ \t]+([a-zA-Z0-9_]+)/\4/t,traits/
+--regex-scala=/^[ \t]*type[ \t]+([a-zA-Z0-9_]+)/\1/T,types/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*def[ \t]+([a-zA-Z0-9_]+)/\3/m,methods/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*val[ \t]+([a-zA-Z0-9_]+)/\3/l,constants/
+--regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy)[ \t]*)*var[ \t]+([a-zA-Z0-9_]+)/\3/l,variables/
+--regex-scala=/^[ \t]*package[ \t]+([a-zA-Z0-9_.]+)/\1/p,packages/
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 target
+/tags
+/src/electron/scalajs-electron-quick-start*
diff --git a/build.sbt b/build.sbt
@@ -1,11 +1,16 @@
-// This is a Scala.js project.
-enablePlugins(ScalaJSPlugin)
 // Use Node.
 scalaJSUseRhino in Global := false
 
-name := "electron-scala"
-scalaVersion := "2.11.8"
+lazy val ElectronQuickStart = (project in file(".")).
+  settings(
+    name := "scalajs-electron-quick-start",
+    version := "1.0.0",
+    scalaVersion := "2.11.8",
 
-libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.9.0"
-)
+    resolvers += Resolver.sonatypeRepo("public"),
+    libraryDependencies ++= Seq(
+      "org.scala-js"  %%% "scalajs-dom"      % "0.9.0",
+      "com.mscharley" %%% "scalajs-electron" % "0.1.0",
+      "com.mscharley" %%% "scalajs-nodejs"   % "0.1.0"
+    )
+  ).enablePlugins(ScalaJSPlugin)
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "description": "A minimal Electron application with Scala.js support",
   "scripts": {
-    "start": "sbt fullOptJS && electron target/scala-2.11/classes/entry.js",
-    "debug": "sbt clean fastOptJS && electron target/scala-2.11/classes/entry.js",
+    "start": "rm -fv src/electron/${npm_package_name}* && sbt fullOptJS && cp -v target/scala-*/${npm_package_name}* src/electron/ && electron src/electron/entry.js",
+    "debug": "rm -fv src/electron/${npm_package_name}* && sbt clean fastOptJS && cp -v target/scala-*/${npm_package_name}* src/electron/ && electron src/electron/entry.js",
     "test": "sbt test"
   },
   "repository": {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
diff --git a/renderer.js b/renderer.js
diff --git a/src/electron/entry.js b/src/electron/entry.js
@@ -0,0 +1,14 @@
+'use strict';
+
+(function() {
+  require('source-map-support').install();
+  var appName = 'scalajs-electron-quick-start';
+  try {
+    require('./' + appName + '-opt');
+  }
+  catch (e) {
+    require('./' + appName + '-fastopt');
+  }
+
+  ElectronQuickStart.App(__dirname, require).main();
+})();
diff --git a/src/main/resources/index.html → src/electron/index.html b/src/main/resources/index.html → src/electron/index.html
@@ -3,6 +3,23 @@
   <head>
     <meta charset="UTF-8">
     <title>Hello World!</title>
+    <script>
+    (function() {
+      require('source-map-support').install();
+
+      var appName = 'scalajs-electron-quick-start';
+      try {
+        require('./' + appName + '-opt');
+      }
+      catch (e) {
+        require('./' + appName + '-fastopt');
+      }
+
+      window.onload = function() {
+        ElectronQuickStart.Window();
+      }
+    })();
+    </script>
   </head>
   <body>
     <h1>Hello World!</h1>
@@ -11,9 +28,4 @@ <h1>Hello World!</h1>
     Chromium <script>document.write(process.versions.chrome)</script>,
     and Electron <script>document.write(process.versions.electron)</script>.
   </body>
-
-  <script>
-    // You can also require other files to run in this process
-    require('./renderer.js')
-  </script>
 </html>
diff --git a/src/main/resources/entry.js b/src/main/resources/entry.js
diff --git a/src/main/scala/electron/Application.scala b/src/main/scala/electron/Application.scala
diff --git a/src/main/scala/electron/BrowserWindow.scala b/src/main/scala/electron/BrowserWindow.scala
diff --git a/src/main/scala/electron/Electron.scala b/src/main/scala/electron/Electron.scala
diff --git a/src/main/scala/electron/ElectronApp.scala b/src/main/scala/electron/ElectronApp.scala
diff --git a/src/main/scala/electron/WebContents.scala b/src/main/scala/electron/WebContents.scala
diff --git a/src/main/scala/electronscala/App.scala → src/main/scala/electron/quickstart/App.scala b/src/main/scala/electronscala/App.scala → src/main/scala/electron/quickstart/App.scala
@@ -1,15 +1,17 @@
-package electronscala
+package electron.quickstart
 
 import electron._
 
-import scala.scalajs.js.Dynamic.{literal => JsObject}
+import scala.scalajs.js
+import scala.scalajs.js.Dynamic.{global, literal => JsObject}
 import scala.scalajs.js.annotation.JSExport
 
-@JSExport("electronscala.App")
-class App(dirName: String, rawElectron: raw.Electron) extends ElectronApp(rawElectron) {
+@JSExport("ElectronQuickStart.App")
+class App(dirName: String, require: js.Function1[String, js.Any]) extends ElectronApp(require("electron").asInstanceOf[raw.Electron]) {
   // Keep a global reference of the window object, if you don't, the window will
   // be closed automatically when the JavaScript object is garbage collected.
   var mainWindow: Option[BrowserWindow] = None
+  val console = global.console
 
   val createWindow = () => {
     // Create the browser window.
@@ -30,6 +32,8 @@ class App(dirName: String, rawElectron: raw.Electron) extends ElectronApp(rawEle
   }
 
   def main() = {
+    console.log("Starting scalajs-electron-quick-start...");
+
     // This method will be called when Electron has finished initialization and is ready to create browser windows.
     electronApp onceReady createWindow
 

diff --git a/src/main/scala/electron/quickstart/Window.scala b/src/main/scala/electron/quickstart/Window.scala
@@ -0,0 +1,10 @@
+package electron.quickstart
+
+import scala.scalajs.js
+import scala.scalajs.js.Dynamic.global
+import scala.scalajs.js.annotation.JSExport
+
+@JSExport("ElectronQuickStart.Window")
+class Window {
+  global.document.getElementsByTagName("BODY").asInstanceOf[js.Array[js.Dynamic]].apply(0).style = "background: #eee;"
+}
diff --git a/src/main/scala/electron/raw/Application.scala b/src/main/scala/electron/raw/Application.scala
diff --git a/src/main/scala/electron/raw/BrowserWindow.scala b/src/main/scala/electron/raw/BrowserWindow.scala
diff --git a/src/main/scala/electron/raw/Electron.scala b/src/main/scala/electron/raw/Electron.scala
diff --git a/src/main/scala/nodejs/Buffer.scala b/src/main/scala/nodejs/Buffer.scala
diff --git a/src/main/scala/nodejs/EventEmitter.scala b/src/main/scala/nodejs/EventEmitter.scala