create-ampless 0.2.0-alpha.3 → 0.2.0-alpha.6

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

@@ -1,6 +1,17 @@
+import { fileURLToPath } from 'node:url'
+import { dirname, resolve } from 'node:path'
 import { a, defineData, type ClientSchema } from '@aws-amplify/backend'
 import { amplessSchemaModels, defaultAuthorizationModes } from '@ampless/backend'
 
+// AppSync's `a.handler.custom({ entry })` paths are resolved by CDK
+// relative to the file that called `a.handler.custom`. When the call
+// originates inside `@ampless/backend` (via amplessSchemaModels), the
+// CDK synth tries to resolve `./list-published-posts.js` relative to
+// `node_modules/@ampless/backend/dist/index.js` and fails with
+// `UnresolvedEntryPathError`. Anchor the resolver paths at THIS file's
+// directory so the result is unambiguous.
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
 // Ampless's built-in models (Post / Page / Media / Taxonomy / PostTag /
 // KvStore) plus the three public-read custom queries
 // (listPublishedPosts / getPublishedPost / listPostsByTag).
@@ -8,19 +19,20 @@ import { amplessSchemaModels, defaultAuthorizationModes } from '@ampless/backend
 // Add project-specific models alongside the spread:
 //
 //   const schema = a.schema({
-//     ...amplessSchemaModels(a),
+//     ...amplessSchemaModels(a, { resolverPaths }),
 //     MyCustomModel: a
 //       .model({ siteId: a.string().required(), foo: a.string() })
 //       .identifier(['siteId', 'foo'])
 //       .authorization((allow) => [allow.groups(['ampless-admin'])]),
 //   })
-//
-// The three AppSync JS resolvers (`*.js` in this directory) stay
-// user-owned — AppSync resolves `entry: './...'` paths at synth time
-// relative to this file. If you relocate them, pass new paths via
-// `amplessSchemaModels(a, { resolverPaths: { ... } })`.
+const resolverPaths = {
+  listPublishedPosts: resolve(__dirname, 'list-published-posts.js'),
+  getPublishedPost: resolve(__dirname, 'get-published-post.js'),
+  listPostsByTag: resolve(__dirname, 'list-posts-by-tag.js'),
+}
+
 const schema = a.schema({
-  ...amplessSchemaModels(a),
+  ...amplessSchemaModels(a, { resolverPaths }),
 })
 
 export type Schema = ClientSchema<typeof schema>

package/dist/templates/_shared/amplify.yml

@@ -0,0 +1,18 @@
+version: 1
+frontend:
+  phases:
+    preBuild:
+      commands:
+        - npm install
+    build:
+      commands:
+        - npx ampx pipeline-deploy --branch $AWS_BRANCH --app-id $AWS_APP_ID
+        - npm run build
+  artifacts:
+    baseDirectory: .next
+    files:
+      - '**/*'
+  cache:
+    paths:
+      - node_modules/**/*
+      - .next/cache/**/*

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

@@ -1,9 +1,20 @@
-// Back-compat shim. The Amplify SDK is now configured by the admin's
-// `<AdminProviders>` bootstrap (mounted by the layout factory in
-// `@ampless/admin/pages`), so most call sites no longer need to call
-// `configureAmplify()` themselves. Kept as a no-op so any lingering
-// `import '@/lib/amplify'` side-effect imports stay safe.
+// Client-side Amplify SDK setup. Imported as a side-effect from
+// `app/providers.tsx` so it runs on every page load (public + admin +
+// login). `<AdminProviders>` (mounted by the admin layout factory)
+// also performs this configuration, but it only runs for routes under
+// the (admin) group; `/login` is a top-level route outside that group
+// and would otherwise hit "Auth UserPool not configured" because no
+// AdminProviders has bootstrapped the SDK yet.
+//
+// `Amplify.configure` is idempotent — calling it once at the root and
+// again inside AdminProviders is harmless.
+
+import { Amplify } from 'aws-amplify'
+import outputs from '../amplify_outputs.json'
+
+Amplify.configure(outputs, { ssr: true })
 
 export function configureAmplify() {
-  // intentionally empty — admin bootstrap handles this
+  // module-level side effect above already ran; keep this as a no-op
+  // for callers that still import it as a function for back-compat.
 }

package/dist/templates/_shared/package.json

@@ -24,7 +24,7 @@
     "@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.2",
+    "@ampless/admin": "^0.2.0-alpha.5",
     "@ampless/backend": "^0.2.0-alpha.1",
     "@ampless/runtime": "^0.2.0-alpha.2",
     "@digital-go-jp/tailwind-theme-plugin": "^0.3.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ampless",
-  "version": "0.2.0-alpha.3",
+  "version": "0.2.0-alpha.6",
   "description": "Create a new ampless project",
   "license": "MIT",
   "type": "module",
@@ -23,6 +23,7 @@
   "bugs": "https://github.com/heavymoons/ampless/issues",
   "dependencies": {
     "@clack/prompts": "^1.4.0",
+    "execa": "^9.6.1",
     "picocolors": "^1.1.1"
   },
   "keywords": [