create-ampless 0.2.0-alpha.0 → 0.2.0-alpha.2

package/dist/index.js

@@ -16,7 +16,7 @@ async function runPrompts(argProjectName) {
         placeholder: "my-ampless-site",
         defaultValue: argProjectName ?? "my-ampless-site",
         validate: (v) => {
-          if (!v.trim()) return "Project name is required";
+          if (!v || !v.trim()) return "Project name is required";
           if (!/^[a-z0-9-_]+$/.test(v)) return "Use lowercase letters, numbers, hyphens, underscores";
         }
       }),

package/dist/templates/_shared/amplify/auth/resource.ts

@@ -1,8 +1,13 @@
-import { defineAmplessAuth } from '@ampless/backend'
+import { defineAuth } from '@aws-amplify/backend'
+import { amplessAuthConfig } from '@ampless/backend'
 import { postConfirmation } from './post-confirmation/resource.js'
 
 // Provisions a Cognito User Pool + Identity Pool with the three role
 // groups (ampless-admin, ampless-editor, ampless-reader) and wires in
 // the post-confirmation Lambda that promotes the first confirmed user
 // to ampless-admin.
-export const auth = defineAmplessAuth({ postConfirmation })
+//
+// `defineAuth` must be called from this file directly — Amplify Gen 2's
+// import-path verifier requires it to live at amplify/auth/resource.ts.
+// `amplessAuthConfig` just returns the props object.
+export const auth = defineAuth(amplessAuthConfig({ postConfirmation }))

package/dist/templates/_shared/amplify/storage/resource.ts

@@ -1,7 +1,12 @@
-import { defineAmplessStorage } from '@ampless/backend'
+import { defineStorage } from '@aws-amplify/backend'
+import { amplessStorageConfig } from '@ampless/backend'
 
 // Provisions the ampless media + plugins bucket with guest read on
 // `public/*` and admin/editor write on the matched prefixes. CORS and
 // the bucket-level public-access policy are applied by
 // defineAmplessBackend.
-export const storage = defineAmplessStorage()
+//
+// `defineStorage` must be called from this file directly — Amplify Gen 2's
+// import-path verifier requires it to live at amplify/storage/resource.ts.
+// `amplessStorageConfig` just returns the props object.
+export const storage = defineStorage(amplessStorageConfig())

package/dist/templates/_shared/components/i18n-provider.tsx

@@ -1,7 +1,15 @@
+'use client'
+
 // Back-compat shim. I18n provider + hooks moved to `@ampless/admin`
 // (L2 extraction). The component tree mounts the provider inside the
 // admin layout factory; the root layout in `app/layout.tsx` still
 // wraps the public site in this same provider to keep client-side
 // `useT()` calls working from theme-side components too.
+//
+// The `'use client'` directive is needed because the bundled
+// @ampless/admin/components ESM strips per-file 'use client' (tsup
+// default behaviour). This shim re-establishes a client boundary so
+// Next.js doesn't try to evaluate the React hooks inside an RSC
+// server context.
 
 export { I18nProvider, useT, useLocale } from '@ampless/admin/components'

package/dist/templates/_shared/lib/admin-site.ts

@@ -4,5 +4,9 @@
 
 import { admin } from './admin'
 
-export const currentAdminSiteId = admin.currentAdminSiteId.bind(admin)
-export const adminSiteOptions = admin.adminSiteOptions.bind(admin)
+// Arrow wrappers: defer `admin` resolution to call time (avoid TDZ in
+// case of circular import chains touching admin shims).
+export const currentAdminSiteId: typeof admin.currentAdminSiteId =
+  (...args) => admin.currentAdminSiteId(...args)
+export const adminSiteOptions: typeof admin.adminSiteOptions =
+  (...args) => admin.adminSiteOptions(...args)

package/dist/templates/_shared/lib/admin.ts

@@ -4,18 +4,24 @@
 //
 // L2 architectural change (admin extraction): admin UI now lives in
 // `@ampless/admin`. This module wires the project's
-// `amplify_outputs.json`, `cms.config`, and `ampless` runtime into a
-// single `Admin` instance.
+// `amplify_outputs.json` and `cms.config` into a single `Admin`
+// instance.
+//
+// NOTE: We intentionally do NOT pass an `ampless` instance to
+// createAdmin. That would import `lib/ampless.ts`, which imports
+// `themes-registry`, which (via theme pages → `lib/i18n.ts`) imports
+// back to this file — a circular chain that crashes with a TDZ
+// ReferenceError on `ampless` at module init. `createAdmin` builds
+// its own internal Ampless when omitted, which is functionally
+// equivalent for admin's needs.
 
 import outputs from '../amplify_outputs.json'
 import cmsConfig from '@/cms.config'
 import { createAdmin } from '@ampless/admin'
-import { ampless } from './ampless'
 
 export const admin = createAdmin({
   outputs,
   cmsConfig,
-  ampless,
   locale: (cmsConfig as { locale?: string }).locale ?? 'en',
 })
 

package/dist/templates/_shared/lib/auth-server.ts

@@ -6,6 +6,10 @@ import { admin } from './admin'
 
 export type { ServerSession } from '@ampless/admin'
 
-export const getServerSession = admin.getServerSession.bind(admin)
-export const isAdmin = admin.isAdmin.bind(admin)
-export const isEditor = admin.isEditor.bind(admin)
+// Arrow wrappers: defer `admin` resolution to call time (avoid TDZ).
+export const getServerSession: typeof admin.getServerSession =
+  (...args) => admin.getServerSession(...args)
+export const isAdmin: typeof admin.isAdmin =
+  (...args) => admin.isAdmin(...args)
+export const isEditor: typeof admin.isEditor =
+  (...args) => admin.isEditor(...args)

package/dist/templates/_shared/lib/i18n.ts

@@ -20,7 +20,11 @@ export function getDictionary(locale: Locale = admin.locale): Dictionary {
   return adminGetDictionary(locale)
 }
 
-export const t = admin.t
+// Arrow wrapper: defer `admin` resolution to call time. If a future
+// circular import chain triggers i18n.ts before admin.ts has finished
+// initialising, eager `admin.t` would TDZ; calling the method through
+// a wrapper avoids that.
+export const t: typeof admin.t = (key, vars) => admin.t(key, vars)
 
 export function translate(
   _dict: Dictionary,

package/dist/templates/_shared/lib/posts-public.ts

@@ -8,9 +8,17 @@
 
 import { ampless } from './ampless'
 
-export const listPublishedPosts = ampless.listPublishedPosts.bind(ampless)
-export const getPublishedPost = ampless.getPublishedPost.bind(ampless)
-export const listPostsByTag = ampless.listPostsByTag.bind(ampless)
+// Arrow function wrappers (not `.bind(ampless)`) so the `ampless`
+// binding is read at call time, not at module evaluation. Module
+// evaluation can run while `lib/ampless.ts` is still in its TDZ
+// because the themes-registry → theme → shim → ampless dependency
+// chain is circular by construction.
+export const listPublishedPosts: typeof ampless.listPublishedPosts =
+  (...args) => ampless.listPublishedPosts(...args)
+export const getPublishedPost: typeof ampless.getPublishedPost =
+  (...args) => ampless.getPublishedPost(...args)
+export const listPostsByTag: typeof ampless.listPostsByTag =
+  (...args) => ampless.listPostsByTag(...args)
 
 export type {
   ListPostsOptions,

package/dist/templates/_shared/lib/seo.ts

@@ -4,5 +4,8 @@
 
 import { ampless } from './ampless'
 
-export const postMetadata = ampless.postMetadata.bind(ampless)
-export const siteMetadata = ampless.siteMetadata.bind(ampless)
+// Arrow wrappers: defer `ampless` resolution to call time (avoid TDZ).
+export const postMetadata: typeof ampless.postMetadata =
+  (...args) => ampless.postMetadata(...args)
+export const siteMetadata: typeof ampless.siteMetadata =
+  (...args) => ampless.siteMetadata(...args)

package/dist/templates/_shared/lib/site-settings.ts

@@ -3,6 +3,9 @@
 
 import { ampless } from './ampless'
 
-export const loadSiteSettings = ampless.loadSiteSettings.bind(ampless)
+// Arrow wrapper: defer `ampless` resolution to call time (avoid TDZ in
+// the themes-registry → theme → shim → ampless circular import chain).
+export const loadSiteSettings: typeof ampless.loadSiteSettings =
+  (...args) => ampless.loadSiteSettings(...args)
 
 export type { EffectiveSiteSettings } from '@ampless/runtime'

package/dist/templates/_shared/lib/storage.ts

@@ -3,5 +3,8 @@
 
 import { ampless } from './ampless'
 
-export const publicAssetUrl = ampless.publicAssetUrl.bind(ampless)
-export const isStorageConfigured = ampless.isStorageConfigured.bind(ampless)
+// Arrow wrappers: defer `ampless` resolution to call time (avoid TDZ).
+export const publicAssetUrl: typeof ampless.publicAssetUrl =
+  (...args) => ampless.publicAssetUrl(...args)
+export const isStorageConfigured: typeof ampless.isStorageConfigured =
+  (...args) => ampless.isStorageConfigured(...args)

package/dist/templates/_shared/lib/theme-active.ts

@@ -3,6 +3,8 @@
 
 import { ampless } from './ampless'
 
-export const resolveActiveTheme = ampless.resolveActiveTheme.bind(ampless)
+// Arrow wrapper: defer `ampless` resolution to call time (avoid TDZ).
+export const resolveActiveTheme: typeof ampless.resolveActiveTheme =
+  (...args) => ampless.resolveActiveTheme(...args)
 
 export type { ResolvedTheme } from '@ampless/runtime'

package/dist/templates/_shared/lib/theme-config.ts

@@ -3,7 +3,9 @@
 
 import { ampless } from './ampless'
 
-export const loadThemeConfig = ampless.loadThemeConfig.bind(ampless)
+// Arrow wrapper: defer `ampless` resolution to call time (avoid TDZ).
+export const loadThemeConfig: typeof ampless.loadThemeConfig =
+  (...args) => ampless.loadThemeConfig(...args)
 
 export { renderThemeCss } from '@ampless/runtime'
 

package/dist/templates/_shared/package.json

@@ -15,29 +15,29 @@
     "@radix-ui/react-dialog": "^1.1.4",
     "@radix-ui/react-label": "^2.1.1",
     "@radix-ui/react-slot": "^1.1.1",
-    "@tiptap/extension-image": "^2.10.4",
-    "@tiptap/extension-link": "^2.10.4",
-    "@tiptap/pm": "^2.10.4",
-    "@tiptap/react": "^2.10.4",
-    "@tiptap/starter-kit": "^2.10.4",
-    "@ampless/plugin-og-image": "^0.2.0-alpha.0",
-    "@ampless/plugin-rss": "^0.2.0-alpha.0",
-    "@ampless/plugin-seo": "^0.2.0-alpha.0",
-    "@ampless/plugin-webhook": "^0.2.0-alpha.0",
-    "@ampless/admin": "^0.2.0-alpha.0",
-    "@ampless/backend": "^0.2.0-alpha.0",
-    "@ampless/runtime": "^0.2.0-alpha.0",
+    "@tiptap/extension-image": "^3.23.4",
+    "@tiptap/extension-link": "^3.23.4",
+    "@tiptap/pm": "^3.23.4",
+    "@tiptap/react": "^3.23.4",
+    "@tiptap/starter-kit": "^3.23.4",
+    "@ampless/plugin-og-image": "^0.2.0-alpha.1",
+    "@ampless/plugin-rss": "^0.2.0-alpha.1",
+    "@ampless/plugin-seo": "^0.2.0-alpha.1",
+    "@ampless/plugin-webhook": "^0.2.0-alpha.1",
+    "@ampless/admin": "^0.2.0-alpha.1",
+    "@ampless/backend": "^0.2.0-alpha.1",
+    "@ampless/runtime": "^0.2.0-alpha.1",
     "@digital-go-jp/tailwind-theme-plugin": "^0.3.4",
-    "ampless": "^0.2.0-alpha.0",
+    "ampless": "^0.2.0-alpha.1",
     "aws-amplify": "^6.10.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "lucide-react": "^0.469.0",
-    "next": "^15.1.0",
+    "lucide-react": "^1.16.0",
+    "next": "^16.2.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-image-crop": "^11.0.7",
-    "tailwind-merge": "^2.6.0"
+    "tailwind-merge": "^3.6.0"
   },
   "devDependencies": {
     "@aws-amplify/backend": "^1.13.0",
@@ -45,7 +45,7 @@
     "@aws-sdk/client-appsync": "^3.717.0",
     "@aws-sdk/client-cognito-identity-provider": "^3.717.0",
     "@aws-sdk/client-dynamodb": "^3.717.0",
-    "@aws-sdk/client-s3": "^3.717.0",
+    "@aws-sdk/client-s3": "^3.1048.0",
     "@aws-sdk/client-sqs": "^3.717.0",
     "@aws-sdk/lib-dynamodb": "^3.717.0",
     "@aws-sdk/util-dynamodb": "^3.717.0",
@@ -58,6 +58,6 @@
     "aws-cdk-lib": "^2.174.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^4.0.0",
-    "typescript": "^5.7.0"
+    "typescript": "^6.0.3"
   }
 }

package/dist/templates/_shared/proxy.ts

@@ -0,0 +1,16 @@
+// Public-site proxy (Next.js 16 rename of "middleware"). Implementation
+// moved to `@ampless/runtime` (L1 extraction); this file wires the
+// project's `cms.config` into the factory and re-exports the default
+// matcher. The runtime export name is still `createAmplessMiddleware`
+// for API stability; only the user-side file convention (proxy.ts +
+// `export const proxy`) follows Next 16's rename.
+//
+// See `@ampless/runtime/middleware` for behaviour details: multi-site
+// host rewrite, `<slug>.html` → raw route, `?previewTheme=` header
+// forwarding, multi-site Cache-Control override.
+
+import cmsConfig from './cms.config'
+import { createAmplessMiddleware, defaultMatcherConfig } from '@ampless/runtime/middleware'
+
+export const proxy = createAmplessMiddleware({ cmsConfig })
+export const config = defaultMatcherConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ampless",
-  "version": "0.2.0-alpha.0",
+  "version": "0.2.0-alpha.2",
   "description": "Create a new ampless project",
   "license": "MIT",
   "type": "module",
@@ -22,7 +22,7 @@
   "homepage": "https://github.com/heavymoons/ampless#readme",
   "bugs": "https://github.com/heavymoons/ampless/issues",
   "dependencies": {
-    "@clack/prompts": "^0.9.1",
+    "@clack/prompts": "^1.4.0",
     "picocolors": "^1.1.1"
   },
   "keywords": [

package/dist/templates/_shared/middleware.ts

@@ -1,13 +0,0 @@
-// Public-site middleware. Implementation moved to `@ampless/runtime`
-// (L1 extraction); this file wires the project's `cms.config` into
-// the factory and re-exports the default matcher.
-//
-// See `@ampless/runtime/middleware` for behaviour details: multi-site
-// host rewrite, `<slug>.html` → raw route, `?previewTheme=` header
-// forwarding, multi-site Cache-Control override.
-
-import cmsConfig from './cms.config'
-import { createAmplessMiddleware, defaultMatcherConfig } from '@ampless/runtime/middleware'
-
-export const middleware = createAmplessMiddleware({ cmsConfig })
-export const config = defaultMatcherConfig