Skip to content

Commit 3acf053

Browse files
authored
Merge pull request #21 from github/bump-commonmarker
Bump commonmarker to the latest version
2 parents fcd4e0b + 8097a88 commit 3acf053

File tree

9 files changed

+42
-55
lines changed

9 files changed

+42
-55
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Automatically add our team to each pull request in this repo
2+
* @github/pages-reviewers

.github/workflows/cibuild.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
on: push
2+
name: cibuild
3+
jobs:
4+
build:
5+
name: Test
6+
strategy:
7+
matrix:
8+
ruby: [2.6, 2.7]
9+
os: [ubuntu-latest, macos-latest, windows-latest]
10+
runs-on: ${{ matrix.os }}
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: ruby/setup-ruby@v1
14+
with:
15+
ruby-version: ${{ matrix.ruby }}
16+
- name: script/cibuild
17+
run: script/cibuild

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
Gemfile.lock
33
spec/dest
44
.bundle
5+
vendor/

.travis.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
*GitHub Flavored Markdown converter for Jekyll, based on [`jekyll-commonmark`](https://github.com/jekyll/jekyll-commonmark)*
44

55
[![Gem Version](https://img.shields.io/gem/v/jekyll-commonmark-ghpages.svg)](https://rubygems.org/gems/jekyll-commonmark-ghpages)
6-
[![Build Status](https://img.shields.io/travis/github/jekyll-commonmark-ghpages/master.svg)](https://travis-ci.org/github/jekyll-commonmark-ghpages)
7-
[![Windows Build status](https://img.shields.io/appveyor/ci/github/jekyll-commonmark-ghpages/master.svg?label=Windows%20build)](https://ci.appveyor.com/project/github/jekyll-commonmark-ghpages)
6+
[![Build Status](https://github.com/github/jekyll-commonmark-ghpages/actions/workflows/cibuild.yaml/badge.svg)](https://github.com/github/jekyll-commonmark-ghpages/actions/workflows/cibuild.yaml)
87

98
Jekyll Markdown converter that uses [libcmark-gfm](https://github.com/github/cmark), GitHub's fork of [cmark](https://github.com/commonmark/cmark), the reference parser for CommonMark, with some additions to ensure compatibility with existing Kramdown-based sites.
109

@@ -30,6 +29,8 @@ To specify extensions and options for use in converting Markdown to HTML, supply
3029
3130
```yaml
3231
commonmark:
33-
options: ["SMART", "FOOTNOTES"]
32+
options: ["UNSAFE", "SMART", "FOOTNOTES"]
3433
extensions: ["strikethrough", "autolink", "table", "tagfilter"]
3534
```
35+
36+
⚠ The `UNSAFE` option is required for HTML rendering.

appveyor.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

jekyll-commonmark-ghpages.gemspec

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
Gem::Specification.new do |spec|
44
spec.name = "jekyll-commonmark-ghpages"
55
spec.summary = "CommonMark generator for Jekyll"
6-
spec.version = "0.1.6"
7-
spec.authors = ["Ashe Connor"]
8-
spec.email = "kivikakk@github.com"
6+
spec.version = "0.2.0"
7+
spec.authors = ["GitHub, Inc."]
8+
spec.email = "support@github.com"
99
spec.homepage = "https://github.com/github/jekyll-commonmark-ghpages"
1010
spec.licenses = ["MIT"]
1111

@@ -14,8 +14,9 @@ Gem::Specification.new do |spec|
1414
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1515
spec.require_paths = ["lib"]
1616

17-
spec.add_runtime_dependency "jekyll-commonmark", "~> 1.2"
18-
spec.add_runtime_dependency "commonmarker", "~> 0.17.6"
17+
spec.add_runtime_dependency "jekyll", "~> 3.9.0"
18+
spec.add_runtime_dependency "jekyll-commonmark", "~> 1.4.0"
19+
spec.add_runtime_dependency "commonmarker", "~> 0.23.4"
1920
spec.add_runtime_dependency "rouge", ">= 2.0", "< 4.0"
2021

2122
spec.add_development_dependency "rspec", "~> 3.0"

script/cibuild

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
#!/bin/bash
22

3+
# Update gems
4+
gem update --system 3.2.3
5+
6+
# Install bundler
7+
gem install bundler
8+
9+
# Install dependencies
10+
bundle install
11+
12+
# Run tests
313
bundle exec rspec

spec/test_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
let(:converter) { Jekyll::Converters::Markdown::CommonMarkGhPages.new(config) }
2222
let(:config) {
2323
{"commonmark" => {
24-
"options" => ["SMART", "FOOTNOTES"],
24+
"options" => ["UNSAFE", "SMART", "FOOTNOTES"],
2525
"extensions" => ["tagfilter"],
2626
}}
2727
}
@@ -32,7 +32,7 @@
3232

3333
describe Jekyll::Renderer do
3434
it "should not re-process markdown in a liquid tag" do
35-
site = Jekyll::Site.new(Jekyll.configuration("markdown" => "CommonMarkGhPages"))
35+
site = Jekyll::Site.new(Jekyll.configuration("markdown" => "CommonMarkGhPages", "commonmark" => { "options" => ["UNSAFE"] }))
3636
collection = Jekyll::Collection.new(site, "pages")
3737
document = Jekyll::Document.new("hello.md", site: site, collection: collection)
3838
document.content = "**Hi**\n" \

0 commit comments

Comments
 (0)