bookish-press 0.5.1 → 0.5.4

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.5.01",
+    "version": "0.5.4",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
@@ -14,7 +14,7 @@
         "build": "npm run env && vite build",
         "//emu": "echo 'This copies the local .env file and starts the emulator'",
         "emu": "firebase use dev && npm run env && firebase emulators:start",
-        "package": "svelte-package -o package --watch",
+        "package": "svelte-package --watch",
         "test": "vitest",
         "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
         "//env": "echo 'This copies the .env file corresponding to the current Firebase project specified with firebase use, defaulting to local'",
@@ -22,111 +22,59 @@
         "//stage": "echo 'switch to the dev project, deploy, relying on Firebase's predeploy hook to run the build script above before release'",
         "stage": "firebase use dev && firebase deploy",
         "//release": "echo 'switch to the prod project, deploy, relying on Firebase's predeploy hook to run the build script above before release'",
-        "release": "firebase use prod && firebase deploy"
+        "release": "firebase use prod && firebase deploy",
+        "//merge": "merge dev into main, push to remote",
+        "merge": "git checkout main && git merge dev && git push origin main && git checkout dev"
     },
     "devDependencies": {
-        "@sveltejs/adapter-static": "^2.0.1",
-        "@sveltejs/kit": "^1.7.2",
-        "@sveltejs/package": "^2.0.0",
-        "@types/prismjs": "^1.26.0",
+        "@sveltejs/adapter-static": "^2.0",
+        "@sveltejs/kit": "^1.2",
+        "@sveltejs/package": "^2.0",
+        "@types/prismjs": "^1.26",
         "@types/smoothscroll-polyfill": "^0.3.1",
-        "@types/uuid": "^9.0.0",
-        "prettier": "^2.8.4",
-        "prettier-plugin-svelte": "^2.9.0",
+        "@types/uuid": "^9.0",
+        "prettier": "^2.8",
+        "prettier-plugin-svelte": "^2.10",
         "svelte-adapter-firebase": "^0.15.0",
-        "svelte-check": "^3.0.3",
-        "svelte-preprocess": "^5.0.1",
-        "tslib": "^2.5.0",
-        "typescript": "^4.9.5",
-        "vite": "^4.1.2",
-        "vitest": "^0.28.5"
+        "svelte-check": "^3.4",
+        "svelte-preprocess": "^5.0",
+        "tslib": "^2.5",
+        "typescript": "^5",
+        "vite": "^4.3",
+        "vitest": "^0.32"
     },
     "dependencies": {
-        "ajv": "^8.12.0",
-        "ajv-formats": "^2.1.1",
+        "ajv": "^8.12",
+        "ajv-formats": "^2.1",
         "firebase": "latest",
-        "firebase-functions": "^4.2.1",
-        "prismjs": "^1.29.0",
-        "smoothscroll-polyfill": "^0.4.4",
-        "svelte": "^3.55.1",
-        "@sveltejs/kit": "^1.7.2",
-        "uuid": "^9.0.0"
+        "firebase-functions": "latest",
+        "prismjs": "^1.29",
+        "smoothscroll-polyfill": "^0.4",
+        "svelte": "^4.0",
+        "@sveltejs/kit": "^1.20",
+        "uuid": "^9.0"
     },
-    "types": "./src/lib/index.d.ts",
+    "types": "./dist/index.d.ts",
     "exports": {
+        "./package.json": "./package.json",
         ".": {
-            "types": "./package/index.d.ts",
-            "svelte": "./package/index.js"
+            "types": "./dist/index.d.ts",
+            "svelte": "./dist/index.js",
+            "default": "./dist/index.js"
+        },
+        "./Schema": {
+            "types": "./dist/models/book/Schema.d.ts",
+            "default": "./dist/models/book/Schema.js"
         },
         "./Chapter": {
-            "types": "./package/models/book/Chapter.d.ts",
-            "default": "./package/models/book/Chapter.js"
+            "types": "./dist/models/book/Chapter.d.ts"
         },
         "./Edition": {
-            "types": "./package/models/book/Edition.d.ts",
-            "default": "./package/models/book/Edition.js"
-        },
-        "./Contexts": {
-            "types": "./package/components/page/Contexts.d.ts",
-            "default": "./package/components/page/Contexts.js"
-        },
-        "./Edition.svelte": {
-            "types": "./package/components/page/Edition.svelte.d.ts",
-            "svelte": "./package/components/page/Edition.svelte",
-            "default": "./package/components/page/Edition.svelte"
-        },
-        "./Chapter.svelte": {
-            "types": "./package/components/page/Chapter.svelte.d.ts",
-            "svelte": "./package/components/page/Chapter.svelte",
-            "default": "./package/components/page/Chapter.svelte"
-        },
-        "./TableOfContents.svelte": {
-            "types": "./package/components/page/TableOfContents.svelte.d.ts",
-            "svelte": "./package/components/page/TableOfContents.svelte",
-            "default": "./package/components/page/TableOfContents.svelte"
-        },
-        "./Glossary.svelte": {
-            "types": "./package/components/page/Glossary.svelte.d.ts",
-            "svelte": "./package/components/page/Glossary.svelte",
-            "default": "./package/components/page/Glossary.svelte"
-        },
-        "./Index.svelte": {
-            "types": "./package/components/page/Index.svelte.d.ts",
-            "svelte": "./package/components/page/Index.svelte",
-            "default": "./package/components/page/Index.svelte"
-        },
-        "./Unknown.svelte": {
-            "types": "./package/components/page/Unknown.svelte.d.ts",
-            "svelte": "./package/components/page/Unknown.svelte",
-            "default": "./package/components/page/Unknown.svelte"
-        },
-        "./Media.svelte": {
-            "types": "./package/components/page/Media.svelte.d.ts",
-            "svelte": "./package/components/page/Media.svelte",
-            "default": "./package/components/page/Media.svelte"
-        },
-        "./Print.svelte": {
-            "types": "./package/components/page/Print.svelte.d.ts",
-            "svelte": "./package/components/page/Print.svelte",
-            "default": "./package/components/page/Print.svelte"
-        },
-        "./References.svelte": {
-            "types": "./package/components/page/References.svelte.d.ts",
-            "svelte": "./package/components/page/References.svelte",
-            "default": "./package/components/page/References.svelte"
-        },
-        "./Search.svelte": {
-            "types": "./package/components/page/Search.svelte.d.ts",
-            "svelte": "./package/components/page/Search.svelte",
-            "default": "./package/components/page/Search.svelte"
-        },
-        "./Schema": {
-            "types": "./package/models/book/Schema.d.ts",
-            "default": "./package/models/book/Schema.js"
+            "types": "./dist/models/book/Edition.d.ts"
         }
     },
     "files": [
-        "package"
+        "dist"
     ],
-    "svelte": "./package/index.js"
+    "svelte": "./dist/index.js"
 }

package/package/components/chapter/ExtendedPrism.d.ts

@@ -1,2 +0,0 @@
-export default Prism;
-import Prism from "prismjs";

package/package/components/page/Edition.svelte

@@ -1,151 +0,0 @@
-<script>import smoothscroll from 'smoothscroll-polyfill';
-import { goto } from '$app/navigation';
-import { onMount, setContext } from 'svelte';
-import { writable } from 'svelte/store';
-import { BASE, DARK_MODE, } from './Contexts';
-import { BookishTheme } from '../../models/book/Theme';
-import { isDark, setDark } from '../../util/dark';
-// Poly fill smooth scrolling for Safari.
-onMount(() => smoothscroll.polyfill());
-// The book edition to render.
-export let edition;
-// The base path allows links to adjust to different routing contexts in which a book is placed.
-// For example, when the book is hosted alone, all routes might start with the bare root "/",
-// but when the book is being viewed or edited in the Bookish app, it needs a prefix for the
-// route in the app.
-export let base = '';
-// When the base changes, update the context.
-let baseStore = writable(base);
-$: setContext(BASE, baseStore);
-$: baseStore.set(base);
-// Default dark mode to whatever's stored in local storage, if anything.
-// respect user choice on the website despite the system theme
-let darkMode = writable(isDark());
-// Expose dark mode to descendants
-setContext(DARK_MODE, darkMode);
-// When dark mode changes, update the body's class list.
-$: {
-    setDark($darkMode);
-    // Set the theme, whatever it is, and change it when the edition changes
-    setTheme(edition.getTheme() ?? BookishTheme);
-}
-// Set the theme on mount.
-onMount(() => {
-    setTheme(edition.getTheme() ?? BookishTheme);
-});
-// Redirect old hash routes by simply replacing their hash before routing.
-if (typeof window !== 'undefined' && window.location.hash.startsWith('#/'))
-    goto(location.hash.replace('#', ''));
-/** Given a theme, sets the appropriate CSS rules in the browser to apply the theme.*/
-function setTheme(theme) {
-    // If the theme is being unset, make sure we've removed any overrding style declaration.
-    // This let's the default theme kick in.
-    let themeTagImports = document.getElementById('bookish-theme-imports');
-    let themeTagCSS = document.getElementById('bookish-theme');
-    // We only want to set it if it's actually different than what's currently set.
-    // Otherwise during editing we get lots of jittery changes on each edit, because the
-    // whole edition is rerendering. To check this, we set a data attribute on the style tag containing
-    // a stringify of the theme set. We do this separately for the imports, since they can have more
-    // major changes than the spacing and color sizes, changing fonts especially.
-    const themeTagCSSValue = themeTagCSS?.dataset.css;
-    const themeTagImportsValue = themeTagImports?.dataset.imports;
-    const newThemeTagCSSValue = JSON.stringify(theme);
-    const newThemeTagImportsValue = JSON.stringify(theme?.imports);
-    if (theme !== null) {
-        // If the imports changed, update theme.
-        if (themeTagImportsValue !== newThemeTagImportsValue) {
-            // If it's being set, create a new style tag.
-            const newThemeImportsTag = document.createElement('style');
-            // Give it an ID so we can remove it later.
-            newThemeImportsTag.setAttribute('id', 'bookish-theme-imports');
-            newThemeImportsTag.dataset.imports = newThemeTagImportsValue;
-            // Insert any import statements, then any rules.
-            const css = `${(theme.imports ?? [])
-                .map((url) => `@import url(${url});`)
-                .join('\n')}`;
-            newThemeImportsTag.appendChild(document.createTextNode(css));
-            document.head.appendChild(newThemeImportsTag);
-            // Remove the old tag
-            themeTagImports?.remove();
-        }
-        // If the rules changed, update them.
-        if (themeTagCSSValue !== newThemeTagCSSValue) {
-            // If it's being set, create a new style tag.
-            const newThemeCSSTag = document.createElement('style');
-            // Give it an ID so we can remove it later.
-            newThemeCSSTag.setAttribute('id', 'bookish-theme');
-            newThemeCSSTag.dataset.css = newThemeTagCSSValue;
-            // Insert any import statements, then any rules.
-            const css = `
-                    ${(theme.imports ?? [])
-                .map((url) => `@import url(${url});`)
-                .join('\n')}
-                    .bookish {
-                        ${theme.light ? toRules(theme.light) : ''}
-                        ${theme.fonts ? toRules(theme.fonts) : ''}
-                        ${theme.sizes ? toRules(theme.sizes) : ''}
-                        ${theme.weights ? toRules(theme.weights) : ''}
-                        ${theme.spacing ? toRules(theme.spacing) : ''}
-                    }
-                    .dark {
-                        ${theme.dark ? toRules(theme.dark) : ''}
-                    }`;
-            newThemeCSSTag.appendChild(document.createTextNode(css));
-            document.head.appendChild(newThemeCSSTag);
-            // Remove the old tag
-            themeTagCSS?.remove();
-        }
-    }
-    else {
-        // Remove the old tags, unsetting the theme.
-        themeTagImports?.remove();
-        themeTagCSS?.remove();
-    }
-}
-function toRules(set) {
-    return Object.keys(set)
-        .map((name) => {
-        const value = set[name];
-        if (value.length > 0) {
-            const cssVariable = '--bookish-' +
-                name
-                    .replace(/([a-z])([A-Z])/g, '$1 $2')
-                    .split(' ')
-                    .map((s) => s.toLowerCase())
-                    .join('-')
-                    .replace(/([0-9])/g, '-$1-');
-            return `${cssVariable}: ${value};`;
-        }
-    })
-        .join('\n\t\t');
-}
-</script>
-
-<main class="bookish {$darkMode ? ' dark' : ''}">
-    <slot />
-</main>
-
-<style>
-    * {
-        box-sizing: border-box;
-    }
-
-    /* WINDOW AND PAGES */
-    :global(body) {
-        margin: 0;
-        padding: 0;
-        background-color: var(--bookish-background-color);
-    }
-
-    /* The root container for a book */
-    .bookish {
-        font-weight: var(--bookish-paragraph-font-weight);
-        font-family: var(--bookish-paragraph-font-family);
-        font-size: var(--bookish-paragraph-font-size);
-        background-color: var(--bookish-background-color);
-        color: var(--bookish-paragraph-color);
-        width: 100%;
-        z-index: 0;
-        text-align: left;
-    }
-</style>