Merge branch 'current' into rc

This commit is contained in:
Franck Nijhof 2021-08-04 10:13:14 +02:00
commit 8b21325f2e
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
5 changed files with 1017 additions and 164 deletions

View File

@ -10,7 +10,7 @@ jobs:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v2.3.4 uses: actions/checkout@v2.3.4
- name: Setting up Node.js ${{ matrix.node-version }} - name: Setting up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.3.0 uses: actions/setup-node@v2.3.1
with: with:
node-version: 12.x node-version: 12.x
- name: Setup NPM cache - name: Setup NPM cache
@ -33,7 +33,7 @@ jobs:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v2.3.4 uses: actions/checkout@v2.3.4
- name: Setting up Node.js ${{ matrix.node-version }} - name: Setting up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.3.0 uses: actions/setup-node@v2.3.1
with: with:
node-version: 12.x node-version: 12.x
- name: Setup NPM cache - name: Setup NPM cache

View File

@ -21,7 +21,7 @@ group :jekyll_plugins do
end end
gem 'sinatra', '2.1.0' gem 'sinatra', '2.1.0'
gem 'nokogiri', '1.12.0' gem 'nokogiri', '1.12.1'
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# and associated library # and associated library

View File

@ -74,10 +74,10 @@ GEM
multi_json (1.15.0) multi_json (1.15.0)
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
nokogiri (1.12.0) nokogiri (1.12.1)
mini_portile2 (~> 2.6.1) mini_portile2 (~> 2.6.1)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.12.0-x64-mingw32) nokogiri (1.12.1-x64-mingw32)
racc (~> 1.4) racc (~> 1.4)
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
@ -130,7 +130,7 @@ DEPENDENCIES
jekyll-sitemap (= 1.4.0) jekyll-sitemap (= 1.4.0)
jekyll-time-to-read (= 0.1.2) jekyll-time-to-read (= 0.1.2)
jekyll-toc (= 0.17.1) jekyll-toc (= 0.17.1)
nokogiri (= 1.12.0) nokogiri (= 1.12.1)
rake (= 13.0.6) rake (= 13.0.6)
sass-globbing (= 1.1.5) sass-globbing (= 1.1.5)
sassc (= 2.1.0) sassc (= 2.1.0)

1165
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -4,12 +4,12 @@
"version": "1.0.0", "version": "1.0.0",
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"remark-cli": "^9.0.0", "remark-cli": "^10.0.0",
"remark-frontmatter": "^3.0.0", "remark-frontmatter": "^3.0.0",
"remark-lint": "^8.0.0", "remark-lint": "^8.0.0",
"remark-lint-fenced-code-flag": "^2.0.1", "remark-lint-fenced-code-flag": "^2.0.1",
"remark-lint-no-shell-dollars": "^2.0.2", "remark-lint-no-shell-dollars": "^2.0.2",
"remark-stringify": "^9.0.1", "remark-stringify": "^10.0.0",
"textlint": "^12.0.2", "textlint": "^12.0.2",
"textlint-rule-common-misspellings": "^1.0.1", "textlint-rule-common-misspellings": "^1.0.1",
"textlint-rule-terminology": "^2.1.5" "textlint-rule-terminology": "^2.1.5"