Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update transpiler to Esperanto. #10329

Merged
merged 2 commits into from
Feb 1, 2015
Merged

Update transpiler to Esperanto. #10329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e98581
Update transpiler to Esperanto.
rwjblue Feb 1, 2015
cadf6fc
Update ember-dev to fix issue with expectedDeprecations in production.
rwjblue Feb 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-runtime/lib/ext/rsvp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-runtime/tests/mixins/promise_proxy_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down