Skip to content

Commit bea26ad

Browse files
committed
use pkg.homepage rather than ember-addon object
1 parent b0d1b16 commit bea26ad

File tree

19 files changed

+47
-76
lines changed

19 files changed

+47
-76
lines changed

blueprints/ember-cli-addon-docs/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = {
5757

5858
if (!updatedDemoUrl) {
5959
this.ui.writeWarnLine(
60-
`Unable to update the "ember-addon.demoUrl" configuration in your package.json. To include this for ` +
60+
`Unable to update the "homepage" configuration in your package.json. To include this for ` +
6161
`including a link on Ember Observer, set it to https://{ORGANIZATION}.github.io/{REPO}`
6262
);
6363
}

lib/utils/update-demo-url.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@ function repoFromPackage(packageJson) {
1919

2020
module.exports = function updateDemoUrl(packageJsonPath, gitConfigPath) {
2121
const packageJson = fs.readJsonSync(packageJsonPath);
22-
const addonConfig = packageJson['ember-addon'] || {};
23-
const hasDemo = addonConfig.demoUrl;
2422

25-
if (hasDemo) {
23+
// https://docs.npmjs.com/files/package.json#homepage
24+
if (packageJson.homepage) {
2625
return true;
2726
}
2827

2928
const repo = repoFromPackage(packageJson) || gitConfigUrl(gitConfigPath);
3029
const gitInfo = hostedGitInfo.fromUrl(repo);
3130

3231
if (gitInfo) {
33-
addonConfig.demoUrl = `https://${gitInfo.user}.github.io/${gitInfo.project}`;
34-
packageJson['ember-addon'] = addonConfig;
32+
packageJson.homepage = `https://${gitInfo.user}.github.io/${gitInfo.project}`;
3533

3634
fs.writeJSONSync(packageJsonPath, packageJson, {
3735
spaces: 2

tests-node/fixtures/update-demo-url/ember-addon-missing/output.json

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

tests-node/fixtures/update-demo-url/ember-addon-present/output.json

Lines changed: 0 additions & 7 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
22
"repository": "https://github.com/ember-learn/ember-cli-addon-docs",
3-
"ember-addon": {
4-
"configPath": "tests/dummy/config"
5-
}
3+
"homepage": "https://www.somewhere-else.com"
64
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"repository": "https://github.com/ember-learn/ember-cli-addon-docs",
3+
"homepage": "https://www.somewhere-else.com"
4+
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"repository": {
33
"url": "https://github.com/ember-learn/ember-cli-addon-docs"
4-
},
5-
"ember-addon": {
6-
"configPath": "tests/dummy/config"
74
}
85
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"repository": {
3+
"url": "https://github.com/ember-learn/ember-cli-addon-docs"
4+
},
5+
"homepage": "https://ember-learn.github.io/ember-cli-addon-docs"
6+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)