Skip to content

Disable the js auto-rewrite #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
farmdawgnation merged 2 commits into from
Jan 1, 2020
Merged

Disable the js auto-rewrite #1978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fb3728
Disable the js auto-rewrite
farmdawgnation Dec 28, 2019
091e6dd
Mark minified spec as pending until fixed
farmdawgnation Jan 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions web/webkit/src/main/scala/net/liftweb/http/ResourceServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,12 @@ object ResourceServer {
}

@volatile var pathRewriter: PartialFunction[List[String], List[String]] = rewriter orElse {
case "lift.js" :: Nil => List("lift-min.js")
case "json.js" :: Nil => List("json2-min.js")
case "json2.js" :: Nil => List("json2-min.js")
// These automatic rewrites have been disabled since we're not currently
// minifying our internal js files on build. There's an open question in
// my mind as to whether or not we _should_ continue doin that.
// case "lift.js" :: Nil => List("lift-min.js")
// case "json.js" :: Nil => List("json2-min.js")
// case "json2.js" :: Nil => List("json2-min.js")
case xs => xs
}

Expand Down Expand Up @@ -136,4 +139,3 @@ object ResourceServer {
pathRewriter = rw orElse pathRewriter
}
}

3 changes: 1 addition & 2 deletions web/webkit/src/test/scala/net/liftweb/http/ResourceServerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class ResourceServerSpec extends Specification {
"default json to json2 minified version" in {
(ResourceServer.pathRewriter("json.js"::Nil) must_== List("json2-min.js")) and
(ResourceServer.pathRewriter("json2.js"::Nil) must_== List("json2-min.js"))
}
}.pendingUntilFixed
}
}