From 4e9858137966a7fef62c9de301242656888311e7 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sun, 1 Feb 2015 12:04:27 -0500 Subject: [PATCH 1/2] Update transpiler to Esperanto. Supports latest ES2015 syntax and features. --- package.json | 2 +- packages/ember-runtime/lib/ext/rsvp.js | 2 +- packages/ember-runtime/tests/mixins/promise_proxy_test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2dc7bec0695..2dd9cecfd6a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "ember-cli": "0.1.6", "ember-cli-yuidoc": "^0.3.1", "ember-publisher": "0.0.7", - "emberjs-build": "0.0.22", + "emberjs-build": "0.0.23", "express": "^4.5.0", "glob": "~4.3.2", "htmlbars": "0.8.4", diff --git a/packages/ember-runtime/lib/ext/rsvp.js b/packages/ember-runtime/lib/ext/rsvp.js index f2eda16b4a6..7899239254f 100644 --- a/packages/ember-runtime/lib/ext/rsvp.js +++ b/packages/ember-runtime/lib/ext/rsvp.js @@ -8,7 +8,7 @@ import run from "ember-metal/run_loop"; // it should be `import * as RSVP from 'rsvp';` but // Esprima does not support this syntax yet (and neither does // es6-module-transpiler 0.4.0 - 0.6.2). -module RSVP from 'rsvp'; +import * as RSVP from 'rsvp'; var testModuleName = 'ember-testing/test'; var Test; diff --git a/packages/ember-runtime/tests/mixins/promise_proxy_test.js b/packages/ember-runtime/tests/mixins/promise_proxy_test.js index 4f82ac49c7b..7bb4fa6c2da 100644 --- a/packages/ember-runtime/tests/mixins/promise_proxy_test.js +++ b/packages/ember-runtime/tests/mixins/promise_proxy_test.js @@ -3,11 +3,11 @@ import {get} from "ember-metal/property_get"; import run from "ember-metal/run_loop"; import ObjectProxy from "ember-runtime/system/object_proxy"; import PromiseProxyMixin from "ember-runtime/mixins/promise_proxy"; -var RSVP = requireModule("rsvp"); // jshint ignore:line import { default as EmberRSVP, onerrorDefault } from "ember-runtime/ext/rsvp"; +import * as RSVP from 'rsvp'; var ObjectPromiseProxy; From cadf6fcf4e02f3e54df161f0e6e8ed2423d234d5 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sun, 1 Feb 2015 14:29:56 -0500 Subject: [PATCH 2/2] Update ember-dev to fix issue with expectedDeprecations in production. --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 2e513440063..2fb475319a4 100644 --- a/bower.json +++ b/bower.json @@ -10,6 +10,6 @@ "rsvp": "https://github.com/tildeio/rsvp.js.git#3.0.14", "router.js": "https://github.com/tildeio/router.js.git#72eb0d336c1c3b7ad3965198b330fe148d935efe", "dag-map": "https://github.com/krisselden/dag-map.git#e307363256fe918f426e5a646cb5f5062d3245be", - "ember-dev": "https://github.com/emberjs/ember-dev.git#1c30a1666273ab2a9b134a42bad28c774f9ecdfc" + "ember-dev": "https://github.com/emberjs/ember-dev.git#1a1ef3e1806be21dd554d285521abc0b13cdfe20" } }