contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Refactoring: attempt to fix build

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-07-16 03:26:43 +02:00
parent b6a1246bbe
commit cacc078042
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/generateLayouts.ts
View file

@ -77,7 +77,9 @@ async function createSocialImage(layout: LayoutConfig, template: "" | "Wide"): P
} }
delete svg["defs"] delete svg["defs"]
delete svg["$"] delete svg["$"]
let templateSvg = await ScriptUtils.ReadSvg("./assets/SocialImageTemplate" + template + ".svg") let templateSvg = await ScriptUtils.ReadSvg(
"./public/assets/SocialImageTemplate" + template + ".svg"
)
templateSvg = Utils.WalkJson( templateSvg = Utils.WalkJson(
templateSvg, templateSvg,
(leaf) => { (leaf) => {
@ -287,8 +289,8 @@ async function createLandingPage(layout: LayoutConfig, manifest, whiteIcons, alr
) )
.replace( .replace(
'<script type="module" src="./index.ts"></script>', '<script src="./src/index.ts" type="module"></script>',
`<script type="module" src='./index_${layout.id}.ts'></script>` `<script type="module" src='./index_${layout.id}.ts'></script>`
) )
return output return output
@ -296,7 +298,8 @@ async function createLandingPage(layout: LayoutConfig, manifest, whiteIcons, alr
async function createIndexFor(theme: LayoutConfig) { async function createIndexFor(theme: LayoutConfig) {
const filename = "index_" + theme.id + ".ts" const filename = "index_" + theme.id + ".ts"
writeFileSync(filename, `import layout from "./assets/generated/themes/${theme.id}.json"\n`) writeFileSync(filename, `import layout from "./src/assets/generated/themes/${theme.id}.json"\n`)
appendFileSync(filename, codeTemplate) appendFileSync(filename, codeTemplate)
} }
@ -308,9 +311,6 @@ function createDir(path) {
async function main(): Promise<void> { async function main(): Promise<void> {
const alreadyWritten = [] const alreadyWritten = []
createDir("./assets/generated")
createDir("./assets/generated/layers")
createDir("./assets/generated/themes")
createDir("./public/assets/") createDir("./public/assets/")
createDir("./public/assets/generated") createDir("./public/assets/generated")
createDir("./public/assets/generated/images") createDir("./public/assets/generated/images")
@ -359,6 +359,7 @@ async function main(): Promise<void> {
// Create a landing page for the given theme // Create a landing page for the given theme
const landing = await createLandingPage(layout, manifest, whiteIcons, alreadyWritten) const landing = await createLandingPage(layout, manifest, whiteIcons, alreadyWritten)
writeFile(enc(layout.id) + ".html", landing, err) writeFile(enc(layout.id) + ".html", landing, err)
await createIndexFor(layout) await createIndexFor(layout)
} }

12
src/index_theme.ts.template
View file

@ -1,11 +1,7 @@
import { Utils } from "./Utils" import ThemeViewState from "./src/Models/ThemeViewState"
import ThemeViewState from "./Models/ThemeViewState" import SvelteUIElement from "./src/UI/Base/SvelteUIElement"
import SvelteUIElement from "./UI/Base/SvelteUIElement" import ThemeViewGUI from "./src/UI/ThemeViewGUI.svelte"
import ThemeViewGUI from "./UI/ThemeViewGUI.svelte" import LayoutConfig from "./src/Models/ThemeConfig/LayoutConfig";
import LayoutConfig from "./Models/ThemeConfig/LayoutConfig";
// Miscelleanous
Utils.DisableLongPresses()
const state = new ThemeViewState(new LayoutConfig(<any> layout)) const state = new ThemeViewState(new LayoutConfig(<any> layout))
const main = new SvelteUIElement(ThemeViewGUI, { state }) const main = new SvelteUIElement(ThemeViewGUI, { state })

2
theme.html
View file

@ -96,7 +96,7 @@
</script> </script>
<script src="./index.ts" type="module"></script> <script src="./src/index.ts" type="module"></script>
<script async data-goatcounter="https://pietervdvn.goatcounter.com/count" src="//gc.zgo.at/count.js"></script> <script async data-goatcounter="https://pietervdvn.goatcounter.com/count" src="//gc.zgo.at/count.js"></script>
<script> <script>