Skip to content

Commit

Permalink
Merge pull request #179 from rwjblue/babel-6
Browse files Browse the repository at this point in the history
Update to Babel 6.
  • Loading branch information
rwjblue authored Mar 24, 2017
2 parents 81c3d0b + 0bc5fd5 commit 9966909
Show file tree
Hide file tree
Showing 3 changed files with 1,463 additions and 947 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"url": "git+https://github.com/ember-cli/ember-resolver.git"
},
"engines": {
"node": ">= 0.12"
"node": ">= 4"
},
"author": "Robert Jackson <[email protected]>",
"license": "MIT",
Expand All @@ -25,7 +25,7 @@
"ember-cli-app-version": "^2.0.1",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars": "^1.0.3",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0",
"ember-cli-qunit": "^3.1.1",
Expand All @@ -40,7 +40,7 @@
"ember-addon"
],
"dependencies": {
"ember-cli-babel": "^5.1.6",
"ember-cli-babel": "^6.0.0-beta.7",
"ember-cli-version-checker": "^1.1.6"
},
"ember-addon": {
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/resolvers/classic/basic-test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* globals requirejs, require */
/* globals requirejs */

import Ember from 'ember';
import require from 'require';
import { module, test } from 'qunit';
import Resolver from 'ember-resolver/resolvers/classic';

Expand Down
Loading

0 comments on commit 9966909

Please sign in to comment.