diff --git a/.github/pull.yml b/.github/pull.yml deleted file mode 100644 index 120bc7ad3..000000000 --- a/.github/pull.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: "1" -rules: - - base: master - upstream: typestrong:master - mergeMethod: merge -label: ":arrow_heading_down: pull" diff --git a/examples/basic/media/logo-128.png b/examples/basic/media/logo-128.png index 820a4510e..120c55ad6 100644 Binary files a/examples/basic/media/logo-128.png and b/examples/basic/media/logo-128.png differ diff --git a/package-lock.json b/package-lock.json index 3fabda8a6..14dadcfa8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@gerrit0/typedoc", + "name": "typedoc", "version": "0.15.0-0", "lockfileVersion": 1, "requires": true, @@ -138,24 +138,6 @@ "to-fast-properties": "^2.0.0" } }, - "@gerrit0/typedoc-default-themes": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@gerrit0/typedoc-default-themes/-/typedoc-default-themes-0.6.0.tgz", - "integrity": "sha512-FVLlZX1hP3ONLTnvldbiK0ApP+uNjG0vw2qtIQChxodjhbvkL2mC6DVrfUwnCd+ruQa1U1RliyAzjDZPYEjRfw==", - "requires": { - "backbone": "^1.4.0", - "jquery": "^3.4.1", - "lunr": "^2.3.6", - "underscore": "^1.9.1" - }, - "dependencies": { - "jquery": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", - "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" - } - } - }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -981,6 +963,11 @@ "handlebars": "^4.1.0" } }, + "jquery": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", + "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=" + }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", @@ -1932,6 +1919,17 @@ "tslib": "^1.8.1" } }, + "typedoc-default-themes": { + "version": "0.6.0-0", + "resolved": "https://registry.npmjs.org/typedoc-default-themes/-/typedoc-default-themes-0.6.0-0.tgz", + "integrity": "sha512-O7hBMS1yBCozvVUntIIdlBk04WiqM+f6NOEc9p+LimJSFKJMF66cgzejeiybuTk6mgbMJW+olg42BNYC8E9x9Q==", + "requires": { + "backbone": "^1.1.2", + "jquery": "^2.2.4", + "lunr": "^2.3.6", + "underscore": "^1.9.1" + } + }, "typescript": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz", diff --git a/package.json b/package.json index 0d5ad0cfa..b3d088137 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "@gerrit0/typedoc", + "name": "typedoc", "description": "Create api documentation for TypeScript projects.", - "version": "0.15.0", + "version": "0.15.0-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/Gerrit0/TypeDoc.git" + "url": "git://github.com/TypeStrong/TypeDoc.git" }, "bugs": { "url": "https://github.com/TypeStrong/TypeDoc/issues" @@ -30,7 +30,6 @@ "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", @@ -40,6 +39,7 @@ "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=30000 dist/test/*.test.js", + "test": "nyc --reporter=html --reporter=text-summary mocha --timeout=10000 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", diff --git a/scripts/rebuild_specs.js b/scripts/rebuild_specs.js index 8a03061e1..2a56cd3e2 100644 --- a/scripts/rebuild_specs.js +++ b/scripts/rebuild_specs.js @@ -16,7 +16,6 @@ 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'); diff --git a/src/lib/output/renderer.ts b/src/lib/output/renderer.ts index f715bce6b..df6d5da29 100644 --- a/src/lib/output/renderer.ts +++ b/src/lib/output/renderer.ts @@ -279,7 +279,7 @@ export class Renderer extends ChildableComponent * @returns The path to the theme directory. */ static getThemeDirectory(): string { - return Path.dirname(require.resolve('@gerrit0/typedoc-default-themes')); + return Path.dirname(require.resolve('typedoc-default-themes')); } /** diff --git a/src/test/converter.test.ts b/src/test/converter.test.ts index 1bfc87425..112e45278 100644 --- a/src/test/converter.test.ts +++ b/src/test/converter.test.ts @@ -68,8 +68,7 @@ describe('Converter', function() { target: 'ES5', module: 'CommonJS', experimentalDecorators: true, - jsx: 'react', - name: 'typedoc' + jsx: 'react' }); }); @@ -113,8 +112,7 @@ describe('Converter with categorizeByGroup=false', function() { module: 'CommonJS', experimentalDecorators: true, categorizeByGroup: false, - jsx: 'react', - name: 'typedoc' + jsx: 'react' }); }); @@ -168,8 +166,7 @@ describe('Converter with excludeNotExported=true', function() { module: 'CommonJS', experimentalDecorators: true, excludeNotExported: true, - jsx: 'react', - name: 'typedoc' + jsx: 'react' }); }); diff --git a/src/test/renderer.test.ts b/src/test/renderer.test.ts index ac5853c08..e160c896a 100644 --- a/src/test/renderer.test.ts +++ b/src/test/renderer.test.ts @@ -61,8 +61,7 @@ describe('Renderer', function() { target: 'ES5', readme: Path.join(src, '..', 'README.md'), module: 'CommonJS', - gaSite: 'foo.com', // verify theme option without modifying output - name: 'typedoc' + gaSite: 'foo.com' // verify theme option without modifying output }); });