Commit Graph

53 Commits

Author SHA1 Message Date
Michael Snoyman
98955ac161 Minor doc fix (thanks Toby) 2013-12-24 14:52:50 +02:00
Michael Snoyman
b81a9721fb Disable CSS minification when combining stylesheets #623 2013-11-21 22:44:31 +02:00
John Lenz
a4690dd424 yesod-static: improve messages for embedded compression tools
When trying various compression tools, display some messages
to the user about which compression tool is used.

--HG--
extra : rebase_source : e90e6ed49317b91a0fbe90d94f437459926f59e7
2013-09-19 15:22:14 -05:00
John Lenz
380cdcd174 static: make Entry a setting type
In the future we might want to add new features to the
Entry.  I am currently thinking about source maps, where
a new field will need to be added to the Entry.  Therefore,
use Data.Default to make sure we don't need to bump the
major version for these features.
2013-09-17 11:03:00 -05:00
John Lenz
1a5aa23f13 static: fix the build on GHC 7.4
There were two build issues on GHC 7.4: using atomicModifyIORef'
and ByteString.Lazy.toStrict, both of which were missing.  These
are now fixed.

In addition, looking at the IORef code more closely,
we want the quite a bit of strictness in the IORef.
The common case is that the widget content already exists in the map
(every reload of a page will call embedStaticContent), but until we
force the map the thunks holding the duplicated generated content will
be kept around, leaking memory.  This will be the common situation since
the vast majority of the time the content already exists.  Since
the containers module does not have a strict map until 0.5, use
unordered containers which does have a strict map.
2013-09-12 17:52:15 -05:00
John Lenz
8e16fd2227 static: update sample-embed.hs and point the old embedded static to the new one 2013-09-12 12:21:47 -05:00
John Lenz
2ad3977712 static: add several embedded generators
This constains the generators to embed files, directories,
and javascript compression
2013-09-12 12:21:47 -05:00
John Lenz
f8a35ce0a0 static: Add an embedded static subsite
This commit adds just the subsite itself.  The subsite
works by running a list of generaters at compile time.
The entries produced by the generators are converted into
wai-app-static.WaiAppStatic.Storage.Embedded entries.  Also,
addStaticContent is supported via an IORef.  When a widget
produces static content (css, javascript), it is stuck into
the IORef inside the embedded static subsite.  The embedded
static subsite will then serve it from the IORef, properly
using a 304 response if the client already has the content.
2013-09-12 12:21:33 -05:00
Alexey Kotlyarov
f0bef8005f Update to cryptohash-cryptoapi
Crypto.Hash.MD5 no longer exports the MD5 type, switch to
cryptohash-cryptoapi.
2013-09-01 15:05:27 +10:00
Michael Snoyman
18dd77a1fe Revert string packing in yesod-static 2013-04-25 13:55:45 +03:00
Michael Snoyman
d79fe24d4d Fixes after merge 2013-04-24 22:00:56 +03:00
Michael Snoyman
98ededba28 Merge remote-tracking branch 'origin/yesod1.2'
Conflicts:
	yesod-auth/Yesod/Auth.hs
	yesod-auth/yesod-auth.cabal
	yesod-core/yesod-core.cabal
	yesod-static/Yesod/Static.hs
	yesod-static/yesod-static.cabal
	yesod/yesod.cabal
2013-04-24 19:00:03 +03:00
Michael Snoyman
d01d6fa61a Static file combining #517 2013-04-21 11:14:18 +03:00
Michael Snoyman
91757320f3 Dedupe path pieces in yesod-static 2013-04-18 22:59:40 +03:00
Felipe Lessa
53fd20d239 Squash static strings into a single one. 2013-04-09 18:03:32 -03:00
Felipe Lessa
1a8767935e Whitespace. 2013-04-09 18:03:17 -03:00
Michael Snoyman
0eda39f242 Added ParseRoute instance for Static 2013-03-19 15:53:03 +02:00
Michael Snoyman
8b9f8ea024 Some convenience re-exports 2013-03-15 05:54:09 +02:00
Michael Snoyman
2d93157e9a Fixed Yesod.Static 2013-03-14 19:02:30 +02:00
Michael Snoyman
9c4cd573b4 Everything compiles 2013-03-14 09:28:51 +02:00
Michael Snoyman
099b96f178 Everything compiles 2013-03-13 13:35:11 +02:00
Michael Snoyman
617c1d724e Removed some FIXMEs 2013-01-02 14:26:56 +02:00
Michael Snoyman
992f4e7893 staticFiles (in Yesod.Static) does not work without OverloadedStrings (#437) 2012-12-26 15:59:49 +02:00
Michael Snoyman
c26e5cd4eb Cleaned up some warnings 2012-11-02 08:27:30 +02:00
Michael Snoyman
cd8a898115 No infinite redirects in yesod-static (#442) 2012-10-28 09:09:44 +02:00
Michael Snoyman
699d76d13a Merge branch 'beta'
Conflicts:
	yesod-core/yesod-core.cabal
	yesod-json/yesod-json.cabal
	yesod-test/Yesod/Test.hs
	yesod-test/test/main.hs
	yesod-test/yesod-test.cabal
2012-07-11 08:48:09 +03:00
Max Cantor
5c4e5d989f Added warning about Static embed. Updated to address Felipe's very valid criticisms. 2012-07-05 09:45:47 -07:00
Michael Snoyman
985dd6c924 Remainder of Logger changes, scaffolded site works (#360) 2012-07-05 13:37:54 +03:00
Michael Snoyman
ebc737a5cb conduit 0.5 2012-06-22 15:28:14 +03:00
Michael Snoyman
80513d5286 Removed an unneeded import 2012-05-21 22:01:41 +03:00
Felipe Lessa
a1203297b9 yesod-static: Correctly add the "etag" param to TH-generated routes.
The wai-app-static package expects the etag parameter to be
passed in the form of

  /...?etag=XXXX

but yesod-static was passing

  /...?XXXX

This commit fixes this bug.
2012-05-17 09:59:17 -03:00
Michael Snoyman
cbd0719f37 conduit 0.3 2012-03-12 13:40:04 +02:00
Greg Weber
f3087f8e98 add tests back
removed in 1f2e451370
2012-02-05 07:56:36 -06:00
Simon Hengel
02f1fa1b5b yesod-static: Escape / in documentation of staticFilesList 2012-01-18 09:58:39 +01:00
Michael Snoyman
dfbdaf0b4c Some fixes noticed on working with yesodweb 2012-01-08 11:05:05 +02:00
Michael Snoyman
205b3bf6b3 Get crypto-conduit changes to compile 2012-01-07 18:10:11 +02:00
Felipe Lessa
59c3705f7d Use crypto-conduit 0.1.1's hashFile in base64md5File. 2012-01-07 08:51:00 -02:00
Felipe Lessa
af352c5ed0 Use crypto-conduit for base64md5File. 2012-01-07 01:24:19 -02:00
Michael Snoyman
69a5d0e0ed Whole repo builds with new yesod-routes 2012-01-05 15:27:16 +02:00
Felipe Lessa
697ebbb2f5 Improve yesod-static:Yesod.Static's documentation. 2011-12-30 15:53:08 -02:00
Michael Snoyman
61f0c26e9f MonadLift 2011-12-30 13:30:24 +02:00
Michael Snoyman
50ce1da37e Everything builds 2011-12-28 10:03:14 +02:00
Greg Weber
11ac3a00dd get yesod-static tests running again 2011-11-27 08:12:49 -06:00
Michael Snoyman
8e1d49aa59 Avoid resource exhaustion in yesod-static 2011-10-05 13:36:10 +02:00
Michael Snoyman
eb42fbd976 staticFilesList 2011-09-22 09:26:36 +03:00
Greg Weber
f200e9caec pass static directory onto wai-app-static 2011-08-28 13:16:04 -07:00
Michael Snoyman
d1bb17304a Builds properly with stricter rules 2011-08-28 11:02:32 +03:00
Greg Weber
2adc337fa1 use staticDevel in scaffold 2011-08-22 20:31:22 -07:00
Greg Weber
1b8c016557 Bring back proper etag support 2011-08-22 20:23:44 -07:00
Michael Snoyman
3bee4e7b13 yesod-static uses fileSystemLookupHash 2011-08-22 22:02:00 +03:00