Skip to content

Commit 1d655ab

Browse files
Merge branch 'master' into modules-refactor
2 parents ce71c78 + e12dfad commit 1d655ab

File tree

8 files changed

+307
-354
lines changed

8 files changed

+307
-354
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

3+
/concat-stats-for
4+
35
# Terraform
46
terraform.tfstate
57
terraform.tfstate.backup

app/components/api-index-filter.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { computed } from '@ember/object';
22
import Component from '@ember/component';
3-
import _ from 'lodash';
3+
import uniq from 'npm:lodash.uniq';
4+
import sortBy from 'npm:lodash.sortby';
5+
46

57
export default Component.extend({
68
classNames: ['api-index-filter'],
@@ -46,7 +48,7 @@ export default Component.extend({
4648
if (!this.get('filterData.showDeprecated')) {
4749
items = items.filter(item => item.deprecated !== true);
4850
}
49-
return _.uniq(_.sortBy(items, 'name'), true, (item => item.name));
51+
return uniq(sortBy(items, 'name'), true, (item => item.name));
5052
},
5153

5254
filteredData: computed('filteredMethods', 'filteredProperties', 'filteredEvents', function() {

app/controllers/project-version.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import Controller from '@ember/controller';
22
import { computed } from '@ember/object';
33
import { A } from '@ember/array';
44
import { inject as service } from '@ember/service';
5-
import _ from 'lodash';
5+
import values from 'npm:lodash.values';
6+
import groupBy from 'npm:lodash.groupby';
67
import semverCompare from 'npm:semver-compare';
78
import FilterParams from '../mixins/filter-params';
89

@@ -73,9 +74,9 @@ export default Controller.extend(FilterParams, {
7374
const compactVersion = version.split('.').slice(0, 2).join('.');
7475
return { id: version, compactVersion };
7576
});
76-
let groupedVersions = _.groupBy(versions, version => version.compactVersion);
77+
let groupedVersions = groupBy(versions, version => version.compactVersion);
7778

78-
return _.values(groupedVersions).map(groupedVersion => groupedVersion[0]);
79+
return values(groupedVersions).map(groupedVersion => groupedVersion[0]);
7980
}),
8081

8182
selectedProjectVersion:computed('projectVersions.[]', 'model.version', function() {

app/controllers/project-version/modules/module.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { computed } from '@ember/object';
22
import { inject as service } from '@ember/service';
33
import ClassController from '../classes/class';
4-
import _ from 'lodash';
4+
import uniq from 'npm:lodash.uniq';
5+
import union from 'npm:lodash.union';
56

67
export default ClassController.extend({
78
filterData: service(),
@@ -23,7 +24,7 @@ export default ClassController.extend({
2324
}),
2425

2526
classesAndNamespaces: computed('classes', 'namespaces', function () {
26-
return _.uniq(_.union(this.get('namespaces'), this.get('classes')).sort(), true);
27+
return uniq(union(this.get('namespaces'), this.get('classes')).sort(), true);
2728
})
2829

2930
});

app/routes/project-version.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { inject as service } from '@ember/service';
22
import Route from '@ember/routing/route';
3-
import _ from 'lodash';
3+
import last from 'npm:lodash.last';
4+
45

56
export default Route.extend({
67

@@ -27,7 +28,7 @@ export default Route.extend({
2728
let namespaceParams = transition.params['project-version.namespaces.namespace'];
2829
if (!classParams && !moduleParams && !namespaceParams) {
2930
const namespaces = model.hasMany('namespaces').ids().sort();
30-
const namespace = _.last(namespaces[0].split("-"));
31+
const namespace = last(namespaces[0].split("-"));
3132
return this.transitionTo('project-version.namespaces.namespace', model.get('project.id'), model.get('compactVersion'), namespace);
3233
}
3334
},

bin/ember-fastboot

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,31 @@ const app = httpServer.app;
3838
/** We rewrite the 307 location header into a relativeURL so that our special setup is handled */
3939
app.use(function(req, res, next) {
4040
const originalSendFn = res.send;
41+
4142
res.send = function(data) {
4243
if (res.hasHeader('location')) {
43-
const originalLocation = res.getHeader('location');
44-
const relativeURL = new URL(originalLocation).pathname;
44+
let originalLocation = res.getHeader('location');
45+
46+
// FastBoot broke us once by removing the protocol so adding a check for safety
47+
if (originalLocation.startsWith('//')) {
48+
originalLocation = `http:${originalLocation}`;
49+
}
50+
51+
let relativeURL = '/api/ember/2.14/namespaces/Ember';
52+
53+
try {
54+
relativeURL = new URL(originalLocation).pathname;
55+
} catch (e) {
56+
console.log(`Original location value: ${originalLocation}`)
57+
console.log(e);
58+
}
59+
4560
res.setHeader('location', relativeURL);
4661
arguments[0] = arguments[0].replace(new RegExp(originalLocation, 'g'), relativeURL);
4762
}
4863
originalSendFn.apply(res, arguments);
4964
}
65+
5066
res.removeHeader('X-Powered-By');
5167
next();
5268
});

package.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@
1818
"test": "ember exam"
1919
},
2020
"dependencies": {
21-
"algoliasearch": "^3.24.0",
21+
"algoliasearch": "^3.24.3",
22+
"lodash.groupby": "^4.6.0",
23+
"lodash.last": "^3.0.0",
24+
"lodash.sortby": "^4.7.0",
25+
"lodash.union": "^4.6.0",
26+
"lodash.uniq": "^4.5.0",
27+
"lodash.values": "^4.3.0",
2228
"semver-compare": "^1.0.0"
2329
},
2430
"devDependencies": {
@@ -27,7 +33,7 @@
2733
"ember-algolia": "^0.0.6",
2834
"ember-anchor": "~0.1.8",
2935
"ember-browserify": "^1.2.0",
30-
"ember-cli": "^2.14.0",
36+
"ember-cli": "^2.14.1",
3137
"ember-cli-app-version": "^3.0.0",
3238
"ember-cli-autoprefixer": "^0.7.0",
3339
"ember-cli-babel": "^6.6.0",
@@ -38,47 +44,46 @@
3844
"ember-cli-deploy-build": "^1.1.0",
3945
"ember-cli-deploy-gzip": "^1.0.0",
4046
"ember-cli-document-title": "^0.3.3",
41-
"ember-cli-eslint": "^4.1.0",
42-
"ember-cli-fastboot": "^1.0.0-rc.6",
47+
"ember-cli-eslint": "^4.2.0",
48+
"ember-cli-fastboot": "^1.0.1",
4349
"ember-cli-head": "^0.3.1",
4450
"ember-cli-htmlbars": "^2.0.2",
4551
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
46-
"ember-cli-inject-live-reload": "^1.6.1",
52+
"ember-cli-inject-live-reload": "^1.7.0",
4753
"ember-cli-qunit": "^4.0.0",
4854
"ember-cli-sass": "^7.0.0",
4955
"ember-cli-shims": "^1.1.0",
50-
"ember-cli-template-lint": "^0.7.0",
56+
"ember-cli-template-lint": "^0.7.1",
5157
"ember-cli-uglify": "^1.2.0",
5258
"ember-composable-helpers": "^2.0.3",
5359
"ember-concurrency": "^0.8.7",
54-
"ember-data": "^2.14.4",
60+
"ember-data": "^2.14.8",
5561
"ember-data-fastboot": "0.1.0",
5662
"ember-disable-proxy-controllers": "^1.0.1",
5763
"ember-exam": "^0.7.0",
5864
"ember-export-application-global": "^2.0.0",
59-
"ember-fetch": "^3.2.8",
65+
"ember-fetch": "^3.2.9",
6066
"ember-inflector": "^2.0.1",
6167
"ember-load-initializers": "^1.0.0",
62-
"ember-lodash": "^4.17.5",
6368
"ember-maybe-import-regenerator": "^0.1.6",
6469
"ember-native-dom-helpers": "^0.5.2",
6570
"ember-normalize": "^1.0.0",
6671
"ember-percy": "^1.2.13",
6772
"ember-power-select": "^1.9.2",
6873
"ember-resolver": "^4.3.0",
69-
"ember-route-action-helper": "^2.0.3",
74+
"ember-route-action-helper": "^2.0.5",
7075
"ember-service-worker": "0.6.7",
7176
"ember-service-worker-asset-cache": "0.6.1",
7277
"ember-service-worker-cache-fallback": "0.6.1",
7378
"ember-service-worker-index": "0.6.1",
7479
"ember-source": "^2.14.1",
75-
"ember-svg-jar": "^0.10.3",
80+
"ember-svg-jar": "^0.11.1",
7681
"ember-test-selectors": "^0.3.6",
7782
"ember-tether": "1.0.0-beta.0",
7883
"ember-truth-helpers": "^1.3.0",
7984
"ember-web-app": "^2.0.0",
80-
"fastboot-app-server": "1.0.0-rc.5",
81-
"loader.js": "^4.5.1",
85+
"fastboot-app-server": "^1.0.1",
86+
"loader.js": "^4.6.0",
8287
"minimist": "^1.2.0",
8388
"normalize.css": "^7.0.0"
8489
},
@@ -97,7 +102,6 @@
97102
]
98103
},
99104
"fastbootDependencies": [
100-
"algoliasearch",
101-
"hide-powered-by"
105+
"algoliasearch"
102106
]
103107
}

0 commit comments

Comments
 (0)