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: v4.2.5
Choose a base ref
...
head repository: markedjs/marked
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.2.6
Choose a head ref
  • 18 commits
  • 10 files changed
  • 5 contributors

Commits on Dec 26, 2022

  1. chore(deps-dev): Bump @babel/core from 7.20.5 to 7.20.7 (#2694)

    Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.20.5 to 7.20.7.
    - [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.20.7/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>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 26, 2022
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    61be30e View commit details
  2. chore(deps-dev): Bump rollup from 3.7.5 to 3.8.1 (#2695)

    Bumps [rollup](https://github.com/rollup/rollup) from 3.7.5 to 3.8.1.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v3.7.5...v3.8.1)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 26, 2022
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    36e7b99 View commit details

Commits on Jan 2, 2023

  1. 1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    df9f2d3 View commit details
  2. chore(deps-dev): Bump rollup from 3.8.1 to 3.9.1 (#2697)

    Bumps [rollup](https://github.com/rollup/rollup) from 3.8.1 to 3.9.1.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v3.8.1...v3.9.1)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 2, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    285c0e2 View commit details
  3. chore(deps-dev): Bump eslint from 8.30.0 to 8.31.0 (#2696)

    Bumps [eslint](https://github.com/eslint/eslint) from 8.30.0 to 8.31.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
    - [Commits](eslint/eslint@v8.30.0...v8.31.0)
    
    ---
    updated-dependencies:
    - dependency-name: eslint
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 2, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a1f33a7 View commit details

Commits on Jan 8, 2023

  1. chore(deps): Bump json5 from 1.0.1 to 1.0.2 (#2702)

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 8, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    372433c View commit details
  2. chore: add .devcontainer config (#2700)

    Co-authored-by: Tony Brix <tony@brix.ninja>
    Closes #2699
    tristan-f-r authored Jan 8, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c554f93 View commit details

Commits on Jan 9, 2023

  1. chore(deps-dev): Bump @babel/core from 7.20.7 to 7.20.12 (#2703)

    Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.20.7 to 7.20.12.
    - [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.20.12/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>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 9, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    08223a1 View commit details
  2. chore(deps-dev): Bump semantic-release from 19.0.5 to 20.0.2 (#2704)

    Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 19.0.5 to 20.0.2.
    - [Release notes](https://github.com/semantic-release/semantic-release/releases)
    - [Commits](semantic-release/semantic-release@v19.0.5...v20.0.2)
    
    ---
    updated-dependencies:
    - dependency-name: semantic-release
      dependency-type: direct:development
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jan 9, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    53c686c View commit details

Commits on Jan 11, 2023

  1. chore(ci): cleanup ci (#2705)

    chore(ci): add build test to ci
    UziTech authored Jan 11, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d28cc87 View commit details

Commits on Jan 14, 2023

  1. chore(ci): add version, unify output (#2701)

    Co-authored-by: Tony Brix <tony@brix.ninja>
    fixes undefined
    tristan-f-r authored Jan 14, 2023
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    886de34 View commit details
  2. 1
    Copy the full SHA
    79b8c0b View commit details
  3. chore: add env variables

    UziTech committed Jan 14, 2023
    1
    Copy the full SHA
    ea57b34 View commit details
  4. chore: export version

    UziTech committed Jan 14, 2023
    1
    Copy the full SHA
    bf1d909 View commit details
  5. chore: actually release

    UziTech committed Jan 14, 2023
    1
    Copy the full SHA
    4267343 View commit details
  6. 🗜️ build [skip ci]

    MarkedJS bot committed Jan 14, 2023
    Copy the full SHA
    f2dbda1 View commit details
  7. build

    semantic-release-bot committed Jan 14, 2023
    Copy the full SHA
    d0e97fb View commit details
  8. chore(release): 4.2.6 [skip ci]

    ## [4.2.6](v4.2.5...v4.2.6) (2023-01-14)
    
    ### Bug Fixes
    
    * add version to build files ([79b8c0b](79b8c0b))
    semantic-release-bot committed Jan 14, 2023
    1
    Copy the full SHA
    cb87794 View commit details
Showing with 1,294 additions and 480 deletions.
  1. +18 −0 .devcontainer/devcontainer.json
  2. +27 −15 .github/workflows/tests.yml
  3. +1 −0 docs/USING_ADVANCED.md
  4. +2 −2 lib/marked.cjs
  5. +2 −2 lib/marked.esm.js
  6. +2 −2 lib/marked.umd.js
  7. +2 −2 marked.min.js
  8. +1,198 −416 package-lock.json
  9. +5 −5 package.json
  10. +37 −36 rollup.config.js
18 changes: 18 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
{
"name": "marked",
// We're using node 14 for development, to keep close to the engine compatibility that marked.js uses.
"image": "mcr.microsoft.com/devcontainers/javascript-node:0-14",
"postCreateCommand": "npm install",

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
"extensions": [
"dbaeumeur.vscode-eslint"
]
}
}
}
42 changes: 27 additions & 15 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -10,17 +10,16 @@ permissions:

jobs:
Test:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
strategy:
matrix:
# lowest verison here should also be in `engines` field
node_version: [12, 'lts/*', 'node']
node_version: [12, 'lts/*', '*']
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
- name: Install Node
uses: dcodeIO/setup-node-nvm@master
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
- name: Install Dependencies
@@ -31,20 +30,37 @@ jobs:
run: npm run test:specs

Lint:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 'lts/*'
- name: Install Dependencies
run: npm ci
- name: Lint ✨
run: npm run test:lint

Build:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 'lts/*'
- name: Install Dependencies
run: npm ci
- name: Build 🗜️
run: npm run build

Release:
permissions:
contents: write
needs: [Test, Lint]
needs: [Test, Lint, Build]
if: |
github.ref == 'refs/heads/master' &&
github.event.repository.fork == false
@@ -53,13 +69,18 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3
- name: Install Node
uses: dcodeIO/setup-node-nvm@master
uses: actions/setup-node@v3
with:
node-version: 'lts/*'
- name: Install Dependencies
run: npm ci
- name: Build 🗜️
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
export SEMANTIC_RELEASE_NEXT_VERSION=$(npx semantic-release --no-ci --dry-run | grep -oP 'The next release version is \K[0-9]+\.[0-9]+\.[0-9]+')
echo "Next Version: $SEMANTIC_RELEASE_NEXT_VERSION"
npm run build
if ! git diff --quiet; then
git config --global user.email "<>"
@@ -71,12 +92,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npx semantic-release

Skip:
permissions:
contents: none
if: contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-latest
steps:
- name: Skip CI 🚫
run: echo skip ci
1 change: 1 addition & 0 deletions docs/USING_ADVANCED.md
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ Marked can be extended using [custom extensions](/using_pro#extensions). This is
|[Admonition](https://www.npmjs.com/package/marked-admonition-extension)|[`marked-admonition-extension`](https://www.npmjs.com/package/marked-admonition-extension)| Admonition extension |
|[Bidi](https://github.com/markedjs/marked-bidi)|[`marked-bidi`](https://www.npmjs.com/package/marked-bidi)|Add Bidirectional text support to the HTML|
|[Custom Heading ID](https://github.com/markedjs/marked-custom-heading-id)|[`marked-custom-heading-id`](https://www.npmjs.com/package/marked-custom-heading-id)|Specify a custom heading id in headings with the [Markdown Extended Syntax](https://www.markdownguide.org/extended-syntax/#heading-ids) `# heading {#custom-id}`|
|[Emoji](https://github.com/UziTech/marked-emoji)|[`marked-emoji`](https://www.npmjs.com/package/marked-emoji)|Add emoji support like on GitHub|
|[Extended Tables](https://github.com/calculuschild/marked-extended-tables)|[`marked-extended-tables`](https://www.npmjs.com/package/marked-extended-tables)|Extends the standard Github-Flavored tables to support advanced features: Column Spanning, Row Spanning, Multi-row headers|
|[GFM Heading ID](https://github.com/markedjs/marked-gfm-heading-id)|[`marked-gfm-heading-id`](https://www.npmjs.com/package/marked-gfm-heading-id)|Use [`github-slugger`](https://github.com/Flet/github-slugger) to create the heading IDs and allow a custom prefix.|
|[Katex Code](https://github.com/UziTech/marked-katex-extension)|[`marked-katex-extension`](https://www.npmjs.com/package/marked-katex-extension)|Render [katex](https://katex.org/) code|
4 changes: 2 additions & 2 deletions lib/marked.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* marked - a markdown parser
* Copyright (c) 2011-2022, Christopher Jeffrey. (MIT Licensed)
* marked v4.2.5 - a markdown parser
* Copyright (c) 2011-2023, Christopher Jeffrey. (MIT Licensed)
* https://github.com/markedjs/marked
*/

4 changes: 2 additions & 2 deletions lib/marked.esm.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* marked - a markdown parser
* Copyright (c) 2011-2022, Christopher Jeffrey. (MIT Licensed)
* marked v4.2.5 - a markdown parser
* Copyright (c) 2011-2023, Christopher Jeffrey. (MIT Licensed)
* https://github.com/markedjs/marked
*/

4 changes: 2 additions & 2 deletions lib/marked.umd.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* marked - a markdown parser
* Copyright (c) 2011-2022, Christopher Jeffrey. (MIT Licensed)
* marked v4.2.5 - a markdown parser
* Copyright (c) 2011-2023, Christopher Jeffrey. (MIT Licensed)
* https://github.com/markedjs/marked
*/

Loading