From cbbe88c22474390e729f9e889be9d5e0430f18d5 Mon Sep 17 00:00:00 2001 From: Wilson Gramer Date: Sun, 1 Nov 2020 00:33:19 -0400 Subject: [PATCH 1/5] Remove highlight.js typings highlight.js provides its own typings as of 10.1.0. --- notNeededPackages.json | 12 ++ types/highlight.js/highlight.js-tests.ts | 16 --- types/highlight.js/index.d.ts | 163 ----------------------- types/highlight.js/tsconfig.json | 23 ---- types/highlight.js/tslint.json | 16 --- types/highlight.js/v7/index.d.ts | 82 ------------ types/highlight.js/v7/tsconfig.json | 28 ---- types/highlight.js/v7/tslint.json | 14 -- types/highlightjs/highlightjs-tests.ts | 9 -- types/highlightjs/index.d.ts | 7 - types/highlightjs/tsconfig.json | 23 ---- types/highlightjs/tslint.json | 1 - types/markdown-it/package.json | 6 + types/remarkable/package.json | 6 + 14 files changed, 24 insertions(+), 382 deletions(-) delete mode 100644 types/highlight.js/highlight.js-tests.ts delete mode 100644 types/highlight.js/index.d.ts delete mode 100644 types/highlight.js/tsconfig.json delete mode 100644 types/highlight.js/tslint.json delete mode 100644 types/highlight.js/v7/index.d.ts delete mode 100644 types/highlight.js/v7/tsconfig.json delete mode 100644 types/highlight.js/v7/tslint.json delete mode 100644 types/highlightjs/highlightjs-tests.ts delete mode 100644 types/highlightjs/index.d.ts delete mode 100644 types/highlightjs/tsconfig.json delete mode 100644 types/highlightjs/tslint.json create mode 100644 types/markdown-it/package.json create mode 100644 types/remarkable/package.json diff --git a/notNeededPackages.json b/notNeededPackages.json index 037e5f5c60c907..29887c0179cb8c 100644 --- a/notNeededPackages.json +++ b/notNeededPackages.json @@ -1932,6 +1932,18 @@ "sourceRepoURL": "http://www.highcharts.com/", "asOfVersion": "7.0.0" }, + { + "libraryName": "highlight.js", + "typingsPackageName": "highlight.js", + "sourceRepoURL": "https://github.com/highlightjs/highlight.js", + "asOfVersion": "10.1.0" + }, + { + "libraryName": "highlight.js", + "typingsPackageName": "highlightjs", + "sourceRepoURL": "https://github.com/highlightjs/highlight.js", + "asOfVersion": "10.1.0" + }, { "libraryName": "hirestime", "typingsPackageName": "hirestime", diff --git a/types/highlight.js/highlight.js-tests.ts b/types/highlight.js/highlight.js-tests.ts deleted file mode 100644 index 7f313c39ec7792..00000000000000 --- a/types/highlight.js/highlight.js-tests.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - highlight.js definition by Niklas Mollenhauer - Last Update: 10.09.2013 - Source Code: https://github.com/isagalaev/highlight.js - Project Page: http://softwaremaniacs.org/soft/highlight/en/ -*/ - -import * as hljs from 'highlight.js'; - -var code = "using System;\npublic class Test\n{\npublic static void Main()\n{\n// your code goes here\n}\n}"; -var lang = "cs"; - -hljs.configure({ tabReplace: " " }); // 4 spaces - -var hl = hljs.highlight(lang, code).value; -hl = hljs.highlightAuto(code).value; diff --git a/types/highlight.js/index.d.ts b/types/highlight.js/index.d.ts deleted file mode 100644 index 7f21d01c7de3aa..00000000000000 --- a/types/highlight.js/index.d.ts +++ /dev/null @@ -1,163 +0,0 @@ -// Type definitions for highlight.js v9.12 -// Project: https://github.com/isagalaev/highlight.js -// Definitions by: Niklas Mollenhauer -// Jeremy Hull -// Josh Goldberg -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -declare namespace hljs -{ - interface Node { } - - export function highlight( - name: string, - value: string, - ignore_illegals?: boolean, - continuation?: ICompiledMode) : IHighlightResult; - export function highlightAuto( - value: string, - languageSubset?: string[]) : IAutoHighlightResult; - - export function fixMarkup(value: string) : string; - - export function highlightBlock(block: Node) : void; - - export function configure(options: IOptions): void; - - export function initHighlighting(): void; - export function initHighlightingOnLoad(): void; - - export function registerLanguage( - name: string, - language: (hljs?: HLJSStatic) => IModeBase): void; - export function listLanguages(): string[]; - export function getLanguage(name: string): IMode; - - export function inherit(parent: Object, obj: Object): Object; - - export function COMMENT( - begin: (string|RegExp), - end: (string|RegExp), - inherits: IModeBase): IMode; - - // Common regexps - export var IDENT_RE: string; - export var UNDERSCORE_IDENT_RE: string; - export var NUMBER_RE: string; - export var C_NUMBER_RE: string; - export var BINARY_NUMBER_RE: string; - export var RE_STARTERS_RE: string; - - // Common modes - export var BACKSLASH_ESCAPE : IMode; - export var APOS_STRING_MODE : IMode; - export var QUOTE_STRING_MODE : IMode; - export var PHRASAL_WORDS_MODE : IMode; - export var C_LINE_COMMENT_MODE : IMode; - export var C_BLOCK_COMMENT_MODE : IMode; - export var HASH_COMMENT_MODE : IMode; - export var NUMBER_MODE : IMode; - export var C_NUMBER_MODE : IMode; - export var BINARY_NUMBER_MODE : IMode; - export var CSS_NUMBER_MODE : IMode; - export var REGEX_MODE : IMode; - export var TITLE_MODE : IMode; - export var UNDERSCORE_TITLE_MODE : IMode; - - export interface IHighlightResultBase - { - relevance: number; - language: string; - value: string; - } - - export interface IAutoHighlightResult extends IHighlightResultBase - { - second_best?: IAutoHighlightResult; - } - - export interface IHighlightResult extends IHighlightResultBase - { - top: ICompiledMode; - } - - export interface HLJSStatic - { - inherit(parent: Object, obj: Object): Object; - - // Common regexps - IDENT_RE: string; - UNDERSCORE_IDENT_RE: string; - NUMBER_RE: string; - C_NUMBER_RE: string; - BINARY_NUMBER_RE: string; - RE_STARTERS_RE: string; - - // Common modes - BACKSLASH_ESCAPE : IMode; - APOS_STRING_MODE : IMode; - QUOTE_STRING_MODE : IMode; - PHRASAL_WORDS_MODE : IMode; - C_LINE_COMMENT_MODE : IMode; - C_BLOCK_COMMENT_MODE : IMode; - HASH_COMMENT_MODE : IMode; - NUMBER_MODE : IMode; - C_NUMBER_MODE : IMode; - BINARY_NUMBER_MODE : IMode; - CSS_NUMBER_MODE : IMode; - REGEX_MODE : IMode; - TITLE_MODE : IMode; - UNDERSCORE_TITLE_MODE : IMode; - } - - // Reference: - // https://github.com/isagalaev/highlight.js/blob/master/docs/reference.rst - export interface IModeBase - { - className?: string; - aliases?: string[]; - begin?: (string|RegExp); - end?: (string|RegExp); - case_insensitive?: boolean; - beginKeyword?: string; - endsWithParent?: boolean; - lexems?: string; - illegal?: string; - excludeBegin?: boolean; - excludeEnd?: boolean; - returnBegin?: boolean; - returnEnd?: boolean; - starts?: string; - subLanguage?: string; - subLanguageMode?: string; - relevance?: number; - variants?: IMode[]; - } - - export interface IMode extends IModeBase - { - keywords?: any; - contains?: IMode[]; - } - - export interface ICompiledMode extends IModeBase - { - compiled: boolean; - contains?: ICompiledMode[]; - keywords?: Object; - terminators: RegExp; - terminator_end?: string; - } - - export interface IOptions - { - classPrefix?: string; - tabReplace?: string; - useBR?: boolean; - languages?: string[]; - } -} - - -export = hljs; -export as namespace hljs; diff --git a/types/highlight.js/tsconfig.json b/types/highlight.js/tsconfig.json deleted file mode 100644 index 7050dc4a7c02df..00000000000000 --- a/types/highlight.js/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "baseUrl": "../", - "typeRoots": [ - "../" - ], - "types": [], - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts", - "highlight.js-tests.ts" - ] -} diff --git a/types/highlight.js/tslint.json b/types/highlight.js/tslint.json deleted file mode 100644 index b1e56bec62e36c..00000000000000 --- a/types/highlight.js/tslint.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "dtslint/dt.json", - "rules": { - "ban-types": false, - "dt-header": false, - "export-just-namespace": false, - "interface-name": false, - "no-consecutive-blank-lines": false, - "no-empty-interface": false, - "no-var-keyword": false, - "one-line": false, - "prefer-const": false, - "strict-export-declare-modifiers": false, - "typedef-whitespace": false - } -} diff --git a/types/highlight.js/v7/index.d.ts b/types/highlight.js/v7/index.d.ts deleted file mode 100644 index e264776df3b34a..00000000000000 --- a/types/highlight.js/v7/index.d.ts +++ /dev/null @@ -1,82 +0,0 @@ -// Type definitions for highlight.js v7.5.0 -// Project: https://github.com/isagalaev/highlight.js -// Definitions by: Niklas Mollenhauer -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -declare module "highlight.js" -{ - namespace hljs - { - export var LANGUAGES: { [name: string] : any; }; - - export function blockText(block: Node, ignoreNewLines: boolean) : string; - export function blockLanguage(block: Node) : string; - - export function highlight(language_name: string, value: string) : IHighlightResult - export function highlightAuto(text: string) : IHighlightResult - - export function fixMarkup(value: string, tabReplace: boolean, useBR: boolean) : string; - - export function highlightBlock(block: Node, tabReplace?: boolean, useBR?: boolean) : void; - - export function initHighlighting(): void; - export function initHighlightingOnLoad(): void; - - export var tabReplace : string; - - // Common regexps - export var IDENT_RE: string; - export var UNDERSCORE_IDENT_RE: string; - export var NUMBER_RE: string; - export var C_NUMBER_RE: string; - export var BINARY_NUMBER_RE: string; - export var RE_STARTERS_RE: string; - - // Common modes - export var BACKSLASH_ESCAPE : IMode; - export var APOS_STRING_MODE : IMode; - export var QUOTE_STRING_MODE : IMode; - export var C_LINE_COMMENT_MODE : IMode; - export var C_BLOCK_COMMENT_MODE : IMode; - export var HASH_COMMENT_MODE : IMode; - export var NUMBER_MODE : IMode; - export var C_NUMBER_MODE : IMode; - export var BINARY_NUMBER_MODE : IMode; - - export interface IHighlightResult - { - relevance: number; - keyword_count: number; - value: string; - } - - export interface IAutoHighlightResult extends IHighlightResult - { - language: string; - second_best?: IAutoHighlightResult; - } - - // Reference: - // https://github.com/isagalaev/highlight.js/blob/master/docs/reference.rst - export interface IMode - { - className?: string; - begin: string; - end?: string; - beginWithKeyword?: boolean; - endsWithParent?: boolean; - lexems?: string; - keywords?: Object; - illegal?: string; - excludeBegin?: boolean; - excludeEnd?: boolean; - returnBegin?: boolean; - returnEnd?: boolean; - contains?: IMode[]; - starts?: string; - subLanguage?: string; - relevance?: number; - } - } - export = hljs; -} diff --git a/types/highlight.js/v7/tsconfig.json b/types/highlight.js/v7/tsconfig.json deleted file mode 100644 index 952615b0f79213..00000000000000 --- a/types/highlight.js/v7/tsconfig.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6", - "dom" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "baseUrl": "../../", - "typeRoots": [ - "../../" - ], - "types": [], - "paths": { - "highlight.js": [ - "highlight.js/v7" - ] - }, - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts" - ] -} diff --git a/types/highlight.js/v7/tslint.json b/types/highlight.js/v7/tslint.json deleted file mode 100644 index 39d84cab7f393c..00000000000000 --- a/types/highlight.js/v7/tslint.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "dtslint/dt.json", - "rules": { - "ban-types": false, - "dt-header": false, - "interface-name": false, - "no-single-declare-module": false, - "no-var-keyword": false, - "one-line": false, - "semicolon": false, - "strict-export-declare-modifiers": false, - "typedef-whitespace": false - } -} diff --git a/types/highlightjs/highlightjs-tests.ts b/types/highlightjs/highlightjs-tests.ts deleted file mode 100644 index 93059c85f835fb..00000000000000 --- a/types/highlightjs/highlightjs-tests.ts +++ /dev/null @@ -1,9 +0,0 @@ -import hljs = require('highlightjs'); - -const code = "using System;\npublic class Test\n{\npublic static void Main()\n{\n// your code goes here\n}\n}"; -const lang = "cs"; - -hljs.configure({ tabReplace: " " }); // 4 spaces - -let hl = hljs.highlight(lang, code).value; -hl = hljs.highlightAuto(code).value; diff --git a/types/highlightjs/index.d.ts b/types/highlightjs/index.d.ts deleted file mode 100644 index 3d5022b5dd04f2..00000000000000 --- a/types/highlightjs/index.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -// Type definitions for highlightjs 9.12 -// Project: https://github.com/isagalaev/highlight.js -// Definitions by: Florian Keller -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -import highlightjs = require('highlight.js'); -export = highlightjs; diff --git a/types/highlightjs/tsconfig.json b/types/highlightjs/tsconfig.json deleted file mode 100644 index a139fae4719498..00000000000000 --- a/types/highlightjs/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictFunctionTypes": true, - "strictNullChecks": true, - "baseUrl": "../", - "typeRoots": [ - "../" - ], - "types": [], - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts", - "highlightjs-tests.ts" - ] -} diff --git a/types/highlightjs/tslint.json b/types/highlightjs/tslint.json deleted file mode 100644 index 3db14f85eaf7b9..00000000000000 --- a/types/highlightjs/tslint.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": "dtslint/dt.json" } diff --git a/types/markdown-it/package.json b/types/markdown-it/package.json new file mode 100644 index 00000000000000..54c4e2847fc761 --- /dev/null +++ b/types/markdown-it/package.json @@ -0,0 +1,6 @@ +{ + "private": true, + "dependencies": { + "highlight.js": "^10.1.0" + } +} diff --git a/types/remarkable/package.json b/types/remarkable/package.json new file mode 100644 index 00000000000000..54c4e2847fc761 --- /dev/null +++ b/types/remarkable/package.json @@ -0,0 +1,6 @@ +{ + "private": true, + "dependencies": { + "highlight.js": "^10.1.0" + } +} From e96ca306ea0ce62866b748ce44ef8ce43e06b387 Mon Sep 17 00:00:00 2001 From: Wilson Gramer Date: Sun, 1 Nov 2020 02:14:34 -0500 Subject: [PATCH 2/5] Add back 'highlightjs' typings that point to highlight.js --- types/highlightjs/highlightjs-tests.ts | 9 +++++++++ types/highlightjs/index.d.ts | 8 ++++++++ types/highlightjs/tsconfig.json | 23 +++++++++++++++++++++++ types/highlightjs/tslint.json | 1 + 4 files changed, 41 insertions(+) create mode 100644 types/highlightjs/highlightjs-tests.ts create mode 100644 types/highlightjs/index.d.ts create mode 100644 types/highlightjs/tsconfig.json create mode 100644 types/highlightjs/tslint.json diff --git a/types/highlightjs/highlightjs-tests.ts b/types/highlightjs/highlightjs-tests.ts new file mode 100644 index 00000000000000..93059c85f835fb --- /dev/null +++ b/types/highlightjs/highlightjs-tests.ts @@ -0,0 +1,9 @@ +import hljs = require('highlightjs'); + +const code = "using System;\npublic class Test\n{\npublic static void Main()\n{\n// your code goes here\n}\n}"; +const lang = "cs"; + +hljs.configure({ tabReplace: " " }); // 4 spaces + +let hl = hljs.highlight(lang, code).value; +hl = hljs.highlightAuto(code).value; diff --git a/types/highlightjs/index.d.ts b/types/highlightjs/index.d.ts new file mode 100644 index 00000000000000..3ed0d8e34ddd90 --- /dev/null +++ b/types/highlightjs/index.d.ts @@ -0,0 +1,8 @@ +// Type definitions for highlightjs 10.1 +// Project: https://github.com/isagalaev/highlight.js +// Definitions by: Florian Keller +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +import highlightjs = require('highlight.js'); + +export = highlightjs; diff --git a/types/highlightjs/tsconfig.json b/types/highlightjs/tsconfig.json new file mode 100644 index 00000000000000..a139fae4719498 --- /dev/null +++ b/types/highlightjs/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictFunctionTypes": true, + "strictNullChecks": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "highlightjs-tests.ts" + ] +} diff --git a/types/highlightjs/tslint.json b/types/highlightjs/tslint.json new file mode 100644 index 00000000000000..3db14f85eaf7b9 --- /dev/null +++ b/types/highlightjs/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From b3f7c55a1b046d336393b2c07d736a8ee57f253c Mon Sep 17 00:00:00 2001 From: Wilson Gramer Date: Thu, 5 Nov 2020 19:43:16 -0500 Subject: [PATCH 3/5] Fix dependencies using DT typings for old versions of highlight.js --- types/highlightjs/index.d.ts | 3 ++- types/{markdown-it => highlightjs}/package.json | 0 types/highlightjs/tslint.json | 7 ++++++- types/remarkable/package.json | 6 ------ 4 files changed, 8 insertions(+), 8 deletions(-) rename types/{markdown-it => highlightjs}/package.json (100%) delete mode 100644 types/remarkable/package.json diff --git a/types/highlightjs/index.d.ts b/types/highlightjs/index.d.ts index 3ed0d8e34ddd90..a7456c6e5cd048 100644 --- a/types/highlightjs/index.d.ts +++ b/types/highlightjs/index.d.ts @@ -1,7 +1,8 @@ -// Type definitions for highlightjs 10.1 +// Type definitions for highlight.js 10.1 // Project: https://github.com/isagalaev/highlight.js // Definitions by: Florian Keller // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 3.5 import highlightjs = require('highlight.js'); diff --git a/types/markdown-it/package.json b/types/highlightjs/package.json similarity index 100% rename from types/markdown-it/package.json rename to types/highlightjs/package.json diff --git a/types/highlightjs/tslint.json b/types/highlightjs/tslint.json index 3db14f85eaf7b9..41344f59e7cba0 100644 --- a/types/highlightjs/tslint.json +++ b/types/highlightjs/tslint.json @@ -1 +1,6 @@ -{ "extends": "dtslint/dt.json" } +{ + "extends": "dtslint/dt.json", + "rules": { + "npm-naming": false + } +} diff --git a/types/remarkable/package.json b/types/remarkable/package.json deleted file mode 100644 index 54c4e2847fc761..00000000000000 --- a/types/remarkable/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "private": true, - "dependencies": { - "highlight.js": "^10.1.0" - } -} From 42c21d6a348a6c05c88b9013238f50e5c6321518 Mon Sep 17 00:00:00 2001 From: Wilson Gramer Date: Thu, 5 Nov 2020 20:04:08 -0500 Subject: [PATCH 4/5] Add old @types/highlight.js to remarkable test dependencies --- types/remarkable/package.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 types/remarkable/package.json diff --git a/types/remarkable/package.json b/types/remarkable/package.json new file mode 100644 index 00000000000000..8e8e452b5d49d6 --- /dev/null +++ b/types/remarkable/package.json @@ -0,0 +1,7 @@ +{ + "private": true, + "dependencies": { + "highlight.js": "^9.7.0", + "@types/highlight.js": "^9.7.0" + } +} From ddbed2ba1624fedc367756e343cd2bb5b9386593 Mon Sep 17 00:00:00 2001 From: Wilson Gramer Date: Sun, 8 Nov 2020 12:08:37 -0500 Subject: [PATCH 5/5] Add old @types/highlight.js to markdown-it test dependencies --- types/markdown-it/package.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 types/markdown-it/package.json diff --git a/types/markdown-it/package.json b/types/markdown-it/package.json new file mode 100644 index 00000000000000..8e8e452b5d49d6 --- /dev/null +++ b/types/markdown-it/package.json @@ -0,0 +1,7 @@ +{ + "private": true, + "dependencies": { + "highlight.js": "^9.7.0", + "@types/highlight.js": "^9.7.0" + } +}