Skip to content

Commit

Permalink
Update to ember 3.1
Browse files Browse the repository at this point in the history
Using a direct link to ember-source release until emberjs/ember.js#16493 gets tagged into an npm release
  • Loading branch information
niranjan94 committed Apr 16, 2018
1 parent 6acadc4 commit 033e3a5
Show file tree
Hide file tree
Showing 5 changed files with 203 additions and 84 deletions.
4 changes: 1 addition & 3 deletions app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from 'open-event-frontend/config/environment';

let App;

App = Application.extend({
const App = Application.extend({
modulePrefix : config.modulePrefix,
podModulePrefix : config.podModulePrefix,
Resolver
Expand Down
2 changes: 0 additions & 2 deletions app/initializers/blanket.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ export function initialize(application) {
inject('confirm', 'service:confirm');
inject('sanitizer', 'service:sanitizer');

application.inject('component', 'routing', 'service:-routing');
application.inject('component', 'router', 'service:router');

}

export default {
Expand Down
2 changes: 1 addition & 1 deletion config/deprecation-workflow.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
window.deprecationWorkflow = window.deprecationWorkflow || {};
window.deprecationWorkflow.config = {
workflow: [
{ handler: 'silence', matchId: 'ember-router.router' }
{ handler: 'silence', matchId: 'ember-routing.route-router' }
]
};
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
},
"devDependencies": {
"async": "^2.4.1",
"babel-eslint": "^8.0.2",
"babel-eslint": "^8.2.3",
"broccoli-asset-rev": "^2.4.5",
"broccoli-persistent-filter": "^1.3.1",
"ember-ajax": "^3.0.0",
"ember-browserify": "^1.1.13",
"ember-cli": "~3.0.0",
"ember-cli": "~3.1.2",
"ember-cli-app-version": "^3.0.0",
"ember-cli-autoprefixer": "0.8.1",
"ember-cli-babel": "^6.6.0",
Expand Down Expand Up @@ -62,42 +62,42 @@
"ember-cli-uglify": "^2.0.0",
"ember-composable-helpers": "^2.0.0",
"ember-config-service": "^0.2.0",
"ember-data": "~3.0.0",
"ember-data": "~3.1.1",
"ember-data-has-many-query": "^0.2.0",
"ember-exam": "^1.0.0",
"ember-export-application-global": "^2.0.0",
"ember-fetch": "^3.4.5",
"ember-fullcalendar": "^1.7.0",
"ember-g-map": "0.0.25",
"ember-href-to": "1.14",
"ember-l10n": "^2.0.3",
"ember-href-to": "1.15.1",
"ember-l10n": "^2.0.4",
"ember-link-action": "0.0.38",
"ember-load-initializers": "^1.0.0",
"ember-lodash": "^4.17.5",
"ember-math-helpers": "^2.1.1",
"ember-math-helpers": "^2.4.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-metrics": "^0.12.1",
"ember-models-table": "^1.13.0",
"ember-moment": "^7.5.0",
"ember-notify": "^5.2.1",
"ember-resolver": "^4.1.0",
"ember-route-action-helper": "^2.0.5",
"ember-router-scroll": "^0.5.0",
"ember-router-scroll": "^0.6.0",
"ember-scroll-to": "^0.6.4",
"ember-simple-auth": "^1.5.1",
"ember-simple-auth-token": "^3.0.0",
"ember-source": "~3.0.0",
"ember-source": "https://s3.amazonaws.com/builds.emberjs.com/release/shas/50db6dc8001c127e5aeb2d6ddbacf9f9205d1d7b.tgz",
"ember-string-helpers": "^1.0.2",
"ember-truth-helpers": "^2.0.0",
"ember-uuid": "^1.0.0",
"eslint-plugin-ember-suave": "^1.0.0",
"gettext.js": "git://github.com/Cropster/gettext.js.git#master",
"google-material-color": "^1.3.1",
"http-status": "^1.0.1",
"loader.js": "^4.6.0",
"loader.js": "^4.7.0",
"object-to-formdata": "^1.4.3",
"query-string": "^6.0.0",
"qunit-dom": "^0.5.0",
"qunit-dom": "^0.6.2",
"sanitize-html": "^1.14.1",
"semantic-ui-ember": "^2.1.0",
"url-parse": "^1.3.0",
Expand Down
Loading

0 comments on commit 033e3a5

Please sign in to comment.