From 9fb372813d821114d0ffd3df559d87fbe3f99455 Mon Sep 17 00:00:00 2001 From: Matt Farmer Date: Fri, 27 Dec 2019 21:13:43 -0500 Subject: [PATCH 1/2] Disable the js auto-rewrite --- .../main/scala/net/liftweb/http/ResourceServer.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/webkit/src/main/scala/net/liftweb/http/ResourceServer.scala b/web/webkit/src/main/scala/net/liftweb/http/ResourceServer.scala index b22f828b6c..5b1f7ee167 100644 --- a/web/webkit/src/main/scala/net/liftweb/http/ResourceServer.scala +++ b/web/webkit/src/main/scala/net/liftweb/http/ResourceServer.scala @@ -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 } @@ -136,4 +139,3 @@ object ResourceServer { pathRewriter = rw orElse pathRewriter } } - From 091e6dd1092e989552b3ac987d27883269f4c3da Mon Sep 17 00:00:00 2001 From: Matt Farmer Date: Wed, 1 Jan 2020 12:10:21 -0500 Subject: [PATCH 2/2] Mark minified spec as pending until fixed --- .../src/test/scala/net/liftweb/http/ResourceServerSpec.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/webkit/src/test/scala/net/liftweb/http/ResourceServerSpec.scala b/web/webkit/src/test/scala/net/liftweb/http/ResourceServerSpec.scala index 4b4c515793..d23cf05c6a 100644 --- a/web/webkit/src/test/scala/net/liftweb/http/ResourceServerSpec.scala +++ b/web/webkit/src/test/scala/net/liftweb/http/ResourceServerSpec.scala @@ -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 } } -