Skip to content

Commit

Permalink
bump ember-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
sly7-7 committed Feb 21, 2017
1 parent b50ed5c commit c2ca068
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 27 deletions.
9 changes: 1 addition & 8 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{
"name": "ember-data",
"license": "MIT",
"dependencies": {
"ember": "components/ember#release",
"ember-cli-shims": "0.1.1",
"pretender": "^0.12.0"
},
"resolutions": {
"ember": "release"
}
"dependencies": {}
}
32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
"bower": "bower install",
"production": "ember build --environment=production"
},
"engines": {
"node": ">= 0.10.0"
},
"author": "",
"license": "MIT",
"dependencies": {
Expand All @@ -32,7 +29,7 @@
"broccoli-file-creator": "^1.0.0",
"broccoli-merge-trees": "^1.0.0",
"chalk": "^1.1.1",
"ember-cli-babel": "^5.1.6",
"ember-cli-babel": "^5.1.7",
"ember-cli-path-utils": "^1.0.0",
"ember-cli-string-utils": "^1.0.0",
"ember-cli-test-info": "^1.0.0",
Expand All @@ -49,44 +46,46 @@
},
"devDependencies": {
"bower": "^1.6.5",
"broccoli-asset-rev": "^2.4.2",
"broccoli-asset-rev": "^2.4.5",
"broccoli-concat": "0.0.13",
"broccoli-funnel": "^1.0.0",
"broccoli-stew": "^1.0.1",
"broccoli-string-replace": "^0.1.1",
"broccoli-uglify-sourcemap": "^1.0.1",
"broccoli-yuidoc": "^2.1.0",
"ember-ajax": "^2.0.1",
"ember-cli": "^2.8.0",
"ember-cli-app-version": "^1.0.0",
"ember-ajax": "^2.4.1",
"ember-cli": "^2.11.1",
"ember-cli-app-version": "^2.0.0",
"ember-cli-blueprint-test-helpers": "0.11.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "1.3.0",
"ember-cli-htmlbars": "^1.0.3",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-internal-test-helpers": "^0.8.1",
"ember-cli-pretender": "0.6.0",
"ember-cli-pretender": "^1.0.1",
"ember-cli-qunit": "^2.1.0",
"ember-cli-release": "^0.2.9",
"ember-cli-shims": "^1.0.2",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-dev": "emberjs/ember-dev#bcfb9c3487ec2fd58b932394a15ce16fd9cf7eed",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1",
"ember-load-initializers": "^0.6.0",
"ember-publisher": "0.0.7",
"ember-resolver": "^2.0.3",
"ember-source": "~2.11.0",
"ember-watson": "^0.7.0",
"express": "^4.14.0",
"faker": "^3.1.0",
"github": "^0.2.4",
"glob": "5.0.13",
"heimdall-query": "^0.0.5",
"json-api-mock-server": "0.1.1",
"loader.js": "^4.0.1",
"loader.js": "^4.0.10",
"mocha": "2.4.5",
"mocha-only-detector": "0.0.2",
"morgan": "^1.7.0",
Expand All @@ -98,6 +97,9 @@
"peerDependencies": {
"ember-inflector": "^1.9.4"
},
"engines": {
"node": ">= 0.12.0"
},
"keywords": [
"ember-addon"
],
Expand Down
3 changes: 0 additions & 3 deletions server/.jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{{content-for "body"}}
{{content-for "test-body"}}

<script src="{{rootURL}}testem.js" integrity=""></script>
<script src="/testem.js" integrity=""></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
<script src="{{rootURL}}assets/dummy.js"></script>
Expand Down

0 comments on commit c2ca068

Please sign in to comment.