Use yarn for all deps except for jQuery

NPM has broken jQuery for <1.11; but jquerytools requires jQuery <1.9

7 files changed, 26 insertions, 12 deletions

diff --git a/public-src/3rd-party/package.json b/public-src/3rd-party/package.json
index 78d3f03..d59a2a7 100644
--- a/public-src/3rd-party/package.json
+++ b/public-src/3rd-party/package.json
@@ -1,6 +1,9 @@
 {
   "dependencies": {
     "flot": "git://github.com/flot/flot#v0.8.3",
+    "jarmon": "git://git.lukeshu.com/2git/jarmon#lukeshu/master",
+    "javascriptrrd": "git://git.lukeshu.com/2git/javascriptrrd#v1.1.1",
+    "jquerytools": "git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068",
     "requirejs": "^2.3.5",
     "sorttable": "git://github.com/stuartlangridge/sorttable"
   }
diff --git a/public-src/3rd-party/yarn.lock b/public-src/3rd-party/yarn.lock
index d71257a..39719ce 100644
--- a/public-src/3rd-party/yarn.lock
+++ b/public-src/3rd-party/yarn.lock
@@ -6,6 +6,18 @@
   version "0.8.3"
   resolved "git://github.com/flot/flot#453b017cc5acfd75e252b93e8635f57f4196d45d"
 
+"jarmon@git://git.lukeshu.com/2git/jarmon#lukeshu/master":
+  version "0.0.0"
+  resolved "git://git.lukeshu.com/2git/jarmon#2836159a6a67e659e6634cc8d4505829596fc614"
+
+"javascriptrrd@git://git.lukeshu.com/2git/javascriptrrd#v1.1.1":
+  version "0.0.0"
+  resolved "git://git.lukeshu.com/2git/javascriptrrd#ccb760b9a830c9f7aff831752edf0bb287189775"
+
+"jquerytools@git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068":
+  version "0.0.0"
+  resolved "git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068"
+
 requirejs@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
diff --git a/public-src/jarmon-style/loading.gif b/public-src/jarmon-style/loading.gif
index fc52d2c..575e48e 120000
--- a/public-src/jarmon-style/loading.gif
+++ b/public-src/jarmon-style/loading.gif
@@ -1 +1 @@
-../../jarmon/docs/examples/assets/icons/loading.gif
\ No newline at end of file
+../3rd-party/yarn/jarmon/docs/examples/assets/icons/loading.gif
\ No newline at end of file
diff --git a/public-src/jarmon-style/next.gif b/public-src/jarmon-style/next.gif
index 8b08c07..1695d18 120000
--- a/public-src/jarmon-style/next.gif
+++ b/public-src/jarmon-style/next.gif
@@ -1 +1 @@
-../../jarmon/docs/examples/assets/icons/next.gif
\ No newline at end of file
+../3rd-party/yarn/jarmon/docs/examples/assets/icons/next.gif
\ No newline at end of file
diff --git a/public-src/jarmon-style/prev.gif b/public-src/jarmon-style/prev.gif
index 4c1ad5b..16fbeaa 120000
--- a/public-src/jarmon-style/prev.gif
+++ b/public-src/jarmon-style/prev.gif
@@ -1 +1 @@
-../../jarmon/docs/examples/assets/icons/prev.gif
\ No newline at end of file
+../3rd-party/yarn/jarmon/docs/examples/assets/icons/prev.gif
\ No newline at end of file
diff --git a/public-src/jarmon.js b/public-src/jarmon.js
deleted file mode 120000
index d8eb9e7..0000000
--- a/public-src/jarmon.js
+++ /dev/null
@@ -1 +0,0 @@
-../jarmon/jarmon/jarmon.js
\ No newline at end of file
diff --git a/public-src/require.config.js b/public-src/require.config.js
index 432a906..5094bf1 100644
--- a/public-src/require.config.js
+++ b/public-src/require.config.js
@@ -9,15 +9,15 @@ var require = {
 				"flot/jquery.flot.stack", // >= 0.7
 				"flot/jquery.flot.time", // split in to a plugin in >=0.8.0
 				"flot/jquery.flot.selection", // split in to a plugin in >= 0.6
-				"jquerytools/tabs",
-				"jquerytools/toolbox.history",
+				"jquerytools/tabs/tabs",
+				"jquerytools/toolbox/toolbox.history",
 			],
 			exports: "jarmon"
 		},
 		// jQuery plugins
-		"jquerytools/tabs"            : { deps: ["jquery"], exports: "jQuery.tools.tabs" },
-		"jquerytools/toolbox.history" : { deps: ["jquery" /* <1.9 */], exports: "jQuery.tools.history" },
-		"flot/jquery.flot"            : { deps: ["jquery" /* <1.9 */], exports: "jQuery.plot" },
+		"jquerytools/tabs/tabs"               : { deps: ["jquery"], exports: "jQuery.tools.tabs" },
+		"jquerytools/toolbox/toolbox.history" : { deps: ["jquery" /* <1.9 */], exports: "jQuery.tools.history" },
+		"flot/jquery.flot"                    : { deps: ["jquery" /* <1.9 */], exports: "jQuery.plot" },
 		// Flot plugins
 		"flot/jquery.flot.time"      : { deps: ["flot/jquery.flot"] },
 		"flot/jquery.flot.selection" : { deps: ["flot/jquery.flot"] },
@@ -30,11 +30,11 @@ var require = {
 		"flot"          : "/3rd-party/yarn/flot",
 		//"jquery"        : "/3rd-party/yarn/jquery/dist/jquery",
 		"requirejs"     : "/3rd-party/yarn/requirejs/require",
+		"javascriptrrd" : "/3rd-party/yarn/javascriptrrd/src/lib",
+		"jquerytools"   : "/3rd-party/yarn/jquerytools/src",
+		"jarmon"        : "/3rd-party/yarn/jarmon/jarmon/jarmon",
 
 		"cfg"           : "/cfg",
-		"jarmon"        : "/jarmon",
-		"javascriptrrd" : "/jarmon-dependencies/javascriptrrd-1.1.1",
 		"jquery"        : "/jarmon-dependencies/jquery-1.6.3",
-		"jquerytools"   : "/jarmon-dependencies/jquerytools-8ac4636a01d3860f1c4726ba722190a531bf1068",
 	},
 };