Merge pull request #1 from jspm/master

merge upstream

package-overrides/github/ajaxorg/ace-builds@1.1.6.json

@@ -7,6 +7,11 @@
   "shim": {
     "ace": {
       "exports": "ace"
+    },
+    "*": {
+      "deps": [
+        "ace/ace"
+      ]
     }
   }
 }

package-overrides/github/almasaeed2010/AdminLTE@2.3.2.json

@@ -0,0 +1,11 @@
+{
+    "main": "dist/js/app.js",
+    "dependencies": {
+        "jquery": "^2.2.1"
+    },
+    "shim": {
+        "dist/js/app": {
+            "deps": ["jquery"]
+        }
+    }
+}

package-overrides/github/angular-ui/ui-select@0.14.2.json

@@ -6,10 +6,10 @@
   "main": "dist/select",
   "registry": "jspm",
   "shim": {
-    "select": {
+    "dist/select": {
       "deps": [
         "angular",
-        "./dist/select.css!"
+        "./select.css!"
       ]
     }
   }

package-overrides/github/angular/bower-material@1.0.6.json

@@ -0,0 +1,20 @@
+{
+  "main": "angular-material",
+  "shim": {
+    "angular-material": {
+      "deps": [
+        "./angular-material.css!",
+        "angular",
+        "angular-animate",
+        "angular-aria"
+      ]
+    }
+  },
+  "registry": "jspm",
+  "dependencies": {
+    "angular": "^1.5.0",
+    "angular-animate": "^1.5.0",
+    "angular-aria": "^1.5.0",
+    "css": "^0.1.0"
+  }
+}

package-overrides/github/firebase/angularfire@1.1.4.json

@@ -0,0 +1,16 @@
+{
+  "main": "dist/angularfire.js",
+  "shim": {
+    "dist/angularfire": {
+      "deps": [
+        "firebase",
+        "angular"
+      ]
+    }
+  },
+  "registry": "jspm",
+  "dependencies": {
+    "angular": "^1.3.0",
+    "firebase": "^2.0.0"
+  }
+}

package-overrides/github/nnnick/Chart.js@2.0.0-beta2.json

@@ -0,0 +1,12 @@
+{
+    "main": "Chart",
+    "files": ["Chart.js"],
+    "shim": {
+        "Chart.js": {
+             "deps": ["moment"]
+        }
+    },
+    "dependencies": {
+        "moment": "*"
+    }
+}

package-overrides/github/rauschma/enumify@master.json

@@ -0,0 +1,3 @@
+{
+  "main": "src/enumify"
+}

package-overrides/github/sytelus/cryptojs@3.1.2.json

@@ -0,0 +1,221 @@
+{
+  "main": "core.js",
+  "format": "global",
+  "directories": {
+    "lib": "components"
+  },
+  "shim": {
+    "aes": {
+      "deps": [
+        "cryptojs/enc-base64.js",
+        "cryptojs/md5.js",
+        "cryptojs/evpkdf.js",
+        "cryptojs/cipher-core.js"
+      ],
+      "exports": "CryptoJS.lib.BlockCipher.AES"
+    },
+    "cipher-core": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS"
+    },
+    "core": {
+      "exports": "CryptoJS"
+    },
+    "enc-base64": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.enc.Base64"
+    },
+    "enc-utf16": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.enc.Utf16LE"
+    },
+    "evpkdf": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.algo.EvpKDF"
+    },
+    "format-hex": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.format.Hex"
+    },
+    "hmac": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.algo.HMAC"
+    },
+    "lib-typedarrays": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.lib.WordArray"
+    },
+    "md5": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.MD5"
+    },
+    "mode-cfb": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.mode.CFB"
+    },
+    "mode-ctr": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.mode.CTR"
+    },
+    "mode-ctr-gladman": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.mode.CTRGladman"
+    },
+    "mode-ecb": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.mode.ECB"
+    },
+    "mode-ofb": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.mode.OFB"
+    },
+    "pad-ansix923": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.pad.AnsiX923"
+    },
+    "pad-iso10126": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.pad.Iso10126"
+    },
+    "pad-iso97971": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.pad.Iso97971"
+    },
+    "pad-nopadding": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.pad.NoPadding"
+    },
+    "pad-zeropadding": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.pad.ZeroPadding"
+    },
+    "pbkdf2": {
+      "deps": [
+        "cryptojs/sha1.js",
+        "cryptojs/hmac.js"
+      ],
+      "exports": "CryptoJS.PBKDF2"
+    },
+    "rabbit": {
+      "deps": [
+        "cryptojs/enc-base64.js",
+        "cryptojs/md5.js",
+        "cryptojs/evpkdf.js",
+        "cryptojs/cipher-core.js"
+      ],
+      "exports": "CryptoJS.Rabbit"
+    },
+    "rabbit-legacy": {
+      "deps": [
+        "cryptojs/enc-base64.js",
+        "cryptojs/md5.js",
+        "cryptojs/evpkdf.js",
+        "cryptojs/cipher-core.js"
+      ],
+      "exports": "CryptoJS.RabbitLegacy"
+    },
+    "rc4": {
+      "deps": [
+        "cryptojs/enc-base64.js",
+        "cryptojs/md5.js",
+        "cryptojs/evpkdf.js",
+        "cryptojs/cipher-core.js"
+      ],
+      "exports": "CryptoJS.lib.StreamCipher.RC4"
+    },
+    "RIPEMD160": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.RIPEMD160"
+    },
+    "sha1": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.SHA1"
+    },
+    "sha224": {
+      "deps": [
+        "cryptojs/sha256.js"
+      ],
+      "exports": "CryptoJS.SHA224"
+    },
+    "sha256": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS.SHA256"
+    },
+    "sha3": {
+      "deps": [
+        "cryptojs/x64-core.js"
+      ],
+      "exports": "CryptoJS.SHA3"
+    },
+    "sha384": {
+      "deps": [
+        "cryptojs/x64-core.js",
+        "cryptojs/sha512.js"
+      ],
+      "exports": "CryptoJS.SHA384"
+    },
+    "sha512": {
+      "deps": [
+        "cryptojs/x64-core.js"
+      ],
+      "exports": "CryptoJS.SHA512"
+    },
+    "tripledes": {
+      "deps": [
+        "cryptojs/enc-base64.js",
+        "cryptojs/md5.js",
+        "cryptojs/evpkdf.js",
+        "cryptojs/cipher-core.js"
+      ],
+      "exports": "CryptoJS.lib.BlockCipher.TripleDES"
+    },
+    "x64-core": {
+      "deps": [
+        "cryptojs/core.js"
+      ],
+      "exports": "CryptoJS"
+    }
+  }
+}

package-overrides/npm/angular@1.5.0-rc.2.json

@@ -2,8 +2,8 @@
   "format": "global",
   "jspmNodeConversion": false,
   "main": "angular",
-  "meta": {
+  "shim": {
-    "angular.js": {
+    "angular": {
       "exports": "angular"
     }
   }

package-overrides/npm/coffee-script@1.10.0.json

@@ -0,0 +1,5 @@
+{
+  "map": {
+    "child_process": "@empty"
+  }
+}

package-overrides/npm/element-resize-detector@1.1.0.json

@@ -0,0 +1,8 @@
+{
+  "main": "dist/element-resize-detector",
+  "shim": {
+    "dist/element-resize-detector": {
+      "exports": "utils"
+    }
+  }
+}

package-overrides/npm/functify@0.4.0.json

@@ -0,0 +1,4 @@
+{
+  "main": "src/functify",
+  "jspmNodeConversion": false
+}

registry.json

@@ -11,6 +11,7 @@
   "jsx": "github:floatdrop/plugin-jsx",
   "less": "github:aaike/jspm-less-plugin",
   "md": "github:guybedford/system-md",
+  "node-binary": "npm:systemjs-plugin-node-binary",
   "plugin-babel": "npm:systemjs-plugin-babel",
   "plugin-traceur": "npm:systemjs-plugin-traceur",
   "plugin-typescript": "github:frankwallis/plugin-typescript",
@@ -123,6 +124,7 @@
   "aurelia-flux": "github:tfrydrychewicz/aurelia-flux",
   "aurelia-framework": "npm:aurelia-framework",
   "aurelia-google-analytics": "github:miguelzakharia/aurelia-google-analytics",
+  "aurelia-google-maps": "npm:aurelia-google-maps",
   "aurelia-history": "npm:aurelia-history",
   "aurelia-history-browser": "npm:aurelia-history-browser",
   "aurelia-html-template-element": "github:aurelia/html-template-element",
@@ -134,11 +136,13 @@
   "aurelia-logging": "npm:aurelia-logging",
   "aurelia-logging-console": "npm:aurelia-logging-console",
   "aurelia-materialize-bridge": "github:aurelia-ui-toolkits/aurelia-materialize-bridge",
+  "aurelia-material-design-lite": "github:Gheoan/aurelia-material-design-lite",
   "aurelia-metadata": "npm:aurelia-metadata",
   "aurelia-modal": "github:vheissu/aurelia-modal",
   "aurelia-notification": "github:MarcScheib/aurelia-notification",
   "aurelia-path": "npm:aurelia-path",
   "aurelia-polymer": "github:roguePanda/aurelia-polymer",
+  "aurelia-resize": "github:MeirionHughes/aurelia-resize",
   "aurelia-route-recognizer": "npm:aurelia-route-recognizer",
   "aurelia-router": "npm:aurelia-router",
   "aurelia-router-loader": "npm:aurelia-router-loader",
@@ -198,6 +202,7 @@
   "core-js": "npm:core-js",
   "cram": "github:cujojs/cram",
   "crypto": "github:jspm/nodelibs-crypto",
+  "cryptojs": "github:sytelus/cryptojs",
   "css-element-queries": "github:marcj/css-element-queries",
   "curl": "github:cujojs/curl",
   "cytoscape":"github:cytoscape/cytoscape.js",
@@ -217,9 +222,11 @@
   "dropzone": "github:enyo/dropzone",
   "duratiform": "npm:duratiform",
   "elastic.js": "github:fullscale/elastic.js",
+  "element-resize-detector": "npm:element-resize-detector",
   "ember": "github:components/ember",
   "ember-data": "github:components/ember-data",
   "ember-wiz": "github:ricottatosta/ember-wiz",
+  "enumify": "github:rauschma/enumify",
   "es5-shim": "github:es-shims/es5-shim",
   "es6-shim": "github:es-shims/es6-shim",
   "eva": "npm:eva",
@@ -239,6 +246,7 @@
   "font-awesome": "npm:font-awesome",
   "foundation": "npm:foundation-sites",
   "fs": "github:jspm/nodelibs-fs",
+  "functify": "npm:functify",
   "golden-layout": "npm:golden-layout",
   "greensock": "github:greensock/GreenSock-JS",
   "hammer": "github:hammerjs/hammer.js",
@@ -304,6 +312,7 @@
   "js-deco": "github:gooy/js-deco",
   "js.edgar": "npm:js.edgar",
   "jsfromhell": "github:jonasraoni/JSFromHell",
+  "jsnlog": "npm:jsnlog",
   "jsol": "github:daepark/JSOL",
   "jsplumb": "github:sporritt/jsPlumb",
   "jssha": "github:Caligatio/jsSHA",
@@ -329,6 +338,10 @@
   "log4js": "github:mobilexag/log4js",
   "malihu-custom-scrollbar-plugin": "github:malihu/malihu-custom-scrollbar-plugin",
   "marionette": "github:marionettejs/backbone.marionette",
+  "marvelous-aurelia-core": "github:marveloussoftware/marvelous-aurelia-core",
+  "marvelous-aurelia-forms": "github:marveloussoftware/marvelous-aurelia-forms",
+  "marvelous-aurelia-grid": "github:marveloussoftware/marvelous-aurelia-grid",
+  "marvelous-aurelia-query-language": "github:marveloussoftware/marvelous-aurelia-query-language",
   "masonry": "github:desandro/masonry",
   "material-design-lite": "github:google/material-design-lite",
   "material-design-icons": "github:google/material-design-icons",
@@ -337,6 +350,7 @@
   "meld": "github:cujojs/meld",
   "messageformat": "npm:messageformat",
   "microplugin": "npm:microplugin",
+  "mindtouch-martian": "github:mindtouch/martian",
   "minivents": "github:allouis/minivents",
   "mithril": "npm:mithril",
   "mixing": "npm:mixing",
@@ -455,6 +469,7 @@
   "superagent": "npm:superagent",
   "svg.js":  "github:wout/svg.js",
   "systemjs-hot-reloader": "github:capaj/systemjs-hot-reloader",
+  "systemjs-hot-reloader-store": "github:peteruithoven/systemjs-hot-reloader-store",
   "t7": "npm:t7",
   "tabletools": "github:DataTables/TableTools",
   "tag":"npm:systemjs-riot",