From 964ba8e4bd72364c2263625f102aedc3753c4b14 Mon Sep 17 00:00:00 2001 From: Damian Kaminski Date: Sun, 5 Jun 2016 16:12:50 +0200 Subject: [PATCH] refactor(all): aurelia and internal libraries bump up, change license to MIT --- LICENSE | 30 ++++--- build/paths.js | 19 ++--- config.js | 183 ++++++++++++++++++++++------------------ package.json | 22 ++--- src/styles/default.scss | 6 +- 5 files changed, 140 insertions(+), 120 deletions(-) diff --git a/LICENSE b/LICENSE index 21fe65a..faab9ff 100644 --- 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 \ No newline at end of file +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. \ No newline at end of file diff --git a/build/paths.js b/build/paths.js index ab34f23..f05743c 100644 --- 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' } } \ No newline at end of file diff --git a/config.js b/config.js index e3d344c..4fdf24b 100644 --- a/config.js +++ b/config.js @@ -13,116 +13,133 @@ System.config({ }, map: { - "aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.2.2", - "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.5", + "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-framework": "npm:aurelia-framework@1.0.0-beta.1.1.3", - "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.6", - "aurelia-pal-browser": "npm:aurelia-pal-browser@1.0.0-beta.1.1.4", - "aurelia-polyfills": "npm:aurelia-polyfills@1.0.0-beta.1.0.6", - "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.1.4", - "aurelia-templating-resources": "npm:aurelia-templating-resources@1.0.0-beta.1.1.3", - "babel": "npm:babel-core@5.8.35", - "babel-runtime": "npm:babel-runtime@5.8.35", - "core-js": "npm:core-js@2.1.5", + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1", + "aurelia-pal-browser": "npm:aurelia-pal-browser@1.0.0-beta.2.0.1", + "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", + "babel": "npm:babel-core@5.8.38", + "babel-runtime": "npm:babel-runtime@5.8.38", + "core-js": "npm:core-js@2.4.0", "es6-module-loader": "npm:es6-module-loader@0.17.11", - "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/nodelibs-assert@0.1.0": { - "assert": "npm:assert@1.3.0" + "assert": "npm:assert@1.4.1" + }, + "github:jspm/nodelibs-buffer@0.1.0": { + "buffer": "npm:buffer@3.6.0" }, "github:jspm/nodelibs-path@0.1.0": { "path-browserify": "npm:path-browserify@0.0.0" }, "github:jspm/nodelibs-process@0.1.2": { - "process": "npm:process@0.11.2" + "process": "npm:process@0.11.3" }, "github:jspm/nodelibs-util@0.1.0": { "util": "npm:util@0.10.3" }, - "github:marveloussoftware/marvelous-aurelia-core@0.1.0": { - "aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.2.2", - "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.5", - "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.1.4" + "github:marveloussoftware/marvelous-aurelia-core@0.2.1": { + "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" }, - "github:marveloussoftware/marvelous-aurelia-query-language@0.1.2": { - "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.5", - "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.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:aurelia-dependency-injection@1.0.0-beta.1.2.3", + "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.2.7", + "marvelous-aurelia-core": "github:marveloussoftware/marvelous-aurelia-core@0.2.1" }, - "npm:assert@1.3.0": { + "npm:assert@1.4.1": { + "assert": "github:jspm/nodelibs-assert@0.1.0", + "buffer": "github:jspm/nodelibs-buffer@0.1.0", + "process": "github:jspm/nodelibs-process@0.1.2", "util": "npm:util@0.10.3" }, - "npm:aurelia-binding@1.0.0-beta.1.2.2": { - "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.6", - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1", - "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.1.1" + "npm:aurelia-binding@1.0.0-beta.1.3.6": { + "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1", + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1", + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2", + "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1" }, - "npm:aurelia-dependency-injection@1.0.0-beta.1.1.5": { - "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2", - "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.6", - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1" + "npm:aurelia-dependency-injection@1.0.0-beta.1.2.3": { + "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1", + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1", + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2" }, "npm:aurelia-framework@1.0.0-beta.1.1.3": { - "aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.2.2", - "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.5", - "aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.1.1", - "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2", - "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.6", - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1", - "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1", - "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.1.1", - "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.1.4", - "core-js": "npm:core-js@2.1.5" - }, - "npm:aurelia-loader@1.0.0-beta.1.1.1": { - "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.6", - "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1" - }, - "npm:aurelia-metadata@1.0.0-beta.1.1.6": { - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1" - }, - "npm:aurelia-pal-browser@1.0.0-beta.1.1.4": { - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1" - }, - "npm:aurelia-polyfills@1.0.0-beta.1.0.6": { - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1" - }, - "npm:aurelia-task-queue@1.0.0-beta.1.1.1": { - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1" - }, - "npm:aurelia-templating-resources@1.0.0-beta.1.1.3": { - "aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.2.2", - "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.5", - "aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.1.1", - "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2", - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1", - "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1", - "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.1.1", - "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.1.4" - }, - "npm:aurelia-templating@1.0.0-beta.1.1.4": { - "aurelia-binding": "npm:aurelia-binding@1.0.0-beta.1.2.2", - "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.0.0-beta.1.1.5", - "aurelia-loader": "npm:aurelia-loader@1.0.0-beta.1.1.1", - "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.1.2", - "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.1.6", - "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.1.1", - "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.1.1", - "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.1.1" - }, - "npm:babel-runtime@5.8.35": { + "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-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0", + "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1", + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1", + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2", + "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2", + "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1", + "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.2.7", + "core-js": "npm:core-js@2.4.0" + }, + "npm:aurelia-loader@1.0.0-beta.1.2.0": { + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1", + "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2" + }, + "npm:aurelia-metadata@1.0.0-beta.1.2.1": { + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2" + }, + "npm:aurelia-pal-browser@1.0.0-beta.2.0.1": { + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2" + }, + "npm:aurelia-polyfills@1.0.0-beta.1.1.6": { + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2" + }, + "npm:aurelia-task-queue@1.0.0-beta.1.2.1": { + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2" + }, + "npm:aurelia-templating-resources@1.0.0-beta.1.2.6": { + "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-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0", + "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1", + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1", + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2", + "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2", + "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1", + "aurelia-templating": "npm:aurelia-templating@1.0.0-beta.1.2.7" + }, + "npm:aurelia-templating@1.0.0-beta.1.2.7": { + "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-loader": "npm:aurelia-loader@1.0.0-beta.1.2.0", + "aurelia-logging": "npm:aurelia-logging@1.0.0-beta.1.2.1", + "aurelia-metadata": "npm:aurelia-metadata@1.0.0-beta.1.2.1", + "aurelia-pal": "npm:aurelia-pal@1.0.0-beta.1.2.2", + "aurelia-path": "npm:aurelia-path@1.0.0-beta.1.2.2", + "aurelia-task-queue": "npm:aurelia-task-queue@1.0.0-beta.1.2.1" + }, + "npm:babel-runtime@5.8.38": { + "process": "github:jspm/nodelibs-process@0.1.2" + }, + "npm:buffer@3.6.0": { + "base64-js": "npm:base64-js@0.0.8", + "child_process": "github:jspm/nodelibs-child_process@0.1.0", + "fs": "github:jspm/nodelibs-fs@0.1.2", + "ieee754": "npm:ieee754@1.1.6", + "isarray": "npm:isarray@1.0.0", "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:core-js@2.1.5": { + "npm:core-js@2.4.0": { "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0", "process": "github:jspm/nodelibs-process@0.1.2", - "systemjs-json": "github:systemjs/plugin-json@0.1.0" + "systemjs-json": "github:systemjs/plugin-json@0.1.2" }, "npm:es6-module-loader@0.17.11": { "fs": "github:jspm/nodelibs-fs@0.1.2", "process": "github:jspm/nodelibs-process@0.1.2", - "systemjs-json": "github:systemjs/plugin-json@0.1.0", + "systemjs-json": "github:systemjs/plugin-json@0.1.2", "util": "github:jspm/nodelibs-util@0.1.0", "when": "npm:when@3.7.7" }, @@ -132,7 +149,7 @@ System.config({ "npm:path-browserify@0.0.0": { "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:process@0.11.2": { + "npm:process@0.11.3": { "assert": "github:jspm/nodelibs-assert@0.1.0" }, "npm:util@0.10.3": { diff --git a/package.json b/package.json index c7c6c1e..ea374aa 100644 --- 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 index c373ea9..13acb34 100644 --- 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";