fix(fusumarc): decide repositoryUrl automatically

README.md

@@ -169,7 +169,6 @@ meta:
   description: Explain how specifications are determined and how it will be in the future.
   thumbnail: https://avatars1.githubusercontent.com/u/1725583?v=4&s=200
   siteName: slides.hiroppy.me
-  repositoryUrl: https://github.com/hiroppy/fusuma
   sns:
     - twitter
     - hatena
@@ -204,8 +203,7 @@ module.exports = {
     description: 'test',
     thumbnail: 'url',
     siteName: 'siteName',
-    sns: ['twitter', 'hatena'],
-    repositoryUrl: 'https://github.com/hiroppy/fusuma'
+    sns: ['twitter', 'hatena']
   },
   slide: {
     loop: true,

packages/configs/src/fusumarc.js

@@ -13,7 +13,6 @@ const config = {
   meta: {
     url: null,
     name: null,
-    author: null,
     thumbnail: null,
     description: null,
     sns: ['twitter'] // twitter, hatena

packages/fusuma/src/tasks.js

@@ -17,7 +17,7 @@ async function initProcess({ schema }) {
 async function startProcess(basePath) {
   const spinner = loader('Starting with webpack-dev-server...').start();
   const config = await fusuma.read(basePath);
-  const remoteOrigin = await getRemoteOriginUrl(basePath);
+  const remoteOrigin = await getRemoteOriginUrl();
 
   start(
     {
@@ -36,7 +36,7 @@ async function startProcess(basePath) {
 async function buildProcess(basePath, extendedConfig = {}, isOutput = true) {
   const spinner = loader('Building with webpack...').start();
   const config = merge(await fusuma.read(basePath), extendedConfig);
-  const remoteOrigin = await getRemoteOriginUrl(basePath);
+  const remoteOrigin = await getRemoteOriginUrl();
 
   await deleteDir(join(basePath, 'dist'));
   await build(

packages/utils/package.json

@@ -18,7 +18,7 @@
   "homepage": "https://github.com/hiroppy/fusuma#readme",
   "dependencies": {
     "child-process-promise": "^2.2.1",
-    "remote-origin-url": "2.0.0",
+    "git-remote-origin-url": "^3.0.0",
     "rmfr": "2.0.0"
   }
 }

packages/utils/src/getRemoteOriginUrl.js

@@ -1,21 +1,20 @@
 'use strict';
 
-const remoteOriginUrl = require('remote-origin-url');
+const gitRemoteOriginUrl = require('git-remote-origin-url');
 
-function getRemoteOriginUrl(basePath) {
-  return new Promise((resolve) => {
-    remoteOriginUrl(`${basePath}/.git/config`, (err, url) => {
-      if (err) {
-        console.error('Could not find github url');
-        resolve('');
-      } else {
-        url = url || '';
+async function getRemoteOriginUrl() {
+  try {
+    let url = await gitRemoteOriginUrl();
 
-        if (url.includes('git@')) resolve(`https://github.com/${url.split(':')[1]}`);
-        else resolve(url);
-      }
-    });
-  });
+    if (url.includes('git@')) {
+      url = `https://github.com/${url.split(':')[1]}`;
+    }
+
+    return url;
+  } catch (e) {
+    console.error(e);
+    return '';
+  }
 }
 
 module.exports = getRemoteOriginUrl;

packages/webpack/src/webpack.config.js

@@ -8,6 +8,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { babel: babelrc } = require('@fusuma/configs');
 const css = require('./css');
 
+// set paths in node_modules
 const configsEntryPoint = require.resolve('@fusuma/configs');
 const configsBasePath = configsEntryPoint.split('/src')[0];
 const clientEntryPoint = require.resolve('@fusuma/client');
@@ -20,7 +21,7 @@ module.exports = ({
   internal = {},
   server = {}
 }) => {
-  const { url, name, description, thumbnail, siteName, sns, repositoryUrl } = meta;
+  const { url, name, description, thumbnail, siteName, sns } = meta;
   const {
     sidebar,
     targetBlank = true,
@@ -105,7 +106,7 @@ module.exports = ({
         'process.env.SIDEBAR': JSON.stringify(sidebar === undefined ? true : sidebar),
         'process.env.TITLE': JSON.stringify(name),
         'process.env.BASE_PATH': JSON.stringify(basePath),
-        'process.env.REMOTE_ORIGIN_URL': JSON.stringify(repositoryUrl || remoteOrigin),
+        'process.env.REMOTE_ORIGIN_URL': JSON.stringify(remoteOrigin),
         'process.env.TARGET_BLANK': JSON.stringify(targetBlank),
         'process.env.SHOW_INDEX': JSON.stringify(showIndex),
         'process.env.IS_VERTICAL': JSON.stringify(isVertical),

samples/intro/.fusumarc.yml

@@ -4,7 +4,6 @@ meta:
   description: Introduce Fusuma
   thumbnail: https://avatars0.githubusercontent.com/u/3367801?s=400&v=4
   siteName: hiroppy.me
-  repositoryUrl: https://github.com/hiroppy/fusuma
   sns: ['twitter']
 slide:
   showIndex: true

samples/issues/.fusumarc.yml

@@ -4,7 +4,6 @@ meta:
   description: Introduce Fusuma
   thumbnail: https://avatars0.githubusercontent.com/u/3367801?s=400&v=4
   siteName: hiroppy.me
-  repositoryUrl: https://github.com/hiroppy/fusuma
   sns: ['twitter']
 slide:
   showIndex: true