refactor(all): aurelia and internal libraries bump up, change license…

… to MIT
MarvelousSoftware · Jun 5, 2016 · 964ba8e · 964ba8e
1 parent fad75b6
commit 964ba8e
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 120 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,17 +1,21 @@
-Copyright (c) 2016 Damian Kamiński. 
+The MIT License (MIT)
 
-This file is part of Marvelous-aurelia-grid.
+Copyright (c) 2016 Damian Kamiński.
 
-Marvelous-aurelia-grid is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Marvelous-aurelia-grid is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-You should have received a copy of the GNU General Public License
-along with Marvelous-aurelia-grid; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/build/paths.js b/build/paths.js
@@ -19,15 +19,14 @@ module.exports = {
     output: 'dist/'
   },
   deps: [
-    getDependencyInfo('core'),
-    getDependencyInfo('queryLanguage', 'query-language')
+    getDependencyInfo('marvelous-aurelia-core', 'core'),
+    getDependencyInfo('marvelous-aurelia-query-language', 'query-language')
   ]
 };
 var deps = module.exports.deps;
 deps.watch = deps.map(function (x) { return x.buildSyncFile; });
 
-function getDependencyInfo (name, packageName) {
-  packageName = 'marvelous-aurelia-' + (packageName || name);
+function getDependencyInfo (packageName, mainFile) {
   var packagesDirectory = jspmPackages + '/github/marveloussoftware/';
 
   var jspmPackageDefinition = pkg.jspm.dependencies[packageName];
@@ -40,19 +39,19 @@ function getDependencyInfo (name, packageName) {
   var fullPackageName = packageName + '@' + version;
 
   return {
-    name: name,
+    name: packageName,
     fullPackageName: fullPackageName,
-    main: 'github:marveloussoftware/' + fullPackageName + '/' + name,
+    main: 'github:marveloussoftware/' + fullPackageName + '/' + mainFile,
     packagesDirectory: packagesDirectory,
     copy: [
       {
-        src: pkg.marvelous.projects[name] + 'dev/system/**/*.*',
+        src: pkg.marvelous.projects[packageName] + 'dev/system/**/*.*',
         dest: packagesDirectory + fullPackageName
       },
       {
-        src: pkg.marvelous.projects[name] + 'dev/' + packageName + '.d.ts',
-        dest: 'typings/marvelous-software'
+        src: pkg.marvelous.projects[packageName] + 'dev/' + packageName + '.d.ts',
+        dest: packagesDirectory + fullPackageName
       }],
-    buildSyncFile: pkg.marvelous.projects[name] + 'dev/buildSyncFile.txt'
+    buildSyncFile: pkg.marvelous.projects[packageName] + 'dev/buildSyncFile.txt'
   }
 }
diff --git a/config.js b/config.js
@@ -13,116 +13,133 @@ System.config({
   },
 
   map: {
-    "aurelia-binding": "npm:[email protected].2.2",
-    "aurelia-dependency-injection": "npm:[email protected].1.5",
+    "aurelia-binding": "npm:[email protected].3.6",
+    "aurelia-dependency-injection": "npm:[email protected].2.3",
     "aurelia-framework": "npm:[email protected]",
-    "aurelia-metadata": "npm:[email protected].1.6",
-    "aurelia-pal-browser": "npm:[email protected].1.1.4",
-    "aurelia-polyfills": "npm:[email protected].0.6",
-    "aurelia-templating": "npm:[email protected].1.4",
-    "aurelia-templating-resources": "npm:[email protected].1.3",
-    "babel": "npm:[email protected].35",
-    "babel-runtime": "npm:[email protected].35",
-    "core-js": "npm:core-js@2.1.5",
+    "aurelia-metadata": "npm:[email protected].2.1",
+    "aurelia-pal-browser": "npm:[email protected].2.0.1",
+    "aurelia-polyfills": "npm:[email protected].1.6",
+    "aurelia-templating": "npm:[email protected].2.7",
+    "aurelia-templating-resources": "npm:[email protected].2.6",
+    "babel": "npm:[email protected].38",
+    "babel-runtime": "npm:[email protected].38",
+    "core-js": "npm:core-js@2.4.0",
     "es6-module-loader": "npm:[email protected]",
-    "marvelous-aurelia-core": "github:marveloussoftware/marvelous-aurelia-core@0.1.0",
-    "marvelous-aurelia-query-language": "github:marveloussoftware/marvelous-aurelia-query-language@0.1.2",
+    "marvelous-aurelia-core": "github:marveloussoftware/marvelous-aurelia-core@0.2.1",
+    "marvelous-aurelia-query-language": "github:marveloussoftware/marvelous-aurelia-query-language@0.2.0",
     "github:jspm/[email protected]": {
-      "assert": "npm:[email protected]"
+      "assert": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "buffer": "npm:[email protected]"
     },
     "github:jspm/[email protected]": {
       "path-browserify": "npm:[email protected]"
     },
     "github:jspm/[email protected]": {
-      "process": "npm:[email protected].2"
+      "process": "npm:[email protected].3"
     },
     "github:jspm/[email protected]": {
       "util": "npm:[email protected]"
     },
-    "github:marveloussoftware/[email protected]": {
-      "aurelia-binding": "npm:[email protected]",
-      "aurelia-dependency-injection": "npm:[email protected]",
-      "aurelia-templating": "npm:[email protected]"
+    "github:marveloussoftware/[email protected]": {
+      "aurelia-binding": "npm:[email protected]",
+      "aurelia-dependency-injection": "npm:[email protected]",
+      "aurelia-polyfills": "npm:[email protected]",
+      "aurelia-templating": "npm:[email protected]"
     },
-    "github:marveloussoftware/marvelous-aurelia-query-language@0.1.2": {
-      "aurelia-dependency-injection": "npm:[email protected].1.5",
-      "aurelia-templating": "npm:[email protected].1.4",
-      "marvelous-aurelia-core": "github:marveloussoftware/marvelous-aurelia-core@0.1.0"
+    "github:marveloussoftware/marvelous-aurelia-query-language@0.2.0": {
+      "aurelia-dependency-injection": "npm:[email protected].2.3",
+      "aurelia-templating": "npm:[email protected].2.7",
+      "marvelous-aurelia-core": "github:marveloussoftware/marvelous-aurelia-core@0.2.1"
     },
-    "npm:[email protected]": {
+    "npm:[email protected]": {
+      "assert": "github:jspm/[email protected]",
+      "buffer": "github:jspm/[email protected]",
+      "process": "github:jspm/[email protected]",
       "util": "npm:[email protected]"
     },
-    "npm:[email protected]": {
-      "aurelia-metadata": "npm:[email protected]",
-      "aurelia-pal": "npm:[email protected]",
-      "aurelia-task-queue": "npm:[email protected]"
+    "npm:[email protected]": {
+      "aurelia-logging": "npm:[email protected]",
+      "aurelia-metadata": "npm:[email protected]",
+      "aurelia-pal": "npm:[email protected]",
+      "aurelia-task-queue": "npm:[email protected]"
     },
-    "npm:[email protected].1.5": {
-      "aurelia-logging": "npm:[email protected].1.2",
-      "aurelia-metadata": "npm:[email protected].1.6",
-      "aurelia-pal": "npm:[email protected].1.1"
+    "npm:[email protected].2.3": {
+      "aurelia-logging": "npm:[email protected].2.1",
+      "aurelia-metadata": "npm:[email protected].2.1",
+      "aurelia-pal": "npm:[email protected].2.2"
     },
     "npm:[email protected]": {
-      "aurelia-binding": "npm:[email protected]",
-      "aurelia-dependency-injection": "npm:[email protected]",
-      "aurelia-loader": "npm:[email protected]",
-      "aurelia-logging": "npm:[email protected]",
-      "aurelia-metadata": "npm:[email protected]",
-      "aurelia-pal": "npm:[email protected]",
-      "aurelia-path": "npm:[email protected]",
-      "aurelia-task-queue": "npm:[email protected]",
-      "aurelia-templating": "npm:[email protected]",
-      "core-js": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-metadata": "npm:[email protected]",
-      "aurelia-path": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-pal": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-pal": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-pal": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-pal": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-binding": "npm:[email protected]",
-      "aurelia-dependency-injection": "npm:[email protected]",
-      "aurelia-loader": "npm:[email protected]",
-      "aurelia-logging": "npm:[email protected]",
-      "aurelia-pal": "npm:[email protected]",
-      "aurelia-path": "npm:[email protected]",
-      "aurelia-task-queue": "npm:[email protected]",
-      "aurelia-templating": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
-      "aurelia-binding": "npm:[email protected]",
-      "aurelia-dependency-injection": "npm:[email protected]",
-      "aurelia-loader": "npm:[email protected]",
-      "aurelia-logging": "npm:[email protected]",
-      "aurelia-metadata": "npm:[email protected]",
-      "aurelia-pal": "npm:[email protected]",
-      "aurelia-path": "npm:[email protected]",
-      "aurelia-task-queue": "npm:[email protected]"
-    },
-    "npm:[email protected]": {
+      "aurelia-binding": "npm:[email protected]",
+      "aurelia-dependency-injection": "npm:[email protected]",
+      "aurelia-loader": "npm:[email protected]",
+      "aurelia-logging": "npm:[email protected]",
+      "aurelia-metadata": "npm:[email protected]",
+      "aurelia-pal": "npm:[email protected]",
+      "aurelia-path": "npm:[email protected]",
+      "aurelia-task-queue": "npm:[email protected]",
+      "aurelia-templating": "npm:[email protected]",
+      "core-js": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-metadata": "npm:[email protected]",
+      "aurelia-path": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-pal": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-pal": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-pal": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-pal": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-binding": "npm:[email protected]",
+      "aurelia-dependency-injection": "npm:[email protected]",
+      "aurelia-loader": "npm:[email protected]",
+      "aurelia-logging": "npm:[email protected]",
+      "aurelia-metadata": "npm:[email protected]",
+      "aurelia-pal": "npm:[email protected]",
+      "aurelia-path": "npm:[email protected]",
+      "aurelia-task-queue": "npm:[email protected]",
+      "aurelia-templating": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "aurelia-binding": "npm:[email protected]",
+      "aurelia-dependency-injection": "npm:[email protected]",
+      "aurelia-loader": "npm:[email protected]",
+      "aurelia-logging": "npm:[email protected]",
+      "aurelia-metadata": "npm:[email protected]",
+      "aurelia-pal": "npm:[email protected]",
+      "aurelia-path": "npm:[email protected]",
+      "aurelia-task-queue": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "process": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "base64-js": "npm:[email protected]",
+      "child_process": "github:jspm/[email protected]",
+      "fs": "github:jspm/[email protected]",
+      "ieee754": "npm:[email protected]",
+      "isarray": "npm:[email protected]",
       "process": "github:jspm/[email protected]"
     },
-    "npm:core-js@2.1.5": {
+    "npm:core-js@2.4.0": {
       "fs": "github:jspm/[email protected]",
       "path": "github:jspm/[email protected]",
       "process": "github:jspm/[email protected]",
-      "systemjs-json": "github:systemjs/[email protected].0"
+      "systemjs-json": "github:systemjs/[email protected].2"
     },
     "npm:[email protected]": {
       "fs": "github:jspm/[email protected]",
       "process": "github:jspm/[email protected]",
-      "systemjs-json": "github:systemjs/[email protected].0",
+      "systemjs-json": "github:systemjs/[email protected].2",
       "util": "github:jspm/[email protected]",
       "when": "npm:[email protected]"
     },
@@ -132,7 +149,7 @@ System.config({
     "npm:[email protected]": {
       "process": "github:jspm/[email protected]"
     },
-    "npm:[email protected].2": {
+    "npm:[email protected].3": {
       "assert": "github:jspm/[email protected]"
     },
     "npm:[email protected]": {

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "marvelous-aurelia-grid",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "author": "Damian Kaminski",
-  "license": "GNU General Public License",
+  "license": "MIT",
   "homepage": "http://marvelous.software/docs.html#/grid",
   "main": "dist/commonjs/grid.js",
   "repository": {
@@ -65,13 +65,13 @@
       "lib": "dist/amd"
     },
     "dependencies": {
-      "aurelia-binding": "npm:aurelia-binding@^1.0.0-beta.1.1.3",
-      "aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0-beta.1.1.3",
-      "aurelia-polyfills": "npm:aurelia-polyfills@^1.0.0-beta.1.0.6",
-      "aurelia-templating": "npm:aurelia-templating@^1.0.0-beta.1.1.1",
-      "aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0-beta.1.1.3",
-      "marvelous-aurelia-core": "marveloussoftware/marvelous-aurelia-core@^0.1.0",
-      "marvelous-aurelia-query-language": "marveloussoftware/marvelous-aurelia-query-language@^0.1.2"
+      "aurelia-binding": "npm:aurelia-binding@^1.0.0-beta.1.3.6",
+      "aurelia-dependency-injection": "npm:aurelia-dependency-injection@^1.0.0-beta.1.2.3",
+      "aurelia-polyfills": "npm:aurelia-polyfills@^1.0.0-beta.1.1.6",
+      "aurelia-templating": "npm:aurelia-templating@^1.0.0-beta.1.2.7",
+      "aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0-beta.1.2.6",
+      "marvelous-aurelia-core": "marveloussoftware/marvelous-aurelia-core@^0.2.1",
+      "marvelous-aurelia-query-language": "marveloussoftware/marvelous-aurelia-query-language@^0.2.0"
     },
     "devDependencies": {
       "aurelia-pal-browser": "npm:aurelia-pal-browser@^1.0.0-beta.1",
@@ -83,8 +83,8 @@
   },
   "marvelous": {
     "projects": {
-      "core": "../marvelous-aurelia-core/",
-      "queryLanguage": "../marvelous-aurelia-query-language/"
+      "marvelous-aurelia-core": "../marvelous-aurelia-core/",
+      "marvelous-aurelia-query-language": "../marvelous-aurelia-query-language/"
     }
   }
 }
diff --git a/src/styles/default.scss b/src/styles/default.scss
@@ -1,7 +1,7 @@
 // Core
-@import "../../jspm_packages/github/marveloussoftware/marvelous-aurelia-core@0.1.0/styles/variables";
-@import "../../jspm_packages/github/marveloussoftware/marvelous-aurelia-core@0.1.0/styles/mixins";
-@import "../../jspm_packages/github/marveloussoftware/marvelous-aurelia-core@0.1.0/styles/base"; // TODO: this one should probably be imported with js import
+@import "../../jspm_packages/github/marveloussoftware/marvelous-aurelia-core@0.2.1/styles/variables";
+@import "../../jspm_packages/github/marveloussoftware/marvelous-aurelia-core@0.2.1/styles/mixins";
+@import "../../jspm_packages/github/marveloussoftware/marvelous-aurelia-core@0.2.1/styles/base"; // TODO: this one should probably be imported with js import
 
 // Components
 @import "variables";