diff --git a/scripts/docs/dgeni-config.js b/scripts/docs/dgeni-config.js index e0f63234..fabc0ae2 100644 --- a/scripts/docs/dgeni-config.js +++ b/scripts/docs/dgeni-config.js @@ -16,14 +16,14 @@ module.exports = function(currentVersion) { return new Package('ionic-v2-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage]) // .processor(require('./processors/latest-version')) - .processor(require('./processors/jekyll')) .processor(require('./processors/remove-private-members')) .processor(require('./processors/hide-private-api')) - .processor(require('./processors/collect-inputs-outputs')) - .processor(require('./processors/npm-id')) + // .processor(require('./processors/collect-inputs-outputs')) .processor(require('./processors/parse-optional')) + .processor(require('./processors/npm-id')) + .processor(require('./processors/jekyll')) -// for debugging docs + // for debugging docs // .processor(function test(){ // return { // diff --git a/scripts/docs/dgeni-readmes-config.js b/scripts/docs/dgeni-readmes-config.js index 13cd4957..58d55f86 100644 --- a/scripts/docs/dgeni-readmes-config.js +++ b/scripts/docs/dgeni-readmes-config.js @@ -19,9 +19,10 @@ module.exports = function(currentVersion) { // .processor(require('./processors/latest-version')) .processor(require('./processors/readmes')) - .processor(require('./processors/npm-id')) .processor(require('./processors/remove-private-members')) .processor(require('./processors/hide-private-api')) + .processor(require('./processors/npm-id')) + // .processor(require('./processors/collect-inputs-outputs')) // for debugging docs diff --git a/scripts/docs/processors/jekyll.js b/scripts/docs/processors/jekyll.js index 56a2032c..da030f77 100644 --- a/scripts/docs/processors/jekyll.js +++ b/scripts/docs/processors/jekyll.js @@ -5,6 +5,9 @@ module.exports = function jekyll(renderDocsProcessor) { $runAfter: ['paths-computed'], $runBefore: ['rendering-docs'], $process: function(docs) { + + console.log('jekyll running'); + var currentVersion = renderDocsProcessor.extraData.version.current.name; // pretty up and sort the docs object for menu generation diff --git a/scripts/docs/processors/npm-id.js b/scripts/docs/processors/npm-id.js index 4e1a7f4a..223e49eb 100644 --- a/scripts/docs/processors/npm-id.js +++ b/scripts/docs/processors/npm-id.js @@ -2,7 +2,7 @@ module.exports = function npmId(renderDocsProcessor) { return { name: 'npm-id', $runAfter: ['paths-computed'], - $runBefore: ['jekyll'], + $runBefore: ['rendering-docs'], $process: function(docs) { var currentVersion = renderDocsProcessor.extraData.version.current.name; @@ -12,10 +12,8 @@ module.exports = function npmId(renderDocsProcessor) { }); docs.forEach(function(doc, i) { - doc.npmId = doc.outputPath.replace('/README.md', '') // for readmes - .replace('@ionic-native/plugins/','') // for readmes - .replace('content/docs/v2/native/', '') // for docs - .replace('/index.md', ''); // for docs + doc.npmId = doc.id.match(/plugins\/(.*)\/index/)[1]; + console.log('@ionic-native/' + doc.npmId); }); // returning docs will replace docs object in the next process