Skip to content

Commit 4e9e04c

Browse files
sivakumar-kailasamsivakumar-kailasam
committed
Upgrade deps & changes arnd app blueprint
1 parent d679e39 commit 4e9e04c

File tree

16 files changed

+623
-1765
lines changed

16 files changed

+623
-1765
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ terraform.tfstate.backup
2020
/coverage/*
2121
/libpeerconnection.log
2222
npm-debug.log*
23+
yarn-error.log
2324
testem.log
2425

2526
public/json-docs/

‎app/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
let App = Ember.Application.extend({
6+
const App = Ember.Application.extend({
77
modulePrefix: config.modulePrefix,
88
podModulePrefix: config.podModulePrefix,
99
Resolver

‎app/components/api-index-filter.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@ export default Component.extend({
77
classNames: ['api-index-filter'],
88

99
filteredMethods: computed('model.methods.[]',
10-
'filterData.showInherited',
11-
'filterData.showProtected',
12-
'filterData.showPrivate',
13-
'filterData.showDeprecated',
14-
function() {
15-
return this.filterItems('methods');
16-
}),
10+
'filterData.showInherited',
11+
'filterData.showProtected',
12+
'filterData.showPrivate',
13+
'filterData.showDeprecated',
14+
function() {
15+
return this.filterItems('methods');
16+
}),
1717

1818
filteredEvents: computed('model.events.[]',
19-
'filterData.showInherited',
20-
'filterData.showProtected',
21-
'filterData.showPrivate',
22-
'filterData.showDeprecated',
23-
function() {
24-
return this.filterItems('events');
25-
}),
19+
'filterData.showInherited',
20+
'filterData.showProtected',
21+
'filterData.showPrivate',
22+
'filterData.showDeprecated',
23+
function() {
24+
return this.filterItems('events');
25+
}),
2626

2727
filteredProperties: computed('model.properties.[]',
28-
'filterData.showInherited',
29-
'filterData.showProtected',
30-
'filterData.showPrivate',
31-
'filterData.showDeprecated',
32-
function() {
33-
return this.filterItems('properties');
34-
}),
28+
'filterData.showInherited',
29+
'filterData.showProtected',
30+
'filterData.showPrivate',
31+
'filterData.showDeprecated',
32+
function() {
33+
return this.filterItems('properties');
34+
}),
3535

3636
filterItems(itemType) {
3737
let items = this.getWithDefault(`model.${itemType}`, []);

‎app/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

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

13-
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
14-
<link rel="stylesheet" href="{{rootURL}}assets/ember-api-docs.css">
13+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
14+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-api-docs.css">
1515
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600" rel="stylesheet">
1616

1717
{{content-for "head-footer"}}

‎app/routes/class.js

+33-33
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,45 @@ export default Ember.Route.extend({
77

88
model(params) {
99
return this.get('store').findRecord('project', 'ember', { includes: 'project-version' })
10-
.then((project) => {
11-
let versions = project.get('projectVersions').toArray();
12-
let lastVersion = getLastVersion(versions);
13-
//peel off the .html
14-
let className = params['class'].substr(0, params['class'].lastIndexOf('.'));
15-
let id = `ember-${lastVersion}-${className}`;
16-
return Ember.RSVP.hash({
17-
project: Ember.RSVP.resolve(project),
18-
version: Ember.RSVP.resolve(lastVersion),
19-
classData: this.store.find('class', id)
20-
.then((classData) => {
21-
return {
22-
type: 'class',
23-
data: classData
24-
};
25-
})
26-
.catch(() => {
27-
return this.store.find('namespace', id).then((classData) => {
28-
return {
29-
type: 'namespace',
30-
data: classData
31-
};
32-
});
33-
})
34-
.catch((e) => {
35-
return this.transitionTo('project-version');
10+
.then((project) => {
11+
let versions = project.get('projectVersions').toArray();
12+
let lastVersion = getLastVersion(versions);
13+
//peel off the .html
14+
let className = params['class'].substr(0, params['class'].lastIndexOf('.'));
15+
let id = `ember-${lastVersion}-${className}`;
16+
return Ember.RSVP.hash({
17+
project: Ember.RSVP.resolve(project),
18+
version: Ember.RSVP.resolve(lastVersion),
19+
classData: this.store.find('class', id)
20+
.then((classData) => {
21+
return {
22+
type: 'class',
23+
data: classData
24+
};
25+
})
26+
.catch(() => {
27+
return this.store.find('namespace', id).then((classData) => {
28+
return {
29+
type: 'namespace',
30+
data: classData
31+
};
32+
});
33+
})
34+
.catch((e) => {
35+
return this.transitionTo('project-version');
36+
})
3637
})
3738
})
38-
})
39-
.catch((e) => {
40-
return this.transitionTo('project-version');
41-
});
39+
.catch((e) => {
40+
return this.transitionTo('project-version');
41+
});
4242
},
4343

4444
redirect(model) {
4545
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
46-
model.project.id,
47-
model.version,
48-
model.classData.data.get('name'));
46+
model.project.id,
47+
model.version,
48+
model.classData.data.get('name'));
4949
},
5050

5151
serialize(model) {

‎app/routes/data-class.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ export default Ember.Route.extend({
3737
},
3838
redirect(model) {
3939
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
40-
model.project.id,
41-
model.version,
42-
model.classData.data.get('name'));
40+
model.project.id,
41+
model.version,
42+
model.classData.data.get('name'));
4343
},
4444

4545
serialize(model) {

‎app/routes/data-module.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ export default Ember.Route.extend({
2929
},
3030
redirect(model) {
3131
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
32-
model.project.id,
33-
model.version,
34-
model.classData.data.get('name'));
32+
model.project.id,
33+
model.version,
34+
model.classData.data.get('name'));
3535
},
3636

3737
serialize(model) {

‎app/routes/module.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export default Ember.Route.extend({
2828

2929
redirect(model) {
3030
return this.transitionTo(`project-version.${inflector.pluralize(model.classData.type)}.${model.classData.type}`,
31-
model.project.id,
32-
model.version,
33-
model.classData.data.get('name'));
31+
model.project.id,
32+
model.version,
33+
model.classData.data.get('name'));
3434
},
3535

3636
serialize(model) {

‎app/templates/project-version/classes/class.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<span class="attribute-label">Uses:</span>
1717
<span class="attribute-value">
1818
{{#each model.uses as |parentClass idx|}}
19-
{{#unless (eq idx 0)}}<span class="comma">,</span>{{/unless}}
19+
{{#if (not-eq idx 0)}}<span class="comma">,</span>{{/if}}
2020
{{#link-to 'project-version.classes.class' model.usedClassProjectName model.usedClassVersion parentClass}}{{parentClass}}{{/link-to}}
2121
{{/each}}
2222
</span>

‎bower.json

-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
"bourbon": "^4.2.7",
55
"bitters": "^1.5.0",
66
"neat": "^1.8.0",
7-
"lodash": "~3.7.0",
87
"remarkable": "^1.7.1",
98
"highlightjs": "^9.8.0"
10-
},
11-
"resolutions": {
12-
"FakeXMLHttpRequest": "^1.4.0",
13-
"route-recognizer": "^0.2.3"
149
}
1510
}

‎config/environment.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* eslint-env node */
22
module.exports = function(environment) {
3-
var ALGOLIA_APP_ID = process.env.ALGOLIA_APP_ID || 'BH4D9OD16A';
4-
var ALGOLIA_API_KEY = process.env.ALGOLIA_API_KEY || '760969ef081fcadc7e0e60faefdb0907';
3+
let ALGOLIA_APP_ID = process.env.ALGOLIA_APP_ID || 'BH4D9OD16A';
4+
let ALGOLIA_API_KEY = process.env.ALGOLIA_API_KEY || '760969ef081fcadc7e0e60faefdb0907';
55

6-
var ENV = {
6+
let ENV = {
77
modulePrefix: 'ember-api-docs',
8-
environment: environment,
8+
environment,
99
rootURL: '/',
1010
routerRootURL: '/',
1111
locationType: 'auto',
@@ -62,7 +62,7 @@ module.exports = function(environment) {
6262
ENV.contentSecurityPolicy = {
6363
"default-src": "'self' *.fastly.net",
6464
"connect-src": "'self' *.algolia.net *.algolianet.com *.fastly.net",
65-
"script-src": "'self' unsafe-inline use.typekit.net 'sha256-36n/xkZHEzq3lo4O+0jXMYbl+dWu3C8orOFHtcAH6HU=' *.fastly.net https://www.google-analytics.com",
65+
"script-src": "'self' unsafe-inline use.typekit.net 'sha256-MNuF6TzV3gmv/+u8a3VX42UzW4hLNNj8hfFTcdh9jDM=' *.fastly.net https://www.google-analytics.com",
6666
"font-src": "'self' data://* https://fonts.gstatic.com *.fastly.net",
6767
"img-src": "'self' data://* *.fastly.net https://www.google-analytics.com",
6868
"style-src": "'self' 'unsafe-inline' https://fonts.googleapis.com *.fastly.net"

‎config/target.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* eslint-env node */
2+
module.exports = {
3+
browsers: [
4+
'ie 9',
5+
'last 1 Chrome versions',
6+
'last 1 Firefox versions',
7+
'last 1 Safari versions'
8+
]
9+
};

‎ember-cli-build.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
/* eslint-env node: true */
2-
let EmberApp = require('ember-cli/lib/broccoli/ember-app');
1+
/* eslint-env node */
2+
'use strict';
3+
4+
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
35

46
module.exports = function(defaults) {
57
let prepend = '';

‎package.json

+15-16
Original file line numberDiff line numberDiff line change
@@ -39,55 +39,54 @@
3939
"ember-a11y-testing": "^0.4.2",
4040
"ember-algolia": "^0.0.6",
4141
"ember-anchor": "~0.1.8",
42-
"ember-browserify": "~1.1.13",
43-
"ember-cli": "~2.13.2",
42+
"ember-browserify": "^1.1.14",
43+
"ember-cli": "^2.14.0",
4444
"ember-cli-app-version": "^3.0.0",
4545
"ember-cli-autoprefixer": "^0.7.0",
46-
"ember-cli-babel": "^6.4.1",
46+
"ember-cli-babel": "^6.6.0",
4747
"ember-cli-bourbon": "^1.2.2",
4848
"ember-cli-content-security-policy": "^0.6.1",
4949
"ember-cli-dependency-checker": "^2.0.0",
5050
"ember-cli-deploy": "^1.0.1",
5151
"ember-cli-deploy-build": "^1.1.0",
5252
"ember-cli-deploy-gzip": "^1.0.0",
5353
"ember-cli-document-title": "^0.3.3",
54-
"ember-cli-eslint": "^3.1.0",
55-
"ember-cli-fastboot": "sivakumar-kailasam/ember-cli-fastboot#relative-location-redirect",
54+
"ember-cli-eslint": "^4.1.0",
55+
"ember-cli-fastboot": "^1.0.0-rc.5",
5656
"ember-cli-head": "^0.3.0",
5757
"ember-cli-htmlbars": "^2.0.2",
5858
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
5959
"ember-cli-inject-live-reload": "^1.6.1",
6060
"ember-cli-qunit": "^4.0.0",
61-
"ember-cli-release": "^1.0.0-beta.2",
62-
"ember-cli-sass": "^6.2.0",
61+
"ember-cli-sass": "^7.0.0",
6362
"ember-cli-shims": "^1.1.0",
64-
"ember-cli-template-lint": "^0.5.2",
63+
"ember-cli-template-lint": "^0.7.0",
6564
"ember-cli-uglify": "^1.2.0",
66-
"ember-composable-helpers": "^2.0.1",
65+
"ember-composable-helpers": "^2.0.3",
6766
"ember-concurrency": "^0.8.5",
6867
"ember-data": "^2.13.1",
6968
"ember-data-fastboot": "0.1.0",
7069
"ember-disable-proxy-controllers": "^1.0.1",
7170
"ember-exam": "^0.7.0",
7271
"ember-export-application-global": "^2.0.0",
73-
"ember-fetch": "^2.1.0",
72+
"ember-fetch": "^3.2.7",
7473
"ember-inflector": "^2.0.1",
7574
"ember-load-initializers": "^1.0.0",
76-
"ember-lodash": "^4.17.4",
75+
"ember-lodash": "^4.17.5",
7776
"ember-maybe-import-regenerator": "^0.1.6",
78-
"ember-native-dom-helpers": "^0.4.2",
77+
"ember-native-dom-helpers": "^0.5.2",
7978
"ember-power-select": "^1.8.5",
80-
"ember-resolver": "^4.1.0",
79+
"ember-resolver": "^4.2.1",
8180
"ember-route-action-helper": "^2.0.3",
8281
"ember-service-worker": "0.6.7",
8382
"ember-service-worker-asset-cache": "0.6.1",
8483
"ember-service-worker-cache-fallback": "0.6.1",
8584
"ember-service-worker-index": "0.6.1",
86-
"ember-source": "~2.13.3",
87-
"ember-test-selectors": "^0.3.4",
85+
"ember-source": "^2.14.0",
86+
"ember-test-selectors": "^0.3.5",
8887
"ember-tether": "1.0.0-beta.0",
8988
"ember-truth-helpers": "^1.3.0",
90-
"ember-web-app": "1.3.0",
89+
"ember-web-app": "^1.3.1",
9190
"ember-web-app-rename": "1.0.0",
9291
"fastboot-app-server": "1.0.0-rc.5",
9392
"loader.js": "^4.4.1",

‎tests/helpers/module-for-acceptance.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Ember from 'ember';
33
import startApp from '../helpers/start-app';
44
import destroyApp from '../helpers/destroy-app';
55

6-
const { RSVP: { Promise } } = Ember;
6+
const { RSVP: { resolve } } = Ember;
77

88
export default function(name, options = {}) {
99
module(name, {
@@ -17,7 +17,7 @@ export default function(name, options = {}) {
1717

1818
afterEach() {
1919
let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
20-
return Promise.resolve(afterEach).then(() => destroyApp(this.application));
20+
return resolve(afterEach).then(() => destroyApp(this.application));
2121
}
2222
});
2323
}

0 commit comments

Comments
 (0)