From 82c00fe44457795cecb7f0352f773bfee757fae5 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Fri, 2 Sep 2016 14:10:09 +0200 Subject: [PATCH] fix typedoc integration --- dist/npmts.check.d.ts | 2 ++ dist/npmts.check.js | 4 ++-- dist/npmts.typedoc.js | 6 ++++-- ts/npmts.check.ts | 8 ++++++-- ts/npmts.typedoc.ts | 8 +++++--- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dist/npmts.check.d.ts b/dist/npmts.check.d.ts index fc80a6d..739439e 100644 --- a/dist/npmts.check.d.ts +++ b/dist/npmts.check.d.ts @@ -1,3 +1,5 @@ /// import * as plugins from "./npmts.plugins"; +import { ProjectinfoNpm } from "projectinfo"; +export declare let projectInfo: ProjectinfoNpm; export declare let run: (configArg: any) => plugins.Q.Promise<{}>; diff --git a/dist/npmts.check.js b/dist/npmts.check.js index c8fa197..5961c2c 100644 --- a/dist/npmts.check.js +++ b/dist/npmts.check.js @@ -2,10 +2,10 @@ var plugins = require("./npmts.plugins"); var paths = require("./npmts.paths"); var npmts_promisechain_1 = require("./npmts.promisechain"); +exports.projectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd); var checkProjectTypings = function (configArg) { var done = plugins.Q.defer(); - var cwdProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd); - if (typeof cwdProjectInfo.packageJson.typings == "undefined") { + if (typeof exports.projectInfo.packageJson.typings == "undefined") { plugins.beautylog.error("please add typings field to package.json"); process.exit(1); } diff --git a/dist/npmts.typedoc.js b/dist/npmts.typedoc.js index 542f761..3f2e620 100644 --- a/dist/npmts.typedoc.js +++ b/dist/npmts.typedoc.js @@ -3,6 +3,7 @@ require("typings-global"); var plugins = require("./npmts.plugins"); var paths = require("./npmts.paths"); var npmts_promisechain_1 = require("./npmts.promisechain"); +var npmts_check_1 = require("./npmts.check"); var genTypeDoc = function (configArg) { var done = plugins.Q.defer(); npmts_promisechain_1.npmtsOra.text("now generating " + "TypeDoc documentation".yellow); @@ -17,8 +18,9 @@ var genTypeDoc = function (configArg) { out: paths.pagesApiDir, json: plugins.path.join(paths.pagesApiDir, "file.json"), // TypeDoc options (see typedoc docs) - name: "my-project", - //theme: "default", + name: npmts_check_1.projectInfo.name, + readme: plugins.path.join(paths.cwd, "README.md"), + // theme: "default", ignoreCompilerErrors: true, version: true, })) diff --git a/ts/npmts.check.ts b/ts/npmts.check.ts index 1f3facd..e0e0957 100644 --- a/ts/npmts.check.ts +++ b/ts/npmts.check.ts @@ -2,10 +2,14 @@ import * as plugins from "./npmts.plugins"; import * as paths from "./npmts.paths"; import { npmtsOra } from "./npmts.promisechain"; +import {ProjectinfoNpm} from "projectinfo"; + +export let projectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd); + let checkProjectTypings = (configArg) => { let done = plugins.Q.defer(); - let cwdProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd); - if(typeof cwdProjectInfo.packageJson.typings == "undefined"){ + + if(typeof projectInfo.packageJson.typings == "undefined"){ plugins.beautylog.error(`please add typings field to package.json`); process.exit(1); }; diff --git a/ts/npmts.typedoc.ts b/ts/npmts.typedoc.ts index 2a4f659..492387b 100644 --- a/ts/npmts.typedoc.ts +++ b/ts/npmts.typedoc.ts @@ -3,6 +3,8 @@ import plugins = require("./npmts.plugins"); import paths = require("./npmts.paths"); import { npmtsOra } from "./npmts.promisechain"; +import {projectInfo} from "./npmts.check"; + let genTypeDoc = function (configArg) { let done = plugins.Q.defer(); npmtsOra.text("now generating " + "TypeDoc documentation".yellow); @@ -19,9 +21,9 @@ let genTypeDoc = function (configArg) { json: plugins.path.join(paths.pagesApiDir, "file.json"), // TypeDoc options (see typedoc docs) - name: "my-project", - - //theme: "default", + name: projectInfo.name, + readme: plugins.path.join(paths.cwd,"README.md"), + // theme: "default", ignoreCompilerErrors: true, version: true, }))