Merge branch 'master' into master

Author: Gerrit0

.github/pull.yml

@@ -0,0 +1,6 @@
+version: "1"
+rules:
+  - base: master
+    upstream: typestrong:master
+    mergeMethod: merge
+label: ":arrow_heading_down: pull"

examples/basic/media/logo-128.png

@@ -1,7 +1,7 @@
 {
-  "name": "typedoc",
+  "name": "@gerrit0/typedoc",
   "description": "Create api documentation for TypeScript projects.",
-  "version": "0.15.0-0",
+  "version": "0.15.0",
   "homepage": "https://typedoc.org",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -15,7 +15,7 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git://github.com/TypeStrong/TypeDoc.git"
+    "url": "git://github.com/Gerrit0/TypeDoc.git"
   },
   "bugs": {
     "url": "https://github.com/TypeStrong/TypeDoc/issues"
@@ -30,6 +30,7 @@
     "node": ">= 6.0.0"
   },
   "dependencies": {
+    "@gerrit0/typedoc-default-themes": "^0.6.0",
     "@types/minimatch": "3.0.3",
     "fs-extra": "^7.0.1",
     "handlebars": "^4.1.2",
@@ -39,7 +40,6 @@
     "minimatch": "^3.0.0",
     "progress": "^2.0.3",
     "shelljs": "^0.8.3",
-    "typedoc-default-themes": "^0.6.0-0",
     "typescript": "3.5.x"
   },
   "devDependencies": {
@@ -64,7 +64,7 @@
   ],
   "scripts": {
     "pretest": "node scripts/copy_test_files.js",
-    "test": "nyc --reporter=html --reporter=text-summary mocha --timeout=10000 dist/test/*.test.js",
+    "test": "nyc --reporter=html --reporter=text-summary mocha --timeout=30000 dist/test/*.test.js",
     "test:ts": "mocha --require ts-node/register --watch-extensions ts --timeout=10000 src/test/*.test.ts",
     "build": "tsc --project .",
     "postbuild": "node scripts/replace_application_version.js",

package-lock.json

@@ -16,6 +16,7 @@ const app = new TypeDoc.Application({
         "lib.es2015.iterable.d.ts",
         "lib.es2015.collection.d.ts"
     ],
+    name: 'typedoc'
 });
 
 const base = path.join(__dirname, '../src/test/converter');

package.json

@@ -279,7 +279,7 @@ export class Renderer extends ChildableComponent<Application, RendererComponent>
      * @returns The path to the theme directory.
      */
     static getThemeDirectory(): string {
-        return Path.dirname(require.resolve('typedoc-default-themes'));
+        return Path.dirname(require.resolve('@gerrit0/typedoc-default-themes'));
     }
 
     /**

scripts/rebuild_specs.js

@@ -68,7 +68,8 @@ describe('Converter', function() {
             target: 'ES5',
             module: 'CommonJS',
             experimentalDecorators: true,
-            jsx: 'react'
+            jsx: 'react',
+            name: 'typedoc'
         });
     });
 
@@ -112,7 +113,8 @@ describe('Converter with categorizeByGroup=false', function() {
             module: 'CommonJS',
             experimentalDecorators: true,
             categorizeByGroup: false,
-            jsx: 'react'
+            jsx: 'react',
+            name: 'typedoc'
         });
     });
 
@@ -166,7 +168,8 @@ describe('Converter with excludeNotExported=true', function() {
             module: 'CommonJS',
             experimentalDecorators: true,
             excludeNotExported: true,
-            jsx: 'react'
+            jsx: 'react',
+            name: 'typedoc'
         });
     });
 

src/lib/output/renderer.ts

@@ -61,7 +61,8 @@ describe('Renderer', function() {
             target: 'ES5',
             readme: Path.join(src, '..', 'README.md'),
             module: 'CommonJS',
-            gaSite: 'foo.com' // verify theme option without modifying output
+            gaSite: 'foo.com', // verify theme option without modifying output
+            name: 'typedoc'
         });
     });