Merge pull request #45 from trusktr/master

Added Famo.us dependencies and overrides.
This commit is contained in:
Guy Bedford
2014-10-09 23:08:35 +02:00
3 changed files with 41 additions and 9 deletions
@@ -0,0 +1,16 @@
{
"directories" : {
"lib": "dist"
},
"main": "famous-angular",
"dependencies": {
"famous": "^0.3.0",
"angular": "^1.2.0",
"css": "^0.1.0"
},
"shim": {
"famous-angular": {
"deps": ["./famous-angular.css!"]
}
}
}
@@ -0,0 +1,14 @@
{
"directories": {
"lib": "src"
},
"dependencies": {
"famous-polyfills": "^0.3.0",
"css": "^0.1.0"
},
"shim": {
"*/*": {
"deps": ["famous-polyfills", "../core/famous.css!"]
}
}
}
+11 -9
View File
@@ -1,17 +1,17 @@
{ {
"css": "github:systemjs/plugin-css", "css": "github:systemjs/plugin-css",
"font": "github:guybedford/system-font",
"image": "github:systemjs/plugin-image", "image": "github:systemjs/plugin-image",
"json": "github:systemjs/plugin-json", "json": "github:systemjs/plugin-json",
"text": "github:systemjs/plugin-text",
"font": "github:guybedford/system-font",
"md": "github:guybedford/system-md", "md": "github:guybedford/system-md",
"text": "github:systemjs/plugin-text",
"ace": "github:ajaxorg/ace-builds", "ace": "github:ajaxorg/ace-builds",
"angular": "github:angular/bower-angular", "angular": "github:angular/bower-angular",
"angular-mocks": "github:angular/bower-angular-mocks",
"angular-cookies": "github:angular/bower-angular-cookies",
"angular-animate": "github:angular/bower-angular-animate", "angular-animate": "github:angular/bower-angular-animate",
"angular-cookies": "github:angular/bower-angular-cookies",
"angular-material": "github:angular/bower-material", "angular-material": "github:angular/bower-material",
"angular-mocks": "github:angular/bower-angular-mocks",
"angular-ui-router": "github:angular-ui/ui-router", "angular-ui-router": "github:angular-ui/ui-router",
"angular-ui-router-extras": "github:christopherthielen/ui-router-extras", "angular-ui-router-extras": "github:christopherthielen/ui-router-extras",
"angular-ui-tree": "github:JimLiu/angular-ui-tree", "angular-ui-tree": "github:JimLiu/angular-ui-tree",
@@ -20,8 +20,8 @@
"backbone.babysitter": "github:marionettejs/backbone.babysitter", "backbone.babysitter": "github:marionettejs/backbone.babysitter",
"backbone.wreqr": "github:marionettejs/backbone.wreqr", "backbone.wreqr": "github:marionettejs/backbone.wreqr",
"bootstrap": "github:twbs/bootstrap", "bootstrap": "github:twbs/bootstrap",
"chosen": "github:harvesthq/chosen",
"chart": "github:nnnick/Chart.js", "chart": "github:nnnick/Chart.js",
"chosen": "github:harvesthq/chosen",
"cola": "github:cujojs/cola", "cola": "github:cujojs/cola",
"cram": "github:cujojs/cram", "cram": "github:cujojs/cram",
"curl": "github:cujojs/curl", "curl": "github:cujojs/curl",
@@ -30,9 +30,9 @@
"dropzone": "github:enyo/dropzone", "dropzone": "github:enyo/dropzone",
"ember": "github:components/ember", "ember": "github:components/ember",
"ember-data": "github:components/ember-data", "ember-data": "github:components/ember-data",
"test.js": "github:some/test",
"famous": "github:Famous/famous", "famous": "github:Famous/famous",
"famous-angular": "github:Famous/famous-angular", "famous-angular": "github:Famous/famous-angular",
"famous-polyfills": "github:Famous/polyfills",
"font-awesome": "npm:font-awesome", "font-awesome": "npm:font-awesome",
"foundation": "github:zurb/bower-foundation", "foundation": "github:zurb/bower-foundation",
"hammer": "github:hammerjs/hammer.js", "hammer": "github:hammerjs/hammer.js",
@@ -59,25 +59,27 @@
"msgs": "github:cujojs/msgs", "msgs": "github:cujojs/msgs",
"mustache": "github:janl/mustache.js", "mustache": "github:janl/mustache.js",
"ng-multi-transclude": "github:zachsnow/ng-multi-transclude", "ng-multi-transclude": "github:zachsnow/ng-multi-transclude",
"nprogress": "github:rstacruz/nprogress",
"nodelibs": "github:jspm/nodelibs", "nodelibs": "github:jspm/nodelibs",
"nprogress": "github:rstacruz/nprogress",
"parallax": "github:wagerfield/parallax", "parallax": "github:wagerfield/parallax",
"pikaday": "github:dbushell/Pikaday", "pikaday": "github:dbushell/Pikaday",
"poly": "github:cujojs/poly", "poly": "github:cujojs/poly",
"prism": "github:LeaVerou/prism", "prism": "github:LeaVerou/prism",
"quint": "github:jquery/qunit", "quint": "github:jquery/qunit",
"ratchet": "github:maker/ratchet",
"raphael": "github:DmitryBaranovskiy/raphael", "raphael": "github:DmitryBaranovskiy/raphael",
"reqwest": "github:ded/reqwest", "ratchet": "github:maker/ratchet",
"react": "github:reactjs/react-bower", "react": "github:reactjs/react-bower",
"react-router": "github:rackt/react-router", "react-router": "github:rackt/react-router",
"reqwest": "github:ded/reqwest",
"respond": "github:scottjehl/Respond", "respond": "github:scottjehl/Respond",
"rest": "github:cujojs/rest", "rest": "github:cujojs/rest",
"select2": "github:ivaynberg/select2", "select2": "github:ivaynberg/select2",
"showdown": "github:showdownjs/showdown", "showdown": "github:showdownjs/showdown",
"skrollr": "github:Prinzhorn/skrollr", "skrollr": "github:Prinzhorn/skrollr",
"spin": "github:fgnass/spin.js", "spin": "github:fgnass/spin.js",
"test.js": "github:some/test",
"tinygrowl": "github:ajkochanowicz/tinygrowl", "tinygrowl": "github:ajkochanowicz/tinygrowl",
"trusktr-famous": "github:trusktr/famous",
"typeahead": "github:twitter/typeahead.js", "typeahead": "github:twitter/typeahead.js",
"underscore": "npm:underscore", "underscore": "npm:underscore",
"webfont": "github:components/webfontloader", "webfont": "github:components/webfontloader",