diff --git a/package.json b/package.json index 5ea140b..633dddc 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "wouter-preact": "^2.7.3" }, "staticFiles": { - "staticPath": "node_modules/emglken/build", - "excludeGlob": "*.js" + "staticPath": "node_modules/emglken/build/*.wasm" } } diff --git a/src/components/player/UrlPlayer.js b/src/components/player/UrlPlayer.js index da30ba3..9dfa609 100644 --- a/src/components/player/UrlPlayer.js +++ b/src/components/player/UrlPlayer.js @@ -1,14 +1,14 @@ import { h } from 'preact' import { useState, useEffect } from 'preact/hooks' -import { prepareVM } from '~/src/common/if' +import { prepareVM } from './common/if' const INITIAL_STATUS = { stage: 'loading', details: 'Loading...' } -export default function ({url}) { +export default function ({ url }) { const [status, setStatus] = useState(INITIAL_STATUS) const [vm, setVM] = useState(null) @@ -25,7 +25,6 @@ export default function ({url}) { return (
- {url} {status.details}
) } diff --git a/src/common/engines.js b/src/components/player/common/engines.js similarity index 100% rename from src/common/engines.js rename to src/components/player/common/engines.js diff --git a/src/common/if.js b/src/components/player/common/if.js similarity index 95% rename from src/common/if.js rename to src/components/player/common/if.js index 70af296..98bf665 100644 --- a/src/common/if.js +++ b/src/components/player/common/if.js @@ -1,7 +1,7 @@ // import CheapGlkOte from 'cheap-glkote' // import engine from 'emglken/src/tads.js' -import { engineByFilename } from '~/src/common/engines' +import { engineByFilename } from './engines' export const prepareVM = ({ url, setStatus, setVM }) => _ => { const st = (stage, details) => args => { diff --git a/src/themes/themes.js b/src/themes/themes.js index 60b8694..5af3adc 100644 --- a/src/themes/themes.js +++ b/src/themes/themes.js @@ -18,13 +18,13 @@ const assertTheme = theme => ? theme : DEFAULT_THEME -export const useThemeEngine = (defaultTheme = DEFAULT_THEME) => { +export const useThemeEngine = (initialTheme = DEFAULT_THEME) => { const [currentTheme, setCurrentTheme] = - useState(DEFAULT_THEME) + useState(initialTheme) - const setTheme = useCallback(theme => { - setCurrentTheme(assertTheme(theme)) - }, [currentTheme]); + const setTheme = useCallback(theme => { + setCurrentTheme(assertTheme(theme)) + }, [currentTheme]) - return { currentTheme, setTheme, themes }; + return { currentTheme, setTheme, themes } } diff --git a/src/utils/utils.routing.js b/src/utils/utils.routing.js index 2296ecf..dcd213b 100644 --- a/src/utils/utils.routing.js +++ b/src/utils/utils.routing.js @@ -22,6 +22,3 @@ export const useHashLocation = () => { export const buildPlayLinkHref = (url, theme) => `/#/play/${theme}/${encodeURIComponent(url)}` - -export const getFileExtension = fileName => - fileName.split('.').pop()