Merge pull request #334 from kamiazya/support-ink3

feat: support ink 3

Author: kamiazya

.eslintrc.json

@@ -10,6 +10,9 @@
     "useJSXTextNode": true
   },
   "settings": {
+    "react": {
+      "version": "detect"
+    },
     "import/resolver": {
       "node": {
         "extensions": [
@@ -30,8 +33,9 @@
     "airbnb",
     "plugin:prettier/recommended",
     "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
-    "plugin:jest/recommended"
+    "prettier",
+    "plugin:jest/recommended",
+    "plugin:react-hooks/recommended"
   ],
   "rules": {
     "prettier/prettier": "error",
@@ -46,6 +50,13 @@
           ".tsx"
         ]
       }
+    ],
+    "react/function-component-definition": [
+      2,
+      {
+        "namedComponents": "arrow-function",
+        "unnamedComponents": "arrow-function"
+      }
     ]
   }
 }

.github/FUNDING.yml

@@ -4,12 +4,11 @@ on: [push]
 
 jobs:
   test:
-    name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Test on node ${{ matrix.node-version }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x]
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [12.x, 14.x, 16.x]
 
     steps:
     - uses: actions/checkout@v1
@@ -43,7 +42,7 @@ jobs:
     - uses: actions/checkout@master
     - uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 16.x
         registry-url: https://registry.npmjs.org
     - name: Install dependencies
       run: yarn install --frozen-lockfile --ignore-optional

.github/dependabot.yml

@@ -4,5 +4,6 @@
   "semi": true,
   "trailingComma": "all",
   "printWidth": 120,
-  "bracketSpacing": true
+  "bracketSpacing": true,
+  "endOfLine": "auto"
 }

.github/release-drafter.yml

@@ -1,8 +1,12 @@
 {
   "name": "ink-highlight",
   "version": "0.2.1",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "exports": {
+    "import": "./lib/index.mjs",
+    "require": "./lib/index.js"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/kamiazya/ink-highlight.git"
@@ -36,44 +40,48 @@
   "scripts": {
     "demo": "ts-node -P demo/tsconfig.json demo/main",
     "test": "jest",
-    "build": "rollup -c",
+    "build": "rollup -c && prettier --write './lib/index.d.ts'",
     "lint": "eslint -c .eslintrc.json --ext ts,tsx src",
     "format": "yarn lint --fix"
   },
   "peerDependencies": {
-    "ink": "^2.0.0",
-    "react": "^16.8.0"
+    "ink": "^3.0.0",
+    "react": "^17.0.0"
   },
   "dependencies": {
-    "cli-highlight": "^2.1.4",
-    "prop-types": "^15.7.2"
+    "cli-highlight": "^2.1.11",
+    "prop-types": "^15.8.1"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^4.0.0",
-    "@types/jest": "^25.1.4",
-    "@types/prop-types": "^15.7.3",
-    "@types/react": "^16.9.23",
-    "@typescript-eslint/eslint-plugin": "^2.22.0",
-    "@typescript-eslint/parser": "^2.22.0",
-    "eslint": "^6.8.0",
-    "eslint-config-airbnb": "^18.0.1",
-    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jest": "^23.8.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-react": "^7.19.0",
-    "ink": "^2.7.1",
-    "ink-testing-library": "^1.0.3",
-    "jest": "^25.1.0",
-    "jest-snapshot-serializer-raw": "^1.1.0",
-    "prettier": "^1.19.1",
-    "react": "^16.13.0",
-    "rollup": "^2.0.2",
-    "rollup-plugin-terser": "^5.2.0",
-    "ts-jest": "^25.2.1",
-    "ts-node": "^8.6.2",
+    "@rollup/plugin-typescript": "^8.3.1",
+    "@types/jest": "^27.4.1",
+    "@types/node": "*",
+    "@types/prop-types": "^15.7.4",
+    "@types/react": "^17.0.43",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
+    "eslint": "^8.12.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.1.3",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "ink": "^3.2.0",
+    "ink-testing-library": "^2.1.0",
+    "jest": "^27.5.1",
+    "jest-snapshot-serializer-raw": "^1.2.0",
+    "prettier": "^2.6.2",
+    "react": "^17.0.0",
+    "rollup": "^2.70.1",
+    "rollup-plugin-delete": "^2.0.0",
+    "rollup-plugin-dts": "^4.2.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "ts-jest": "^27.1.4",
+    "ts-node": "^10.7.0",
     "tslib": "*",
-    "typescript": "^3.8.3"
+    "typescript": "^4.6.3"
   }
 }

.github/workflows/node-ci.yml

@@ -1,14 +1,51 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import typescript from '@rollup/plugin-typescript';
+import del from 'rollup-plugin-delete';
+import dts from 'rollup-plugin-dts';
 import { terser } from 'rollup-plugin-terser';
 
-export default {
-  input: 'src/index.ts',
-  output: [
-    {
-      format: 'cjs',
-      dir: 'lib',
-    },
-  ],
-  plugins: [typescript(), terser()],
-  external: ['react', 'prop-types', 'ink', 'cli-highlight'],
-};
+/** @type {import('rollup').RollupOutput[]} */
+const options = [
+  {
+    input: './src/index.ts',
+    plugins: [
+      typescript({
+        declaration: true,
+      }),
+      terser({
+        format: {
+          comments: false,
+        },
+      }),
+    ],
+    external: ['react', 'ink', 'prop-types', 'cli-highlight'],
+    output: [
+      {
+        format: 'cjs',
+        dir: './lib',
+      },
+      {
+        format: 'esm',
+        file: './lib/index.mjs',
+      },
+    ],
+  },
+  {
+    input: './lib/index.d.ts',
+    plugins: [
+      del({
+        targets: ['lib/**/*.d.ts', '!lib/index.d.ts'],
+        hook: 'buildEnd',
+      }),
+      dts(),
+    ],
+    output: [
+      {
+        format: 'esm',
+        file: './lib/index.d.ts',
+      },
+    ],
+  },
+];
+
+export default options;

.github/workflows/release-management.yml

@@ -1,4 +1,5 @@
 import React, { FC, useContext } from 'react';
+import { Text } from 'ink';
 import PropTypes from 'prop-types';
 import { highlight } from 'cli-highlight';
 import { HighlightOptions, HighlightOptionsContext } from './HighlightOptionsContext';
@@ -13,33 +14,29 @@ export const Highlight: FC<Props> = ({ code, ...option }) => {
   const contextOption = useContext(HighlightOptionsContext);
   const language = option.language !== undefined ? option.language : contextOption.language;
   const ignoreIllegals = option.ignoreIllegals !== undefined ? option.ignoreIllegals : contextOption.ignoreIllegals;
-  const continuation = option.continuation !== undefined ? option.continuation : contextOption.continuation;
   const languageSubset = option.languageSubset !== undefined ? option.languageSubset : contextOption.languageSubset;
 
   return (
-    <>
+    <Text>
       {highlight(code, {
         language,
         ignoreIllegals,
-        continuation,
         languageSubset,
         theme,
       })}
-    </>
+    </Text>
   );
 };
 
 Highlight.propTypes = {
   code: PropTypes.string.isRequired,
   language: PropTypes.string,
   ignoreIllegals: PropTypes.bool,
-  continuation: PropTypes.any,
   languageSubset: PropTypes.arrayOf(PropTypes.string.isRequired),
 };
 
 Highlight.defaultProps = {
   language: undefined,
   ignoreIllegals: undefined,
-  continuation: undefined,
   languageSubset: undefined,
 };