From ee312672d307e3bcc981b952dc2a4ff88d5c2d08 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sat, 10 Mar 2012 14:36:54 -0800
Subject: [PATCH 1/7] This is duplicated by the contents of static.

---
 src/ep.json                        | 1 -
 src/node/hooks/express/minified.js | 6 ------
 2 files changed, 7 deletions(-)
 delete mode 100644 src/node/hooks/express/minified.js

diff --git a/src/ep.json b/src/ep.json
index bc955dbf..59cbf3aa 100644
--- a/src/ep.json
+++ b/src/ep.json
@@ -3,7 +3,6 @@
     { "name": "static", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/static:expressCreateServer" } },
     { "name": "specialpages", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/specialpages:expressCreateServer" } },
     { "name": "padurlsanitize", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padurlsanitize:expressCreateServer" } },
-    { "name": "minified", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/minified:expressCreateServer" } },
     { "name": "padreadonly", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padreadonly:expressCreateServer" } },
     { "name": "webaccess", "hooks": { "expressConfigure": "ep_etherpad-lite/node/hooks/express/webaccess:expressConfigure" } },
     { "name": "apicalls", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/apicalls:expressCreateServer" } },
diff --git a/src/node/hooks/express/minified.js b/src/node/hooks/express/minified.js
deleted file mode 100644
index f8a988d7..00000000
--- a/src/node/hooks/express/minified.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var minify = require('../../utils/Minify');
-
-exports.expressCreateServer = function (hook_name, args, cb) {
-  //serve minified files
-  args.app.get(/^\/minified\/(.*)/, minify.minifyJS);
-}

From 648603126b7d9ab87cb9b19b5422d936dc2536f4 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sat, 10 Mar 2012 13:59:07 -0800
Subject: [PATCH 2/7] Remove require changes in `pushScriptsTo` method.

These duplicate `pushRequireScriptTo` at least, but mostly break things.
---
 src/static/js/ace.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 4114b63c..7331d68d 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -176,10 +176,6 @@ function Ace2Editor()
     } else {
       file = ACE_SOURCE;
       file = file.replace(/^\.\.\/static\/js\//, '../minified/');
-      buffer.push('<script type="text/javascript" src="../static/js/require-kernel.js"><\/script>');
-      buffer.push('<script type="text/javascript">');
-      buffer.push('require.setRootURI("../minified/"); require.setLibraryURI("../minified/plugins/"); require.setGlobalKeyPath("require");');
-      buffer.push('<\/script>');
       buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
       buffer.push('<script type="text/javascript">');
       buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');

From 2fd901979211b37fdaf164462a31d29eb9db8820 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sat, 10 Mar 2012 14:11:02 -0800
Subject: [PATCH 3/7] Remove require code that is unnecessary and/or incorrect.

---
 src/static/js/ace.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 7331d68d..fdeadb79 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -257,9 +257,7 @@ function Ace2Editor()
       pushRequireScriptTo(iframeHTML);
       // Inject my plugins into my child.
       iframeHTML.push('\
-<script type="text/javascript" src="../static/js/require-kernel.js"></script>\
 <script type="text/javascript">\
-  require.setRootURI("../minified/"); require.setLibraryURI("../minified/plugins/"); require.setGlobalKeyPath("require");\
   require.define("/plugins", null);\n\
   require.define("/plugins.js", function (require, exports, module) {\
     module.exports = require("ep_etherpad-lite/static/js/plugins");\

From ca02ca05ae881637975630ec368abc1e42698e99 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sat, 10 Mar 2012 14:12:04 -0800
Subject: [PATCH 4/7] Remove unnecessary line.

---
 src/static/js/ace.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index fdeadb79..836a6395 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -175,7 +175,6 @@ function Ace2Editor()
       buffer.push('<\/script>');
     } else {
       file = ACE_SOURCE;
-      file = file.replace(/^\.\.\/static\/js\//, '../minified/');
       buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
       buffer.push('<script type="text/javascript">');
       buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');

From c6b8beabd3712bab24705597fb5103ba371fac34 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sat, 10 Mar 2012 14:23:15 -0800
Subject: [PATCH 5/7] Correct paths to reflect their being libraries.

---
 src/static/js/ace.js       | 4 ++--
 src/static/pad.html        | 2 +-
 src/static/timeslider.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 836a6395..9202a014 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -166,8 +166,8 @@ function Ace2Editor()
   }
   function pushScriptsTo(buffer) {
     /* Folling is for packaging regular expression. */
-    /* $$INCLUDE_JS("../minified/ace2_inner.js?callback=require.define"); */
-    var ACE_SOURCE = '../minified/ace2_inner.js?callback=require.define';
+    /* $$INCLUDE_JS("../minified/plugins/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define"); */
+    var ACE_SOURCE = '../minified/plugins/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define';
     if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
diff --git a/src/static/pad.html b/src/static/pad.html
index f82abaa2..6cc08f9b 100644
--- a/src/static/pad.html
+++ b/src/static/pad.html
@@ -260,7 +260,7 @@
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
         <script type="text/javascript" src="../static/js/jquery.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
-        <script type="text/javascript" src="../minified/pad.js?callback=require.define"></script>
+        <script type="text/javascript" src="../minified/plugins/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
         <script type="text/javascript">
             var clientVars = {};
             (function () {
diff --git a/src/static/timeslider.html b/src/static/timeslider.html
index 377740f7..b518c7fe 100644
--- a/src/static/timeslider.html
+++ b/src/static/timeslider.html
@@ -200,7 +200,7 @@
 <script type="text/javascript" src="../../../static/js/require-kernel.js"></script>
 <script type="text/javascript" src="../../../static/js/jquery.js"></script>
 <script type="text/javascript" src="../../../socket.io/socket.io.js"></script>
-<script type="text/javascript" src="../../../minified/timeslider.js?callback=require.define"></script>
+<script type="text/javascript" src="../../../minified/plugins/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script>
 <script type="text/javascript" src="../../../static/custom/timeslider.js"></script>
 <script type="text/javascript" >
   var clientVars = {};

From 1a1f222221266a20ce1adcf839c581e664f88283 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sat, 10 Mar 2012 14:13:08 -0800
Subject: [PATCH 6/7] Change paths.

---
 src/node/hooks/express/static.js | 8 ++++----
 src/static/js/ace.js             | 6 +++---
 src/static/pad.html              | 6 +++---
 src/static/timeslider.html       | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js
index 9481eb5a..99701706 100644
--- a/src/node/hooks/express/static.js
+++ b/src/node/hooks/express/static.js
@@ -13,9 +13,9 @@ exports.expressCreateServer = function (hook_name, args, cb) {
      are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js,
      commonly ETHERPAD_ROOT/node_modules/ep_myplugin/static/js/test.js
   */
-  args.app.get(/^\/minified\/plugins\/([^\/]+)\/static\/(.*)/, function(req, res, next) {
+  args.app.get(/^\/javascripts\/lib\/([^\/]+)\/static\/(.*)/, function(req, res, next) {
     var plugin_name = req.params[0];
-    var modulePath = req.url.split("?")[0].substr("/minified/plugins/".length);
+    var modulePath = req.url.split("?")[0].substr("/javascripts/lib/".length);
     var fullPath = require.resolve(modulePath);
 
     if (plugins.plugins[plugin_name] == undefined) {
@@ -35,7 +35,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 
   // Cache both minified and static.
   var assetCache = new CachingMiddleware;
-  args.app.all('/(minified|static)/*', assetCache.handle);
+  args.app.all('/(javascripts|static)/*', assetCache.handle);
 
   // Minify will serve static files compressed (minify enabled). It also has
   // file-specific hacks for ace/require-kernel/etc.
@@ -44,7 +44,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   // Setup middleware that will package JavaScript files served by minify for
   // CommonJS loader on the client-side.
   var jsServer = new (Yajsml.Server)({
-    rootPath: 'minified/'
+    rootPath: 'javascripts/src/'
   , rootURI: 'http://localhost:' + settings.port + '/static/js/'
   });
 
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 9202a014..5707b6b7 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -156,7 +156,7 @@ function Ace2Editor()
   }
   function pushRequireScriptTo(buffer) {
     var KERNEL_SOURCE = '../static/js/require-kernel.js';
-    var KERNEL_BOOT = 'require.setRootURI("../minified/");\nrequire.setLibraryURI("../minified/plugins/");\nrequire.setGlobalKeyPath("require");'
+    var KERNEL_BOOT = 'require.setRootURI("../javascripts/src");\nrequire.setLibraryURI("../javascripts/lib");\nrequire.setGlobalKeyPath("require");'
     if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[KERNEL_SOURCE]) {
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[KERNEL_SOURCE]);
@@ -166,8 +166,8 @@ function Ace2Editor()
   }
   function pushScriptsTo(buffer) {
     /* Folling is for packaging regular expression. */
-    /* $$INCLUDE_JS("../minified/plugins/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define"); */
-    var ACE_SOURCE = '../minified/plugins/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define';
+    /* $$INCLUDE_JS("../javascripts/src/ace2_inner.js?callback=require.define"); */
+    var ACE_SOURCE = '../javascripts/src/ace2_inner.js?callback=require.define';
     if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
diff --git a/src/static/pad.html b/src/static/pad.html
index 6cc08f9b..04d5ca33 100644
--- a/src/static/pad.html
+++ b/src/static/pad.html
@@ -260,12 +260,12 @@
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
         <script type="text/javascript" src="../static/js/jquery.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
-        <script type="text/javascript" src="../minified/plugins/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
+        <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
         <script type="text/javascript">
             var clientVars = {};
             (function () {
-              require.setRootURI("../minified/");
-              require.setLibraryURI("../minified/plugins/");
+              require.setRootURI("../javascripts/src");
+              require.setLibraryURI("../javascripts/lib");
               require.setGlobalKeyPath("require");
 
               var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
diff --git a/src/static/timeslider.html b/src/static/timeslider.html
index b518c7fe..413fbe80 100644
--- a/src/static/timeslider.html
+++ b/src/static/timeslider.html
@@ -200,13 +200,13 @@
 <script type="text/javascript" src="../../../static/js/require-kernel.js"></script>
 <script type="text/javascript" src="../../../static/js/jquery.js"></script>
 <script type="text/javascript" src="../../../socket.io/socket.io.js"></script>
-<script type="text/javascript" src="../../../minified/plugins/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script>
+<script type="text/javascript" src="../../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script>
 <script type="text/javascript" src="../../../static/custom/timeslider.js"></script>
 <script type="text/javascript" >
   var clientVars = {};
   (function () {
-    require.setRootURI("../../../minified/");
-    require.setLibraryURI("../../../minified/plugins/");
+    require.setRootURI("../../../javascripts/src");
+    require.setLibraryURI("../../../javascripts/lib");
     require.setGlobalKeyPath("require");
 
     var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');

From 0d6ec8c04ab3bef7edc4d9e7292b112208db1e8d Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Sat, 10 Mar 2012 14:03:29 -0800
Subject: [PATCH 7/7] Minify implements virtual plugins resources.

---
 src/node/hooks/express/static.js | 27 ++-------------------------
 src/node/utils/Minify.js         | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js
index 99701706..e8f9afbb 100644
--- a/src/node/hooks/express/static.js
+++ b/src/node/hooks/express/static.js
@@ -8,31 +8,6 @@ var fs = require("fs");
 var ERR = require("async-stacktrace");
 
 exports.expressCreateServer = function (hook_name, args, cb) {
-  /* Handle static files for plugins:
-     paths like "/static/plugins/ep_myplugin/js/test.js"
-     are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js,
-     commonly ETHERPAD_ROOT/node_modules/ep_myplugin/static/js/test.js
-  */
-  args.app.get(/^\/javascripts\/lib\/([^\/]+)\/static\/(.*)/, function(req, res, next) {
-    var plugin_name = req.params[0];
-    var modulePath = req.url.split("?")[0].substr("/javascripts/lib/".length);
-    var fullPath = require.resolve(modulePath);
-
-    if (plugins.plugins[plugin_name] == undefined) {
-      return next();
-    }
-
-    fs.readFile(fullPath, "utf8", function(err, data){
-      if(ERR(err)) return;
-      
-      res.send("require.define('" + modulePath + "', function (require, exports, module) {" + data + "})");
-    })
-
-//require.define("/plugins.js", function (require, exports, module) {
-
-    //res.sendfile(fullPath);
-  });
-
   // Cache both minified and static.
   var assetCache = new CachingMiddleware;
   args.app.all('/(javascripts|static)/*', assetCache.handle);
@@ -46,6 +21,8 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   var jsServer = new (Yajsml.Server)({
     rootPath: 'javascripts/src/'
   , rootURI: 'http://localhost:' + settings.port + '/static/js/'
+  , libraryPath: 'javascripts/lib/'
+  , libraryURI: 'http://localhost:' + settings.port + '/static/plugins/'
   });
 
   var StaticAssociator = Yajsml.associators.StaticAssociator;
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index a49195a7..4e1c44db 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -27,6 +27,7 @@ var cleanCSS = require('clean-css');
 var jsp = require("uglify-js").parser;
 var pro = require("uglify-js").uglify;
 var path = require('path');
+var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
 var RequireKernel = require('require-kernel');
 var server = require('../server');
 
@@ -63,6 +64,22 @@ exports.minify = function(req, res, next)
     return; 
   }
 
+  /* Handle static files for plugins:
+     paths like "plugins/ep_myplugin/static/js/test.js"
+     are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js,
+     commonly ETHERPAD_ROOT/node_modules/ep_myplugin/static/js/test.js
+  */
+  var match = filename.match(/^plugins\/([^\/]+)\/static\/(.*)/);
+  if (match) {
+    var pluginName = match[1];
+    var resourcePath = match[2];
+    var plugin = plugins.plugins[pluginName];
+    if (plugin) {
+      var pluginPath = plugin.package.realPath;
+      filename = path.relative(ROOT_DIR, pluginPath + '/static/' + resourcePath);
+    }
+  }
+
   // What content type should this be?
   // TODO: This should use a MIME module.
   var contentType;