- also bumped tailwind to 4.x - updated postcss to match
This commit is contained in:
2
.tool-versions
Normal file
2
.tool-versions
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
ruby 3.3.9
|
||||||
|
nodejs 22.20.0
|
||||||
2
Gemfile
2
Gemfile
@@ -8,5 +8,5 @@ group :jekyll_plugins do
|
|||||||
gem 'jekyll-compose'
|
gem 'jekyll-compose'
|
||||||
gem 'jekyll-feed'
|
gem 'jekyll-feed'
|
||||||
gem 'jekyll-gist'
|
gem 'jekyll-gist'
|
||||||
gem 'jekyll-postcss'
|
gem 'jekyll-postcss-v2'
|
||||||
end
|
end
|
||||||
|
|||||||
120
Gemfile.lock
120
Gemfile.lock
@@ -1,44 +1,53 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
Ascii85 (1.1.1)
|
Ascii85 (2.0.1)
|
||||||
addressable (2.8.6)
|
addressable (2.8.7)
|
||||||
public_suffix (>= 2.0.2, < 6.0)
|
public_suffix (>= 2.0.2, < 7.0)
|
||||||
afm (0.2.2)
|
afm (1.0.0)
|
||||||
async (2.11.0)
|
async (2.34.0)
|
||||||
console (~> 1.25, >= 1.25.2)
|
console (~> 1.29)
|
||||||
fiber-annotation
|
fiber-annotation
|
||||||
io-event (~> 1.5, >= 1.5.1)
|
io-event (~> 1.11)
|
||||||
timers (~> 4.1)
|
metrics (~> 0.12)
|
||||||
bigdecimal (3.1.8)
|
traces (~> 0.18)
|
||||||
|
base64 (0.3.0)
|
||||||
|
benchmark (0.5.0)
|
||||||
|
bigdecimal (3.3.1)
|
||||||
colorator (1.1.0)
|
colorator (1.1.0)
|
||||||
concurrent-ruby (1.2.3)
|
concurrent-ruby (1.3.5)
|
||||||
console (1.25.2)
|
console (1.34.2)
|
||||||
fiber-annotation
|
fiber-annotation
|
||||||
fiber-local (~> 1.1)
|
fiber-local (~> 1.1)
|
||||||
json
|
json
|
||||||
|
csv (3.3.5)
|
||||||
em-websocket (0.5.3)
|
em-websocket (0.5.3)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
http_parser.rb (~> 0)
|
http_parser.rb (~> 0)
|
||||||
ethon (0.16.0)
|
ethon (0.18.0)
|
||||||
ffi (>= 1.15.0)
|
ffi (>= 1.15.0)
|
||||||
|
logger
|
||||||
eventmachine (1.2.7)
|
eventmachine (1.2.7)
|
||||||
faraday (2.9.0)
|
faraday (2.14.0)
|
||||||
faraday-net_http (>= 2.0, < 3.2)
|
faraday-net_http (>= 2.0, < 3.5)
|
||||||
faraday-net_http (3.1.0)
|
json
|
||||||
net-http
|
logger
|
||||||
ffi (1.16.3)
|
faraday-net_http (3.4.2)
|
||||||
|
net-http (~> 0.5)
|
||||||
|
ffi (1.17.2)
|
||||||
fiber-annotation (0.2.0)
|
fiber-annotation (0.2.0)
|
||||||
fiber-local (1.1.0)
|
fiber-local (1.1.0)
|
||||||
fiber-storage
|
fiber-storage
|
||||||
fiber-storage (0.1.1)
|
fiber-storage (1.0.1)
|
||||||
forwardable-extended (2.6.0)
|
forwardable-extended (2.6.0)
|
||||||
google-protobuf (4.26.1)
|
google-protobuf (4.33.1)
|
||||||
|
bigdecimal
|
||||||
rake (>= 13)
|
rake (>= 13)
|
||||||
hashery (2.1.2)
|
hashery (2.1.2)
|
||||||
html-proofer (5.0.9)
|
html-proofer (5.1.1)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
async (~> 2.1)
|
async (~> 2.1)
|
||||||
|
benchmark (~> 0.5)
|
||||||
nokogiri (~> 1.13)
|
nokogiri (~> 1.13)
|
||||||
pdf-reader (~> 2.11)
|
pdf-reader (~> 2.11)
|
||||||
rainbow (~> 3.0)
|
rainbow (~> 3.0)
|
||||||
@@ -46,20 +55,23 @@ GEM
|
|||||||
yell (~> 2.0)
|
yell (~> 2.0)
|
||||||
zeitwerk (~> 2.5)
|
zeitwerk (~> 2.5)
|
||||||
http_parser.rb (0.8.0)
|
http_parser.rb (0.8.0)
|
||||||
i18n (1.14.5)
|
i18n (1.14.7)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
io-event (1.5.1)
|
io-event (1.14.2)
|
||||||
jekyll (4.3.3)
|
jekyll (4.4.1)
|
||||||
addressable (~> 2.4)
|
addressable (~> 2.4)
|
||||||
|
base64 (~> 0.2)
|
||||||
colorator (~> 1.0)
|
colorator (~> 1.0)
|
||||||
|
csv (~> 3.0)
|
||||||
em-websocket (~> 0.5)
|
em-websocket (~> 0.5)
|
||||||
i18n (~> 1.0)
|
i18n (~> 1.0)
|
||||||
jekyll-sass-converter (>= 2.0, < 4.0)
|
jekyll-sass-converter (>= 2.0, < 4.0)
|
||||||
jekyll-watch (~> 2.0)
|
jekyll-watch (~> 2.0)
|
||||||
|
json (~> 2.6)
|
||||||
kramdown (~> 2.3, >= 2.3.1)
|
kramdown (~> 2.3, >= 2.3.1)
|
||||||
kramdown-parser-gfm (~> 1.0)
|
kramdown-parser-gfm (~> 1.0)
|
||||||
liquid (~> 4.0)
|
liquid (~> 4.0)
|
||||||
mercenary (>= 0.3.6, < 0.5)
|
mercenary (~> 0.3, >= 0.3.6)
|
||||||
pathutil (~> 0.9)
|
pathutil (~> 0.9)
|
||||||
rouge (>= 3.0, < 5.0)
|
rouge (>= 3.0, < 5.0)
|
||||||
safe_yaml (~> 1.0)
|
safe_yaml (~> 1.0)
|
||||||
@@ -71,25 +83,27 @@ GEM
|
|||||||
jekyll (>= 3.7, < 5.0)
|
jekyll (>= 3.7, < 5.0)
|
||||||
jekyll-gist (1.5.0)
|
jekyll-gist (1.5.0)
|
||||||
octokit (~> 4.2)
|
octokit (~> 4.2)
|
||||||
jekyll-postcss (0.5.0)
|
jekyll-postcss-v2 (1.0.2)
|
||||||
jekyll-sass-converter (3.0.0)
|
jekyll-sass-converter (3.1.0)
|
||||||
sass-embedded (~> 1.54)
|
sass-embedded (~> 1.75)
|
||||||
jekyll-watch (2.2.1)
|
jekyll-watch (2.2.1)
|
||||||
listen (~> 3.0)
|
listen (~> 3.0)
|
||||||
json (2.7.2)
|
json (2.16.0)
|
||||||
kramdown (2.4.0)
|
kramdown (2.5.1)
|
||||||
rexml
|
rexml (>= 3.3.9)
|
||||||
kramdown-parser-gfm (1.1.0)
|
kramdown-parser-gfm (1.1.0)
|
||||||
kramdown (~> 2.0)
|
kramdown (~> 2.0)
|
||||||
liquid (4.0.4)
|
liquid (4.0.4)
|
||||||
listen (3.9.0)
|
listen (3.9.0)
|
||||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||||
rb-inotify (~> 0.9, >= 0.9.10)
|
rb-inotify (~> 0.9, >= 0.9.10)
|
||||||
|
logger (1.7.0)
|
||||||
mercenary (0.4.0)
|
mercenary (0.4.0)
|
||||||
mini_portile2 (2.8.6)
|
metrics (0.15.0)
|
||||||
net-http (0.4.1)
|
mini_portile2 (2.8.9)
|
||||||
uri
|
net-http (0.8.0)
|
||||||
nokogiri (1.16.5)
|
uri (>= 0.11.1)
|
||||||
|
nokogiri (1.18.10)
|
||||||
mini_portile2 (~> 2.8.2)
|
mini_portile2 (~> 2.8.2)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
octokit (4.25.1)
|
octokit (4.25.1)
|
||||||
@@ -97,43 +111,41 @@ GEM
|
|||||||
sawyer (~> 0.9)
|
sawyer (~> 0.9)
|
||||||
pathutil (0.16.2)
|
pathutil (0.16.2)
|
||||||
forwardable-extended (~> 2.6)
|
forwardable-extended (~> 2.6)
|
||||||
pdf-reader (2.12.0)
|
pdf-reader (2.15.0)
|
||||||
Ascii85 (~> 1.0)
|
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
|
||||||
afm (~> 0.2.1)
|
afm (>= 0.2.1, < 2)
|
||||||
hashery (~> 2.0)
|
hashery (~> 2.0)
|
||||||
ruby-rc4
|
ruby-rc4
|
||||||
ttfunk
|
ttfunk
|
||||||
public_suffix (5.0.5)
|
public_suffix (6.0.2)
|
||||||
racc (1.8.0)
|
racc (1.8.1)
|
||||||
rainbow (3.1.1)
|
rainbow (3.1.1)
|
||||||
rake (13.2.1)
|
rake (13.3.1)
|
||||||
rb-fsevent (0.11.2)
|
rb-fsevent (0.11.2)
|
||||||
rb-inotify (0.11.1)
|
rb-inotify (0.11.1)
|
||||||
ffi (~> 1.0)
|
ffi (~> 1.0)
|
||||||
rexml (3.2.8)
|
rexml (3.4.4)
|
||||||
strscan (>= 3.0.9)
|
rouge (4.6.1)
|
||||||
rouge (4.2.1)
|
|
||||||
ruby-rc4 (0.1.5)
|
ruby-rc4 (0.1.5)
|
||||||
safe_yaml (1.0.5)
|
safe_yaml (1.0.5)
|
||||||
sass-embedded (1.77.2)
|
sass-embedded (1.94.1)
|
||||||
google-protobuf (>= 3.25, < 5.0)
|
google-protobuf (~> 4.31)
|
||||||
rake (>= 13.0.0)
|
rake (>= 13)
|
||||||
sawyer (0.9.2)
|
sawyer (0.9.3)
|
||||||
addressable (>= 2.3.5)
|
addressable (>= 2.3.5)
|
||||||
faraday (>= 0.17.3, < 3)
|
faraday (>= 0.17.3, < 3)
|
||||||
strscan (3.1.0)
|
|
||||||
terminal-table (3.0.2)
|
terminal-table (3.0.2)
|
||||||
unicode-display_width (>= 1.1.1, < 3)
|
unicode-display_width (>= 1.1.1, < 3)
|
||||||
timers (4.3.5)
|
traces (0.18.2)
|
||||||
ttfunk (1.8.0)
|
ttfunk (1.8.0)
|
||||||
bigdecimal (~> 3.1)
|
bigdecimal (~> 3.1)
|
||||||
typhoeus (1.4.1)
|
typhoeus (1.4.1)
|
||||||
ethon (>= 0.9.0)
|
ethon (>= 0.9.0)
|
||||||
unicode-display_width (2.5.0)
|
unicode-display_width (2.6.0)
|
||||||
uri (0.13.0)
|
uri (1.1.1)
|
||||||
webrick (1.8.1)
|
webrick (1.9.1)
|
||||||
yell (2.2.2)
|
yell (2.2.2)
|
||||||
zeitwerk (2.6.14)
|
zeitwerk (2.7.3)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
@@ -144,7 +156,7 @@ DEPENDENCIES
|
|||||||
jekyll-compose
|
jekyll-compose
|
||||||
jekyll-feed
|
jekyll-feed
|
||||||
jekyll-gist
|
jekyll-gist
|
||||||
jekyll-postcss
|
jekyll-postcss-v2
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.5.10
|
2.5.10
|
||||||
|
|||||||
@@ -25,4 +25,4 @@ postcss:
|
|||||||
plugins:
|
plugins:
|
||||||
- jekyll-gist
|
- jekyll-gist
|
||||||
- jekyll-feed
|
- jekyll-feed
|
||||||
- jekyll-postcss
|
- jekyll-postcss-v2
|
||||||
|
|||||||
11
css/main.css
11
css/main.css
@@ -1,6 +1,9 @@
|
|||||||
---
|
---
|
||||||
# front matter
|
|
||||||
---
|
---
|
||||||
@import "tailwindcss/base";
|
@import "tailwindcss";
|
||||||
@import "tailwindcss/components";
|
|
||||||
@import "tailwindcss/utilities";
|
@layer utilities {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@config "../../tailwind.config.js";
|
||||||
20
flake.lock
generated
20
flake.lock
generated
@@ -3,11 +3,11 @@
|
|||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696426674,
|
"lastModified": 1761588595,
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -21,11 +21,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1731533236,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -36,16 +36,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716218643,
|
"lastModified": 1763334038,
|
||||||
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
|
"narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
|
"rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-23.11",
|
"ref": "nixos-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
44
flake.nix
44
flake.nix
@@ -2,7 +2,7 @@
|
|||||||
description = "walkah.net";
|
description = "walkah.net";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
|
||||||
flake-compat = {
|
flake-compat = {
|
||||||
@@ -11,23 +11,29 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, flake-utils, ... }:
|
outputs =
|
||||||
flake-utils.lib.eachDefaultSystem
|
{ nixpkgs, flake-utils, ... }:
|
||||||
(system:
|
flake-utils.lib.eachDefaultSystem (
|
||||||
let pkgs = nixpkgs.legacyPackages.${system};
|
system:
|
||||||
in
|
let
|
||||||
{
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
devShells.default = pkgs.mkShell {
|
in
|
||||||
name = "net";
|
{
|
||||||
buildInputs = with pkgs; [ libyaml nodejs ruby ];
|
devShells.default = pkgs.mkShell {
|
||||||
shellHook = ''
|
name = "net";
|
||||||
mkdir -p .gems
|
buildInputs = with pkgs; [
|
||||||
|
libyaml
|
||||||
|
nodejs
|
||||||
|
ruby
|
||||||
|
];
|
||||||
|
shellHook = ''
|
||||||
|
mkdir -p .gems
|
||||||
|
|
||||||
export GEM_HOME=$PWD/.gems
|
export GEM_HOME=$PWD/.gems
|
||||||
export GEM_PATH=$GEM_HOME
|
export GEM_PATH=$GEM_HOME
|
||||||
export PATH=$PWD/bin:$GEM_HOME/bin:$PATH
|
export PATH=$PWD/bin:$GEM_HOME/bin:$PATH
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
2462
package-lock.json
generated
2462
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,10 +1,12 @@
|
|||||||
{
|
{
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@tailwindcss/postcss": "^4.1.17",
|
||||||
"@tailwindcss/typography": "^0.5.2",
|
"@tailwindcss/typography": "^0.5.2",
|
||||||
"autoprefixer": "^10.4.7",
|
"autoprefixer": "^10.4.7",
|
||||||
"cssnano": "^7.0.0",
|
"cssnano": "^7.0.0",
|
||||||
"postcss": "^8.4.14",
|
"postcss": "^8.4.14",
|
||||||
|
"postcss-cli": "^11.0.1",
|
||||||
"postcss-import": "^16.0.0",
|
"postcss-import": "^16.0.0",
|
||||||
"tailwindcss": "^3.0.24"
|
"tailwindcss": "^4.1.17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,5 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
plugins: [
|
plugins: {
|
||||||
require('postcss-import'),
|
'@tailwindcss/postcss': {},
|
||||||
require('tailwindcss'),
|
}
|
||||||
require('autoprefixer'),
|
}
|
||||||
...(process.env.JEKYLL_ENV == "production"
|
|
||||||
? [require('cssnano')({ preset: 'default' })]
|
|
||||||
: [])
|
|
||||||
]
|
|
||||||
};
|
|
||||||
Reference in New Issue
Block a user