Skip to content

Commit d87067b

Browse files
committed
Use file-embed-lzma
1 parent 993cc7d commit d87067b

File tree

3 files changed

+7
-129
lines changed

3 files changed

+7
-129
lines changed

servant-swagger-ui.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,34 +97,28 @@ library
9797

9898
build-depends:
9999
base >=4.7 && <4.12
100-
, base-compat >=0.9.3 && <0.10
101100
, blaze-markup >=0.7.0.2 && <0.9
102101
, bytestring >=0.10.4.0 && <0.11
103-
, directory >=1.2.1.0 && <1.4
104-
, filepath >=1.3.0.2 && <1.5
102+
, file-embed-lzma >=0 && <0.1
105103
, http-media >=0.6.2 && <0.8
106-
, lzma >=0.0.0.3 && <0.1
107104
, servant >=0.4.4.5 && <0.14
108105
, servant-blaze >=0.4.4.5 && <0.9
109106
, servant-server >=0.4.4.5 && <0.14
110107
, servant-swagger >=1.0.3 && <1.2
111108
, swagger2 >=2.0.1 && <2.3
112-
, template-haskell >=2.9 && <2.14
113109
, text >=1.2.0.6 && <1.3
114-
, th-lift-instances >=0.1.11 && <0.2
115-
, transformers >=0.3 && <0.6
116110
, wai-app-static >=3.0.1.1 && <3.2
117111
if flag(servant-0-5)
118112
build-depends:
119113
servant >=0.5
114+
, transformers >=0.3 && <0.6
120115
, transformers-compat >=0.3 && <0.6
121116
else
122117
build-depends:
123118
servant <0.5
124119
, either
125120
exposed-modules:
126121
Servant.Swagger.UI
127-
Servant.Swagger.UI.Internal
128122
default-language: Haskell2010
129123

130124
test-suite example

src/Servant/Swagger/UI.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ module Servant.Swagger.UI (
7171

7272
import Data.ByteString (ByteString)
7373
import Data.Swagger (Swagger)
74+
import FileEmbedLzma
7475
import GHC.TypeLits (KnownSymbol, Symbol, symbolVal)
7576
import Network.Wai.Application.Static (embeddedSettings, staticApp)
7677
import Servant
7778
import Servant.HTML.Blaze (HTML)
78-
import Servant.Swagger.UI.Internal
7979
import Text.Blaze (ToMarkup (..))
8080

8181
import qualified Data.Text as T
@@ -192,16 +192,16 @@ swaggerUiIndexTemplate :: T.Text
192192
swaggerUiIndexTemplate = $(embedText "index.html.tmpl")
193193

194194
swaggerUiFiles :: [(FilePath, ByteString)]
195-
swaggerUiFiles = $(mkRecursiveEmbedded "swagger-ui-dist-3.9.1")
195+
swaggerUiFiles = $(embedRecursiveDir "swagger-ui-dist-3.9.1")
196196

197197
jensolegIndexTemplate :: T.Text
198198
jensolegIndexTemplate = $(embedText "jensoleg.index.html.tmpl")
199199

200200
jensolegFiles :: [(FilePath, ByteString)]
201-
jensolegFiles = $(mkRecursiveEmbedded "jensoleg-dist")
201+
jensolegFiles = $(embedRecursiveDir "jensoleg-dist")
202202

203203
redocIndexTemplate :: T.Text
204-
redocIndexTemplate = $(embedStringFile "redoc.index.html.tmpl")
204+
redocIndexTemplate = $(embedText "redoc.index.html.tmpl")
205205

206206
redocFiles :: [(FilePath, ByteString)]
207-
redocFiles = $(mkRecursiveEmbedded "redoc-dist")
207+
redocFiles = $(embedRecursiveDir "redoc-dist")

src/Servant/Swagger/UI/Internal.hs

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)