Skip to content

Commit 9fa9402

Browse files
wilkinsonawilkinsona
committed
Upgrade Slate sample to Slate 2.7.1
Closes gh-693
1 parent 536e87a commit 9fa9402

40 files changed

+14260
-12421
lines changed

‎samples/rest-notes-slate/slate/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ build/
2222
_yardoc
2323
doc/
2424
.idea/
25+
26+
# Vagrant artifacts
27+
ubuntu-*-console.log

‎samples/rest-notes-slate/slate/CHANGELOG.md‎

Lines changed: 147 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,151 @@
11
# Changelog
22

3-
## Version 1.5.0
3+
## Version 2.7.1
4+
5+
*August 13, 2020*
6+
7+
* __[security]__ Bumped middleman from 4.3.7 to 4.3.8
8+
9+
_Note_: Slate uses redcarpet, not kramdown, for rendering markdown to HTML, and so was unaffected by the security vulnerability in middleman.
10+
If you have changed slate to use kramdown, and with GFM, you may need to install the `kramdown-parser-gfm` gem.
11+
12+
## Version 2.7.0
13+
14+
*June 21, 2020*
15+
16+
* __[security]__ Bumped rack in Gemfile.lock from 2.2.2 to 2.2.3
17+
* Bumped bundled jQuery from 3.2.1 to 3.5.1
18+
* Bumped bundled lunr from 0.5.7 to 2.3.8
19+
* Bumped imagesloaded from 3.1.8 to 4.1.4
20+
* Bumped rouge from 3.17.0 to 3.20.0
21+
* Bumped redcarpet from 3.4.0 to 3.5.0
22+
* Fix color of highlighted code being unreadable when printing page
23+
* Add clipboard icon for "Copy to Clipboard" functionality to code boxes (see note below)
24+
* Fix handling of ToC selectors that contain punctutation (thanks @gruis)
25+
* Fix language bar truncating languages that overflow screen width
26+
* Strip HTML tags from ToC title before displaying it in title bar in JS (backup to stripping done in Ruby code) (thanks @atic)
27+
28+
To enable the new clipboard icon, you need to add `code_clipboard: true` to the frontmatter of source/index.html.md.
29+
See [this line](https://github.com/slatedocs/slate/blame/main/source/index.html.md#L19) for an example of usage.
30+
31+
## Version 2.6.1
32+
33+
*May 30, 2020*
34+
35+
* __[security]__ update child dependency activesupport in Gemfile.lock to 5.4.2.3
36+
* Update Middleman in Gemfile.lock to 4.3.7
37+
* Replace Travis-CI with GitHub actions for continuous integration
38+
* Replace Spectrum with GitHub discussions
39+
40+
## Version 2.6.0
41+
42+
*May 18, 2020*
43+
44+
__Note__: 2.5.0 was "pulled" due to a breaking bug discovered after release. It is recommended to skip it, and move straight to 2.6.0.
45+
46+
* Fix large whitespace gap in middle column for sections with codeblocks
47+
* Fix highlighted code elements having a different background than rest of code block
48+
* Change JSON keys to have a different font color than their values
49+
* Disable asset hashing for woff and woff2 elements due to middleman bug breaking woff2 asset hashing in general
50+
* Move Dockerfile to Debian from Alpine
51+
* Converted repo to a [GitHub template](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-template-repository)
52+
* Update sassc to 2.3.0 in Gemfile.lock
53+
54+
## Version 2.5.0
55+
56+
*May 8, 2020*
57+
58+
* __[security]__ update nokogiri to ~> 1.10.8
59+
* Update links in example docs to https://github.com/slatedocs/slate from https://github.com/lord/slate
60+
* Update LICENSE to include full Apache 2.0 text
61+
* Test slate against Ruby 2.5 and 2.6 on Travis-CI
62+
* Update Vagrantfile to use Ubuntu 18.04 (thanks @bradthurber)
63+
* Parse arguments and flags for deploy.sh on script start, instead of potentially after building source files
64+
* Install nodejs inside Vagrantfile (thanks @fernandoaguilar)
65+
* Add Dockerfile for running slate (thanks @redhatxl)
66+
* update middleman-syntax and rouge to ~>3.2
67+
* update middleman to 4.3.6
68+
69+
## Version 2.4.0
70+
71+
*October 19, 2019*
72+
73+
- Move repository from lord/slate to slatedocs/slate
74+
- Fix documentation to point at new repo link, thanks to [Arun](https://github.com/slash-arun), [Gustavo Gawryszewski](https://github.com/gawry), and [Daniel Korbit](https://github.com/danielkorbit)
75+
- Update `nokogiri` to 1.10.4
76+
- Update `ffi` in `Gemfile.lock` to fix security warnings, thanks to [Grey Baker](https://github.com/greysteil) and [jakemack](https://github.com/jakemack)
77+
- Update `rack` to 2.0.7 in `Gemfile.lock` to fix security warnings, thanks to [Grey Baker](https://github.com/greysteil) and [jakemack](https://github.com/jakemack)
78+
- Update middleman to `4.3` and relax constraints on middleman related gems, thanks to [jakemack](https://github.com/jakemack)
79+
- Add sass gem, thanks to [jakemack](https://github.com/jakemack)
80+
- Activate `asset_cache` in middleman to improve cacheability of static files, thanks to [Sam Gilman](https://github.com/thenengah)
81+
- Update to using bundler 2 for `Gemfile.lock`, thanks to [jakemack](https://github.com/jakemack)
82+
83+
## Version 2.3.1
84+
85+
*July 5, 2018*
86+
87+
- Update `sprockets` in `Gemfile.lock` to fix security warnings
88+
89+
## Version 2.3
90+
91+
*July 5, 2018*
92+
93+
- Allows strikethrough in markdown by default.
94+
- Upgrades jQuery to 3.2.1, thanks to [Tomi Takussaari](https://github.com/TomiTakussaari)
95+
- Fixes invalid HTML in `layout.erb`, thanks to [Eric Scouten](https://github.com/scouten) for pointing out
96+
- Hopefully fixes Vagrant memory issues, thanks to [Petter Blomberg](https://github.com/p-blomberg) for the suggestion
97+
- Cleans HTML in headers before setting `document.title`, thanks to [Dan Levy](https://github.com/justsml)
98+
- Allows trailing whitespace in markdown files, thanks to [Samuel Cousin](https://github.com/kuzyn)
99+
- Fixes pushState/replaceState problems with scrolling not changing the document hash, thanks to [Andrey Fedorov](https://github.com/anfedorov)
100+
- Removes some outdated examples, thanks [@al-tr](https://github.com/al-tr), [Jerome Dahdah](https://github.com/jdahdah), and [Ricardo Castro](https://github.com/mccricardo)
101+
- Fixes `nav-padding` bug, thanks [Jerome Dahdah](https://github.com/jdahdah)
102+
- Code style fixes thanks to [Sebastian Zaremba](https://github.com/vassyz)
103+
- Nokogiri version bump thanks to [Grey Baker](https://github.com/greysteil)
104+
- Fix to default `index.md` text thanks to [Nick Busey](https://github.com/NickBusey)
105+
106+
Thanks to everyone who contributed to this release!
107+
108+
## Version 2.2
109+
110+
*January 19, 2018*
111+
112+
- Fixes bugs with some non-roman languages not generating unique headers
113+
- Adds editorconfig, thanks to [Jay Thomas](https://github.com/jaythomas)
114+
- Adds optional `NestingUniqueHeadCounter`, thanks to [Vladimir Morozov](https://github.com/greenhost87)
115+
- Small fixes to typos and language, thx [Emir Ribić](https://github.com/ribice), [Gregor Martynus](https://github.com/gr2m), and [Martius](https://github.com/martiuslim)!
116+
- Adds links to Spectrum chat for questions in README and ISSUE_TEMPLATE
117+
118+
## Version 2.1
119+
120+
*October 30, 2017*
121+
122+
- Right-to-left text stylesheet option, thanks to [Mohammad Hossein Rabiee](https://github.com/mhrabiee)
123+
- Fix for HTML5 history state bug, thanks to [Zach Toolson](https://github.com/ztoolson)
124+
- Small styling changes, typo fixes, small bug fixes from [Marian Friedmann](https://github.com/rnarian), [Ben Wilhelm](https://github.com/benwilhelm), [Fouad Matin](https://github.com/fouad), [Nicolas Bonduel](https://github.com/NicolasBonduel), [Christian Oliff](https://github.com/coliff)
125+
126+
Thanks to everyone who submitted PRs for this version!
127+
128+
## Version 2.0
129+
130+
*July 17, 2017*
131+
132+
- All-new statically generated table of contents
133+
- Should be much faster loading and scrolling for large pages
134+
- Smaller Javascript file sizes
135+
- Avoids the problem with the last link in the ToC not ever highlighting if the section was shorter than the page
136+
- Fixes control-click not opening in a new page
137+
- Automatically updates the HTML title as you scroll
138+
- Updated design
139+
- New default colors!
140+
- New spacings and sizes!
141+
- System-default typefaces, just like GitHub
142+
- Added search input delay on large corpuses to reduce lag
143+
- We even bumped the major version cause hey, why not?
144+
- Various small bug fixes
145+
146+
Thanks to everyone who helped debug or wrote code for this version! It was a serious community effort, and I couldn't have done it alone.
147+
148+
## Version 1.5
4149

5150
*February 23, 2017*
6151

@@ -9,7 +154,7 @@
9154
- Switch default code highlighting color scheme to better highlight JSON
10155
- Various small typo and bug fixes
11156

12-
## Version 1.4.0
157+
## Version 1.4
13158

14159
*November 24, 2016*
15160

‎samples/rest-notes-slate/slate/Dockerfile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM ruby:2.6-slim
2+
3+
WORKDIR /srv/slate
4+
5+
VOLUME /srv/slate/source
6+
EXPOSE 4567
7+
8+
COPY . /srv/slate
9+
10+
RUN apt-get update \
11+
&& apt-get install -y --no-install-recommends \
12+
build-essential \
13+
nodejs \
14+
&& gem install bundler \
15+
&& bundle install \
16+
&& apt-get remove -y build-essential \
17+
&& apt-get autoremove -y \
18+
&& rm -rf /var/lib/apt/lists/*
19+
20+
CMD ["bundle", "exec", "middleman", "server", "--watcher-force-polling"]

‎samples/rest-notes-slate/slate/Gemfile‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
ruby '>=2.3.1'
12
source 'https://rubygems.org'
23

34
# Middleman
4-
gem 'middleman', '~>4.2.1'
5-
gem 'middleman-syntax', '~> 3.0.0'
6-
gem 'middleman-autoprefixer', '~> 2.7.0'
7-
gem "middleman-sprockets", "~> 4.1.0"
8-
gem 'rouge', '~> 2.0.5'
9-
gem 'redcarpet', '~> 3.4.0'
5+
gem 'middleman', '~>4.3'
6+
gem 'middleman-syntax', '~> 3.2'
7+
gem 'middleman-autoprefixer', '~> 2.7'
8+
gem 'middleman-sprockets', '~> 4.1'
9+
gem 'rouge', '~> 3.20'
10+
gem 'redcarpet', '~> 3.5.0'
11+
gem 'nokogiri', '~> 1.10.8'
12+
gem 'sass'

‎samples/rest-notes-slate/slate/Gemfile.lock‎

Lines changed: 66 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,58 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.0.7)
4+
activesupport (5.2.4.3)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
addressable (2.5.2)
10-
public_suffix (>= 2.0.2, < 4.0)
11-
autoprefixer-rails (6.7.7.2)
9+
addressable (2.7.0)
10+
public_suffix (>= 2.0.2, < 5.0)
11+
autoprefixer-rails (9.5.1.1)
1212
execjs
13-
backports (3.11.4)
13+
backports (3.18.1)
1414
coffee-script (2.4.1)
1515
coffee-script-source
1616
execjs
1717
coffee-script-source (1.12.2)
18-
compass-import-once (1.0.5)
19-
sass (>= 3.2, < 3.5)
20-
concurrent-ruby (1.1.3)
18+
concurrent-ruby (1.1.7)
2119
contracts (0.13.0)
22-
dotenv (2.5.0)
20+
dotenv (2.7.6)
2321
erubis (2.7.0)
2422
execjs (2.7.0)
2523
fast_blank (1.0.0)
26-
fastimage (2.1.4)
27-
ffi (1.9.25)
28-
haml (5.0.4)
24+
fastimage (2.2.0)
25+
ffi (1.13.1)
26+
haml (5.1.2)
2927
temple (>= 0.8.0)
3028
tilt
3129
hamster (3.0.0)
3230
concurrent-ruby (~> 1.0)
3331
hashie (3.6.0)
34-
i18n (0.7.0)
35-
kramdown (1.17.0)
32+
i18n (0.9.5)
33+
concurrent-ruby (~> 1.0)
34+
kramdown (2.3.0)
35+
rexml
3636
listen (3.0.8)
3737
rb-fsevent (~> 0.9, >= 0.9.4)
3838
rb-inotify (~> 0.9, >= 0.9.7)
39-
memoist (0.16.0)
40-
middleman (4.2.1)
39+
memoist (0.16.2)
40+
middleman (4.3.8)
4141
coffee-script (~> 2.2)
42-
compass-import-once (= 1.0.5)
4342
haml (>= 4.0.5)
44-
kramdown (~> 1.2)
45-
middleman-cli (= 4.2.1)
46-
middleman-core (= 4.2.1)
47-
sass (>= 3.4.0, < 4.0)
48-
middleman-autoprefixer (2.7.1)
49-
autoprefixer-rails (>= 6.5.2, < 7.0.0)
43+
kramdown (>= 2.3.0)
44+
middleman-cli (= 4.3.8)
45+
middleman-core (= 4.3.8)
46+
middleman-autoprefixer (2.10.1)
47+
autoprefixer-rails (~> 9.1)
5048
middleman-core (>= 3.3.3)
51-
middleman-cli (4.2.1)
49+
middleman-cli (4.3.8)
5250
thor (>= 0.17.0, < 2.0)
53-
middleman-core (4.2.1)
54-
activesupport (>= 4.2, < 5.1)
51+
middleman-core (4.3.8)
52+
activesupport (>= 4.2, < 6.0)
5553
addressable (~> 2.3)
5654
backports (~> 3.6)
57-
bundler (~> 1.1)
55+
bundler
5856
contracts (~> 0.13.0)
5957
dotenv
6058
erubis
@@ -63,47 +61,57 @@ GEM
6361
fastimage (~> 2.0)
6462
hamster (~> 3.0)
6563
hashie (~> 3.4)
66-
i18n (~> 0.7.0)
64+
i18n (~> 0.9.0)
6765
listen (~> 3.0.0)
6866
memoist (~> 0.14)
6967
padrino-helpers (~> 0.13.0)
7068
parallel
7169
rack (>= 1.4.5, < 3)
72-
sass (>= 3.4)
70+
sassc (~> 2.0)
7371
servolux
74-
tilt (~> 2.0)
72+
tilt (~> 2.0.9)
7573
uglifier (~> 3.0)
7674
middleman-sprockets (4.1.1)
7775
middleman-core (~> 4.0)
7876
sprockets (>= 3.0)
79-
middleman-syntax (3.0.0)
77+
middleman-syntax (3.2.0)
8078
middleman-core (>= 3.2)
81-
rouge (~> 2.0)
82-
minitest (5.11.3)
79+
rouge (~> 3.2)
80+
mini_portile2 (2.4.0)
81+
minitest (5.14.1)
82+
nokogiri (1.10.9)
83+
mini_portile2 (~> 2.4.0)
8384
padrino-helpers (0.13.3.4)
8485
i18n (~> 0.6, >= 0.6.7)
8586
padrino-support (= 0.13.3.4)
8687
tilt (>= 1.4.1, < 3)
8788
padrino-support (0.13.3.4)
8889
activesupport (>= 3.1)
89-
parallel (1.12.1)
90-
public_suffix (3.0.3)
91-
rack (2.0.6)
92-
rb-fsevent (0.10.3)
93-
rb-inotify (0.9.10)
94-
ffi (>= 0.5.0, < 2)
95-
redcarpet (3.4.0)
96-
rouge (2.0.7)
97-
sass (3.4.25)
90+
parallel (1.19.2)
91+
public_suffix (4.0.5)
92+
rack (2.2.3)
93+
rb-fsevent (0.10.4)
94+
rb-inotify (0.10.1)
95+
ffi (~> 1.0)
96+
redcarpet (3.5.0)
97+
rexml (3.2.4)
98+
rouge (3.20.0)
99+
sass (3.7.4)
100+
sass-listen (~> 4.0.0)
101+
sass-listen (4.0.0)
102+
rb-fsevent (~> 0.9, >= 0.9.4)
103+
rb-inotify (~> 0.9, >= 0.9.7)
104+
sassc (2.4.0)
105+
ffi (~> 1.9)
98106
servolux (0.13.0)
99107
sprockets (3.7.2)
100108
concurrent-ruby (~> 1.0)
101109
rack (> 1, < 3)
102-
temple (0.8.0)
103-
thor (0.20.3)
110+
temple (0.8.2)
111+
thor (1.0.1)
104112
thread_safe (0.3.6)
105-
tilt (2.0.8)
106-
tzinfo (1.2.5)
113+
tilt (2.0.10)
114+
tzinfo (1.2.7)
107115
thread_safe (~> 0.1)
108116
uglifier (3.2.0)
109117
execjs (>= 0.3.0, < 3)
@@ -112,12 +120,17 @@ PLATFORMS
112120
ruby
113121

114122
DEPENDENCIES
115-
middleman (~> 4.2.1)
116-
middleman-autoprefixer (~> 2.7.0)
117-
middleman-sprockets (~> 4.1.0)
118-
middleman-syntax (~> 3.0.0)
119-
redcarpet (~> 3.4.0)
120-
rouge (~> 2.0.5)
123+
middleman (~> 4.3)
124+
middleman-autoprefixer (~> 2.7)
125+
middleman-sprockets (~> 4.1)
126+
middleman-syntax (~> 3.2)
127+
nokogiri (~> 1.10.8)
128+
redcarpet (~> 3.5.0)
129+
rouge (~> 3.20)
130+
sass
131+
132+
RUBY VERSION
133+
ruby 2.3.3p222
121134

122135
BUNDLED WITH
123-
1.17.1
136+
2.1.4

0 commit comments

Comments
 (0)