Merge branch 'main' into reconfigure-typescript

Author: remcohaszing

.editorconfig

@@ -1,9 +1,9 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/bb.yml

@@ -1,13 +1,13 @@
-name: bb
-on:
-  issues:
-    types: [opened, reopened, edited, closed, labeled, unlabeled]
-  pull_request_target:
-    types: [opened, reopened, edited, closed, labeled, unlabeled]
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
       - uses: unifiedjs/beep-boop-beta@main
         with:
           repo-token: ${{secrets.GITHUB_TOKEN}}
+name: bb
+on:
+  issues:
+    types: [closed, edited, labeled, opened, reopened, unlabeled]
+  pull_request_target:
+    types: [closed, edited, labeled, opened, reopened, unlabeled]

.github/workflows/main.yml

@@ -3,17 +3,17 @@ jobs:
     name: ${{matrix.node}}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{matrix.node}}
       - run: npm install
       - run: npm test
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
     strategy:
       matrix:
         node:
-          - lts/gallium
+          - lts/hydrogen
           - node
 name: main
 on:

changelog.md

@@ -704,7 +704,7 @@ slightly differently.
 
 ### Fixes
 
-* (Typings) Add `parserOptions` to type defintions (Ted Piotrowski)
+* (Typings) Add `parserOptions` to type definitions (Ted Piotrowski)
 * Allow renderer to be any React element type (Nathan Bierema)
 
 ## 4.1.0 - 2019-06-24

lib/index.js

@@ -219,9 +219,7 @@ export default function Markdown(options) {
     Fragment,
     components,
     ignoreInvalidStyle: true,
-    // @ts-expect-error: to do: types.
     jsx,
-    // @ts-expect-error: to do: types.
     jsxs,
     passKeys: true,
     passNode: true

license

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Espen Hovlandsdal
+Copyright (c) Espen Hovlandsdal
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -94,22 +94,23 @@
     "react": ">=18"
   },
   "devDependencies": {
-    "@types/node": "^20.0.0",
+    "@types/node": "^22.0.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "c8": "^10.0.0",
-    "esbuild": "^0.21.0",
+    "esbuild": "^0.24.0",
     "eslint-plugin-react": "^7.0.0",
     "prettier": "^3.0.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "rehype-raw": "^7.0.0",
     "remark-cli": "^12.0.0",
+    "remark-gfm": "^4.0.0",
     "remark-preset-wooorm": "^10.0.0",
     "remark-toc": "^9.0.0",
     "type-coverage": "^2.0.0",
-    "typescript": "^5.5.1-rc",
-    "xo": "^0.58.0"
+    "typescript": "^5.0.0",
+    "xo": "^0.59.0"
   },
   "scripts": {
     "build": "tsc --build --clean && tsc --build && type-coverage",

readme.md

@@ -678,7 +678,7 @@ const markdown = `
 # This is perfect!
 `
 
-// Pass the value as an expresion as an only child:
+// Pass the value as an expression as an only child:
 const result = <Markdown>{markdown}</Markdown>
 ```