Permalink
Browse files

Remove commonjs-utils dep, add perstore dep

  • Loading branch information...
1 parent 8618149 commit cce796436acbba4b3cb288858b205129f6b477f4 @kriszyp kriszyp committed Nov 16, 2011
Showing with 16 additions and 21 deletions.
  1. +2 −2 app.js
  2. +8 −11 index.js
  3. +3 −5 package.json
  4. +1 −1 public/js/edit.js
  5. +1 −1 public/js/monitor.js
  6. +1 −1 ringo-index.js
View
4 app.js
@@ -3,8 +3,8 @@
*/
var pageFacets = require("./facet/page"),
pageChangeFacets = require("./facet/page-change"),
- admins = require("commonjs-utils/settings").security.admins,
- copy = require("commonjs-utils/copy").copy,
+ admins = require("perstore/util/settings").security.admins,
+ copy = require("perstore/util/copy").copy,
Restrictive = require("perstore/facet").Restrictive,
FileSystem = require("perstore/store/filesystem").FileSystem,
File = require("pintura/media").getFileModel(),
View
@@ -1,9 +1,8 @@
// helpful for debugging
var pinturaApp,
- settings = require("commonjs-utils/settings"),
+ settings = require("perstore/util/settings"),
Static = require("pintura/jsgi/static").Static,
- start = require("pintura/start-node").start,
- multiNode = require("multi-node/multi-node");
+ start = require("pintura/start-node").start;
function setPinturaApp(){
pinturaApp = require("pintura/pintura").app;
require("./app");
@@ -18,19 +17,17 @@ start(
// cascade from static to pintura REST handling
// the main place for static files accessible from the web
Static({urls:["/public"], root: "public", directoryListing: true}),
- Static({urls:["/packages"], root: "/c/packages", directoryListing: true}),
- Static({urls:["/explorer"], root: require("nodules").getCachePath("persevere-client/") + "/explorer"}),
+ Static({urls:["/packages"], root: require.resolve("pintura/pintura").replace(/pintura[\\\/]pintura.js$/,''), directoryListing: true}),
+// Static({urls:["/explorer"], root: require.resolve("persevere/persvr").replace(/persvr.js$/,'') + "/explorer"}),
// this will provide access to the server side JS libraries from the client
- require("transporter/jsgi/transporter").Transporter({
- loader: require("nodules").forBrowser().useLocal().getModuleSource}),
- // main pintura app
- function(request){
- return pinturaApp(request);
- }
+ pinturaApp
])
)
//)
);
+if(require.main == module){
+ require("repl").start();
+}
// this is just to ensure the static analysis preloads the explorer package
false&&require("persevere-client/explorer/explorer.js");
View
@@ -1,11 +1,10 @@
{
"name": "persevere-example-wiki",
"author": "",
- "version": "0.0.0",
+ "version": "0.0.3",
"contributors": [],
"mappings":{
"perstore": "http://github.com/kriszyp/perstore/zipball/v0.2.4!/",
- "commonjs-utils": "http://github.com/kriszyp/commonjs-utils/zipball/v0.2.2!/",
"pintura": "http://github.com/kriszyp/pintura/zipball/v0.2.6!/",
"promised-io": "jar:http://github.com/kriszyp/promised-io/zipball/v0.2.3!/",
"templify": "http://github.com/dmachi/templify/zipball/master",
@@ -27,10 +26,9 @@
}
],
"dependencies": {
- "pintura": ">=0.2.6",
+ "pintura": ">=0.3.0",
+ "perstore": ">=0.3.0",
"promised-io": ">=0.2.2",
- "commonjs-utils": ">=0.2.2",
- "multi-node": ">=0.2.3",
"wiky": ">=0.95.1"
}
}
View
@@ -1,5 +1,5 @@
define(function(require){
-var JSON = require("commonjs-utils/json");
+var JSON = require("pintura/util/json");
pageName = location.search.match(/page=([^&]+)/);
pageName = decodeURIComponent(pageName && pageName[1]);
View
@@ -1,5 +1,5 @@
define(function(require){
-var JSON = require("commonjs-utils/json"),
+var JSON = require("pintura/util/json"),
request = require("promised-io/http-client").request;
//pageName = typeof pageName === "undefined" ? decodeURIComponent(location.pathname.match(/[^\/]*$/)[0]) : pageName;
View
@@ -4,7 +4,7 @@
var pinturaApp = // the main app
require("pintura/pintura").app,
- settings = require("commonjs-utils/settings");
+ settings = require("perstore/util/settings");
require("./app");
if(require.main == module){

0 comments on commit cce7964

Please sign in to comment.