From 6b5b5d0ba7a41b068a31c4ef81fbdf9e7a8a9ddb Mon Sep 17 00:00:00 2001 From: supersabillon Date: Wed, 25 Jan 2017 22:03:29 -0800 Subject: [PATCH 1/2] Upgrading to ember 2.11.0 --- .gitignore | 4 +-- .travis.yml | 14 ++++---- LICENSE.md | 2 +- README.md | 2 +- bower.json | 1 - config/ember-try.js | 46 +++++++++++++++++++++--- package.json | 58 ++++++++++++++++--------------- tests/dummy/config/environment.js | 4 +++ tests/index.html | 2 +- 9 files changed, 88 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 86fceae..5ad14dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://help.github.com/ignore-files/ for more about ignoring files. # compiled output /dist @@ -13,5 +13,5 @@ /connect.lock /coverage/* /libpeerconnection.log -npm-debug.log +npm-debug.log* testem.log diff --git a/.travis.yml b/.travis.yml index 68b59ab..7afaaf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,17 @@ sudo: false cache: directories: - - node_modules + - $HOME/.npm + - $HOME/.cache # includes bowers cache env: - - EMBER_TRY_SCENARIO=default - - EMBER_TRY_SCENARIO=ember-1.13 + # we recommend testing LTS's and latest stable release (bonus points to beta/canary) + - EMBER_TRY_SCENARIO=ember-lts-2.4 + - EMBER_TRY_SCENARIO=ember-lts-2.8 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary + - EMBER_TRY_SCENARIO=ember-default matrix: fast_finish: true @@ -23,9 +26,8 @@ matrix: before_install: - npm config set spin false - - npm install -g bower + - npm install -g bower phantomjs-prebuilt - bower --version - - npm install phantomjs-prebuilt - phantomjs --version install: @@ -35,4 +37,4 @@ install: script: # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup + - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup diff --git a/LICENSE.md b/LICENSE.md index 02000b5..0d5e3ef 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 +Copyright (c) 2017 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: diff --git a/README.md b/README.md index 567e1fc..dd2bfc6 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ This addon supports the same options as the [ag-grid](https://github.com/ceolter | --- | --- | --- | | width | "100%" | Sets width of grid | | height | "400px" | Sets height of grid | -| theme | "ag-fresh" | ag-Grid provides three themes: ag-fresh, ag-blue, ag-dark, ag-bootstrap and ag-material | +| theme | "ag-fresh" | ag-Grid provides four themes: ag-fresh, ag-blue, ag-dark, ag-bootstrap and ag-material | Example: diff --git a/bower.json b/bower.json index 936f880..8e009bf 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,6 @@ "name": "ember-ag-grid", "dependencies": { "ember": "~2.7.1", - "ember-cli-shims": "0.1.1", "ember-qunit-notifications": "0.1.0", "ag-grid": "^5.3.0", "pretender": "~1.0.0", diff --git a/config/ember-try.js b/config/ember-try.js index 014f603..b1813d0 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -2,19 +2,34 @@ module.exports = { scenarios: [ { - name: 'default', + name: 'ember-lts-2.4', bower: { - dependencies: { } + dependencies: { + 'ember': 'components/ember#lts-2-4' + }, + resolutions: { + 'ember': 'lts-2-4' + } + }, + npm: { + devDependencies: { + 'ember-source': null + } } }, { - name: 'ember-1.13', + name: 'ember-lts-2.8', bower: { dependencies: { - 'ember': '~1.13.0' + 'ember': 'components/ember#lts-2-8' }, resolutions: { - 'ember': '~1.13.0' + 'ember': 'lts-2-8' + } + }, + npm: { + devDependencies: { + 'ember-source': null } } }, @@ -27,6 +42,11 @@ module.exports = { resolutions: { 'ember': 'release' } + }, + npm: { + devDependencies: { + 'ember-source': null + } } }, { @@ -38,6 +58,11 @@ module.exports = { resolutions: { 'ember': 'beta' } + }, + npm: { + devDependencies: { + 'ember-source': null + } } }, { @@ -49,6 +74,17 @@ module.exports = { resolutions: { 'ember': 'canary' } + }, + npm: { + devDependencies: { + 'ember-source': null + } + } + }, + { + name: 'ember-default', + npm: { + devDependencies: {} } } ] diff --git a/package.json b/package.json index 289a134..1d013cb 100644 --- a/package.json +++ b/package.json @@ -2,56 +2,58 @@ "name": "ember-ag-grid", "version": "0.2.2", "description": "An ag-Grid component for ember cli", + "keywords": [ + "ember-addon", + "ember-ag-grid", + "ag-grid", + "grid", + "table" + ], + "license": "MIT", + "author": "Joel Sabillon", "directories": { "doc": "doc", "test": "tests" }, + "repository": "https://github.com/supersabillon/ember-ag-grid", "scripts": { "build": "ember build", "start": "ember server", "test": "ember try:each" }, - "repository": "https://github.com/supersabillon/ember-ag-grid", - "engines": { - "node": ">= 0.10.0" - }, - "author": "Joel Sabillon", - "license": "MIT", "dependencies": { "ember-get-config": "0.0.4", - "ember-cli-babel": "^5.1.5" + "ember-cli-babel": "^5.1.7" }, "devDependencies": { - "broccoli-asset-rev": "^2.4.2", - "ember-ajax": "^2.0.1", - "ember-bootstrap": "0.6.4", - "ember-cli": "2.7.0", - "ember-cli-app-version": "^1.0.0", - "ember-cli-dependency-checker": "^1.2.0", - "ember-cli-htmlbars": "^1.0.3", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.4.0", - "ember-cli-jshint": "^1.0.0", + "broccoli-asset-rev": "^2.4.5", + "ember-ajax": "^2.4.1", + "ember-bootstrap": "0.6.4", + "ember-cli": "2.11.0", + "ember-cli-app-version": "^2.0.0", + "ember-cli-dependency-checker": "^1.3.0", + "ember-cli-htmlbars": "^1.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.3.3", + "ember-cli-inject-live-reload": "^1.4.1", + "ember-cli-jshint": "^2.0.1", "ember-cli-mirage": "0.1.11", - "ember-cli-qunit": "^2.0.0", + "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", + "ember-cli-shims": "^1.0.2", "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.7.0", + "ember-data": "^2.11.0", "ember-disable-prototype-extensions": "^1.1.0", "ember-export-application-global": "^1.0.5", - "ember-load-initializers": "^0.5.1", + "ember-load-initializers": "^0.6.0", "ember-resolver": "^2.0.3", - "loader.js": "^4.0.1" + "ember-source": "^2.11.0", + "loader.js": "^4.0.10" + }, + "engines": { + "node": ">= 0.12.0" }, - "keywords": [ - "ember-addon", - "ember-ag-grid", - "ag-grid", - "grid", - "table" - ], "ember-addon": { "configPath": "tests/dummy/config" } diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 2529939..703c472 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -10,6 +10,10 @@ module.exports = function(environment) { FEATURES: { // Here you can enable experimental features on an ember canary build // e.g. 'with-controller': true + }, + EXTEND_PROTOTYPES: { + // Prevent Ember Data from overriding Date.parse. + Date: false } }, diff --git a/tests/index.html b/tests/index.html index f7ff652..5209b85 100644 --- a/tests/index.html +++ b/tests/index.html @@ -21,7 +21,7 @@ {{content-for "body"}} {{content-for "test-body"}} - + From 9d6a9616c1bc188982cd6ba12fb05a06a0d6f971 Mon Sep 17 00:00:00 2001 From: supersabillon Date: Wed, 25 Jan 2017 22:04:56 -0800 Subject: [PATCH 2/2] 0.2.3 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1d013cb..927c35a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-ag-grid", - "version": "0.2.2", + "version": "0.2.3", "description": "An ag-Grid component for ember cli", "keywords": [ "ember-addon", @@ -28,7 +28,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.4.5", "ember-ajax": "^2.4.1", - "ember-bootstrap": "0.6.4", + "ember-bootstrap": "0.6.4", "ember-cli": "2.11.0", "ember-cli-app-version": "^2.0.0", "ember-cli-dependency-checker": "^1.3.0",