Skip to content

Cleanup Ember dependencies #772

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.

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

Merged
merged 17 commits into from
Jun 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions app/components/download-graph.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Ember from 'ember';
import _ from 'lodash';

export default Ember.Component.extend({
classNames: 'graph-data',
Expand Down Expand Up @@ -112,7 +111,7 @@ export default Ember.Component.extend({
// Walk over the headers/colums in reverse order, as the newest version
// is at the end, but in the UI we want it at the top of the chart legend.

_.range(headers.length - 1, 0, -1).forEach((dataCol, i) => {
range(headers.length - 1, 0, -1).forEach((dataCol, i) => {
columns.push(dataCol); // add the column itself
columns.push({ // add a 'calculated' column, the moving average
type: 'number',
Expand Down Expand Up @@ -154,3 +153,11 @@ export default Ember.Component.extend({
});
},
});

function range(start, end, step) {
let array = [];
for (let i = start; i !== end; i += step) {
array.push(i);
}
return array;
}
4 changes: 2 additions & 2 deletions app/templates/crates.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
{{/link-to}}
{{/each}}

{{#x-select value=letter}}
{{#x-select value=letter action=(action (mut letter)) as |xs|}}
<option>Filter by the letter...</option>
{{#each alphabet as |letter|}}
{{#x-option value=letter}}{{ letter }}{{/x-option}}
{{#xs.option value=letter}}{{ letter }}{{/xs.option}}
{{/each}}
{{/x-select}}
</div>
Expand Down
5 changes: 0 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
"name": "cargo",
"dependencies": {
"Faker": "3.1.0",
"jquery": "3.2.1",
"lodash": "4.17.4",
"ember": "2.12.0",
"moment": "2.17.1",
"moment-timezone": "0.5.11",
"normalize-css": "5.0.0",
"pretender": "1.4.2",
"clipboard": "1.6.1"
Expand Down
1 change: 0 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ module.exports = function(defaults) {
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.

app.import('bower_components/moment/moment.js');
app.import('bower_components/normalize-css/normalize.css');
app.import('bower_components/clipboard/dist/clipboard.js');
return app.toTree();
Expand Down
26 changes: 12 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,35 @@
"devDependencies": {
"bower": "1.8.0",
"broccoli-asset-rev": "2.5.0",
"ember-ajax": "2.5.6",
"ember-ajax": "^3.0.0",
"ember-cli": "2.12.0",
"ember-cli-app-version": "2.0.2",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "5.2.4",
"ember-cli-dependency-checker": "1.3.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-htmlbars": "1.2.0",
"ember-cli-htmlbars-inline-precompile": "0.3.6",
"ember-cli-ic-ajax": "1.0.0",
"ember-cli-inject-live-reload": "1.6.1",
"ember-cli-jshint": "2.0.1",
"ember-cli-meta-tags": "3.0.4",
"ember-cli-mirage": "0.2.9",
"ember-cli-moment-shim": "3.0.1",
"ember-cli-qunit": "3.1.2",
"ember-cli-release": "0.2.9",
"ember-cli-sass": "6.1.2",
"ember-cli-shims": "1.0.2",
"ember-cli-moment-shim": "^3.3.1",
"ember-cli-qunit": "^4.0.0",
"ember-cli-sass": "^6.2.0",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-test-loader": "1.1.1",
"ember-cli-uglify": "1.2.0",
"ember-data": "2.12.1",
"ember-export-application-global": "1.1.1",
"ember-load-initializers": "0.6.3",
"ember-lodash": "4.17.1",
"ember-moment": "7.3.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-moment": "^7.3.1",
"ember-page-title": "3.1.5",
"ember-resolver": "3.0.0",
"ember-route-alias": "0.1.5",
"ember-router-scroll": "0.1.1",
"ember-source": "2.12.0",
"ember-suave": "4.0.1",
"emberx-select": "2.2.3",
"emberx-select": "^3.0.1",
"loader.js": "4.2.3"
}
}
12 changes: 0 additions & 12 deletions testem.json

This file was deleted.

4 changes: 2 additions & 2 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import resolver from './helpers/resolver';
import registerSelectHelper from './helpers/register-select-helper';
registerSelectHelper();
import {
setResolver
} from 'ember-qunit';
import { start } from 'ember-cli-qunit';

setResolver(resolver);
start();
Loading