npm ized a few submodules

diff --git a/enyo-client/application/tools/minify.sh b/enyo-client/application/tools/minify.sh
index 101e4af..bec4aef 100755 (executable)
--- a/enyo-client/application/tools/minify.sh
+++ b/enyo-client/application/tools/minify.sh
@@ -7,6 +7,7 @@ PWD=$(pwd)
 pushd ../../../lib/enyo-x/enyo
 ./tools/deploy.js -p source/package.js
 cp build/enyo.* ../../../enyo-client/application/build/
+rm -rf build deploy
 popd
 
 # build app

diff --git a/lib/enyo-x/lib/package.js b/lib/enyo-x/lib/package.js
index ec703db..93c5e41 100644 (file)
--- a/lib/enyo-x/lib/package.js
+++ b/lib/enyo-x/lib/package.js
@@ -1,9 +1,9 @@
 enyo.depends(
   "date_format/date_format.js",
   "gts-plugins/DatePicker",
-  "nvd3/lib/d3.v3.js",
-  "nvd3/nv.d3.min.js",
-  "font-onyx/lib/Icon.js",
-  "font-onyx/lib/IconButton.js",
-  "font-onyx/lib/TextIcon.js"
+  "../../../node_modules/nvd3/lib/d3.v3.js",
+  "../../../node_modules/nvd3/nv.d3.min.js",
+  "../../../node_modules/font-onyx/lib/Icon.js",
+  "../../../node_modules/font-onyx/lib/IconButton.js",
+  "../../../node_modules/font-onyx/lib/TextIcon.js"
 );

diff --git a/package.json b/package.json
index f6e8713..10ecb2f 100644 (file)
--- a/package.json
+++ b/package.json
@@ -27,12 +27,14 @@
     "ejs": "0.8.x",
     "express": "3.1.x",
     "fluentreports": "git://github.com/xtuple/fluentreports.git",
+    "font-onyx": "0.0.2",
     "globalize": "^0.1.1",
     "ipp": "0.0.5",
     "json-patch": "git://github.com/xtuple/JSON-Patch.git",
     "less": "1.5.0",
     "moment": "2.4.x",
     "nodemailer": "0.3.x",
+    "nvd3": "^1.1.15",
     "oauth2orize": "0.1.x",
     "oauth2orize-jwt-bearer": "0.1.x",
     "passport": "0.1.x",