@levino/shipyard-base 0.5.2 → 0.5.4

package/astro/layouts/Page.astro

@@ -1,6 +1,7 @@
 ---
 import Footer from './Footer.astro'
 import '../../src/globals.css'
+import { i18n } from 'astro:config/server'
 import config from 'virtual:shipyard/config'
 import { mapObjIndexed } from 'ramda'
 import type {
@@ -26,7 +27,8 @@ type Props = {
 const currentPath = Astro.url.pathname
 const props = Astro.props.frontmatter || Astro.props
 
-const withLocale = (path: string) => `/${Astro.currentLocale}${path}`
+const withLocale = (path: string) =>
+  i18n ? `/${Astro.currentLocale}${path}` : path
 const applyLocaleAndSetActive: (navigation: NavigationTree) => NavigationTree =
   mapObjIndexed((entry: NavigationEntry) => ({
     ...entry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@levino/shipyard-base",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "type": "module",
   "main": "src/index.ts",
   "exports": {
@@ -12,7 +12,7 @@
     "./components/*": "./astro/components/*"
   },
   "peerDependencies": {
-    "astro": "^5",
+    "astro": "^5.7",
     "daisyui": "^4",
     "tailwindcss": "^3",
     "@tailwindcss/typography": "^0.5.10"
@@ -23,7 +23,7 @@
   ],
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
-    "@types/ramda": "^0.29.9",
+    "@types/ramda": "^0.31",
     "daisyui": "^4.6.0",
     "tailwindcss": "^3.4.0",
     "typescript": "^5.2.2",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "clsx": "^2.1.0",
-    "ramda": "^0.29.1",
+    "ramda": "^0.31",
     "tailwind-merge": "^2.2.0"
   }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 import type { AstroIntegration } from 'astro'
-import type { Config, FinalConfig } from './schemas/config'
+import type { Config } from './schemas/config'
 
 export type { Entry } from '../astro/components/types'
 export type * from './schemas/config'
@@ -12,7 +12,7 @@ const resolveId: Record<string, string | undefined> = {
   [shipyardConfigId]: `${shipyardConfigId}`,
 }
 
-const load = (config: FinalConfig) =>
+const load = (config: Config) =>
   ({
     [shipyardConfigId]: `export default ${JSON.stringify(config)}`,
   }) as Record<string, string | undefined>
@@ -20,19 +20,14 @@ const load = (config: FinalConfig) =>
 export default (config: Config): AstroIntegration => ({
   name: 'shipyard',
   hooks: {
-    'astro:config:setup': ({ updateConfig, config: { i18n } }) => {
-      if (!i18n) {
-        throw new Error(
-          'Shipyard cannot be used without i18n. Please set at least one locale.',
-        )
-      }
+    'astro:config:setup': ({ updateConfig }) => {
       updateConfig({
         vite: {
           plugins: [
             {
               name: 'shipyard',
               resolveId: (id: string) => resolveId[id],
-              load: (id: string) => load({ i18n, ...config })[id],
+              load: (id: string) => load(config)[id],
             },
           ],
         },

package/src/schemas/config.ts

@@ -1,5 +1,3 @@
-import type { AstroConfig } from 'astro'
-
 export interface NavigationEntry {
   label?: string
   href?: string
@@ -9,18 +7,7 @@ export interface NavigationEntry {
 
 export type NavigationTree = Record<string, NavigationEntry>
 
-export interface ScriptConfig {
-  src: string
-  async?: boolean
-  defer?: boolean
-  type?: string
-  crossorigin?: string
-  integrity?: string
-  referrerpolicy?: string
-  [key: string]: string | boolean | undefined
-}
-
-export type Script = string | ScriptConfig
+export type Script = string | astroHTML.JSX.IntrinsicElements['script']
 
 export interface Config {
   brand: string
@@ -29,7 +16,3 @@ export interface Config {
   tagline: string
   scripts?: Script[]
 }
-
-export interface FinalConfig extends Config {
-  i18n: NonNullable<AstroConfig['i18n']>
-}