Fixed development environment and overrides

This commit is contained in:
squidfunk
2022-11-11 18:39:38 +01:00
parent c62ff2c283
commit 6a1b86e8c6
41 changed files with 41 additions and 63 deletions

View File

@@ -169,7 +169,7 @@ const sources$ = copyAll("**/*.py", {
const stylesheets$ = resolve("**/[!_]*.scss", { cwd: "src" })
.pipe(
mergeMap(file => zip(
of(ext(file, ".css")),
of(ext(file, ".css").replace(".overrides/", "")),
transformStyle({
from: `src/${file}`,
to: ext(`${base}/${file}`, ".css")
@@ -178,10 +178,10 @@ const stylesheets$ = resolve("**/[!_]*.scss", { cwd: "src" })
)
/* Transform scripts */
const javascripts$ = resolve("**/{bundle,search}.ts", { cwd: "src" })
const javascripts$ = resolve("**/{custom,bundle,search}.ts", { cwd: "src" })
.pipe(
mergeMap(file => zip(
of(ext(file, ".js")),
of(ext(file, ".js").replace(".overrides/", "")),
transformScript({
from: `src/${file}`,
to: ext(`${base}/${file}`, ".js")
@@ -209,7 +209,10 @@ const manifest$ = merge(
.pipe(
scan((prev, mapping) => (
mapping.reduce((next, [key, value]) => (
next.set(key, value.replace(`${base}/`, ""))
next.set(key, value.replace(
new RegExp(`${base}\\/(\.overrides\\/)?`),
""
))
), prev)
), new Map<string, string>()),
)
@@ -222,6 +225,7 @@ const templates$ = manifest$
to: base,
watch: process.argv.includes("--watch"),
transform: async data => {
console.log(manifest)
const metadata = require("../../package.json")
const banner =
"{#-\n" +
@@ -300,7 +304,7 @@ const index$ = zip(icons$, emojis$)
} as IconSearchIndex
}),
switchMap(data => write(
`${base}/overrides/assets/javascripts/iconsearch_index.json`,
`${base}/.overrides/assets/javascripts/iconsearch_index.json`,
JSON.stringify(data)
))
)