Skip to content

Commit 4f4d17e

Browse files
Merge pull request #597 from ember-learn/subdomain-setup
Subdomain setup
2 parents f56b368 + b77c0b1 commit 4f4d17e

File tree

10 files changed

+19
-94
lines changed

10 files changed

+19
-94
lines changed

.env.sample

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

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Questions
22

3-
This is the issue tracker for [Ember.js API](https://emberjs.com/api/).
3+
This is the issue tracker for [Ember.js API](https://api.emberjs.com/).
44

55
# Issue Labeling
66

@@ -15,8 +15,8 @@ Think you've found a bug or have a new feature to suggest? Let us know!
1515
1. Search for similar issues. It's possible somebody has encountered
1616
this bug already.
1717

18-
2. Please make sure you provide very specific steps to reproduce the error.
19-
If we cannot reproduce it, we will close the ticket. Screenshots or [recorded gifs](https://www.cockos.com/licecap/) of
18+
2. Please make sure you provide very specific steps to reproduce the error.
19+
If we cannot reproduce it, we will close the ticket. Screenshots or [recorded gifs](https://www.cockos.com/licecap/) of
2020
the issue that you are experiencing will help towards reproducing and solving issues sooner.
2121

2222
4. Your issue will be verified. The provided example will be tested for
@@ -109,11 +109,11 @@ to know that you have a clean slate: `yarn install && bower install && yarn test
109109

110110
3. Add a test for your change. Only refactoring and documentation changes
111111
require no new tests. If you are adding functionality or fixing a bug, we need
112-
a test!
112+
a test!
113113

114114
4. Make the test pass.
115115

116-
5. Commit your changes. If your pull request fixes an issue specify it in the commit message.
116+
5. Commit your changes. If your pull request fixes an issue specify it in the commit message.
117117

118118
6. Push to your fork and submit a pull request. Please provide us with some
119119
explanation of why you made the changes you made. For new features make sure to
@@ -123,7 +123,7 @@ We try to be quick about responding to tickets but sometimes we get a bit
123123
backlogged. If the response is slow, try to find someone on slack (#team-learning) to
124124
give the ticket a review.
125125

126-
Including tests that fail without your code, and making it pass will increase the chance
126+
Including tests that fail without your code, and making it pass will increase the chance
127127
that your pull request is accepted.
128128

129129
And in case we didn't emphasize it enough: we love tests!

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# [Ember API Docs](https://emberjs.com/api/) [![Build Status](https://travis-ci.org/ember-learn/ember-api-docs.svg?branch=master)](https://travis-ci.org/ember-learn/ember-api-docs)
1+
# [Ember API Docs](https://api.emberjs.com/) [![Build Status](https://travis-ci.org/ember-learn/ember-api-docs.svg?branch=master)](https://travis-ci.org/ember-learn/ember-api-docs)
22

3-
This project contains only the [API docs](https://emberjs.com/api) portion of [Emberjs.com](https://emberjs.com/). If you're looking for the rest of the site,
3+
This project contains only the [API docs](https://api.emberjs.com/) portion of [Emberjs.com](https://emberjs.com/). If you're looking for the rest of the site,
44
see the [website](https://github.com/emberjs/website)
55
and [guides](https://github.com/emberjs/guides) repositories.
66

77
There are many pieces that together create the Ember API docs site:
8-
- The app in this repository, which fetches and displays the API docs data. It is what you see at
9-
[https://emberjs.com/api](https://emberjs.com/api)
10-
- The YUIdoc code comments found in the
8+
- The app in this repository, which fetches and displays the API docs data. It is what you see at
9+
[https://api.emberjs.com/](https://api.emberjs.com/)
10+
- The YUIdoc code comments found in the
1111
[Ember.js codebase](https://github.com/emberjs/ember.js), where the informational content of the API documentation can be edited
1212
- The data generator that serializes code comments into JSONAPI and
1313
deploys the result,
@@ -18,10 +18,10 @@ a component and styling library shared across apps.
1818

1919
## Contributing
2020

21-
New contributors are welcome! This project is is maintained by an all-volunteer team,
21+
New contributors are welcome! This project is is maintained by an all-volunteer team,
2222
and we are thankful for your help.
2323

24-
The best way to get started is to find issue labeled "good first issue" or "help wanted." If you have questions or want a buddy to pair with, drop by the #-team-learning channel on the
24+
The best way to get started is to find issue labeled "good first issue" or "help wanted." If you have questions or want a buddy to pair with, drop by the #-team-learning channel on the
2525
[Ember Community Slack](https://ember-community-slackin.herokuapp.com/).
2626
Like most open source projects, contributors are encouraged to open an issue
2727
to propose changes and iterate on ideas before investing time in coding.
@@ -33,7 +33,7 @@ Please also see [CONTRIBUTING.md](CONTRIBUTING.md).
3333
## Quickstart to run semi-locally
3434

3535
Follow these instructions to run the app using publically available online data.
36-
You do not need to run [ember-jsonapi-docs](https://github.com/ember-learn/ember-jsonapi-docs)
36+
You do not need to run [ember-jsonapi-docs](https://github.com/ember-learn/ember-jsonapi-docs)
3737
locally yourself.
3838

3939
```

app.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,9 @@
33
"scripts": {
44
},
55
"env": {
6-
"DOCS_SLUG": {
7-
"required": false,
8-
"value": "/api/"
9-
},
106
"FASTLY_API_KEY": {
117
"required": false
128
},
13-
"FASTLY_CDN_URL": {
14-
"required": false
15-
},
169
"FASTLY_SERVICE_ID": {
1710
"required": false
1811
},

app/controllers/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const links = [{
88
name: 'Ember.js Guides',
99
type: 'link'
1010
}, {
11-
href: 'https://emberjs.com/api',
11+
href: 'https://api.emberjs.com',
1212
name: 'API Reference',
1313
type: 'link'
1414
}, {

app/routes/project-version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default Route.extend({
5757
this.set('headData.urlVersion', projectVersion);
5858
if (!this.get('headData.isRelease')) {
5959
let request = this.get('fastboot.request');
60-
let href = this.get('fastboot.isFastBoot') ? `${request.protocol}//emberjs.com/api${request.path}` : window.location.href;
60+
let href = this.get('fastboot.isFastBoot') ? `https://api.emberjs.com/${request.path}` : window.location.href;
6161
let version = new RegExp(model.get('compactVersion'), 'g')
6262
let canonicalUrl = href.replace(version, 'release');
6363
this.set('headData.canonicalUrl', canonicalUrl);

app/services/legacy-module-mappings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default Service.extend({
3232
},
3333

3434
fetch() {
35-
return fetch(`${config.APP.cdnUrl}/assets/mappings.json`);
35+
return fetch('/assets/mappings.json');
3636
},
3737

3838
getModule(name, documentedModule) {

bin/ember-fastboot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ app.use(function(req, res, next) {
5555
originalLocation = `http:${originalLocation}`;
5656
}
5757

58-
let relativeURL = '/api/ember/2.14/namespaces/Ember';
58+
let relativeURL = '/ember/2.14/namespaces/Ember';
5959

6060
try {
6161
relativeURL = new URL(originalLocation).pathname;

config/environment.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module.exports = function(environment) {
2525
// Here you can pass flags/options to your application instance
2626
// when it is created
2727
scrollContainerSelector: 'body, html',
28-
cdnUrl: process.env.FASTLY_CDN_URL ? `https://${process.env.FASTLY_CDN_URL}` : 'https://ember-api-docs-frontend.global.ssl.fastly.net'
2928
},
3029

3130
fastboot: {
@@ -96,16 +95,7 @@ module.exports = function(environment) {
9695
"style-src": "'self' 'unsafe-inline' https://fonts.googleapis.com *.fastly.net"
9796
};
9897

99-
if (environment === 'production') {
100-
101-
/**
102-
* Ideally we want this to be only for fast boot. But we have to wait for
103-
* https://github.com/ember-fastboot/ember-cli-fastboot/issues/254 to be
104-
* solved for that
105-
*/
106-
ENV.routerRootURL = process.env.DOCS_SLUG ? process.env.DOCS_SLUG : '/api/';
107-
108-
}
98+
// if (environment === 'production') {}
10999

110100
return ENV;
111101
};

ember-cli-build.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ const Funnel = require('broccoli-funnel');
55
const mergeTrees = require('broccoli-merge-trees');
66

77
module.exports = function(defaults) {
8-
let prepend = '';
9-
if ('FASTLY_CDN_URL' in process.env) {
10-
prepend = `https://${process.env.FASTLY_CDN_URL}/`;
11-
}
12-
138
let app = new EmberApp(defaults, {
149
fingerprint: {
1510
extensions: ['js', 'css', 'jpg', 'png', 'gif', 'map', 'svg', 'webmanifest'],
16-
prepend,
1711
generateAssetMap: true
1812
},
1913
sassOptions: {
@@ -31,7 +25,6 @@ module.exports = function(defaults) {
3125
},
3226
'asset-cache': {
3327
version: '4', //Might have to change this with the app build,
34-
prepend
3528
},
3629
svgJar: {
3730
sourceDirs: ['public/assets/images']

0 commit comments

Comments
 (0)