multi project build

README.md

@@ -65,6 +65,9 @@ The following `tsc` compiler options are managed by `sbt-typescript` so setting
 If you use the `stage` compile mode the `outFile` option is also managed by `sbt-typescript`.  
 
 ##release notes
+#### v0.4.0-alfa.1
+- supports multi project builds. Uses sbt-web webModules for js deps resolution instead of nodeModules. 
+Hence the alfa moniker to see whether f.i. @types resolution still works.
 
 #### v0.3.0-beta.9
 - fixes compilation of test assets

build.sbt

@@ -1,7 +1,7 @@
 sbtPlugin := true
 organization := "name.de-vries"
 name := "sbt-typescript"
-version := "0.3.0-beta.9"
+version := "0.4.0-alfa.1"
 
 homepage := Some(url("https://github.com/joost-de-vries/sbt-typescript"))
 licenses +=("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))
@@ -59,4 +59,4 @@ bintrayVcsUrl := Some("[email protected]:joost-de-vries/sbt-typescript.git")
 
 scriptedSettings
 scriptedLaunchOpts += s"-Dproject.version=${version.value}"
-//scriptedBufferLog := false
+scriptedBufferLog := false

src/main/scala/name/devries/sbt/typescript/SbtTypescript.scala

@@ -97,8 +97,8 @@ object SbtTypescript extends AutoPlugin with JsonProtocol {
         taskMessage in TestAssets := "Typescript test compiling"
       )
   ) ++ SbtJsTask.addJsSourceFileTasks(typescript) ++ Seq(
-    typescript in Assets := (typescript in Assets).dependsOn(webJarsNodeModules in Assets).value,
-    typescript in TestAssets := (typescript in TestAssets).dependsOn(webJarsNodeModules in TestAssets).value
+    typescript in Assets := (typescript in Assets).dependsOn(webModules in Assets).value,
+    typescript in TestAssets := (typescript in TestAssets).dependsOn(webModules in TestAssets).value
   )
 
   def typescriptUnscopedSettings(config: Configuration) = {
@@ -135,8 +135,8 @@ object SbtTypescript extends AutoPlugin with JsonProtocol {
         ),
         "tsCodesToIgnore" -> JsArray(tsCodesToIgnore.value.toVector.map(JsNumber(_))),
         "nodeModulesDirs" -> toJsArray(
-          mainDir = (webJarsNodeModulesDirectory in Assets).value.getAbsolutePath,
-          testDir = (webJarsNodeModulesDirectory in TestAssets).value.getAbsolutePath),
+          mainDir = ((webJarsDirectory in Assets).value / "lib" ).getAbsolutePath,
+          testDir = ((webJarsDirectory in TestAssets).value / "lib").getAbsolutePath),
         "resolveFromNodeModulesDir" -> JsBoolean(resolveFromWebjarsNodeModulesDir.value),
         "runMode" -> JsString(getCompileMode.value.toString),
         "assertCompilation" -> JsBoolean(assertCompilation.value)

test/build.sbt

@@ -2,19 +2,26 @@
 
 
 lazy val root = (project in file(".")).enablePlugins(SbtWeb)
-
-JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
-
-logLevel in typescript := Level.Debug
-
-assertCompilation in typescript := true
-
-
-jasmineFilter in jasmine := GlobFilter("*Test.js") | GlobFilter("*Spec.js") | GlobFilter("*.spec.js")
-logLevel in jasmine := Level.Info
+  .aggregate(web, common)
+
+lazy val common = (project in file("modules/common"))
+  .enablePlugins(SbtWeb)
+  .settings(commonSettings)
+
+lazy val web = (project in file("modules/web"))
+  .enablePlugins(SbtWeb)
+  .settings(commonSettings)
+  .dependsOn(common)
+
+lazy val commonSettings = Seq(
+  JsEngineKeys.engineType := JsEngineKeys.EngineType.Node,
+  logLevel in typescript := Level.Debug,
+  assertCompilation in typescript := true,
+  resolveFromWebjarsNodeModulesDir := true,
+  excludeFilter in Assets := (excludeFilter in Assets).value || "*.ts"
+)
 
 libraryDependencies ++= Seq(
-  "org.webjars.npm" % "types__jasmine" % "2.5.40"
 )
 
-resolveFromWebjarsNodeModulesDir := true
+

test/modules/common/src/main/assets/component.a.ts

@@ -0,0 +1,5 @@
+export class A{
+    constructor(){
+
+    }
+}

test/modules/common/tsconfig.json

@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators":true,
+    "noEmitOnError": true,
+    "sourceMap": true,
+    "declaration": true,
+    "mapRoot": "/assets",
+    "rootDirs": ["src/main/assets","src/test/assets"],
+    "baseUrl": ".",
+    "paths": {
+      "*": [
+        "*",
+        "target/web/node-modules/main/webjars/*",
+        "target/web/node-modules/main/webjars/lib/*"
+      ]
+    },
+    "outDir": "./target/tsc"
+  },
+  "exclude": [
+    "node_modules",
+    "typings/browser",
+    "typings/main",
+    "typings/main.d.ts",
+    "target",
+    "project"
+  ]
+}

test/modules/web/src/main/assets/component.b.ts

@@ -0,0 +1,3 @@
+import {A} from "common/component.a"
+
+const a = new A()

test/modules/web/tsconfig.json

@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators":true,
+    "noEmitOnError": true,
+    "sourceMap": true,
+    "mapRoot": "/assets",
+    "rootDirs": ["src/main/assets","src/test/assets"],
+    "baseUrl": ".",
+    "paths": {
+      "*": [
+        "*",
+        "target/web/web-modules/main/webjars/lib/*"
+      ]
+    },
+    "outDir": "./target/tsc"
+  },
+  "exclude": [
+    "node_modules",
+    "typings/browser",
+    "typings/main",
+    "typings/main.d.ts",
+    "target",
+    "project"
+  ]
+}

test/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.13

test/project/plugins.sbt

@@ -1,13 +1,10 @@
 lazy val root = Project("plugins", file(".")).dependsOn(plugin)
 
-
-addSbtPlugin("name.de-vries" % "sbt-jasmine" % "0.0.1SNAPSHOT")
-
 lazy val plugin = file("../").getCanonicalFile.toURI
 //logLevel := Level.Debug
 resolvers ++= Seq(
-  Resolver.sbtPluginRepo("releases"),
-  Resolver.mavenLocal,
-  Resolver.sonatypeRepo("releases"),
-  Resolver.typesafeRepo("releases")
+    Resolver.sbtPluginRepo("releases"),
+    Resolver.mavenLocal,
+    Resolver.sonatypeRepo("releases"),
+    Resolver.typesafeRepo("releases")
 )

test/tsconfig.json

@@ -1,24 +1,17 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "module": "commonjs",
+    "module": "system",
     "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "noEmitOnError": true,
+    "experimentalDecorators":true,
     "sourceMap": true,
-    "lib": [
-      "es6"
-    ],
     "mapRoot": "/assets",
-    "rootDirs": [
-      "src/main/assets",
-      "src/test/assets"
-    ],
+    "rootDirs": ["src/main/assets","src/test/assets"],
     "baseUrl": ".",
     "paths": {
       "*": [
         "*",
-        "target/web/node-modules/main/webjars/*"
+        "target/web/web-modules/main/webjars/lib/*"
       ]
     },
     "outDir": "./target/tsc"