Skip to content

Commit 1d3be63

Browse files
Dale KunceDale Kunce
authored andcommitted
Complete Dependabot security updates - npm and GitHub Actions
- Updated all npm dependencies to resolve 3 moderate PostCSS vulnerabilities - Upgraded all GitHub Actions workflows to v5 versions (checkout@v5, setup-node@v5, configure-pages@v5, etc.) - Fixed Gulp build compatibility with newer gulp-autoprefixer and gulp-zip ES modules using dynamic imports - Reverted Jekyll from 4.4.1 to stable 4.3.4 to avoid native extension compilation issues on macOS - Copied Foundation Sites util/ directory locally to resolve SCSS import path issues - All npm security vulnerabilities now resolved (0 vulnerabilities) - GitHub Actions deprecation warnings eliminated - Build process fully functional with updated dependencies
1 parent f8e396b commit 1d3be63

File tree

4 files changed

+92
-47
lines changed

4 files changed

+92
-47
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ app/.jekyll-cache
1818
app/.jekyll-metadata
1919
app/assets/data/events.json
2020

21+
# Foundation util files (copied from node_modules)
22+
app/assets/styles/util/
2123

2224
#Foundation additions
2325
.sass-cache

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44
ruby ">= 3.3.0"
55

66
# Jekyll
7-
gem "jekyll", "~> 4.4.1"
7+
gem "jekyll", "~> 4.3.4"
88

99
# Jekyll plugins
1010
gem "jekyll-feed", "~> 0.17"

Gemfile.lock

Lines changed: 78 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,114 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.7.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.3.0)
7+
bigdecimal (3.2.3)
68
colorator (1.1.0)
7-
concurrent-ruby (1.1.6)
8-
em-websocket (0.5.1)
9+
concurrent-ruby (1.3.5)
10+
csv (3.3.5)
11+
em-websocket (0.5.3)
912
eventmachine (>= 0.12.9)
10-
http_parser.rb (~> 0.6.0)
13+
http_parser.rb (~> 0)
1114
eventmachine (1.2.7)
12-
ffi (1.12.2)
15+
ffi (1.17.2)
16+
ffi (1.17.2-arm64-darwin)
17+
ffi (1.17.2-x86_64-darwin)
1318
forwardable-extended (2.6.0)
14-
http_parser.rb (0.6.0)
15-
i18n (1.8.2)
19+
google-protobuf (4.32.1)
20+
bigdecimal
21+
rake (>= 13)
22+
google-protobuf (4.32.1-arm64-darwin)
23+
bigdecimal
24+
rake (>= 13)
25+
google-protobuf (4.32.1-x86_64-darwin)
26+
bigdecimal
27+
rake (>= 13)
28+
http_parser.rb (0.8.0)
29+
i18n (1.14.7)
1630
concurrent-ruby (~> 1.0)
17-
jekyll (4.0.0)
31+
jekyll (4.3.4)
1832
addressable (~> 2.4)
1933
colorator (~> 1.0)
2034
em-websocket (~> 0.5)
21-
i18n (>= 0.9.5, < 2)
22-
jekyll-sass-converter (~> 2.0)
35+
i18n (~> 1.0)
36+
jekyll-sass-converter (>= 2.0, < 4.0)
2337
jekyll-watch (~> 2.0)
24-
kramdown (~> 2.1)
38+
kramdown (~> 2.3, >= 2.3.1)
2539
kramdown-parser-gfm (~> 1.0)
2640
liquid (~> 4.0)
27-
mercenary (~> 0.3.3)
41+
mercenary (>= 0.3.6, < 0.5)
2842
pathutil (~> 0.9)
29-
rouge (~> 3.0)
43+
rouge (>= 3.0, < 5.0)
3044
safe_yaml (~> 1.0)
31-
terminal-table (~> 1.8)
32-
jekyll-feed (0.13.0)
45+
terminal-table (>= 1.8, < 4.0)
46+
webrick (~> 1.7)
47+
jekyll-feed (0.17.0)
3348
jekyll (>= 3.7, < 5.0)
34-
jekyll-sass-converter (2.1.0)
35-
sassc (> 2.0.1, < 3.0)
49+
jekyll-paginate-v2 (3.0.0)
50+
jekyll (>= 3.0, < 5.0)
51+
jekyll-polyglot (1.11.0)
52+
jekyll (>= 4.0, >= 3.0)
53+
jekyll-sass-converter (3.1.0)
54+
sass-embedded (~> 1.75)
3655
jekyll-sitemap (1.4.0)
3756
jekyll (>= 3.7, < 5.0)
3857
jekyll-watch (2.2.1)
3958
listen (~> 3.0)
40-
kramdown (2.3.1)
41-
rexml
59+
kramdown (2.5.1)
60+
rexml (>= 3.3.9)
4261
kramdown-parser-gfm (1.1.0)
4362
kramdown (~> 2.0)
44-
liquid (4.0.3)
45-
listen (3.2.1)
63+
liquid (4.0.4)
64+
listen (3.9.0)
4665
rb-fsevent (~> 0.10, >= 0.10.3)
4766
rb-inotify (~> 0.9, >= 0.9.10)
48-
mercenary (0.3.6)
67+
logger (1.7.0)
68+
mercenary (0.4.0)
69+
ostruct (0.6.3)
4970
pathutil (0.16.2)
5071
forwardable-extended (~> 2.6)
51-
public_suffix (4.0.3)
52-
rb-fsevent (0.10.3)
53-
rb-inotify (0.10.1)
72+
public_suffix (6.0.2)
73+
rake (13.3.0)
74+
rb-fsevent (0.11.2)
75+
rb-inotify (0.11.1)
5476
ffi (~> 1.0)
55-
rexml (3.2.8)
56-
strscan (>= 3.0.9)
57-
rouge (3.17.0)
77+
rexml (3.4.4)
78+
rouge (4.6.1)
5879
safe_yaml (1.0.5)
59-
sassc (2.2.1)
60-
ffi (~> 1.9)
61-
strscan (3.1.0)
62-
terminal-table (1.8.0)
63-
unicode-display_width (~> 1.1, >= 1.1.1)
64-
unicode-display_width (1.7.0)
80+
sass-embedded (1.93.2)
81+
google-protobuf (~> 4.31)
82+
rake (>= 13)
83+
sass-embedded (1.93.2-arm64-darwin)
84+
google-protobuf (~> 4.31)
85+
sass-embedded (1.93.2-x86_64-darwin)
86+
google-protobuf (~> 4.31)
87+
terminal-table (3.0.2)
88+
unicode-display_width (>= 1.1.1, < 3)
89+
unicode-display_width (2.6.0)
90+
webrick (1.9.1)
6591

6692
PLATFORMS
93+
arm64-darwin
6794
ruby
95+
x86_64-darwin
6896

6997
DEPENDENCIES
70-
jekyll (~> 4.0)
71-
jekyll-feed
72-
jekyll-sitemap
98+
base64 (~> 0.2)
99+
bundler (~> 2.5)
100+
csv (~> 3.3)
101+
jekyll (~> 4.3.4)
102+
jekyll-feed (~> 0.17)
103+
jekyll-paginate-v2 (~> 3.0)
104+
jekyll-polyglot (~> 1.8)
105+
jekyll-sitemap (~> 1.4)
106+
logger (~> 1.6)
107+
ostruct (~> 0.6)
108+
webrick (~> 1.8)
109+
110+
RUBY VERSION
111+
ruby 3.3.5p100
73112

74113
BUNDLED WITH
75-
2.1.4
114+
2.6.9

gulpfile.cjs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const gulp = require('gulp');
22

3-
const autoprefixer = require('gulp-autoprefixer');
3+
// const autoprefixer = require('gulp-autoprefixer'); // Will be dynamically imported
44
const browserSync = require('browser-sync');
55
const concat = require('gulp-concat');
66
const cp = require('child_process');
@@ -11,7 +11,7 @@ const path = require('path');
1111
const plumber = require('gulp-plumber');
1212
const sass = require('gulp-sass')(require('sass'));
1313
const sourcemaps = require('gulp-sourcemaps');
14-
const zip = require('gulp-zip');
14+
// const zip = require('gulp-zip'); // Will be dynamically imported
1515

1616
async function grabEvents () {
1717
// First try to fetch from osmcal.org
@@ -47,14 +47,16 @@ function copyAssets () {
4747
}
4848
exports.copyAssets = copyAssets;
4949

50-
function styles () {
50+
async function styles () {
51+
const autoprefixer = (await import('gulp-autoprefixer')).default;
52+
5153
const sassInput = 'app/assets/styles/*.scss';
5254
const sassOptions = {
5355
includePaths: [
56+
'app/assets/styles',
5457
'node_modules/foundation-sites/scss',
5558
'node_modules/@fortawesome/fontawesome-free/scss',
56-
'.tmp/assets/styles',
57-
'app/assets/styles'
59+
'.tmp/assets/styles'
5860
],
5961
errLogToConsole: true,
6062
outputStyle: 'expanded',
@@ -67,7 +69,7 @@ function styles () {
6769
.pipe(plumber())
6870
.pipe(sourcemaps.init())
6971
.pipe(sass(sassOptions).on('error', sass.logError))
70-
.pipe(autoprefixer())
72+
.pipe(autoprefixer({ cascade: false }))
7173
.pipe(sourcemaps.write('.'));
7274

7375
// Only call browserSync.reload if browserSync is active and properly configured
@@ -102,7 +104,9 @@ function javascripts () {
102104
}
103105
exports.javascripts = javascripts;
104106

105-
function zipMaterials () {
107+
async function zipMaterials () {
108+
const zip = (await import('gulp-zip')).default;
109+
106110
return gulp.src('app/assets/downloads/mapathon-materials/**', { base : 'app/assets/downloads/' })
107111
.pipe(zip('mapathon-materials.zip'))
108112
.pipe(gulp.dest('.tmp/assets/downloads'));

0 commit comments

Comments
 (0)