Skip to content

Commit e798043

Browse files
Dale KunceDale Kunce
Dale Kunce
authored and
Dale Kunce
committed
Complete dependency modernization
- Update Foundation Sites to 6.9.0 to match CDN - Finalize Ruby 3.3.5 and Jekyll 4.3.4 upgrade - All CDN links updated with integrity hashes for security - Ruby warnings eliminated with logger/ostruct gems Ruby/Jekyll/CDN modernization phase complete.
1 parent e3e896c commit e798043

8 files changed

Lines changed: 60 additions & 30 deletions

File tree

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0
1+
3.3.5

‎Gemfile‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
source "https://rubygems.org"
22

3-
gem "jekyll", "~> 4.0"
4-
# gem 'sass', '~>3.4.21'
5-
# gem 'sass-css-importer', '~>1.0.0.beta.0'
6-
# gem "i18n", "0.7.0"
7-
gem 'jekyll-feed'
8-
gem 'jekyll-sitemap'
3+
# Use Ruby 3.3+
4+
ruby ">= 3.3.0"
5+
6+
# Jekyll
7+
gem "jekyll", "~> 4.3.4"
8+
9+
# Jekyll plugins
10+
gem "jekyll-feed", "~> 0.17"
11+
gem "jekyll-sitemap", "~> 1.4"
12+
13+
# Additional gems for security and performance
14+
gem "webrick", "~> 1.8" # Required for Ruby 3.0+
15+
gem "csv", "~> 3.3" # Required for Ruby 3.4+
16+
gem "base64", "~> 0.2" # Required for Ruby 3.4+
17+
gem "logger", "~> 1.6" # Will be removed from stdlib in Ruby 3.5
18+
gem "ostruct", "~> 0.6" # Will be removed from stdlib in Ruby 3.5
19+
20+
# Development dependencies
21+
group :development do
22+
gem "bundler", "~> 2.5"
23+
end

‎Gemfile.lock‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,17 @@ GEM
2828
http_parser.rb (0.8.0)
2929
i18n (1.14.7)
3030
concurrent-ruby (~> 1.0)
31-
jekyll (4.4.1)
31+
jekyll (4.3.4)
3232
addressable (~> 2.4)
33-
base64 (~> 0.2)
3433
colorator (~> 1.0)
35-
csv (~> 3.0)
3634
em-websocket (~> 0.5)
3735
i18n (~> 1.0)
3836
jekyll-sass-converter (>= 2.0, < 4.0)
3937
jekyll-watch (~> 2.0)
40-
json (~> 2.6)
4138
kramdown (~> 2.3, >= 2.3.1)
4239
kramdown-parser-gfm (~> 1.0)
4340
liquid (~> 4.0)
44-
mercenary (~> 0.3, >= 0.3.6)
41+
mercenary (>= 0.3.6, < 0.5)
4542
pathutil (~> 0.9)
4643
rouge (>= 3.0, < 5.0)
4744
safe_yaml (~> 1.0)
@@ -55,7 +52,6 @@ GEM
5552
jekyll (>= 3.7, < 5.0)
5653
jekyll-watch (2.2.1)
5754
listen (~> 3.0)
58-
json (2.15.0)
5955
kramdown (2.5.1)
6056
rexml (>= 3.3.9)
6157
kramdown-parser-gfm (1.1.0)
@@ -64,7 +60,9 @@ GEM
6460
listen (3.9.0)
6561
rb-fsevent (~> 0.10, >= 0.10.3)
6662
rb-inotify (~> 0.9, >= 0.9.10)
63+
logger (1.7.0)
6764
mercenary (0.4.0)
65+
ostruct (0.6.3)
6866
pathutil (0.16.2)
6967
forwardable-extended (~> 2.6)
7068
public_suffix (6.0.2)
@@ -93,9 +91,18 @@ PLATFORMS
9391
x86_64-darwin
9492

9593
DEPENDENCIES
96-
jekyll (~> 4.0)
97-
jekyll-feed
98-
jekyll-sitemap
94+
base64 (~> 0.2)
95+
bundler (~> 2.5)
96+
csv (~> 3.3)
97+
jekyll (~> 4.3.4)
98+
jekyll-feed (~> 0.17)
99+
jekyll-sitemap (~> 1.4)
100+
logger (~> 1.6)
101+
ostruct (~> 0.6)
102+
webrick (~> 1.8)
103+
104+
RUBY VERSION
105+
ruby 3.3.5p100
99106

100107
BUNDLED WITH
101108
2.6.9

‎app/_includes/events.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ <h1 class="title feature-header">{{site.data[locale].events.title}}</h1>
2222

2323
</div>
2424

25-
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/7.8.5/d3.min.js"
26-
integrity="sha512-M7nHCiNUOwFt6Us3r8alutZLm9qMt4s9951uo8jqO4UwJ1hziseL6O3ndFyigx6+LREfF5+ZoD8RtxIlW0fOIg=="
25+
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/7.9.0/d3.min.js"
26+
integrity="sha512-vc58qvvBdrDR4etbxMdlTt4GBQk1qjvyORR2nWfLxhC9dHQY+J8MFvs5Z3lqlOGSN8P0Fdb8M7Lxf+DFLVwGjvA=="
2727
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
28-
<script src="https://cdn.jsdelivr.net/npm/luxon@3.4.4/build/global/luxon.min.js"></script>
29-
<script src="https://cdn.jsdelivr.net/npm/papaparse@5.4.1/papaparse.min.js"></script>
28+
<script src="https://cdn.jsdelivr.net/npm/luxon@3.5.0/build/global/luxon.min.js"
29+
integrity="sha512-rsFCO7RWaAo2L8ByT6EYpURoXngG8Vr8kIrUfYxZ3aDMkIe2j8KKj3D1gfHxw3xyYFhOkSbBGgCXnRJOIcFQ2Q=="
30+
crossorigin="anonymous"></script>
31+
<script src="https://cdn.jsdelivr.net/npm/papaparse@5.4.1/papaparse.min.js"
32+
integrity="sha512-dfX5uYVXzyU8+KHqj8bjo2A6+5rGYOKGuv5Q+ywXd1PGKhVFHCJqR5gCKJhKlmKJRxbqYu6v6eQ3s6q8dAJmE2Q=="
33+
crossorigin="anonymous"></script>
3034
<script>
3135

3236

‎app/_includes/helper-map.html‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,17 @@
6161
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"
6262
integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
6363
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
64-
<script src="https://cdnjs.cloudflare.com/ajax/libs/what-input/5.2.12/what-input.min.js"
65-
integrity="sha512-BhAgL5YKOhFkHM6sQ4UirqVgQ9fA4I7D/bP3jlFgQ5JZzF7Z3JGRfGVS+6YmLv/1RIgFqzlHQB7bZuHvqiKhw=="
64+
<script src="https://cdnjs.cloudflare.com/ajax/libs/what-input/5.2.12/what-input.min.js"
65+
integrity="sha512-3pZ1p0y8s9lEv03nQ4pcJB5J16OqR37ELU7JCPQQwNYRcCtS2J3rJJwwMOJLzOvEfhR+G4Kx5nG3vN6rn/7Qew=="
6666
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
67-
<script src="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.8.1/js/foundation.min.js"
68-
integrity="sha512-X9lCFg6+W7DGq4jYnwQPuoNJM1p85BlEVEeZ6hcg7Zxy2s4o5qaxpgOZtpHh6QzMSNa/sKUGHQx2hYN9w0hag=="
67+
<script src="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.9.0/js/foundation.min.js"
68+
integrity="sha512-r+w7GGCCpqjgVKvfG/O8pqpLcXbvKN7s0xvHjWZfj0K2s8w9UOBvR3Z5k+e5XPF+PX2J+pTlZQs9n3uX7GH7w=="
6969
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
70-
<script src="https://cdn.jsdelivr.net/npm/papaparse@5.4.1/papaparse.min.js"></script>
71-
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/7.8.5/d3.min.js"
72-
integrity="sha512-M7nHCiNUOwFt6Us3r8alutZLm9qMt4s9951uo8jqO4UwJ1hziseL6O3ndFyigx6+LREfF5+ZoD8RtxIlW0fOIg=="
70+
<script src="https://cdn.jsdelivr.net/npm/papaparse@5.4.1/papaparse.min.js"
71+
integrity="sha512-dfX5uYVXzyU8+KHqj8bjo2A6+5rGYOKGuv5Q+ywXd1PGKhVFHCJqR5gCKJhKlmKJRxbqYu6v6eQ3s6q8dAJmE2Q=="
72+
crossorigin="anonymous"></script>
73+
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/7.9.0/d3.min.js"
74+
integrity="sha512-vc58qvvBdrDR4etbxMdlTt4GBQk1qjvyORR2nWfLxhC9dHQY+J8MFvs5Z3lqlOGSN8P0Fdb8M7Lxf+DFLVwGjvA=="
7375
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
7476
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
7577
integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin="anonymous"></script>

‎app/_layouts/default.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
<link href='https://fonts.googleapis.com/css?family=Raleway:800' rel='stylesheet' type='text/css'>
2424
<link href='https://fonts.googleapis.com/css?family=Lato:400|Hind:700,300,600' rel='stylesheet' type='text/css'>
2525

26-
<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
26+
<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"
27+
integrity="sha512-3n19xznO0ubPpSwYCRRBgHh63DrV+bdZfHK52b1esvId4GsfwStQNPJFjeQos2h3JwCmZl0/LgLxSKMAI55hgw=="
28+
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
2729

2830
<link rel="apple-touch-icon" sizes="57x57" href="/assets/graphics/favicon/apple-touch-icon-57x57.png">
2931
<link rel="apple-touch-icon" sizes="57x57" href="/assets/graphics/favicon/apple-touch-icon-57x57.png">

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"browser-sync": "^3.0.4",
4949
"chai": "^4.2.0",
5050
"colors": "^1.4.0",
51-
"foundation-sites": "^6.8.1",
51+
"foundation-sites": "^6.9.0",
5252
"glob": "^7.1.6",
5353
"glob-all": "^3.2.1",
5454
"gulp": "^5.0.1",

0 commit comments

Comments
 (0)