Try fix CI

This commit is contained in:
0x1eef 2024-06-14 23:31:39 -03:00
parent f5d231145c
commit 0e7f223fe0
5 changed files with 14 additions and 12 deletions

9
Rules
View file

@ -15,6 +15,7 @@ locales = %w[ar fa en]
json_dir = File.join(Dir.getwd, "src", "json")
name_by_id = Ryo.from_json(path: File.join(json_dir, "nameById.json"))
tdata = Ryo.from_json(path: File.join(json_dir, "t.json"))
tidy = `which tidy || which tidy5`
buildenv = ENV["buildenv"] || "development"
##
@ -60,10 +61,10 @@ passthrough "/json/durations/*.json"
##
# Require rules
require_rules "nanoc/rules/assets"
require_rules "nanoc/rules/redirect", {locales:}
require_rules "nanoc/rules/random", {locales:, tdata:}
require_rules "nanoc/rules/stream", {locales:, tdata:, name_by_id:}
require_rules "nanoc/rules/index", {locales:, tdata:}
require_rules "nanoc/rules/redirect", {locales:, tidy:}
require_rules "nanoc/rules/random", {locales:, tdata:, tidy:}
require_rules "nanoc/rules/stream", {locales:, tdata:, name_by_id:, tidy:}
require_rules "nanoc/rules/index", {locales:, tdata:, tidy:}
##
# Catch-all

View file

@ -15,16 +15,17 @@ locales.each do |locale|
end
compile "/js/main/surah-index.tsx" do
filter :webpack, depend_on: ["/js/components",
"/js/lib/",
"/js/hooks"]
filter :webpack, exe: tidy,
depend_on: ["/js/components",
"/js/lib/",
"/js/hooks"]
write "/js/main/surah-index.js"
filter :gzip
write "/js/main/surah-index.js.gz"
end
compile "/js/loaders/SurahIndexLoader.ts" do
filter :webpack
filter :webpack, exe: tidy
write "/js/loaders/surah-index-loader.js"
filter :gzip
write "/js/loaders/surah-index-loader.js.gz"

View file

@ -15,7 +15,7 @@ locales.each do |locale|
end
compile "/js/main/random.ts" do
filter(:webpack, depend_on: ["/js/lib/"])
filter(:webpack, exe: tidy, depend_on: ["/js/lib/"])
write("/js/main/random.js")
filter(:gzip)
write("/js/main/random.js.gz")

View file

@ -12,7 +12,7 @@ compile "/html/main/redirect.html.erb" do
end
compile "/js/main/redirect.ts" do
filter(:webpack, depend_on: ["/js/lib/"])
filter(:webpack, exe: tidy, depend_on: ["/js/lib/"])
write("/js/main/redirect.js")
filter(:gzip)
write("/js/main/redirect.js.gz")

View file

@ -42,7 +42,7 @@ Ryo.each(name_by_id) do |id, slug|
end
compile "/js/main/surah-stream.tsx" do
filter :webpack,
filter :webpack, exe: tidy,
depend_on: ["/js/components", "/js/lib/", "/js/hooks"]
write "/js/main/surah-stream.js"
filter :gzip
@ -50,7 +50,7 @@ compile "/js/main/surah-stream.tsx" do
end
compile "/js/loaders/SurahStreamLoader.ts" do
filter :webpack
filter :webpack, exe: tidy
write "/js/loaders/surah-stream-loader.js"
filter :gzip
write "/js/loaders/surah-stream-loader.js.gz"