Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: markedjs/marked
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.1
Choose a base ref
...
head repository: markedjs/marked
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.1.2
Choose a head ref
  • 7 commits
  • 5 files changed
  • 4 contributors

Commits on Jun 16, 2021

  1. 1

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    Copy the full SHA
    da1c57f View commit details

Commits on Jun 21, 2021

  1. chore(deps-dev): Bump semantic-release from 17.4.3 to 17.4.4 (#2117)

    Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.4.3 to 17.4.4.
    - [Release notes](https://github.com/semantic-release/semantic-release/releases)
    - [Commits](semantic-release/semantic-release@v17.4.3...v17.4.4)
    
    ---
    updated-dependencies:
    - dependency-name: semantic-release
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 21, 2021
    1
    Copy the full SHA
    8321e89 View commit details
  2. chore(deps-dev): Bump rollup from 2.51.2 to 2.52.2 (#2116)

    Bumps [rollup](https://github.com/rollup/rollup) from 2.51.2 to 2.52.2.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v2.51.2...v2.52.2)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 21, 2021
    Copy the full SHA
    b611bb1 View commit details
  3. chore(deps-dev): Bump eslint from 7.28.0 to 7.29.0 (#2115)

    Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.29.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
    - [Commits](eslint/eslint@v7.28.0...v7.29.0)
    
    ---
    updated-dependencies:
    - dependency-name: eslint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 21, 2021
    1
    Copy the full SHA
    7c1fa84 View commit details
  4. chore(deps-dev): Bump @babel/core from 7.14.5 to 7.14.6 (#2118)

    Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.14.5 to 7.14.6.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/babel/babel/commits/v7.14.6/packages/babel-core)
    
    ---
    updated-dependencies:
    - dependency-name: "@babel/core"
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jun 21, 2021
    1
    Copy the full SHA
    30c3d05 View commit details

Commits on Jun 22, 2021

  1. 1
    Copy the full SHA
    8659353 View commit details
  2. chore(release): 2.1.2 [skip ci]

    ## [2.1.2](v2.1.1...v2.1.2) (2021-06-22)
    
    ### Bug Fixes
    
    * add Node.js 10 to CI and loosen `engines` field ([#2119](#2119)) ([8659353](8659353))
    semantic-release-bot committed Jun 22, 2021
    1
    Copy the full SHA
    c7b4664 View commit details
Showing with 41 additions and 363 deletions.
  1. +2 −1 .github/workflows/tests.yml
  2. +1 −1 docs/USING_PRO.md
  3. +1 −0 docs/_document.html
  4. +31 −355 package-lock.json
  5. +6 −6 package.json
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,8 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
strategy:
matrix:
node_version: [12, 'lts/*', 'node']
# lowest verison here should also be in `engines` field
node_version: [10, 12, 'lts/*', 'node']
runs-on: ubuntu-latest
steps:
- name: Checkout Code
2 changes: 1 addition & 1 deletion docs/USING_PRO.md
Original file line number Diff line number Diff line change
@@ -288,7 +288,7 @@ console.log(marked('# heading 2\n\n## heading 3'));

***

<h2>Custom Extensions : <code>extensions</code></h2>
<h2 id="extensions">Custom Extensions : <code>extensions</code></h2>

You may supply an `extensions` array to the `options` object. This array can contain any number of `extension` objects, using the following properties:

1 change: 1 addition & 0 deletions docs/_document.html
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@ <h1>Marked Documentation</h1>
<li><a href="/using_pro#renderer">Renderer</a></li>
<li><a href="/using_pro#tokenizer">Tokenizer</a></li>
<li><a href="/using_pro#walk-tokens">Walk Tokens</a></li>
<li><a href="/using_pro#extensions">Custom Extensions</a></li>
<li><a href="/using_pro#lexer">Lexer</a></li>
<li><a href="/using_pro#parser">Parser</a></li>
</ul>
386 changes: 31 additions & 355 deletions package-lock.json
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "marked",
"description": "A markdown parser built for speed",
"author": "Christopher Jeffrey",
"version": "2.1.1",
"version": "2.1.2",
"main": "./src/marked.js",
"browser": "./lib/marked.js",
"bin": {
@@ -33,7 +33,7 @@
"html"
],
"devDependencies": {
"@babel/core": "^7.14.5",
"@babel/core": "^7.14.6",
"@babel/preset-env": "^7.14.5",
"@markedjs/html-differ": "^3.0.4",
"@rollup/plugin-babel": "^5.3.0",
@@ -45,7 +45,7 @@
"@semantic-release/release-notes-generator": "^9.0.3",
"cheerio": "^1.0.0-rc.10",
"commonmark": "0.29.3",
"eslint": "^7.28.0",
"eslint": "^7.29.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-node": "^11.1.0",
@@ -55,9 +55,9 @@
"jasmine": "^3.7.0",
"markdown-it": "12.0.6",
"node-fetch": "^2.6.1",
"rollup": "^2.51.2",
"rollup": "^2.52.2",
"rollup-plugin-license": "^2.5.0",
"semantic-release": "^17.4.3",
"semantic-release": "^17.4.4",
"titleize": "^2.1.0",
"uglify-js": "^3.13.9",
"vuln-regex-detector": "^1.3.0"
@@ -83,6 +83,6 @@
"preversion": "npm run build && (git diff --quiet || git commit -am build)"
},
"engines": {
"node": ">= 12"
"node": ">= 10"
}
}