Merge pull request #15 from github/tsc

muan · web-flow · commit 2e14bea342c7 · 2020-02-20T14:25:39.000-05:00
Replace flow + babel with tsc
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1 @@
 dist
-prettier.config.js
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,8 +1,7 @@
 {
   "extends": [
-    "plugin:flowtype/recommended",
+    "plugin:github/browser",
     "plugin:github/es6",
-    "plugin:github/browser"
-  ],
-  "parser": "babel-eslint"
+    "plugin:github/typescript"
+  ]
 }
diff --git a/.flowconfig b/.flowconfig
diff --git a/index.d.ts b/index.d.ts
diff --git a/karma.config.js b/karma.config.js
@@ -1,7 +1,10 @@
 module.exports = function(config) {
   config.set({
     frameworks: ['mocha', 'chai'],
-    files: [{pattern: 'dist/index.esm.js', type: 'module'}, {pattern: 'test/test.js', type: 'module'}],
+    files: [
+      {pattern: 'dist/index.esm.js', type: 'module'},
+      {pattern: 'test/test.js', type: 'module'}
+    ],
     reporters: ['mocha'],
     port: 9876,
     colors: true,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,12 +5,12 @@
   "repository": "github/paste-markdown",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",
-  "types": "index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "clean": "rm -rf dist",
     "lint": "github-lint",
     "prebuild": "npm run clean && npm run lint && mkdir dist",
-    "build": "rollup -c && cp src/index.js.flow dist/index.umd.js.flow && cp src/index.js.flow dist/index.esm.js.flow",
+    "build": "rollup -c",
     "pretest": "npm run build",
     "test": "karma start karma.config.js",
     "prepublishOnly": "npm run build",
@@ -22,24 +22,22 @@
   ],
   "license": "MIT",
   "files": [
-    "dist",
-    "index.d.ts"
+    "dist/index.d.ts",
+    "dist/index.esm.js",
+    "dist/index.umd.js"
   ],
   "devDependencies": {
-    "@babel/core": "^7.7.0",
-    "babel-eslint": "^10.0.3",
-    "babel-preset-github": "^3.2.1",
     "chai": "^4.2.0",
-    "eslint": "^6.6.0",
-    "eslint-plugin-github": "^3.2.1",
-    "flow-bin": "^0.111.1",
+    "eslint": "^6.8.0",
+    "eslint-plugin-github": "^3.4.0",
     "karma": "^4.4.1",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
     "mocha": "^7.0.1",
-    "rollup": "^1.26.3",
-    "rollup-plugin-babel": "^4.3.3"
+    "rollup": "^1.31.1",
+    "rollup-plugin-typescript2": "^0.26.0",
+    "typescript": "^3.7.5"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,11 +1,7 @@
-/* @flow strict */
-
-import babel from 'rollup-plugin-babel'
-
-const pkg = require('./package.json')
-
+import typescript from 'rollup-plugin-typescript2'
+import pkg from './package.json'
 export default {
-  input: 'src/index.js',
+  input: 'src/index.ts',
   output: [
     {
       file: pkg['module'],
@@ -17,9 +13,5 @@ export default {
       name: 'paste-markdown'
     }
   ],
-  plugins: [
-    babel({
-      presets: ['github']
-    })
-  ]
+  plugins: [typescript()]
 }
diff --git a/src/index.js.flow b/src/index.js.flow
diff --git a/src/index.ts b/src/index.ts
@@ -1,14 +1,12 @@
-/* @flow strict */
-
 import {install as installLink, uninstall as uninstallLink} from './paste-markdown-image-link'
 import {install as installTable, uninstall as uninstallTable} from './paste-markdown-table'
 import {install as installText, uninstall as uninstallText} from './paste-markdown-text'
 
-type Subscription = {|
+interface Subscription {
   unsubscribe: () => void
-|}
+}
 
-export default function subscribe(el: Element): Subscription {
+export default function subscribe(el: HTMLElement): Subscription {
   installTable(el)
   installLink(el)
   installText(el)
diff --git a/src/paste-markdown-image-link.ts b/src/paste-markdown-image-link.ts
@@ -2,13 +2,13 @@
 
 import {insertText} from './text'
 
-export function install(el: Element) {
+export function install(el: HTMLElement) {
   el.addEventListener('dragover', onDragover)
   el.addEventListener('drop', onDrop)
   el.addEventListener('paste', onPaste)
 }
 
-export function uninstall(el: Element) {
+export function uninstall(el: HTMLElement) {
   el.removeEventListener('dragover', onDragover)
   el.removeEventListener('drop', onDrop)
   el.removeEventListener('paste', onPaste)
@@ -64,7 +64,7 @@ function hasLink(transfer: DataTransfer): boolean {
   return Array.from(transfer.types).indexOf('text/uri-list') >= 0
 }
 
-function extractLinks(transfer: DataTransfer): Array<string> {
+function extractLinks(transfer: DataTransfer): string[] {
   return (transfer.getData('text/uri-list') || '').split('\r\n')
 }
 
diff --git a/src/paste-markdown-table.ts b/src/paste-markdown-table.ts
@@ -2,13 +2,13 @@
 
 import {insertText} from './text'
 
-export function install(el: Element) {
+export function install(el: HTMLElement) {
   el.addEventListener('dragover', onDragover)
   el.addEventListener('drop', onDrop)
   el.addEventListener('paste', onPaste)
 }
 
-export function uninstall(el: Element) {
+export function uninstall(el: HTMLElement) {
   el.removeEventListener('dragover', onDragover)
   el.removeEventListener('drop', onDrop)
   el.removeEventListener('paste', onPaste)
@@ -58,21 +58,23 @@ function hasFile(transfer: DataTransfer): boolean {
 
 function columnText(column: Element): string {
   const noBreakSpace = '\u00A0'
-  const text = column.textContent
+  const text = (column.textContent || '')
     .trim()
     .replace(/\|/g, '\\|')
     .replace(/\n/g, ' ')
   return text || noBreakSpace
 }
 
-function tableHeaders(row: Element): Array<string> {
+function tableHeaders(row: Element): string[] {
   return Array.from(row.querySelectorAll('td, th')).map(columnText)
 }
 
 function tableMarkdown(node: Element): string {
   const rows = Array.from(node.querySelectorAll('tr'))
 
-  const headers = tableHeaders(rows.shift())
+  const firstRow = rows.shift()
+  if (!firstRow) return ''
+  const headers = tableHeaders(firstRow)
   const spacers = headers.map(() => '--')
   const header = `${headers.join(' | ')}\n${spacers.join(' | ')}\n`
 
@@ -87,13 +89,13 @@ function tableMarkdown(node: Element): string {
   return `\n${header}${body}\n\n`
 }
 
-function parseTable(html: string): ?Element {
+function parseTable(html: string): HTMLElement | null {
   const el = document.createElement('div')
   el.innerHTML = html
   return el.querySelector('table')
 }
 
-function hasTable(transfer: DataTransfer): ?Element {
+function hasTable(transfer: DataTransfer): HTMLElement | null | void {
   if (Array.from(transfer.types).indexOf('text/html') === -1) return
 
   const html = transfer.getData('text/html')
diff --git a/src/paste-markdown-text.ts b/src/paste-markdown-text.ts
@@ -1,12 +1,10 @@
-/* @flow strict */
-
 import {insertText} from './text'
 
-export function install(el: Element) {
+export function install(el: HTMLElement) {
   el.addEventListener('paste', onPaste)
 }
 
-export function uninstall(el: Element) {
+export function uninstall(el: HTMLElement) {
   el.removeEventListener('paste', onPaste)
 }
 
diff --git a/src/text.ts b/src/text.ts
@@ -1,8 +1,6 @@
-/* @flow strict */
-
 export function insertText(textarea: HTMLInputElement | HTMLTextAreaElement, text: string): void {
-  const beginning = textarea.value.substring(0, textarea.selectionStart)
-  const remaining = textarea.value.substring(textarea.selectionEnd)
+  const beginning = textarea.value.substring(0, textarea.selectionStart || 0)
+  const remaining = textarea.value.substring(textarea.selectionEnd || 0)
 
   const newline = beginning.length === 0 || beginning.match(/\n$/) ? '' : '\n'
   const textBeforeCursor = beginning + newline + text
diff --git a/test/.eslintrc.json b/test/.eslintrc.json
@@ -1,7 +1,4 @@
 {
-  "rules": {
-    "flowtype/require-valid-file-annotation": "off"
-  },
   "env": {
     "mocha": true
   },
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "target": "es2017",
+    "lib": [
+      "es2018",
+      "dom"
+    ],
+    "strict": true,
+    "declaration": true,
+    "outDir": "dist",
+    "removeComments": true,
+    "preserveConstEnums": true
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": [`
`3`		`- "plugin:flowtype/recommended",`
	`3`	`+ "plugin:github/browser",`
`4`	`4`	`"plugin:github/es6",`
`5`		`- "plugin:github/browser"`
`6`		`- ],`
`7`		`- "parser": "babel-eslint"`
	`5`	`+ "plugin:github/typescript"`
	`6`	`+ ]`
`8`	`7`	`}`