Skip to content

Commit f35ee06

Browse files
committed
fix mainclass issue
1 parent 2dcb267 commit f35ee06

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "sbt-sri-platform"
22

3-
//version := "2017.3.23-beta"
3+
//version := "2017.3.26.1-beta"
44

55
scalaVersion := "2.10.6"
66

src/main/scala/sri/sbt/platform/ConfigBuilder.scala

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package sri.sbt.platform
22

3+
import org.scalajs.core.tools.linker.backend.ModuleKind
34
import sbt.Keys._
45
import sbt._
56
import org.scalajs.sbtplugin.ScalaJSPlugin.AutoImport._
67
import org.scalajs.sbtplugin.ScalaJSPluginInternal
8+
import org.scalajs.sbtplugin.ScalaJSPluginInternal.scalaJSProjectBaseSettings
79

810
object ConfigBuilder {
911

@@ -70,8 +72,15 @@ object ConfigBuilder {
7072
dev := {
7173
val indexFile = baseDirectory.value / entryFile
7274
val indexContent = IO.read(indexFile)
73-
(fastOptJS in config).value.data
74-
val launcher = s"""require("./$aPath");"""
75+
println(s"value : ${scalaJSUseMainModuleInitializer.value}")
76+
(fastOptJS).value.data
77+
val mainClassRef = (mainClass in Compile).value
78+
.getOrElse("")
79+
.split('.')
80+
.map(s => s"""["$s"]""")
81+
.mkString("")
82+
.concat("().main()")
83+
val launcher = s"""require("./$aPath")${mainClassRef};"""
7584
if (!indexContent.contains(launcher)) IO.append(indexFile, launcher)
7685
// if (!isServerStarted) {
7786
// if ((npmStart !) == 0) {
@@ -84,7 +93,13 @@ object ConfigBuilder {
8493
val indexFile = baseDirectory.value / entryFile
8594
val indexContent = IO.read(indexFile)
8695
(fullOptJS in config).value.data
87-
val launcher = s"""require("./$aPath");"""
96+
val mainClassRef = (mainClass in Compile).value
97+
.getOrElse("")
98+
.split('.')
99+
.map(s => s"""["$s"]""")
100+
.mkString("")
101+
.concat("().main()")
102+
val launcher = s"""require("./$aPath")${mainClassRef};"""
88103
if (!indexContent.contains(launcher)) IO.append(indexFile, launcher)
89104
}
90105
))

src/main/scala/sri/sbt/platform/SriPlatFormPlugin.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ object SriPlatFormPlugin extends AutoPlugin {
2525
Seq(
2626
defaultConfiguration := Some(common),
2727
scalaJSModuleKind := ModuleKind.CommonJSModule,
28-
scalaJSUseMainModuleInitializer := true,
2928
ivyConfigurations := overrideConfigs(ios,
3029
android,
3130
common,
3231
CustomCompile)(
33-
ivyConfigurations.value)
32+
ivyConfigurations.value),
33+
scalaJSUseMainModuleInitializer := true
3434
) ++ buildConfig(android) ++ buildConfig(ios)
3535
}

0 commit comments

Comments
 (0)