diff --git a/packages/auth/.jshintrc b/packages/auth/.jshintrc index 08096ef..0f54024 100644 --- a/packages/auth/.jshintrc +++ b/packages/auth/.jshintrc @@ -6,7 +6,7 @@ ], "browser": true, "boss": true, - "curly": true, + "curly": false, "debug": false, "devel": true, "eqeqeq": true, diff --git a/packages/auth/.npmignore b/packages/auth/.npmignore index 49996f5..d522ca2 100644 --- a/packages/auth/.npmignore +++ b/packages/auth/.npmignore @@ -10,5 +10,6 @@ dist/ .npmignore **/.gitkeep bower.json +ember-cli-build.js Brocfile.js testem.json diff --git a/packages/auth/.travis.yml b/packages/auth/.travis.yml index 968a0dd..7d6a1f2 100644 --- a/packages/auth/.travis.yml +++ b/packages/auth/.travis.yml @@ -11,6 +11,7 @@ cache: env: - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-1.13.0 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -18,6 +19,7 @@ env: matrix: fast_finish: true allow_failures: + - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary diff --git a/packages/auth/app/initializers/spree-ember-auth-setup-session.js b/packages/auth/app/initializers/spree-ember-auth-setup-session.js index 3de3601..8dddd5e 100644 --- a/packages/auth/app/initializers/spree-ember-auth-setup-session.js +++ b/packages/auth/app/initializers/spree-ember-auth-setup-session.js @@ -1,4 +1,5 @@ -export function initialize(container, application) { +export function initialize(registry, application) { + var container = application.__container__; //TODO: remove deprecation var SpreeAdapter = container.lookup('adapter:-spree'); var Session = container.lookup('simple-auth-session:main'); diff --git a/packages/auth/app/initializers/spree-ember-auth.js b/packages/auth/app/initializers/spree-ember-auth.js index f39686c..d1846f6 100644 --- a/packages/auth/app/initializers/spree-ember-auth.js +++ b/packages/auth/app/initializers/spree-ember-auth.js @@ -2,9 +2,11 @@ import Session from 'simple-auth/session'; import Authorizer from 'spree-ember-auth/authorizers/spree'; import Authenticator from 'spree-ember-auth/authenticators/spree'; -export function initialize(container, application) { - container.register('simple-auth-authorizer:spree', Authorizer); - container.register('simple-auth-authenticator:spree', Authenticator); +export function initialize(registry, application) { + var container = application.__container__; //TODO: remove deprecation + + application.register('simple-auth-authorizer:spree', Authorizer); + application.register('simple-auth-authenticator:spree', Authenticator); var SpreeAuthorizer = container.lookup('simple-auth-authorizer:spree'); var SpreeAuthenticator = container.lookup('simple-auth-authenticator:spree'); diff --git a/packages/auth/bower.json b/packages/auth/bower.json index 5fbab3c..bf7762c 100644 --- a/packages/auth/bower.json +++ b/packages/auth/bower.json @@ -5,10 +5,10 @@ "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-data": "1.0.0-beta.18", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.3", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-qunit": "0.3.4", "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.15", + "ember-resolver": "~0.1.18", "jquery": "^1.11.1", "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1", diff --git a/packages/auth/config/ember-try.js b/packages/auth/config/ember-try.js index 83dab0f..4ae924a 100644 --- a/packages/auth/config/ember-try.js +++ b/packages/auth/config/ember-try.js @@ -4,6 +4,19 @@ module.exports = { name: 'default', dependencies: { } }, + { + name: 'ember-1.13.0', + dependencies: { + 'ember': '1.13.0', + } + }, + { + name: 'ember-ember-data-1.13.0', + dependencies: { + 'ember': '1.13.0', + 'ember-data': '1.13.0' + } + }, { name: 'ember-release', dependencies: { diff --git a/packages/auth/ember-cli-build.js b/packages/auth/ember-cli-build.js new file mode 100644 index 0000000..d37d64c --- /dev/null +++ b/packages/auth/ember-cli-build.js @@ -0,0 +1,17 @@ +/* global require, module */ +var EmberApp = require('ember-cli/lib/broccoli/ember-addon'); + +module.exports = function(defaults) { + var app = new EmberApp(defaults, { + // Add options here + }); + + /* + This build file specifes the options for the dummy test app of this + addon, located in `/tests/dummy` + This build file does *not* influence how the addon or the app using it + behave. You most likely want to be modifying `./index.js` or app's build file + */ + + return app.toTree(); +}; diff --git a/packages/auth/package.json b/packages/auth/package.json index ef5244f..6896eb1 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -19,27 +19,28 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.7", - "ember-cli-app-version": "0.3.3", + "ember-cli": "1.13.1", + "ember-cli-app-version": "0.4.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", - "ember-cli-htmlbars": "0.7.6", - "ember-cli-ic-ajax": "0.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.1.1", + "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.13", + "ember-cli-qunit": "0.3.15", + "ember-cli-release": "0.2.3", "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.18", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", - "ember-try": "0.0.6", - "ember-cli-simple-auth": "0.8.0-beta.1", + "ember-try": "0.0.7", + "ember-disable-prototype-extensions": "^1.0.0", "ember-cli-yuidoc": "0.6.2" }, "keywords": [ "ember-addon" ], "dependencies": { - "ember-cli-htmlbars": "0.7.6", + "ember-cli-htmlbars": "0.7.9", "spree-ember-core": "0.0.1-beta.1", "ember-cli-simple-auth": "0.8.0-beta.1", "spree-ember-storefront": "0.0.1-beta.1", diff --git a/packages/auth/tests/.jshintrc b/packages/auth/tests/.jshintrc index ea8b88f..6ec0b7c 100644 --- a/packages/auth/tests/.jshintrc +++ b/packages/auth/tests/.jshintrc @@ -26,7 +26,7 @@ "node": false, "browser": false, "boss": true, - "curly": false, + "curly": true, "debug": false, "devel": false, "eqeqeq": true, @@ -47,5 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true + "esnext": true, + "unused": true } diff --git a/packages/auth/tests/acceptance/account-test.js b/packages/auth/tests/acceptance/account-test.js index 9b5e3b5..f2e98a6 100644 --- a/packages/auth/tests/acceptance/account-test.js +++ b/packages/auth/tests/acceptance/account-test.js @@ -21,7 +21,6 @@ module('Acceptance: Account', { test('can change password correctly', function(assert) { var seed = (new Date()).valueOf().toString(); var email = 'spree-ember-'+seed+'@example.com'; - var newSeed = (new Date()).valueOf().toString(); var newEmail = 'spree-ember-'+seed+'@example.com'; visit('/account'); diff --git a/packages/auth/tests/acceptance/signup-test.js b/packages/auth/tests/acceptance/signup-test.js index 5c86264..7b73271 100644 --- a/packages/auth/tests/acceptance/signup-test.js +++ b/packages/auth/tests/acceptance/signup-test.js @@ -44,8 +44,6 @@ test('can signup successfully', function(assert) { }); test('can not signup with an invalid email', function(assert) { - var seed = (new Date()).valueOf().toString(); - visit('/account'); andThen(function() { diff --git a/packages/auth/tests/helpers/start-app.js b/packages/auth/tests/helpers/start-app.js index 16cc7c3..0f7aab1 100644 --- a/packages/auth/tests/helpers/start-app.js +++ b/packages/auth/tests/helpers/start-app.js @@ -1,6 +1,5 @@ import Ember from 'ember'; import Application from '../../app'; -import Router from '../../router'; import config from '../../config/environment'; export default function startApp(attrs) { diff --git a/packages/auth/tests/unit/components/spree-auth-test.js b/packages/auth/tests/unit/components/spree-auth-test.js index 5d42394..2d43087 100644 --- a/packages/auth/tests/unit/components/spree-auth-test.js +++ b/packages/auth/tests/unit/components/spree-auth-test.js @@ -4,7 +4,12 @@ import { test } from 'ember-qunit'; -moduleForComponent('spree-auth', { +// fails if ember-qunit = 0.4.X +// Cannot read property 'recognizer' of undefined +// fixed in the beta channel (but won't be back ported to 1.13 most likely) +// https://github.com/switchfly/ember-test-helpers/issues/41 + +moduleForComponent('spree-auth', 'Unit | Component | spree-auth', { // specify the other units that are required for this test needs: [ 'component:spree-input' diff --git a/packages/checkouts/.jshintrc b/packages/checkouts/.jshintrc index 08096ef..0f54024 100644 --- a/packages/checkouts/.jshintrc +++ b/packages/checkouts/.jshintrc @@ -6,7 +6,7 @@ ], "browser": true, "boss": true, - "curly": true, + "curly": false, "debug": false, "devel": true, "eqeqeq": true, diff --git a/packages/checkouts/.npmignore b/packages/checkouts/.npmignore index 49996f5..d522ca2 100644 --- a/packages/checkouts/.npmignore +++ b/packages/checkouts/.npmignore @@ -10,5 +10,6 @@ dist/ .npmignore **/.gitkeep bower.json +ember-cli-build.js Brocfile.js testem.json diff --git a/packages/checkouts/.travis.yml b/packages/checkouts/.travis.yml index 8197d31..7d6a1f2 100644 --- a/packages/checkouts/.travis.yml +++ b/packages/checkouts/.travis.yml @@ -11,6 +11,7 @@ cache: env: - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-1.13.0 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -18,6 +19,8 @@ env: matrix: fast_finish: true allow_failures: + - env: EMBER_TRY_SCENARIO=ember-release + - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary before_install: diff --git a/packages/checkouts/Brocfile.js b/packages/checkouts/Brocfile.js deleted file mode 100644 index 2a682c0..0000000 --- a/packages/checkouts/Brocfile.js +++ /dev/null @@ -1,16 +0,0 @@ -/* jshint node: true */ -/* global require, module */ - -var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); - -/* - This Brocfile specifes the options for the dummy test app of this - addon, located in `/tests/dummy` - - This Brocfile does *not* influence how the addon or the app using it - behave. You most likely want to be modifying `./index.js` or app's Brocfile -*/ - -var app = new EmberAddon(); - -module.exports = app.toTree(); diff --git a/packages/checkouts/app/initializers/spree-ember-checkouts.js b/packages/checkouts/app/initializers/spree-ember-checkouts.js index 146d96b..c286bc9 100644 --- a/packages/checkouts/app/initializers/spree-ember-checkouts.js +++ b/packages/checkouts/app/initializers/spree-ember-checkouts.js @@ -1,11 +1,14 @@ import CurrentOrderSupport from 'spree-ember-checkouts/mixins/current-order-support'; -export function initialize(container, application) { +export function initialize(registry, application) { + var container = application.__container__; // TODO: deprecated + var SpreeService = container.lookup('service:spree'); CurrentOrderSupport.apply(SpreeService); application.deferReadiness(); SpreeService._restoreCurrentOrder().finally(function() { + //TODO:https://github.com/emberjs/ember.js/issues/11247 application.advanceReadiness(); }); } diff --git a/packages/checkouts/bower.json b/packages/checkouts/bower.json index eafe91e..6b053c2 100644 --- a/packages/checkouts/bower.json +++ b/packages/checkouts/bower.json @@ -5,12 +5,12 @@ "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-data": "1.0.0-beta.18", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.3", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-qunit": "0.4.1", "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.15", + "ember-resolver": "~0.1.18", "jquery": "^1.11.1", "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1" } -} \ No newline at end of file +} diff --git a/packages/checkouts/config/ember-try.js b/packages/checkouts/config/ember-try.js index 83dab0f..4ae924a 100644 --- a/packages/checkouts/config/ember-try.js +++ b/packages/checkouts/config/ember-try.js @@ -4,6 +4,19 @@ module.exports = { name: 'default', dependencies: { } }, + { + name: 'ember-1.13.0', + dependencies: { + 'ember': '1.13.0', + } + }, + { + name: 'ember-ember-data-1.13.0', + dependencies: { + 'ember': '1.13.0', + 'ember-data': '1.13.0' + } + }, { name: 'ember-release', dependencies: { diff --git a/packages/checkouts/config/environment.js b/packages/checkouts/config/environment.js index 0dfaed4..9707ea6 100644 --- a/packages/checkouts/config/environment.js +++ b/packages/checkouts/config/environment.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = function(/* environment, appConfig */) { - return { }; + return {}; }; diff --git a/packages/checkouts/ember-cli-build.js b/packages/checkouts/ember-cli-build.js new file mode 100644 index 0000000..d37d64c --- /dev/null +++ b/packages/checkouts/ember-cli-build.js @@ -0,0 +1,17 @@ +/* global require, module */ +var EmberApp = require('ember-cli/lib/broccoli/ember-addon'); + +module.exports = function(defaults) { + var app = new EmberApp(defaults, { + // Add options here + }); + + /* + This build file specifes the options for the dummy test app of this + addon, located in `/tests/dummy` + This build file does *not* influence how the addon or the app using it + behave. You most likely want to be modifying `./index.js` or app's build file + */ + + return app.toTree(); +}; diff --git a/packages/checkouts/package.json b/packages/checkouts/package.json index 4f1a55f..7cfd490 100644 --- a/packages/checkouts/package.json +++ b/packages/checkouts/package.json @@ -19,18 +19,21 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.7", - "ember-cli-app-version": "0.3.3", + "ember-cli": "1.13.1", + "ember-cli-app-version": "0.4.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", - "ember-cli-htmlbars": "0.7.6", - "ember-cli-ic-ajax": "0.1.1", + "ember-cli-htmlbars": "0.7.9", + "ember-cli-htmlbars-inline-precompile": "^0.1.1", + "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.13", + "ember-cli-qunit": "0.3.15", + "ember-cli-release": "0.2.3", "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.18", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", + "ember-disable-prototype-extensions": "^1.0.0", "ember-try": "0.0.6" }, "keywords": [ diff --git a/packages/checkouts/tests/.jshintrc b/packages/checkouts/tests/.jshintrc index ea8b88f..6ec0b7c 100644 --- a/packages/checkouts/tests/.jshintrc +++ b/packages/checkouts/tests/.jshintrc @@ -26,7 +26,7 @@ "node": false, "browser": false, "boss": true, - "curly": false, + "curly": true, "debug": false, "devel": false, "eqeqeq": true, @@ -47,5 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true + "esnext": true, + "unused": true } diff --git a/packages/checkouts/tests/acceptance/checkout-test.js b/packages/checkouts/tests/acceptance/checkout-test.js index 0991a8f..28c7622 100644 --- a/packages/checkouts/tests/acceptance/checkout-test.js +++ b/packages/checkouts/tests/acceptance/checkout-test.js @@ -95,7 +95,7 @@ test('can advance order state', function(assert) { assert.equal(currentOrder.get('state'), 'cart'); assert.equal(checkouts.get('currentState'), 'cart'); - return checkouts.transition().then(function(order){ + return checkouts.transition().then(function(/*order*/){ assert.equal(currentOrder.get('state'), 'address'); assert.equal(checkouts.get('currentState'), 'address'); assert.ok(currentOrder.get('shipAddress')); diff --git a/packages/checkouts/tests/helpers/start-app.js b/packages/checkouts/tests/helpers/start-app.js index 16cc7c3..0f7aab1 100644 --- a/packages/checkouts/tests/helpers/start-app.js +++ b/packages/checkouts/tests/helpers/start-app.js @@ -1,6 +1,5 @@ import Ember from 'ember'; import Application from '../../app'; -import Router from '../../router'; import config from '../../config/environment'; export default function startApp(attrs) { diff --git a/packages/checkouts/vendor/ember-fsm.js b/packages/checkouts/vendor/ember-fsm.js index abd28f1..708369f 100644 --- a/packages/checkouts/vendor/ember-fsm.js +++ b/packages/checkouts/vendor/ember-fsm.js @@ -655,7 +655,9 @@ exports["default"] = Ember.Object.extend({ events.error = { transition: { $all: 'failed' } }; } - this.set('activeTransitions', []); + //TODO: Local fix used until this is closed: + //https://github.com/heycarsten/ember-fsm/issues/16 + this.set('activeTransitions', Ember.A()); this.definition = new Definition({ states: states, @@ -1280,4 +1282,4 @@ exports.bind = bind;function contains(array, item) { exports.contains = contains; },{}]},{},[2]) (2) -}); \ No newline at end of file +}); diff --git a/packages/core/.npmignore b/packages/core/.npmignore index 49996f5..d522ca2 100644 --- a/packages/core/.npmignore +++ b/packages/core/.npmignore @@ -10,5 +10,6 @@ dist/ .npmignore **/.gitkeep bower.json +ember-cli-build.js Brocfile.js testem.json diff --git a/packages/core/.travis.yml b/packages/core/.travis.yml index 8197d31..7d6a1f2 100644 --- a/packages/core/.travis.yml +++ b/packages/core/.travis.yml @@ -11,6 +11,7 @@ cache: env: - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-1.13.0 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -18,6 +19,8 @@ env: matrix: fast_finish: true allow_failures: + - env: EMBER_TRY_SCENARIO=ember-release + - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary before_install: diff --git a/packages/core/Brocfile.js b/packages/core/Brocfile.js deleted file mode 100644 index 2a682c0..0000000 --- a/packages/core/Brocfile.js +++ /dev/null @@ -1,16 +0,0 @@ -/* jshint node: true */ -/* global require, module */ - -var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); - -/* - This Brocfile specifes the options for the dummy test app of this - addon, located in `/tests/dummy` - - This Brocfile does *not* influence how the addon or the app using it - behave. You most likely want to be modifying `./index.js` or app's Brocfile -*/ - -var app = new EmberAddon(); - -module.exports = app.toTree(); diff --git a/packages/core/addon/adapters/spree.js b/packages/core/addon/adapters/spree.js index ce9ad1d..b8dcfcf 100644 --- a/packages/core/addon/adapters/spree.js +++ b/packages/core/addon/adapters/spree.js @@ -1,15 +1,15 @@ import Ember from 'ember'; -import DS from 'ember-data'; +import ActiveModelAdapter from 'active-model-adapter'; /** The Spree Adapter is responsible for communicating with your Spree store. It assumes your server has the `spree_ams` gem installed. @class Spree @namespace Adapter - @extends DS.ActiveModelAdapter + @extends ActiveModelAdapter */ -export default DS.ActiveModelAdapter.extend({ +export default ActiveModelAdapter.extend({ /** The container lookup name for the default Spree serializer. diff --git a/packages/core/addon/serializers/spree.js b/packages/core/addon/serializers/spree.js index 4067717..7d0284c 100644 --- a/packages/core/addon/serializers/spree.js +++ b/packages/core/addon/serializers/spree.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import DS from 'ember-data'; +import { ActiveModelSerializer } from 'active-model-adapter'; /** The Spree Serializer is based on the `DS.ActiveModelSerializer`, but implements @@ -30,7 +30,7 @@ import DS from 'ember-data'; @module spree-ember-core/serializers/spree @extends DS.ActiveModelSerializer */ -export default DS.ActiveModelSerializer.extend({ +export default ActiveModelSerializer.extend({ /** Serializes a record for sending to the Spree server. Here, we extend the default behaviour of `DS.ActiveModelSerializer#serialize` to ensure that we @@ -43,6 +43,8 @@ export default DS.ActiveModelSerializer.extend({ @return {Object} A JSON object representing the record. */ serialize: function(record) { + //TODO: receive a Snapshot instead of a record + //see: https://github.com/emberjs/data/issues/2893#issuecomment-82517432 var payload = this._super.apply(this, arguments); record.eachAttribute(function(name, meta) { if (!meta.options.persistToServer) { diff --git a/packages/core/app/models/taxonomy.js b/packages/core/app/models/taxonomy.js index dba2f74..9a26667 100644 --- a/packages/core/app/models/taxonomy.js +++ b/packages/core/app/models/taxonomy.js @@ -1,3 +1,4 @@ +import Ember from 'ember'; import DS from 'ember-data'; export default DS.Model.extend({ @@ -6,11 +7,11 @@ export default DS.Model.extend({ prettyName: DS.attr('string'), taxons: DS.hasMany('taxon'), - root: function() { + root: Ember.computed('taxons', function() { return this.get('taxons').findBy('parentId', undefined); - }.property('taxons'), + }), - taxonsExcludingRoot: function() { + taxonsExcludingRoot: Ember.computed('taxons', function() { return this.get('taxons').filterBy('parentId'); - }.property('taxons') + }) }); diff --git a/packages/core/app/services/spree.js b/packages/core/app/services/spree.js index db4bb4d..fb167c4 100644 --- a/packages/core/app/services/spree.js +++ b/packages/core/app/services/spree.js @@ -16,7 +16,7 @@ import Storable from 'spree-ember-core/mixins/storable'; @uses Ember.Evented, SpreeEmber.Storable, SpreeEmber.Store */ -export default Ember.Object.extend(Ember.Evented, Storable, { +export default Ember.Service.extend(Ember.Evented, Storable, { /** The Local Storage key we use to Restore and Persist data across browser refreshes. diff --git a/packages/core/bower.json b/packages/core/bower.json index 4eba2d0..be0481a 100644 --- a/packages/core/bower.json +++ b/packages/core/bower.json @@ -4,13 +4,13 @@ "ember": "1.12.0", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-data": "1.0.0-beta.18", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.3", + "ember-data": "v1.0.0-beta.18", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-qunit": "0.4.1", "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.15", + "ember-resolver": "~0.1.18", "jquery": "^1.11.1", "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1" } -} \ No newline at end of file +} diff --git a/packages/core/config/ember-try.js b/packages/core/config/ember-try.js index 83dab0f..4ae924a 100644 --- a/packages/core/config/ember-try.js +++ b/packages/core/config/ember-try.js @@ -4,6 +4,19 @@ module.exports = { name: 'default', dependencies: { } }, + { + name: 'ember-1.13.0', + dependencies: { + 'ember': '1.13.0', + } + }, + { + name: 'ember-ember-data-1.13.0', + dependencies: { + 'ember': '1.13.0', + 'ember-data': '1.13.0' + } + }, { name: 'ember-release', dependencies: { diff --git a/packages/core/ember-cli-build.js b/packages/core/ember-cli-build.js new file mode 100644 index 0000000..d37d64c --- /dev/null +++ b/packages/core/ember-cli-build.js @@ -0,0 +1,17 @@ +/* global require, module */ +var EmberApp = require('ember-cli/lib/broccoli/ember-addon'); + +module.exports = function(defaults) { + var app = new EmberApp(defaults, { + // Add options here + }); + + /* + This build file specifes the options for the dummy test app of this + addon, located in `/tests/dummy` + This build file does *not* influence how the addon or the app using it + behave. You most likely want to be modifying `./index.js` or app's build file + */ + + return app.toTree(); +}; diff --git a/packages/core/package.json b/packages/core/package.json index aa56cc8..382a5da 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -19,24 +19,28 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.7", - "ember-cli-app-version": "0.3.3", + "ember-cli": "1.13.1", + "ember-cli-app-version": "0.4.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", - "ember-cli-htmlbars": "0.7.6", - "ember-cli-ic-ajax": "0.1.1", + "ember-cli-htmlbars": "0.7.9", + "ember-cli-htmlbars-inline-precompile": "^0.1.1", + "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.13", + "ember-cli-qunit": "0.3.15", + "ember-cli-release": "0.2.3", "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.18", + "ember-disable-prototype-extensions": "^1.0.0", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", - "ember-try": "0.0.6" + "ember-try": "0.0.7" }, "keywords": [ "ember-addon" ], "dependencies": { + "active-model-adapter": "1.13.3", "ember-cli-babel": "^5.0.0" }, "ember-addon": { diff --git a/packages/core/tests/.jshintrc b/packages/core/tests/.jshintrc index ea8b88f..6ec0b7c 100644 --- a/packages/core/tests/.jshintrc +++ b/packages/core/tests/.jshintrc @@ -26,7 +26,7 @@ "node": false, "browser": false, "boss": true, - "curly": false, + "curly": true, "debug": false, "devel": false, "eqeqeq": true, @@ -47,5 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true + "esnext": true, + "unused": true } diff --git a/packages/core/tests/helpers/start-app.js b/packages/core/tests/helpers/start-app.js index 16cc7c3..0f7aab1 100644 --- a/packages/core/tests/helpers/start-app.js +++ b/packages/core/tests/helpers/start-app.js @@ -1,6 +1,5 @@ import Ember from 'ember'; import Application from '../../app'; -import Router from '../../router'; import config from '../../config/environment'; export default function startApp(attrs) { diff --git a/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js b/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js index 5c93024..c76aed3 100644 --- a/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js +++ b/packages/core/tests/unit/mixins/handles-nested-server-errors-test.js @@ -5,7 +5,7 @@ import { test } from 'ember-qunit'; -moduleForModel('order', 'Order', { +moduleForModel('order', 'Unit | Mixin | Order', { needs: [ 'model:user', 'model:address', diff --git a/packages/core/tests/unit/models/order-test.js b/packages/core/tests/unit/models/order-test.js index fbfbc13..0c2e0a2 100644 --- a/packages/core/tests/unit/models/order-test.js +++ b/packages/core/tests/unit/models/order-test.js @@ -3,7 +3,7 @@ import { test } from 'ember-qunit'; -moduleForModel('order', 'Order', { +moduleForModel('order', 'Unit | Model | Order', { // Specify the other units that are required for this test. needs: [ 'model:user', diff --git a/packages/core/tests/unit/models/taxon-test.js b/packages/core/tests/unit/models/taxon-test.js index ce2a420..3df7a54 100644 --- a/packages/core/tests/unit/models/taxon-test.js +++ b/packages/core/tests/unit/models/taxon-test.js @@ -3,7 +3,7 @@ import { test } from 'ember-qunit'; -moduleForModel('taxon', 'Taxon', { +moduleForModel('taxon', 'Unit | Model | taxon', { // Specify the other units that are required for this test. needs: [ 'model:taxonomy' diff --git a/packages/core/tests/unit/models/taxonomy-test.js b/packages/core/tests/unit/models/taxonomy-test.js index 07c66af..d94942f 100644 --- a/packages/core/tests/unit/models/taxonomy-test.js +++ b/packages/core/tests/unit/models/taxonomy-test.js @@ -3,7 +3,7 @@ import { test } from 'ember-qunit'; -moduleForModel('taxonomy', 'Taxonomy', { +moduleForModel('taxonomy', 'Unit | Model | taxonomy', { // Specify the other units that are required for this test. needs: [ 'model:taxon' diff --git a/packages/core/tests/unit/serializers/spree-test.js b/packages/core/tests/unit/serializers/spree-test.js index 1e758f2..e841af6 100644 --- a/packages/core/tests/unit/serializers/spree-test.js +++ b/packages/core/tests/unit/serializers/spree-test.js @@ -5,7 +5,7 @@ import { test } from 'ember-qunit'; -moduleFor('serializer:spree', 'SpreeSerializer', { +moduleFor('serializer:spree', 'Unit | Serializer | SpreeSerializer', { needs: ['store:spree'] }); diff --git a/packages/storefront/.jshintrc b/packages/storefront/.jshintrc index 08096ef..0f54024 100644 --- a/packages/storefront/.jshintrc +++ b/packages/storefront/.jshintrc @@ -6,7 +6,7 @@ ], "browser": true, "boss": true, - "curly": true, + "curly": false, "debug": false, "devel": true, "eqeqeq": true, diff --git a/packages/storefront/.npmignore b/packages/storefront/.npmignore index 49996f5..d522ca2 100644 --- a/packages/storefront/.npmignore +++ b/packages/storefront/.npmignore @@ -10,5 +10,6 @@ dist/ .npmignore **/.gitkeep bower.json +ember-cli-build.js Brocfile.js testem.json diff --git a/packages/storefront/.travis.yml b/packages/storefront/.travis.yml index 968a0dd..7d6a1f2 100644 --- a/packages/storefront/.travis.yml +++ b/packages/storefront/.travis.yml @@ -11,6 +11,7 @@ cache: env: - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-1.13.0 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary @@ -18,6 +19,7 @@ env: matrix: fast_finish: true allow_failures: + - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary diff --git a/packages/storefront/README.md b/packages/storefront/README.md index ca46900..9e147a2 100644 --- a/packages/storefront/README.md +++ b/packages/storefront/README.md @@ -61,4 +61,3 @@ var app = new EmberApp({ } }); ``` - diff --git a/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs b/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs index 681cff9..ed921ee 100644 --- a/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs +++ b/packages/storefront/addon/templates/components/spree-breadcrumbs.hbs @@ -1,6 +1,6 @@