Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
chandu0101 committed Sep 22, 2018
1 parent 5fdd436 commit a09d6e7
Show file tree
Hide file tree
Showing 7 changed files with 432 additions and 288 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: scala

scala:
- 2.12.4
- 2.12.6

jdk:
- oraclejdk8
Expand Down
15 changes: 8 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name := "web-router"

//version := "2018.6.0-SNAPSHOT"
//version := "2018.9.0-SNAPSHOT"

enablePlugins(ScalaJSPlugin)


val scala212 = "2.12.4"
val scala212 = "2.12.6"

scalaVersion := scala212

Expand All @@ -21,8 +21,8 @@ scalacOptions ++= Seq(
//deps

libraryDependencies ++= Seq(
"scalajs-react-interface" %%% "core" % "2018.2.2-RC" % Provided,
"scalajs-react-interface" %%% "universal" % "2018.2.2-RC" % Provided)
"scalajs-react-interface" %%% "core" % "2018.9.22-RC" % Provided,
"scalajs-react-interface" %%% "universal" % "2018.9.22-RC" % Provided)

//bintray
resolvers += Resolver.jcenterRepo
Expand All @@ -42,6 +42,7 @@ publishArtifact in Test := false

resolvers += Resolver.bintrayRepo("scalajs-react-interface", "maven")
scalaJSUseMainModuleInitializer in Test := true
scalaJSUseTestModuleInitializer in Test := false

scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))

Expand Down Expand Up @@ -74,9 +75,9 @@ resolvers ++=Seq(Resolver.bintrayRepo("scalajs-react-interface", "maven"),
Resolver.bintrayRepo("scalajs-plus", "maven"))

libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "0.9.4" % Test,
"scalajs-jest" %%% "core" % "2018.2.2-RC" % Test,
"scalajs-react-interface" %%% "web" % "2018.2.2-RC" % Test
"org.scala-js" %%% "scalajs-dom" % "0.9.6" % Test,
"scalajs-jest" %%% "core" % "2018.8.14-RC" % Test,
"scalajs-react-interface" %%% "web" % "2018.9.22-RC" % Test
)
//scalaJSStage in Global := FastOptStage
scalaJSStage in Global := FullOptStage
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {},
"dependencies": {
"history": "^4.7.2",
"jest": "^22.0.4",
"jest": "^23.6.0",
"path-to-regexp": "^2.1.0",
"react": "^16.2.0",
"react-dom": "^16.2.0"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.1.0
sbt.version=1.2.1

2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M3")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M5")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.2")
12 changes: 6 additions & 6 deletions src/main/scala/sri/web/router/RouterCtrl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ final class RouterCtrl private[router] (val history: History,
def previousRoute = _previousRoute

def navigate[C <: RouterScreenClass { type Params = Null }: js.ConstructorTag](
aaction: NavigationAction = NavigationAction.PUSH,
action: NavigationAction = NavigationAction.PUSH,
search: js.UndefOr[String] = js.undefined)(implicit ctag: ClassTag[C]) =
navigateStatic[C](action = aaction, search = search)
navigateStatic[C](action = action, search = search)

def navigateLS[C <: RouterScreenClass {
type Params = Null; type LocationState >: Null <: AnyRef
}: js.ConstructorTag](
state: C#LocationState,
aaction: NavigationAction = NavigationAction.PUSH,
action: NavigationAction = NavigationAction.PUSH,
search: js.UndefOr[String] = js.undefined)(implicit ctag: ClassTag[C]) =
navigateStatic[C](action = aaction, search = search, state = state)
navigateStatic[C](action = action, search = search, state = state)

def navigateP[C <: RouterScreenClass { type Params >: Null <: js.Object }: js.ConstructorTag](
params: C#Params,
aaction: NavigationAction = NavigationAction.PUSH,
action: NavigationAction = NavigationAction.PUSH,
search: js.UndefOr[String] = js.undefined)(implicit ctag: ClassTag[C]) =
navigateDynamic[C](params = params, action = aaction, search = search)
navigateDynamic[C](params = params, action = action, search = search)

def navigatePLS[C <: RouterScreenClass {
type Params >: Null <: js.Object; type LocationState >: Null <: AnyRef
Expand Down
Loading

0 comments on commit a09d6e7

Please sign in to comment.