From b03f1ad4b785dd48b3dd0dd9a161dad279666143 Mon Sep 17 00:00:00 2001 From: WM Date: Sun, 13 Nov 2022 09:29:47 -0500 Subject: [PATCH 1/3] apply pr changes from main branch --- package.json | 14 +++++++++----- src/index.d.ts | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0670296a..44aefe4f 100644 --- a/package.json +++ b/package.json @@ -35,17 +35,21 @@ "react-native-fit-image": "^1.5.5" }, "peerDependencies": { - "react": "^16.2.0", + "react": ">=16.2.0", "react-native": ">=0.50.4" }, "devDependencies": { - "@types/markdown-it": "^10.0.1", - "@types/react-native": ">=0.50.0", "@babel/core": "^7.9.6", "@babel/runtime": "^7.9.6", "@react-native-community/eslint-config": "^1.1.0", - "@typescript-eslint/parser": "^2.32.0", - "eslint": "^7.0.0", + "@types/markdown-it": "^10.0.1", + "@types/react-native": ">=0.50.0", + "@typescript-eslint/eslint-plugin": "^5.42.1", + "@typescript-eslint/parser": ">=2.34.0", + "eslint": "^6.8.0", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-native": "^4.0.0", "json-schema": "^0.2.5", "pre-commit": "1.2.2", "typescript": "^3.8.3" diff --git a/src/index.d.ts b/src/index.d.ts index f0daf4ab..909ad3d7 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -89,6 +89,7 @@ export interface MarkdownProps { mergeStyle?: boolean; debugPrintTree?: boolean; onLinkPress?: (url: string) => boolean; + children: string; } type MarkdownStatic = ComponentType; From 45a565542696ad25f678abde6e6e93f951eeac5e Mon Sep 17 00:00:00 2001 From: WM Date: Sun, 13 Nov 2022 10:45:19 -0500 Subject: [PATCH 2/3] add release-it --- package.json | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 44aefe4f..653e74fa 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,19 @@ { - "name": "react-native-markdown-display", + "name": "react-native-markdown-display-updated", "version": "7.0.0-alpha.2", - "description": "Markdown renderer for react-native, with CommonMark spec support + adds syntax extensions & sugar (URL autolinking, typographer), originally created by Mient-jan Stelling as react-native-markdown-renderer", + "description": "My fork of react-native-markdown-display which forks X-renderer. Forked to get it into react v17. Markdown renderer for react-native, with CommonMark spec support + adds syntax extensions & sugar (URL autolinking, typographer), originally created by Mient-jan Stelling as react-native-markdown-renderer", "main": "src/index.js", "types": "src/index.d.ts", "scripts": { - "lint": "./node_modules/.bin/eslint --fix --cache ./src" + "lint": "./node_modules/.bin/eslint --fix --cache ./src", + "release": "release-it" }, "pre-commit": [ "lint" ], "repository": { "type": "git", - "url": "git+https://github.com/iamacup/react-native-markdown-display.git" + "url": "git+https://github.com/willmac321/react-native-markdown-display.git" }, "keywords": [ "react", @@ -22,12 +23,12 @@ "commonmark", "markdown-it" ], - "author": "Mient-jan Stelling and Tom Pickard + others from the community", + "author": "Will MacIntyre (this fork only) and Mient-jan Stelling and Tom Pickard + others from the community", "license": "MIT", "bugs": { - "url": "https://github.com/iamacup/react-native-markdown-display/issues" + "url": "https://github.com/willmac321/react-native-markdown-display/issues" }, - "homepage": "https://github.com/iamacup/react-native-markdown-display/", + "homepage": "https://github.com/willmac321/react-native-markdown-display/", "dependencies": { "css-to-react-native": "^3.0.0", "markdown-it": "^10.0.0", @@ -52,6 +53,12 @@ "eslint-plugin-react-native": "^4.0.0", "json-schema": "^0.2.5", "pre-commit": "1.2.2", + "release-it": "^15.5.0", "typescript": "^3.8.3" + }, + "release-it": { + "github": { + "release": true + } } } From e46d39ee303214184b465589fd007e17b6c12328 Mon Sep 17 00:00:00 2001 From: WM Date: Sun, 13 Nov 2022 10:45:50 -0500 Subject: [PATCH 3/3] Release 7.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 653e74fa..6eb50f02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-markdown-display-updated", - "version": "7.0.0-alpha.2", + "version": "7.0.0", "description": "My fork of react-native-markdown-display which forks X-renderer. Forked to get it into react v17. Markdown renderer for react-native, with CommonMark spec support + adds syntax extensions & sugar (URL autolinking, typographer), originally created by Mient-jan Stelling as react-native-markdown-renderer", "main": "src/index.js", "types": "src/index.d.ts",