Skip to content
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

Jump to bottom

Minify Simplification #468

Merged
merged 23 commits into from Feb 27, 2012
Merged

Minify Simplification #468

merged 23 commits into from Feb 27, 2012

Conversation

cweider
Copy link
Contributor

@cweider cweider commented Feb 20, 2012

After #449 is pulled, even more code can be removed from Minify. This removes all the JS packaging code from Minify (using the yajsml middleware). These are the significant changes:

  • Only serves individual static files and installed at static/*.
  • Serves/compress all JS and CSS.
  • The ace.js file gets embedded content from internal HTTP requests.
  • LastModified/304’s are much more specific page loads much faster in development.

The internal HTTP requests that both Minify and Yajsml need some scrutiny - I’m not sure if odd environments (the motivation for relative paths) will cause any trouble (my guess is not).

@cweider
Use the correct expression.
2797c2f
@cweider
Extract lastmodified from handler.
d6d4178
@cweider
Catch 304's early.
c266936
@cweider
Return 404's.
a09e208
@cweider
Support GET and HEAD.
a5365f2
@cweider
Allow maxAge of server to be specified in a setting.
1fe9d2a
@cweider
Minify specifies maxAge.
43f4184
@cweider
Create CachingMiddleware for zipping and caching.
bb10f02
@cweider
Inline response generation.
b661ef5
@cweider
Use Yajsml to combine files.
dcc0740 
Minify only constructs individual files and optionally compresses them with UglifyJS.
@cweider
Extract file existance check.
e33c5a3
@cweider
Minify serves the require kernel.
3da1464
@cweider
Last modification is more specific (when possible).
a500625
@cweider
Combine existense and date checks.
ff264aa
@cweider
Only add date if date exists.
494ca05
@cweider
Do not allow relative paths.
aac849f
@cweider
Only gzip text files.
df9e290 
It is not very productive to compress images so compress text only.
@cweider
Minify serves all static assets.
e093000
@cweider
It is ok if the directory doesn't exist.
3b2a3ad
@cweider
Drop all packaging logic from minify.
78691fe
@cweider
Provide a better last modified date for require-kernel.
6a7a3ea
@cweider
Use cache for minified assets.
98f56b5
@cweider
Add some comments.
cfe0954
This was referenced Feb 27, 2012
Closed
Closed
Pita added a commit that referenced this pull request Feb 27, 2012
@Pita
Merge pull request #468 from cweider/minify-simplify
611cfbd 
Minify Simplification
@Pita Pita merged commit 611cfbd into ether:master Feb 27, 2012
@Pita
Copy link
Contributor

Pita commented Feb 27, 2012

all merged, thx

@cweider cweider mentioned this pull request Feb 28, 2012
Closed
rossmeissl added a commit to faradayio/etherpad-lite-heroku that referenced this pull request Apr 10, 2012
@rossmeissl
Revert "Merge pull request ether#468 from cweider/minify-simplify"
7c29504 
This reverts commit 611cfbd, reversing
changes made to bf42359.

Conflicts:

	node/server.js
	node/utils/Minify.js
	node/utils/Settings.js
	node/utils/caching_middleware.js
	package.json
	settings.json.template
	static/pad.html
	static/timeslider.html
@rossmeissl
Copy link

From what I can tell this merge has significantly reduced the reliability of etherpad-lite running at beta.etherpad.org

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cweider @Pita @rossmeissl