Skip to content

Commit e706d74

Browse files
bekicotbekicot
committed
Fix deprecation warning
Update ember to update deprecated dependency used by ember.
1 parent e9c8e3e commit e706d74

32 files changed

+4999
-2394
lines changed

‎.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/blueprints/*/files/**/*.js

‎.eslintrc.js

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,39 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 6,
4+
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'ember-cli-build.js',
24+
'testem.js',
25+
'blueprints/*/index.js',
26+
'config/**/*.js',
27+
'lib/*/index.js'
28+
],
29+
parserOptions: {
30+
sourceType: 'script',
31+
ecmaVersion: 2015
32+
},
33+
env: {
34+
browser: false,
35+
node: true
36+
}
37+
}
38+
]
1339
};

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414
/coverage/*
1515
/libpeerconnection.log
1616
npm-debug.log*
17+
yarn-error.log
1718
testem.log
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

‎app/adapters/issue.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
import Ember from 'ember';
1+
import { assign } from '@ember/polyfills';
22
import ApplicationAdapter from './application';
33

44
export default ApplicationAdapter.extend({
55
host: 'https://api.github.com',
6-
defaults: {
7-
sort: 'created',
8-
order: 'desc',
9-
q: 'state:open'
6+
init() {
7+
this._super();
8+
this.defaults = {
9+
sort: 'created',
10+
order: 'desc',
11+
q: 'state:open'
12+
};
1013
},
1114
query(store, type, query) {
12-
const q = query.q || ''
15+
const q = query.q || '';
1316
if(!(q).match(this.defaults.q || '')) {
1417
query.q = q + ` ${this.defaults.q}`
1518
}
1619
return this._super(
1720
store,
1821
type,
19-
Ember.assign({}, this.defaults, query)
22+
assign({}, this.defaults, query)
2023
);
2124
},
2225
});

‎app/app.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
import Ember from 'ember';
1+
import Application from '@ember/application';
22
import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
let App;
7-
8-
Ember.MODEL_FACTORY_INJECTIONS = true;
9-
Ember.deprecate = () => {};
10-
11-
App = Ember.Application.extend({
6+
const App = Application.extend({
127
modulePrefix: config.modulePrefix,
138
podModulePrefix: config.podModulePrefix,
149
Resolver

‎app/components/search-card.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44
actions: {
55
searchIssues(query) {
66
this.get('onSearch')(query);

‎app/controllers/application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Controller from '@ember/controller';
22

3-
export default Ember.Controller.extend({
3+
export default Controller.extend({
44
toggleSidenav: true,
55
actions: {
66
searchIssues(query) {

‎app/controllers/issues.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Controller from '@ember/controller';
22

3-
export default Ember.Controller.extend({
3+
export default Controller.extend({
44
actions: {
55
groupByRepo() {
66
this.groupModelByRepo();

‎app/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
{{content-for "head"}}
1111

12-
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13-
<link rel="stylesheet" href="{{rootURL}}assets/gsoc-prep-tasks.css">
12+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/gsoc-prep-tasks.css">
1414

1515
{{content-for "head-footer"}}
1616
</head>

‎app/models/issue.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import DS from 'ember-data';
2-
import Ember from 'ember';
2+
import { computed } from '@ember/object';
33

44
export default DS.Model.extend({
55
url: DS.attr(),
66
repository_url: DS.attr(),
7-
repository_id: Ember.computed('repository_url', function() {
7+
repository_id: computed('repository_url', function() {
88
const repoAry = this.get('repository_url').split('/');
99
return repoAry[repoAry.length - 1] + '/' + repoAry[repoAry.length - 2];
1010
}),
@@ -28,7 +28,7 @@ export default DS.Model.extend({
2828
user: DS.attr(),
2929
pullRequest: DS.attr(),
3030

31-
summary: Ember.computed('body', function() {
31+
summary: computed('body', function() {
3232
return this.get('body').slice(0, 30);
3333
})
3434
});

‎app/router.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Ember from 'ember';
1+
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = Ember.Router.extend({
4+
const Router = EmberRouter.extend({
55
location: config.locationType,
66
rootURL: config.rootURL
77
});

‎app/routes/application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Ember from 'ember';
1+
import Route from '@ember/routing/route';
22
import organizationList from '../organizations';
33

4-
export default Ember.Route.extend({
4+
export default Route.extend({
55
queryParams: {
66
q: {
77
refreshModel: true

‎app/routes/issues.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import Ember from 'ember';
2-
3-
export default Ember.Route.extend({
1+
import Route from '@ember/routing/route';
2+
export default Route.extend({
43
model() {
54
// Query params is available on parant route
65
const query = this.modelFor('application');

‎app/templates/components/read-more.hbs

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/templates/issues.hbs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
{{#card.title class="flex-nogrow"}}
2424
<h3>{{issue.title}}</h3>
2525
{{/card.title}}
26-
{{#card.content class="layout-column flex-grow"}}
27-
{{#read-more class="flex-nogrow" maxHeight="350px"}}
28-
{{markdown-to-html markdown=issue.body extensions='issueWrap'}}
29-
{{/read-more}}
30-
{{/card.content}}
26+
3127
{{#paper-button primary=true
3228
raised=true
3329
href=issue.html_url

‎bower.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "gsoc-prep-tasks",
33
"dependencies": {
4-
"remarkable": "^1.7.1",
54
"highlightjs": "^9.10.0",
65
"showdown": "^1.6.4",
76
"localforage": "~1.3.1"

‎config/environment.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/* eslint-env node */
1+
'use strict';
22

33
module.exports = function(environment) {
4-
var ENV = {
5-
modulePrefix: 'gsoc-prep-tasks',
6-
environment: environment,
7-
rootURL: '/',
8-
locationType: 'auto',
4+
let ENV = {
5+
APP: {
6+
// Here you can pass flags/options to your application instance
7+
// when it is created
8+
},
99
EmberENV: {
1010
FEATURES: {
1111
// Here you can enable experimental features on an ember canary build
@@ -17,10 +17,13 @@ module.exports = function(environment) {
1717
},
1818
// LOG_STACKTRACE_ON_DEPRECATION: false,
1919
},
20+
environment: environment,
21+
locationType: 'auto',
2022

21-
APP: {
22-
// Here you can pass flags/options to your application instance
23-
// when it is created
23+
modulePrefix: 'gsoc-prep-tasks',
24+
rootURL: '/',
25+
showdown: {
26+
simplifiedAutoLink: true
2427
}
2528
};
2629

@@ -41,6 +44,7 @@ module.exports = function(environment) {
4144
ENV.APP.LOG_VIEW_LOOKUPS = false;
4245

4346
ENV.APP.rootElement = '#ember-testing';
47+
ENV.APP.autoboot = false;
4448
}
4549

4650
if (environment === 'production') {

‎config/targets.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
'use strict';
2+
3+
const browsers = [
4+
'last 1 Chrome versions',
5+
'last 1 Firefox versions',
6+
'last 1 Safari versions'
7+
];
8+
9+
const isCI = !!process.env.CI;
10+
const isProduction = process.env.EMBER_ENV === 'production';
11+
12+
if (isCI || isProduction) {
13+
browsers.push('ie 11');
14+
}
15+
16+
module.exports = {
17+
browsers
18+
};

‎ember-cli-build.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
/* eslint-env node */
1+
'use strict';
2+
23
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
34

45
module.exports = function(defaults) {
5-
var app = new EmberApp(defaults, {
6+
let app = new EmberApp(defaults, {
67
// Add options here
78
});
89

@@ -19,5 +20,6 @@ module.exports = function(defaults) {
1920
// please specify an object with the list of modules as keys
2021
// along with the exports of each module as its value.
2122

23+
app.import('node_modules/showdown/dist/showdown.js');
2224
return app.toTree();
2325
};

‎package.json

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "gsoc-prep-tasks",
33
"version": "0.0.0",
4+
"private": true,
45
"description": "Small description for gsoc-prep-tasks goes here",
56
"license": "MIT",
67
"author": "",
@@ -11,47 +12,45 @@
1112
"repository": "",
1213
"scripts": {
1314
"build": "ember build",
14-
"start": "ember server",
15+
"lint:js": "eslint ./*.js app blueprints config lib server tests",
16+
"start": "ember serve",
1517
"test": "ember test"
1618
},
1719
"devDependencies": {
1820
"active-model-adapter": "^2.1.1",
1921
"broccoli-asset-rev": "^2.4.5",
20-
"ember-ajax": "^2.4.1",
22+
"ember-ajax": "^3.0.0",
2123
"ember-browserify": "^1.1.13",
22-
"ember-cli": "^2.13.0-beta.3",
23-
"ember-cli-app-version": "^2.0.0",
24-
"ember-cli-babel": "^5.1.7",
25-
"ember-cli-dependency-checker": "^1.3.0",
26-
"ember-cli-eslint": "^3.0.0",
27-
"ember-cli-htmlbars": "^1.1.1",
28-
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
24+
"ember-cli": "~3.1.4",
25+
"ember-cli-app-version": "^3.2.0",
26+
"ember-cli-babel": "^6.6.0",
27+
"ember-cli-dependency-checker": "^2.0.0",
28+
"ember-cli-eslint": "^4.2.1",
29+
"ember-cli-htmlbars": "^2.0.1",
30+
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
2931
"ember-cli-inject-live-reload": "^1.4.1",
30-
"ember-cli-qunit": "^3.1.0",
31-
"ember-cli-sass": "^6.1.2",
32-
"ember-cli-shims": "^1.0.2",
33-
"ember-cli-showdown": "^3.0.0",
32+
"ember-cli-qunit": "^4.1.1",
33+
"ember-cli-sass": "^7.1.7",
34+
"ember-cli-shims": "^1.2.0",
3435
"ember-cli-sri": "^2.1.0",
35-
"ember-cli-uglify": "^1.2.0",
36-
"ember-data": "^2.12.1",
37-
"ember-data-store-cache": "^1.0.0",
38-
"ember-export-application-global": "^1.0.5",
39-
"ember-load-initializers": "^0.6.0",
40-
"ember-localforage-adapter": "^2.2.1",
36+
"ember-cli-uglify": "^2.0.0",
37+
"ember-cli-update": "^0.21.4",
38+
"ember-data": "~3.1.0",
39+
"ember-maybe-import-regenerator": "^0.1.6",
4140
"ember-paper": "^1.0.0-alpha.19",
42-
"ember-read-more": "git+https://github.com/bekicot/ember-read-more.git",
43-
"ember-remarkable": "^3.6.0",
44-
"ember-resolver": "^2.0.3",
45-
"ember-source": "~2.12.0",
46-
"ember-welcome-page": "^2.0.2",
41+
"ember-source": "~3.1.0",
42+
"eslint-plugin-ember": "^5.0.0",
4743
"github-api": "https://github.com/github-tools/github/archive/v3.1.0.tar.gz",
4844
"loader.js": "^4.2.3"
4945
},
5046
"engines": {
51-
"node": ">= 4"
47+
"node": "^4.5 || 6.* || >= 7.*"
5248
},
53-
"private": true,
5449
"dependencies": {
50+
"ember-cli-showdown": "^4.4.2",
51+
"ember-export-application-global": "^2.0.0",
52+
"ember-load-initializers": "^1.1.0",
53+
"ember-resolver": "^4.5.5",
5554
"minimatch": "^3.0.3"
5655
}
5756
}

‎public/crossdomain.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)