fix: correct repository field in package.json, bump devDependencies

Author: JounQin

.eslintrc.js

@@ -1,7 +1,3 @@
-require('ts-node').register({
-  transpileOnly: true,
-})
-
 module.exports = {
   root: true,
   extends: ['@1stg/eslint-config/recommended'],
@@ -14,7 +10,9 @@ module.exports = {
         },
       },
       rules: {
+        '@typescript-eslint/no-unnecessary-condition': 0,
         '@typescript-eslint/unbound-method': 0, // See https://github.com/typescript-eslint/typescript-eslint/issues/636
+        '@typescript-eslint/triple-slash-reference': 0,
       },
     },
   ],

.travis.yml

@@ -7,6 +7,8 @@ cache:
   - directories:
       - .changelog
 
+env: EFF_NO_LINK_RULES=true
+
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH="$HOME/.yarn/bin:$PATH"
@@ -16,8 +18,8 @@ before_install:
 install: yarn --frozen-lockfile
 
 script:
-  - yarn lint
   - yarn build
+  - yarn lint
   - yarn test
 
 after_success:

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "eslint-mdx",
+  "name": "@rxts/eslint-mdx",
   "version": "0.0.0",
   "description": "ESLint Parser/Plugin for MDX",
   "repository": "[email protected]:rx-ts/eslint-mdx.git",
@@ -11,59 +11,52 @@
   ],
   "scripts": {
     "build": "tsc -b",
-    "test": "ts-node -T node_modules/.bin/jest",
-    "lint": "EFF_NO_LINK_RULES=true eslint . --ext js,md,mdx,ts,tsx -f friendly",
+    "test": "jest",
+    "lint:es": "eslint . --ext js,md,ts -f friendly",
+    "lint:ts": "tslint -p . -t stylish",
+    "lint": "run-p lint:*",
     "type-coverage": "type-coverage --cache --ignore-catch --detail --ignore-files *.d.ts --strict"
   },
   "devDependencies": {
-    "@1stg/babel-preset": "^0.6.2",
-    "@1stg/browserslist-config": "^0.2.1",
-    "@1stg/eslint-config": "^0.11.0",
+    "@1stg/babel-preset": "^0.7.0",
+    "@1stg/commitlint-config": "^0.1.0",
+    "@1stg/eslint-config": "^0.12.10",
     "@1stg/husky-config": "^0.3.0",
-    "@1stg/lint-staged": "^0.6.1",
+    "@1stg/lint-staged": "^0.7.4",
     "@1stg/prettier-config": "^0.2.0",
     "@1stg/remark-config": "^0.2.1",
     "@1stg/tsconfig": "^0.5.1",
+    "@1stg/tslint-config": "^0.3.3",
     "@babel/core": "^7.6.0",
-    "@commitlint/cli": "^8.1.0",
-    "@commitlint/config-conventional": "^8.1.0",
+    "@commitlint/cli": "^8.2.0",
     "@types/cosmiconfig": "^5.0.3",
     "@types/eslint": "^6.1.1",
     "@types/jest": "^24.0.18",
     "@types/node": "^12.7.5",
     "@types/react": "^16.9.2",
     "@types/rebass": "^4.0.0",
     "@types/unist": "^2.0.3",
-    "babel-eslint": "^11.0.0-beta.0",
-    "browserslist": "^4.7.0",
     "eslint": "^6.4.0",
-    "eslint-formatter-friendly": "^7.0.0",
-    "eslint-mdx": "link:packages/eslint-mdx/src",
-    "eslint-plugin-mdx": "link:packages/eslint-plugin-mdx/src",
-    "eslint-plugin-react": "^7.14.3",
     "husky": "^3.0.5",
     "jest": "^24.9.0",
     "lerna": "^3.16.4",
     "lerna-changelog": "^0.8.2",
     "lint-staged": "^9.2.5",
+    "npm-run-all": "^4.1.5",
     "prettier": "1.18.2",
     "react": "^16.9.0",
-    "ts-jest": "~24.0.2",
-    "ts-node": "^8.4.1",
+    "ts-jest": "^24.1.0",
+    "tslint": "^5.20.0",
     "type-coverage": "^2.3.0",
     "typescript": "^3.6.3"
   },
-  "browserslist": [
-    "extends @1stg/browserslist-config/latest"
-  ],
   "commitlint": {
     "extends": [
-      "@commitlint/config-conventional"
+      "@1stg"
     ]
   },
   "eslintIgnore": [
-    "**/fixtures/**/*.md",
-    "**/fixtures/**/*.mdx",
+    "**/fixtures/**",
     "CHANGELOG.md",
     "coverage",
     "lib"
@@ -78,9 +71,6 @@
         "statements": 100
       }
     },
-    "modulePathIgnorePatterns": [
-      "<rootDir>/packages/"
-    ],
     "preset": "ts-jest"
   },
   "prettier": "@1stg/prettier-config",

packages/eslint-mdx/package.json

@@ -2,7 +2,11 @@
   "name": "eslint-mdx",
   "version": "1.4.5",
   "description": "ESLint Parser for MDX",
-  "repository": "https://github.com/rx-ts/eslint-mdx/blob/master/packages/eslint-mdx",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rx-ts/eslint-mdx.git",
+    "directory": "packages/eslint-mdx"
+  },
   "author": "JounQin <[email protected]>",
   "license": "MIT",
   "main": "lib",

packages/eslint-mdx/src/helper.ts

@@ -1,23 +1,19 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
 /// <reference path="../typings.d.ts" />
 
+import { AST } from 'eslint'
 import { parse as esParse } from 'espree'
+import { SourceLocation } from 'estree'
+import { Position } from 'unist'
 
 import {
   Arrayable,
   JsxNode,
   JsxType,
   JsxTypes,
-  ParserOptions,
   ParserFn,
+  ParserOptions,
 } from './types'
 
-import { Position } from 'unist'
-// `SourceLocation` is not exported from estree, but it is actually working
-// eslint-disable-next-line import/named
-import { SourceLocation } from 'estree'
-import { AST } from 'eslint'
-
 export const FALLBACK_PARSERS = [
   '@typescript-eslint/parser',
   'babel-eslint',

packages/eslint-mdx/src/parser.ts

@@ -1,24 +1,22 @@
+import { AST, Linter } from 'eslint'
+import { ExpressionStatement } from 'estree'
 import path from 'path'
-
 import remarkMdx from 'remark-mdx'
 import remarkParse from 'remark-parse'
 import unified from 'unified'
+import { Node, Parent } from 'unist'
 
 import {
   hasProperties,
   isJsxNode,
+  last,
   normalizeParser,
   normalizePosition,
   restoreNodeLocation,
-  last,
 } from './helper'
-import { isComment, COMMENT_CONTENT_REGEX } from './regexp'
+import { COMMENT_CONTENT_REGEX, isComment } from './regexp'
 import { traverse } from './traverse'
-import { ParserOptions, LocationError, Comment, ParserFn } from './types'
-
-import { AST, Linter } from 'eslint'
-import { Parent, Node } from 'unist'
-import { ExpressionStatement } from 'estree'
+import { Comment, LocationError, ParserFn, ParserOptions } from './types'
 
 export const mdxProcessor = unified()
   .use(remarkParse)
@@ -44,6 +42,10 @@ export const DEFAULT_PARSER_OPTIONS: ParserOptions = {
   filePath: '__placeholder__.mdx',
 }
 
+const JSX_WRAPPER_START = '<$>'
+const JSX_WRAPPER_END = '</$>'
+const OFFSET = JSX_WRAPPER_START.length
+
 export class Parser {
   // @internal
   private _parser: ParserFn
@@ -71,9 +73,9 @@ export class Parser {
       return node
     }
 
-    const matched = COMMENT_CONTENT_REGEX.exec(value)
+    const commentContent = COMMENT_CONTENT_REGEX.exec(value)
 
-    if (matched) {
+    if (commentContent) {
       const comments: Comment[] = []
       const {
         position: {
@@ -176,7 +178,7 @@ export class Parser {
 
           let normalized = this.normalizeJsxNode(node, parent)
           normalized = Array.isArray(normalized) ? normalized : [normalized]
-          normalized.forEach(node => this._nodeToAst(node, options))
+          normalized.forEach(_node => this._nodeToAst(_node, options))
         },
       })
     }
@@ -212,15 +214,18 @@ export class Parser {
 
     try {
       // wrap into single element which is valid jsx but not valid jsx in mdx, so that it won't break on adjacent JSX nodes
-      program = this._eslintParse(`<$>${value}</$>`).ast
+      program = this._eslintParse(
+        `${JSX_WRAPPER_START}${value}${JSX_WRAPPER_END}`,
+      ).ast
     } catch (e) {
       if (hasProperties<LocationError>(e, LOC_ERROR_PROPERTIES)) {
         const {
           position: { start },
         } = node
 
-        e.index += start.offset - 3
-        e.column = e.lineNumber > 1 ? e.column : e.column + start.column - 3
+        e.index += start.offset - OFFSET
+        e.column =
+          e.lineNumber > 1 ? e.column : e.column + start.column - OFFSET
         e.lineNumber += start.line - 1
 
         throw e
@@ -251,21 +256,21 @@ export class Parser {
       } = jsNode
       const startLine = line + start.line - 1
       const endLine = line + end.line - 1
-      const startOffset = range[0] - 3
-      const endOffset = range[1] - 3
+      const startOffset = range[0] - OFFSET
+      const endOffset = range[1] - OFFSET
       nodes.push({
         type: 'jsx',
         data: nodes.length ? null : node.data,
         value: value.slice(startOffset, endOffset),
         position: {
           start: {
             line: startLine,
-            column: line === startLine ? start.column - 3 : start.column,
+            column: line === startLine ? start.column - OFFSET : start.column,
             offset: offset + startOffset,
           },
           end: {
             line: endLine,
-            column: line === startLine ? end.column - 3 : end.column,
+            column: line === startLine ? end.column - OFFSET : end.column,
             offset: offset + endOffset,
           },
         },
@@ -288,7 +293,7 @@ export class Parser {
     }
 
     const { loc, start } = normalizePosition(node.position)
-    const startLine = loc.start.line - 1 //! line is 1-indexed, change to 0-indexed to simplify usage
+    const startLine = loc.start.line - 1 // ! line is 1-indexed, change to 0-indexed to simplify usage
 
     let program: AST.Program
 
@@ -310,7 +315,6 @@ export class Parser {
     AST_PROPS.forEach(prop =>
       this._ast[prop].push(
         // unfortunately, TS complains about incompatible signature
-        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
         // @ts-ignore
         ...program[prop].map(item =>
           restoreNodeLocation(item, startLine, offset),

packages/eslint-mdx/src/traverse.ts

@@ -1,14 +1,14 @@
+import { Node, Parent } from 'unist'
+
 import { last } from './helper'
 import {
-  isOpenTag,
   isCloseTag,
   isComment,
-  isSelfClosingTag,
   isOpenCloseTag,
+  isOpenTag,
+  isSelfClosingTag,
 } from './regexp'
-import { Traverser, TraverseOptions } from './types'
-
-import { Node, Parent } from 'unist'
+import { TraverseOptions, Traverser } from './types'
 
 export class Traverse {
   // @internal

packages/eslint-mdx/src/types.ts

@@ -1,6 +1,5 @@
 import { JSXElement, JSXFragment } from '@babel/types'
-
-import { Linter, AST } from 'eslint'
+import { AST, Linter } from 'eslint'
 import { Node, Parent, Point } from 'unist'
 
 export type JsxNode = (JSXElement | JSXFragment) & { range: [number, number] }

packages/eslint-plugin-mdx/package.json

@@ -2,7 +2,11 @@
   "name": "eslint-plugin-mdx",
   "version": "1.5.0",
   "description": "ESLint Plugin for MDX",
-  "repository": "https://github.com/rx-ts/eslint-mdx/blob/master/packages/eslint-plugin-mdx",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rx-ts/eslint-mdx.git",
+    "directory": "packages/eslint-plugin-mdx"
+  },
   "author": "JounQin <[email protected]>",
   "license": "MIT",
   "main": "lib",

packages/eslint-plugin-mdx/src/configs/helper.ts

@@ -11,7 +11,6 @@ export const getGlobals = <
         [source]: false,
       }),
     // FIXME: find a better solution
-    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
     // @ts-ignore
     initialGlobals,
   )