Merge remote-tracking branch 'isao/buildjsfix' into merge-perf

Conflicts: lib/app/commands/build/index.js
YahooArchive · Nov 28, 2012 · 1dfef32 · 1dfef32
2 parents 6e4e79b + 1aa8cd9
commit 1dfef32
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/lib/app/commands/build/index.js b/lib/app/commands/build/index.js
@@ -8,11 +8,8 @@ var path = require('path'),
     CWD = process.cwd(),
 
     writer = require('./writer'),
-    util = require(BASE + 'lib/management/utils'),
-
-    Y = util.getYUIInstance({
-        'mojito-resource-store': BASE + 'lib/store.server.js'
-    });
+    Store = require(BASE + 'lib/store'),
+    util = require(BASE + 'lib/management/utils');
 
 
 function getConfigs(opts, buildtype, builddir, store) {
@@ -103,8 +100,10 @@ function run(args, opts, cb) {
     opts.context = typeof opts.context === 'string' ? csvctx(opts.context) : {};
 
     // init resource store
-    store = new Y.mojito.ResourceStore({root: CWD, context: opts.context});
-    store.preload();
+    store = Store.createStore({
+        root: CWD,
+        context: opts.context
+    });
 
     // normalize inputs
     conf = getConfigs(opts, buildtype, args[1], store);