diff --git a/README.md b/README.md index 2acf01f6..bd14fba3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Requires Node v16.5+. ## Developing -The library lives in the `src/package` folder, and the documentation lives in the `src/routes` folder. +The library lives in the `package/` folder, and the documentation lives in the `docs/` folder. ```bash pnpm install # Install dependencies @@ -21,12 +21,12 @@ pnpm dev # Run dev server > Replace `ComponentName` with your component name in the steps below -1. Create a `ComponentName.svelte` file in `src/package/components` -2. Add an export for your component in [./src/package/index.ts](./src/package/index.ts) +1. Create a `ComponentName.svelte` file in `package/components` +2. Add an export for your component in [./package/index.ts](./package/index.ts) ``` export { default as ComponentName } from './components/ComponentName.svelte' ``` -3. Create a `ComponentName.md` file for documentation in `src/routes/components` +3. Create a `ComponentName.md` file for documentation in `docs/routes/components` 4. Add an example of your component in your `ComponentName.md` file, like so: ````md diff --git a/src/app.d.ts b/docs/app.d.ts similarity index 100% rename from src/app.d.ts rename to docs/app.d.ts diff --git a/src/app.html b/docs/app.html similarity index 100% rename from src/app.html rename to docs/app.html diff --git a/src/docs/assets/omorphia.svg b/docs/assets/omorphia.svg similarity index 100% rename from src/docs/assets/omorphia.svg rename to docs/assets/omorphia.svg diff --git a/src/docs/components/Example.svelte b/docs/components/Example.svelte similarity index 100% rename from src/docs/components/Example.svelte rename to docs/components/Example.svelte diff --git a/src/docs/components/Header.svelte b/docs/components/Header.svelte similarity index 100% rename from src/docs/components/Header.svelte rename to docs/components/Header.svelte diff --git a/src/docs/components/Sidebar.svelte b/docs/components/Sidebar.svelte similarity index 92% rename from src/docs/components/Sidebar.svelte rename to docs/components/Sidebar.svelte index 5a209a5f..6c1d8797 100644 --- a/src/docs/components/Sidebar.svelte +++ b/docs/components/Sidebar.svelte @@ -3,12 +3,12 @@ import IconMenu from 'virtual:icons/lucide/menu' - const components = Object.keys(import.meta.glob('../../routes/components/**')) - .map((it) => it.replace('../../routes/components/', '').replace('.md', '')) + const components = Object.keys(import.meta.glob('../routes/components/**')) + .map((it) => it.replace('../routes/components/', '').replace('.md', '')) .sort() - const classes = Object.keys(import.meta.glob('../../routes/classes/**')) - .map((it) => it.replace('../../routes/classes/', '').replace('.md', '')) + const classes = Object.keys(import.meta.glob('../routes/classes/**')) + .map((it) => it.replace('../routes/classes/', '').replace('.md', '')) .sort() let slideIn = false diff --git a/src/global.d.ts b/docs/global.d.ts similarity index 100% rename from src/global.d.ts rename to docs/global.d.ts diff --git a/src/docs/layout/page.svelte b/docs/layout/page.svelte similarity index 95% rename from src/docs/layout/page.svelte rename to docs/layout/page.svelte index 88069f8c..81a5c776 100644 --- a/src/docs/layout/page.svelte +++ b/docs/layout/page.svelte @@ -12,14 +12,14 @@ export let description = 'Learn about Omorphia, the component & style library' - let editUrl = `https://github.com/modrinth/omorphia/edit/main/src/routes/${ + let editUrl = `https://github.com/modrinth/omorphia/edit/main/docs/routes/${ $page.url.pathname.replace('/', '') || 'index' }.md` let api if ($page.url.pathname.includes('components')) { if (import.meta.env.DEV) { - import(`../../package/components/${title}.svelte?raw&sveld`).then( + import(`../../src/components/${title}.svelte?raw&sveld`).then( (output) => (api = output.default) ) } else { diff --git a/plugins/sveld.js b/docs/plugins/sveld.js similarity index 76% rename from plugins/sveld.js rename to docs/plugins/sveld.js index babb7a46..1e9d17e3 100644 --- a/plugins/sveld.js +++ b/docs/plugins/sveld.js @@ -2,7 +2,7 @@ import { ComponentParser } from 'sveld' import * as svelte from 'svelte/compiler' import fs from 'fs/promises' import path from 'path' -import { preprocess } from '../src/package/config/svelte.config.js' +import { preprocess } from '../../src/config/svelte.config.js' export default function sveld() { return { @@ -23,21 +23,21 @@ export default function sveld() { async buildStart() { const output = {} - const componentFiles = await fs.readdir(path.resolve('./src/package/components')) + const componentFiles = await fs.readdir(path.resolve('./src/components')) for (const fileName of componentFiles.filter((name) => name.endsWith('.svelte'))) { - const filePath = path.resolve('./src/package/components', fileName) + const filePath = path.resolve('./src/components', fileName) const raw = (await fs.readFile(filePath)).toString() output[fileName] = await parseRaw(raw, filePath) } try { - await fs.mkdir(path.resolve('./src/generated')) + await fs.mkdir(path.resolve('./generated')) } catch { // Do nothing, directory already exists } - await fs.writeFile(path.resolve('./src/generated/COMPONENT_API.json'), JSON.stringify(output)) + await fs.writeFile(path.resolve('./generated/COMPONENT_API.json'), JSON.stringify(output)) }, } } diff --git a/src/routes/__layout.svelte b/docs/routes/__layout.svelte similarity index 82% rename from src/routes/__layout.svelte rename to docs/routes/__layout.svelte index 0952b104..f544ee99 100644 --- a/src/routes/__layout.svelte +++ b/docs/routes/__layout.svelte @@ -9,11 +9,11 @@
diff --git a/src/routes/classes/Actions.md b/docs/routes/classes/Actions.md similarity index 100% rename from src/routes/classes/Actions.md rename to docs/routes/classes/Actions.md diff --git a/src/routes/classes/Base.md b/docs/routes/classes/Base.md similarity index 100% rename from src/routes/classes/Base.md rename to docs/routes/classes/Base.md diff --git a/src/routes/classes/Card.md b/docs/routes/classes/Card.md similarity index 100% rename from src/routes/classes/Card.md rename to docs/routes/classes/Card.md diff --git a/src/routes/classes/Divider.md b/docs/routes/classes/Divider.md similarity index 100% rename from src/routes/classes/Divider.md rename to docs/routes/classes/Divider.md diff --git a/src/routes/classes/InfoTable.md b/docs/routes/classes/InfoTable.md similarity index 100% rename from src/routes/classes/InfoTable.md rename to docs/routes/classes/InfoTable.md diff --git a/src/routes/classes/Link.md b/docs/routes/classes/Link.md similarity index 100% rename from src/routes/classes/Link.md rename to docs/routes/classes/Link.md diff --git a/src/routes/classes/Member.md b/docs/routes/classes/Member.md similarity index 100% rename from src/routes/classes/Member.md rename to docs/routes/classes/Member.md diff --git a/src/routes/classes/Stat.md b/docs/routes/classes/Stat.md similarity index 100% rename from src/routes/classes/Stat.md rename to docs/routes/classes/Stat.md diff --git a/src/routes/classes/Tags.md b/docs/routes/classes/Tags.md similarity index 100% rename from src/routes/classes/Tags.md rename to docs/routes/classes/Tags.md diff --git a/src/routes/classes/Title.md b/docs/routes/classes/Title.md similarity index 100% rename from src/routes/classes/Title.md rename to docs/routes/classes/Title.md diff --git a/src/routes/components/Avatar.md b/docs/routes/components/Avatar.md similarity index 100% rename from src/routes/components/Avatar.md rename to docs/routes/components/Avatar.md diff --git a/src/routes/components/Badge.md b/docs/routes/components/Badge.md similarity index 100% rename from src/routes/components/Badge.md rename to docs/routes/components/Badge.md diff --git a/src/routes/components/Button.md b/docs/routes/components/Button.md similarity index 100% rename from src/routes/components/Button.md rename to docs/routes/components/Button.md diff --git a/src/routes/components/Checkbox.md b/docs/routes/components/Checkbox.md similarity index 100% rename from src/routes/components/Checkbox.md rename to docs/routes/components/Checkbox.md diff --git a/src/routes/components/CheckboxList.md b/docs/routes/components/CheckboxList.md similarity index 100% rename from src/routes/components/CheckboxList.md rename to docs/routes/components/CheckboxList.md diff --git a/src/routes/components/CheckboxVirtualList.md b/docs/routes/components/CheckboxVirtualList.md similarity index 100% rename from src/routes/components/CheckboxVirtualList.md rename to docs/routes/components/CheckboxVirtualList.md diff --git a/src/routes/components/Chips.md b/docs/routes/components/Chips.md similarity index 100% rename from src/routes/components/Chips.md rename to docs/routes/components/Chips.md diff --git a/src/routes/components/Field.md b/docs/routes/components/Field.md similarity index 100% rename from src/routes/components/Field.md rename to docs/routes/components/Field.md diff --git a/src/routes/components/Modal.md b/docs/routes/components/Modal.md similarity index 100% rename from src/routes/components/Modal.md rename to docs/routes/components/Modal.md diff --git a/src/routes/components/ModalDeletion.md b/docs/routes/components/ModalDeletion.md similarity index 100% rename from src/routes/components/ModalDeletion.md rename to docs/routes/components/ModalDeletion.md diff --git a/src/routes/components/NavRow.md b/docs/routes/components/NavRow.md similarity index 100% rename from src/routes/components/NavRow.md rename to docs/routes/components/NavRow.md diff --git a/src/routes/components/Pagination.md b/docs/routes/components/Pagination.md similarity index 100% rename from src/routes/components/Pagination.md rename to docs/routes/components/Pagination.md diff --git a/src/routes/components/Select.md b/docs/routes/components/Select.md similarity index 100% rename from src/routes/components/Select.md rename to docs/routes/components/Select.md diff --git a/src/routes/components/Slider.md b/docs/routes/components/Slider.md similarity index 100% rename from src/routes/components/Slider.md rename to docs/routes/components/Slider.md diff --git a/src/routes/components/TextInput.md b/docs/routes/components/TextInput.md similarity index 100% rename from src/routes/components/TextInput.md rename to docs/routes/components/TextInput.md diff --git a/src/routes/getting-started/configure.md b/docs/routes/getting-started/configure.md similarity index 100% rename from src/routes/getting-started/configure.md rename to docs/routes/getting-started/configure.md diff --git a/src/routes/getting-started/css.md b/docs/routes/getting-started/css.md similarity index 100% rename from src/routes/getting-started/css.md rename to docs/routes/getting-started/css.md diff --git a/src/routes/getting-started/generator.md b/docs/routes/getting-started/generator.md similarity index 100% rename from src/routes/getting-started/generator.md rename to docs/routes/getting-started/generator.md diff --git a/src/routes/getting-started/icons.md b/docs/routes/getting-started/icons.md similarity index 100% rename from src/routes/getting-started/icons.md rename to docs/routes/getting-started/icons.md diff --git a/src/routes/getting-started/illustrations.md b/docs/routes/getting-started/illustrations.md similarity index 100% rename from src/routes/getting-started/illustrations.md rename to docs/routes/getting-started/illustrations.md diff --git a/src/routes/getting-started/utils.md b/docs/routes/getting-started/utils.md similarity index 100% rename from src/routes/getting-started/utils.md rename to docs/routes/getting-started/utils.md diff --git a/src/routes/index.md b/docs/routes/index.md similarity index 100% rename from src/routes/index.md rename to docs/routes/index.md diff --git a/static/assets/omorphia.png b/docs/static/assets/omorphia.png similarity index 100% rename from static/assets/omorphia.png rename to docs/static/assets/omorphia.png diff --git a/src/docs/styles/gh-markdown.postcss b/docs/styles/gh-markdown.postcss similarity index 100% rename from src/docs/styles/gh-markdown.postcss rename to docs/styles/gh-markdown.postcss diff --git a/src/docs/styles/prism-one-dark.css b/docs/styles/prism-one-dark.css similarity index 100% rename from src/docs/styles/prism-one-dark.css rename to docs/styles/prism-one-dark.css diff --git a/mdsvex.config.js b/mdsvex.config.js index d2b7c589..b73f1e4e 100644 --- a/mdsvex.config.js +++ b/mdsvex.config.js @@ -14,7 +14,7 @@ const config = defineConfig({ examples, { defaults: { - Wrapper: path.resolve('./src/docs/components/Example.svelte'), + Wrapper: path.resolve('./docs/components/Example.svelte'), }, }, ], @@ -22,7 +22,7 @@ const config = defineConfig({ rehypePlugins: [], layout: { - _: './src/docs/layout/page.svelte', + _: './docs/layout/page.svelte', }, }) diff --git a/postcss.config.cjs b/postcss.config.cjs index 7ea00699..4e19d1cc 100644 --- a/postcss.config.cjs +++ b/postcss.config.cjs @@ -1 +1 @@ -module.exports = require('./src/package/config/postcss.config.cjs') +module.exports = require('./src/config/postcss.config.cjs') diff --git a/src/package/components/Avatar.svelte b/src/components/Avatar.svelte similarity index 100% rename from src/package/components/Avatar.svelte rename to src/components/Avatar.svelte diff --git a/src/package/components/Badge.svelte b/src/components/Badge.svelte similarity index 100% rename from src/package/components/Badge.svelte rename to src/components/Badge.svelte diff --git a/src/package/components/Button.svelte b/src/components/Button.svelte similarity index 100% rename from src/package/components/Button.svelte rename to src/components/Button.svelte diff --git a/src/package/components/Checkbox.svelte b/src/components/Checkbox.svelte similarity index 100% rename from src/package/components/Checkbox.svelte rename to src/components/Checkbox.svelte diff --git a/src/package/components/CheckboxList.svelte b/src/components/CheckboxList.svelte similarity index 100% rename from src/package/components/CheckboxList.svelte rename to src/components/CheckboxList.svelte diff --git a/src/package/components/CheckboxVirtualList.svelte b/src/components/CheckboxVirtualList.svelte similarity index 100% rename from src/package/components/CheckboxVirtualList.svelte rename to src/components/CheckboxVirtualList.svelte diff --git a/src/package/components/Chips.svelte b/src/components/Chips.svelte similarity index 100% rename from src/package/components/Chips.svelte rename to src/components/Chips.svelte diff --git a/src/package/components/Field.svelte b/src/components/Field.svelte similarity index 100% rename from src/package/components/Field.svelte rename to src/components/Field.svelte diff --git a/src/package/components/Modal.svelte b/src/components/Modal.svelte similarity index 100% rename from src/package/components/Modal.svelte rename to src/components/Modal.svelte diff --git a/src/package/components/ModalDeletion.svelte b/src/components/ModalDeletion.svelte similarity index 100% rename from src/package/components/ModalDeletion.svelte rename to src/components/ModalDeletion.svelte diff --git a/src/package/components/NavRow.svelte b/src/components/NavRow.svelte similarity index 100% rename from src/package/components/NavRow.svelte rename to src/components/NavRow.svelte diff --git a/src/package/components/Pagination.svelte b/src/components/Pagination.svelte similarity index 100% rename from src/package/components/Pagination.svelte rename to src/components/Pagination.svelte diff --git a/src/package/components/Select.svelte b/src/components/Select.svelte similarity index 100% rename from src/package/components/Select.svelte rename to src/components/Select.svelte diff --git a/src/package/components/Slider.svelte b/src/components/Slider.svelte similarity index 100% rename from src/package/components/Slider.svelte rename to src/components/Slider.svelte diff --git a/src/package/components/TextInput.svelte b/src/components/TextInput.svelte similarity index 100% rename from src/package/components/TextInput.svelte rename to src/components/TextInput.svelte diff --git a/src/package/components/types.d.ts b/src/components/types.d.ts similarity index 100% rename from src/package/components/types.d.ts rename to src/components/types.d.ts diff --git a/src/package/config/postcss.config.cjs b/src/config/postcss.config.cjs similarity index 100% rename from src/package/config/postcss.config.cjs rename to src/config/postcss.config.cjs diff --git a/src/package/config/svelte.config.js b/src/config/svelte.config.js similarity index 100% rename from src/package/config/svelte.config.js rename to src/config/svelte.config.js diff --git a/src/package/index.ts b/src/index.ts similarity index 100% rename from src/package/index.ts rename to src/index.ts diff --git a/src/package/plugins/generator/index.d.ts b/src/plugins/generator/index.d.ts similarity index 100% rename from src/package/plugins/generator/index.d.ts rename to src/plugins/generator/index.d.ts diff --git a/src/package/plugins/generator/index.js b/src/plugins/generator/index.js similarity index 91% rename from src/package/plugins/generator/index.js rename to src/plugins/generator/index.js index 07537685..1707ad4d 100644 --- a/src/package/plugins/generator/index.js +++ b/src/plugins/generator/index.js @@ -22,16 +22,6 @@ export default function Generator(options) { } catch { // File doesn't exist, create folder await fs.mkdir('./generated', { recursive: true }) - await fs.writeFile( - './generated/state.json', - JSON.stringify( - { - options, - }, - null, - 2 - ) - ) } // Don't generate if the last generation was less than TTL and the options are the same @@ -43,16 +33,16 @@ export default function Generator(options) { return } - if (options.tags) await tags(API_URL) - if (options.landingPage) await landingPage(API_URL) - if (options.gameVersions) await gameVersions(API_URL) - if (options.projectColors) await projectColors(API_URL) - // Write new state state.lastGenerated = new Date().toISOString() state.options = options await fs.writeFile('./generated/state.json', JSON.stringify(state, null, 2)) + + if (options.tags) await tags(API_URL) + if (options.landingPage) await landingPage(API_URL) + if (options.gameVersions) await gameVersions(API_URL) + if (options.projectColors) await projectColors(API_URL) }, } } diff --git a/src/package/plugins/generator/outputs/gameVersions.d.ts b/src/plugins/generator/outputs/gameVersions.d.ts similarity index 100% rename from src/package/plugins/generator/outputs/gameVersions.d.ts rename to src/plugins/generator/outputs/gameVersions.d.ts diff --git a/src/package/plugins/generator/outputs/gameVersions.js b/src/plugins/generator/outputs/gameVersions.js similarity index 100% rename from src/package/plugins/generator/outputs/gameVersions.js rename to src/plugins/generator/outputs/gameVersions.js diff --git a/src/package/plugins/generator/outputs/landingPage.d.ts b/src/plugins/generator/outputs/landingPage.d.ts similarity index 100% rename from src/package/plugins/generator/outputs/landingPage.d.ts rename to src/plugins/generator/outputs/landingPage.d.ts diff --git a/src/package/plugins/generator/outputs/landingPage.js b/src/plugins/generator/outputs/landingPage.js similarity index 100% rename from src/package/plugins/generator/outputs/landingPage.js rename to src/plugins/generator/outputs/landingPage.js diff --git a/src/package/plugins/generator/outputs/projectColors.d.ts b/src/plugins/generator/outputs/projectColors.d.ts similarity index 100% rename from src/package/plugins/generator/outputs/projectColors.d.ts rename to src/plugins/generator/outputs/projectColors.d.ts diff --git a/src/package/plugins/generator/outputs/projectColors.js b/src/plugins/generator/outputs/projectColors.js similarity index 100% rename from src/package/plugins/generator/outputs/projectColors.js rename to src/plugins/generator/outputs/projectColors.js diff --git a/src/package/plugins/generator/outputs/tags.d.ts b/src/plugins/generator/outputs/tags.d.ts similarity index 100% rename from src/package/plugins/generator/outputs/tags.d.ts rename to src/plugins/generator/outputs/tags.d.ts diff --git a/src/package/plugins/generator/outputs/tags.js b/src/plugins/generator/outputs/tags.js similarity index 100% rename from src/package/plugins/generator/outputs/tags.js rename to src/plugins/generator/outputs/tags.js diff --git a/src/package/styles.postcss b/src/styles.postcss similarity index 100% rename from src/package/styles.postcss rename to src/styles.postcss diff --git a/src/package/styles/classes/actions.postcss b/src/styles/classes/actions.postcss similarity index 100% rename from src/package/styles/classes/actions.postcss rename to src/styles/classes/actions.postcss diff --git a/src/package/styles/classes/base.postcss b/src/styles/classes/base.postcss similarity index 100% rename from src/package/styles/classes/base.postcss rename to src/styles/classes/base.postcss diff --git a/src/package/styles/classes/button-group.postcss b/src/styles/classes/button-group.postcss similarity index 100% rename from src/package/styles/classes/button-group.postcss rename to src/styles/classes/button-group.postcss diff --git a/src/package/styles/classes/card.postcss b/src/styles/classes/card.postcss similarity index 100% rename from src/package/styles/classes/card.postcss rename to src/styles/classes/card.postcss diff --git a/src/package/styles/classes/divider.postcss b/src/styles/classes/divider.postcss similarity index 100% rename from src/package/styles/classes/divider.postcss rename to src/styles/classes/divider.postcss diff --git a/src/package/styles/classes/illustration.postcss b/src/styles/classes/illustration.postcss similarity index 100% rename from src/package/styles/classes/illustration.postcss rename to src/styles/classes/illustration.postcss diff --git a/src/package/styles/classes/info-table.postcss b/src/styles/classes/info-table.postcss similarity index 100% rename from src/package/styles/classes/info-table.postcss rename to src/styles/classes/info-table.postcss diff --git a/src/package/styles/classes/link.postcss b/src/styles/classes/link.postcss similarity index 100% rename from src/package/styles/classes/link.postcss rename to src/styles/classes/link.postcss diff --git a/src/package/styles/classes/markdown.postcss b/src/styles/classes/markdown.postcss similarity index 100% rename from src/package/styles/classes/markdown.postcss rename to src/styles/classes/markdown.postcss diff --git a/src/package/styles/classes/member.postcss b/src/styles/classes/member.postcss similarity index 100% rename from src/package/styles/classes/member.postcss rename to src/styles/classes/member.postcss diff --git a/src/package/styles/classes/stat.postcss b/src/styles/classes/stat.postcss similarity index 100% rename from src/package/styles/classes/stat.postcss rename to src/styles/classes/stat.postcss diff --git a/src/package/styles/classes/tag.postcss b/src/styles/classes/tag.postcss similarity index 100% rename from src/package/styles/classes/tag.postcss rename to src/styles/classes/tag.postcss diff --git a/src/package/styles/classes/title.postcss b/src/styles/classes/title.postcss similarity index 100% rename from src/package/styles/classes/title.postcss rename to src/styles/classes/title.postcss diff --git a/src/package/styles/external/github-dark.postcss b/src/styles/external/github-dark.postcss similarity index 100% rename from src/package/styles/external/github-dark.postcss rename to src/styles/external/github-dark.postcss diff --git a/src/package/styles/external/github.postcss b/src/styles/external/github.postcss similarity index 100% rename from src/package/styles/external/github.postcss rename to src/styles/external/github.postcss diff --git a/src/package/styles/normalize.postcss b/src/styles/normalize.postcss similarity index 100% rename from src/package/styles/normalize.postcss rename to src/styles/normalize.postcss diff --git a/src/package/styles/themes/base.postcss b/src/styles/themes/base.postcss similarity index 100% rename from src/package/styles/themes/base.postcss rename to src/styles/themes/base.postcss diff --git a/src/package/styles/themes/dark.postcss b/src/styles/themes/dark.postcss similarity index 100% rename from src/package/styles/themes/dark.postcss rename to src/styles/themes/dark.postcss diff --git a/src/package/styles/themes/light.postcss b/src/styles/themes/light.postcss similarity index 100% rename from src/package/styles/themes/light.postcss rename to src/styles/themes/light.postcss diff --git a/src/package/styles/themes/oled.postcss b/src/styles/themes/oled.postcss similarity index 100% rename from src/package/styles/themes/oled.postcss rename to src/styles/themes/oled.postcss diff --git a/src/package/styles/variables/borders.postcss b/src/styles/variables/borders.postcss similarity index 100% rename from src/package/styles/variables/borders.postcss rename to src/styles/variables/borders.postcss diff --git a/src/package/styles/variables/breakpoints.postcss b/src/styles/variables/breakpoints.postcss similarity index 100% rename from src/package/styles/variables/breakpoints.postcss rename to src/styles/variables/breakpoints.postcss diff --git a/src/package/styles/variables/typography.postcss b/src/styles/variables/typography.postcss similarity index 100% rename from src/package/styles/variables/typography.postcss rename to src/styles/variables/typography.postcss diff --git a/src/package/utils/ago.ts b/src/utils/ago.ts similarity index 100% rename from src/package/utils/ago.ts rename to src/utils/ago.ts diff --git a/src/package/utils/classCombine.ts b/src/utils/classCombine.ts similarity index 100% rename from src/package/utils/classCombine.ts rename to src/utils/classCombine.ts diff --git a/src/package/utils/index.ts b/src/utils/index.ts similarity index 100% rename from src/package/utils/index.ts rename to src/utils/index.ts diff --git a/src/package/utils/parse.ts b/src/utils/parse.ts similarity index 100% rename from src/package/utils/parse.ts rename to src/utils/parse.ts diff --git a/src/package/utils/permissions.ts b/src/utils/permissions.ts similarity index 100% rename from src/package/utils/permissions.ts rename to src/utils/permissions.ts diff --git a/src/package/utils/uniqueId.ts b/src/utils/uniqueId.ts similarity index 100% rename from src/package/utils/uniqueId.ts rename to src/utils/uniqueId.ts diff --git a/src/package/utils/versions.ts b/src/utils/versions.ts similarity index 100% rename from src/package/utils/versions.ts rename to src/utils/versions.ts diff --git a/svelte.config.js b/svelte.config.js index 1b48801c..c40f2645 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -2,10 +2,10 @@ import { mdsvex } from 'mdsvex' import mdsvexConfig from './mdsvex.config.js' import adapter from '@sveltejs/adapter-static' import examples from 'mdsvexamples/vite' -import sveld from './plugins/sveld.js' +import sveld from './docs/plugins/sveld.js' import path from 'path' -import { preprocess, plugins } from './src/package/config/svelte.config.js' -import Generator from './src/package/plugins/generator/index.js' +import { preprocess, plugins } from './src/config/svelte.config.js' +import Generator from './src/plugins/generator/index.js' import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin' /** @type {import('@sveltejs/kit').Config} */ @@ -33,10 +33,8 @@ const config = { resolve: { alias: { - $package: path.resolve('./src/package'), - $routes: path.resolve('./src/routes'), $generated: path.resolve('./generated'), - omorphia: path.resolve('./src/package'), + omorphia: path.resolve('./src'), }, }, @@ -48,12 +46,18 @@ const config = { server: { fs: { - allow: ['generated'], + allow: ['generated', 'docs'], }, }, }, files: { - lib: 'src/package', + assets: 'docs/static', + hooks: 'docs/hooks', + lib: 'src', + params: 'docs/params', + routes: 'docs/routes', + serviceWorker: 'docs/service-worker', + template: 'docs/app.html', }, }, } diff --git a/tsconfig.json b/tsconfig.json index 7df617c7..4915325a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,13 +1,12 @@ { "compilerOptions": { "paths": { - "omorphia/*": ["src/package/*"], - "omorphia": ["src/package"], - "$package/*": ["src/package/*"], - "$routes/*": ["src/routes/*"], + "omorphia/utils": ["package/utils"], + "omorphia/*": ["package/*"], + "omorphia": ["package"], "$generated/*": ["generated/*"], - "$lib": ["src/package"], - "$lib/*": ["src/package/*"] + "$lib": ["src"], + "$lib/*": ["src/*"] }, "resolveJsonModule": true, "esModuleInterop": true