You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2021/02/03 03:07:42 UTC

[echarts-doc] branch master updated (e704185 -> 83f92a6)

This is an automated email from the ASF dual-hosted git repository.

shenyi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git.


    from e704185  Merge pull request #160 from susiwen8/code-style
     add 6ebaca8  fix(tool): fix a compatibility issue of `globby` in Windows.
     add 4b7cd93  Merge pull request #147 from apache/fix-tool-md2json
     new 83f92a6  Merge pull request #163 from apache/next

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tool/md2json.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org


[echarts-doc] 01/01: Merge pull request #163 from apache/next

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git

commit 83f92a61c2e8ca26ed59a7fe822227c44c6a012d
Merge: e704185 4b7cd93
Author: Yi Shen <bm...@gmail.com>
AuthorDate: Wed Feb 3 11:07:33 2021 +0800

    Merge pull request #163 from apache/next
    
    chore: merge 'next' into 'master'

 tool/md2json.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc tool/md2json.js
index a420023,63f7b53..3daace2
--- a/tool/md2json.js
+++ b/tool/md2json.js
@@@ -3,9 -3,11 +3,10 @@@ const marked = require('marked')
  const etpl = require('../dep/etpl');
  const globby = require('globby');
  const htmlparser2 = require('htmlparser2');
 -const chalk = require('chalk');
  
  async function convert(opts) {
-     const mdPath = opts.path;
+     // globby does not support '\' yet
+     const mdPath = opts.path.replace(/\\/g, '/');
      const sectionsAnyOf = opts.sectionsAnyOf;
      const entry = opts.entry;
      const tplEnv = opts.tplEnv;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org