@getstrata/starter 2.2.12 → 2.2.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -1293,7 +1293,7 @@ function renderAuthModule(layers) {
1293
1293
  imports.push(`import { ApiToken } from "../../models/ApiToken.ts";`);
1294
1294
  }
1295
1295
  if (cookie) {
1296
- imports.push(`import { renderPage } from "../../lib/view.ts";`);
1296
+ imports.push(`import { CORE_VIEW_RENDERER_TOKEN } from "@getstrata/core/view";`);
1297
1297
  }
1298
1298
  if (mfa) {
1299
1299
  imports.push(`import { pendingMfaClearCookie, pendingMfaSetCookie, readPendingMfaUserId } from "../../bootstrap/pendingMfa.ts";`);
@@ -1781,11 +1781,7 @@ async function completeBrowserSsoLogin(
1781
1781
  pending.headers.append("set-cookie", pendingMfaSetCookie(user.id));
1782
1782
  return pending;
1783
1783
  }` : ""}
1784
- return renderPage(
1785
- "auth/login.eta",
1786
- { layout: { title: "Sign in" }, errors: { email: "These credentials do not match our records." }, email, password: "" },
1787
- request,
1788
- );
1784
+ return views.render("login.eta", { layout: { title: "Sign in" }, errors: { email: "These credentials do not match our records." }, email, password: "" }, { request });
1789
1785
  }
1790
1786
  await persistAuthRecovery(user.id, user.mfa_recovery_codes, mfaResult.consumedRecoveryHash);`;
1791
1787
  const registerSuccessExisting = `return flashResponse(
@@ -1803,10 +1799,11 @@ async function completeBrowserSsoLogin(
1803
1799
  const cookieRoutes = cookie ? `
1804
1800
  webRoutes({ kernel, dependencies }) {
1805
1801
  const auth = dependencies.container.resolve<CookieSessionAuthManager>(CORE_AUTH_TOKEN);
1802
+ const views = dependencies.container.resolve(CORE_VIEW_RENDERER_TOKEN).namespace("auth");
1806
1803
  return {
1807
1804
  "/login": {
1808
1805
  GET: kernel.wrapWebGuest(async (request) =>
1809
- renderPage("auth/login.eta", { layout: { title: "Sign in" }, errors: {}, email: "", password: "" }, request),
1806
+ views.render("login.eta", { layout: { title: "Sign in" }, errors: {}, email: "", password: "" }, { request }),
1810
1807
  ),
1811
1808
  POST: wrapWebLogin(
1812
1809
  kernel,
@@ -1815,22 +1812,13 @@ async function completeBrowserSsoLogin(
1815
1812
  const { email, password, mfa_code } = parseLoginCredentials(fields);
1816
1813
  const user = await starterAuthDirectory.findByEmail?.(email);
1817
1814
  if (!user?.password || !(await verifyPassword(password, user.password))) {
1818
- return renderPage(
1819
- "auth/login.eta",
1820
- { layout: { title: "Sign in" }, errors: { email: "These credentials do not match our records." }, email, password: "" },
1821
- request,
1822
- );
1815
+ return views.render("login.eta", { layout: { title: "Sign in" }, errors: { email: "These credentials do not match our records." }, email, password: "" }, { request });
1823
1816
  }
1824
1817
  ${mfaLoginBranch}
1825
1818
  return auth.signInRedirect(sessionUser(user), "/");
1826
1819
  },
1827
1820
  async (request) =>
1828
- renderPage(
1829
- "auth/login.eta",
1830
- { layout: { title: "Sign in" }, errors: { email: "Too many login attempts. Try again shortly." }, email: "", password: "" },
1831
- request,
1832
- 429,
1833
- ),
1821
+ views.render("login.eta", { layout: { title: "Sign in" }, errors: { email: "Too many login attempts. Try again shortly." }, email: "", password: "" }, { request, status: 429 }),
1834
1822
  ),
1835
1823
  },
1836
1824
  "/register": {
@@ -1838,7 +1826,7 @@ async function completeBrowserSsoLogin(
1838
1826
  if ((process.env.FEATURE_REGISTRATION ?? "true") === "false") {
1839
1827
  return new Response("Not found", { status: 404 });
1840
1828
  }
1841
- return renderPage("auth/register.eta", { layout: { title: "Create account" }, errors: {}, name: "", email: "", password: "" }, request);
1829
+ return views.render("register.eta", { layout: { title: "Create account" }, errors: {}, name: "", email: "", password: "" }, { request });
1842
1830
  }),
1843
1831
  POST: wrapWebRegister(
1844
1832
  kernel,
@@ -1867,17 +1855,12 @@ async function completeBrowserSsoLogin(
1867
1855
  ${verifyRegisterBranch}` : verifyRegisterBranch}
1868
1856
  },
1869
1857
  async (request) =>
1870
- renderPage(
1871
- "auth/register.eta",
1872
- { layout: { title: "Create account" }, errors: { form: "Too many registration attempts. Try again shortly." }, name: "", email: "", password: "" },
1873
- request,
1874
- 429,
1875
- ),
1858
+ views.render("register.eta", { layout: { title: "Create account" }, errors: { form: "Too many registration attempts. Try again shortly." }, name: "", email: "", password: "" }, { request, status: 429 }),
1876
1859
  ),
1877
1860
  },
1878
1861
  "/forgot-password": {
1879
1862
  GET: kernel.wrapWebGuest(async (request) =>
1880
- renderPage("auth/forgot-password.eta", { layout: { title: "Forgot password" }, errors: {}, email: "" }, request),
1863
+ views.render("forgot-password.eta", { layout: { title: "Forgot password" }, errors: {}, email: "" }, { request }),
1881
1864
  ),
1882
1865
  POST: kernel.wrapWeb(async (request) => {
1883
1866
  const { fields } = await parseFormBody(request);
@@ -1895,11 +1878,7 @@ async function completeBrowserSsoLogin(
1895
1878
  "/reset-password": {
1896
1879
  GET: kernel.wrapWeb(kernel.wrapSigned(async (request) => {
1897
1880
  const email = new URL(request.url).searchParams.get("email") ?? "";
1898
- return renderPage(
1899
- "auth/reset-password.eta",
1900
- { layout: { title: "Reset password" }, errors: {}, password: "", email, action: \`\${new URL(request.url).pathname}\${new URL(request.url).search}\` },
1901
- request,
1902
- );
1881
+ return views.render("reset-password.eta", { layout: { title: "Reset password" }, errors: {}, password: "", email, action: \`\${new URL(request.url).pathname}\${new URL(request.url).search}\` }, { request });
1903
1882
  })),
1904
1883
  POST: kernel.wrapWeb(kernel.wrapSigned(async (request) => {
1905
1884
  const userId = await consumeSignedAuthToken(request, AUTH_ONE_TIME_PURPOSES.passwordReset);
@@ -1907,11 +1886,7 @@ async function completeBrowserSsoLogin(
1907
1886
  const email = new URL(request.url).searchParams.get("email") ?? fields.email ?? "";
1908
1887
  const password = fields.password ?? "";
1909
1888
  if (!userId || !email || password.length < 8) {
1910
- return renderPage(
1911
- "auth/reset-password.eta",
1912
- { layout: { title: "Reset password" }, errors: { password: "Invalid or expired reset link." }, password: "", email, action: \`\${new URL(request.url).pathname}\${new URL(request.url).search}\` },
1913
- request,
1914
- );
1889
+ return views.render("reset-password.eta", { layout: { title: "Reset password" }, errors: { password: "Invalid or expired reset link." }, password: "", email, action: \`\${new URL(request.url).pathname}\${new URL(request.url).search}\` }, { request });
1915
1890
  }
1916
1891
  await runAuthWrite(userId, async () => {
1917
1892
  const user = await User.find(userId);
@@ -1945,7 +1920,7 @@ async function completeBrowserSsoLogin(
1945
1920
  { level: "error", message: "Invalid or expired verification link." },
1946
1921
  );
1947
1922
  }
1948
- return renderPage("auth/verify-email.eta", { layout: { title: "Verify email" } }, request);
1923
+ return views.render("verify-email.eta", { layout: { title: "Verify email" } }, { request });
1949
1924
  }),
1950
1925
  },
1951
1926
  "/email/verification-notification": {
@@ -1963,7 +1938,7 @@ async function completeBrowserSsoLogin(
1963
1938
  if (!readPendingMfaUserId(request)) {
1964
1939
  return redirectTo("/login");
1965
1940
  }
1966
- return renderPage("auth/mfa-challenge.eta", { layout: { title: "MFA" }, errors: {}, code: "" }, request);
1941
+ return views.render("mfa-challenge.eta", { layout: { title: "MFA" }, errors: {}, code: "" }, { request });
1967
1942
  }),
1968
1943
  POST: wrapWebLogin(
1969
1944
  kernel,
@@ -1977,11 +1952,7 @@ async function completeBrowserSsoLogin(
1977
1952
  const record = await starterAuthDirectory.findByIdOrThrow(pendingId);
1978
1953
  const mfaResult = completePasswordLogin(record, { mfaCode: submitted });
1979
1954
  if (!mfaResult.ok) {
1980
- return renderPage(
1981
- "auth/mfa-challenge.eta",
1982
- { layout: { title: "MFA" }, errors: { code: "That code is not valid." }, code: "" },
1983
- request,
1984
- );
1955
+ return views.render("mfa-challenge.eta", { layout: { title: "MFA" }, errors: { code: "That code is not valid." }, code: "" }, { request });
1985
1956
  }
1986
1957
  await persistAuthRecovery(pendingId, record.mfa_recovery_codes, mfaResult.consumedRecoveryHash);
1987
1958
  const signed = await auth.signInRedirect(sessionUser(record), "/");
@@ -1989,17 +1960,12 @@ async function completeBrowserSsoLogin(
1989
1960
  return signed;
1990
1961
  },
1991
1962
  async (request) =>
1992
- renderPage(
1993
- "auth/mfa-challenge.eta",
1994
- { layout: { title: "MFA" }, errors: { code: "Too many login attempts. Try again shortly." }, code: "" },
1995
- request,
1996
- 429,
1997
- ),
1963
+ views.render("mfa-challenge.eta", { layout: { title: "MFA" }, errors: { code: "Too many login attempts. Try again shortly." }, code: "" }, { request, status: 429 }),
1998
1964
  ),
1999
1965
  },
2000
1966
  "/confirm-password": {
2001
1967
  GET: kernel.wrapWebAuthenticated(async (request) =>
2002
- renderPage("auth/confirm-password.eta", { layout: { title: "Confirm password" }, errors: {}, password: "" }, request),
1968
+ views.render("confirm-password.eta", { layout: { title: "Confirm password" }, errors: {}, password: "" }, { request }),
2003
1969
  ),
2004
1970
  POST: kernel.wrapWebAuthenticated(async (request) => {
2005
1971
  const user = await auth.user(request);
@@ -2010,11 +1976,7 @@ async function completeBrowserSsoLogin(
2010
1976
  const password = fields.password ?? "";
2011
1977
  const record = await starterAuthDirectory.findByIdOrThrow(Number(user.id));
2012
1978
  if (!record.password || !(await verifyPassword(password, record.password))) {
2013
- return renderPage(
2014
- "auth/confirm-password.eta",
2015
- { layout: { title: "Confirm password" }, errors: { password: "That password is not correct." }, password: "" },
2016
- request,
2017
- );
1979
+ return views.render("confirm-password.eta", { layout: { title: "Confirm password" }, errors: { password: "That password is not correct." }, password: "" }, { request });
2018
1980
  }
2019
1981
  const next = sanitizeInternalPath(new URL(request.url).searchParams.get("redirect") ?? "/account/mfa");
2020
1982
  const confirmed = redirectTo(next);
@@ -2032,11 +1994,7 @@ async function completeBrowserSsoLogin(
2032
1994
  account: record?.email ?? "user",
2033
1995
  issuer: process.env.APP_NAME ?? "Strata",
2034
1996
  });
2035
- return renderPage(
2036
- "auth/mfa-setup.eta",
2037
- { layout: { title: "MFA" }, errors: {}, code: "", secret, otpauth },
2038
- request,
2039
- );
1997
+ return views.render("mfa-setup.eta", { layout: { title: "MFA" }, errors: {}, code: "", secret, otpauth }, { request });
2040
1998
  }),
2041
1999
  POST: kernel.wrapWebPasswordConfirm(async (request) => {
2042
2000
  const user = await auth.user(request);
@@ -2047,17 +2005,13 @@ async function completeBrowserSsoLogin(
2047
2005
  const secret = (fields.secret ?? "").trim();
2048
2006
  const submitted = (fields.code ?? "").trim();
2049
2007
  if (!secret || !verifyTotp(secret, submitted)) {
2050
- return renderPage(
2051
- "auth/mfa-setup.eta",
2052
- {
2008
+ return views.render("mfa-setup.eta", {
2053
2009
  layout: { title: "MFA" },
2054
2010
  errors: { code: "Could not confirm that code." },
2055
2011
  code: "",
2056
2012
  secret,
2057
2013
  otpauth: buildOtpauthUrl({ secret, account: "user", issuer: process.env.APP_NAME ?? "Strata" }),
2058
- },
2059
- request,
2060
- );
2014
+ }, { request });
2061
2015
  }
2062
2016
  const recoveryCodes = generateRecoveryCodes();
2063
2017
  const stored = protectMfaSecret(secret);
@@ -2070,18 +2024,14 @@ async function completeBrowserSsoLogin(
2070
2024
  });
2071
2025
  });
2072
2026
  await revokeUserSessions(Number(user.id));
2073
- return renderPage(
2074
- "auth/mfa-setup.eta",
2075
- {
2027
+ return views.render("mfa-setup.eta", {
2076
2028
  layout: { title: "MFA" },
2077
2029
  errors: {},
2078
2030
  code: "",
2079
2031
  secret,
2080
2032
  otpauth: buildOtpauthUrl({ secret, account: "user", issuer: process.env.APP_NAME ?? "Strata" }),
2081
2033
  recoveryCodes,
2082
- },
2083
- request,
2084
- );
2034
+ }, { request });
2085
2035
  }),
2086
2036
  },` : ""}
2087
2037
  };
@@ -2099,19 +2049,16 @@ export default authModule;
2099
2049
  }
2100
2050
  function renderSiteModule(_layers) {
2101
2051
  return `import type { AppModule } from "@getstrata/bootstrap/contracts";
2102
- import { renderPage } from "../../lib/view.ts";
2052
+ import { CORE_VIEW_RENDERER_TOKEN } from "@getstrata/core/view";
2103
2053
 
2104
2054
  const siteModule: AppModule = {
2105
2055
  name: "site",
2106
2056
  order: 1,
2107
- webRoutes({ kernel }) {
2057
+ webRoutes({ kernel, dependencies }) {
2058
+ const views = dependencies.container.resolve(CORE_VIEW_RENDERER_TOKEN);
2108
2059
  return {
2109
2060
  "/": kernel.wrapWeb(async (request) =>
2110
- renderPage(
2111
- "home.eta",
2112
- { layout: { title: "Welcome", description: "Welcome to your Strata app. Restyle views/home.eta and public/assets/site.css." } },
2113
- request,
2114
- ),
2061
+ views.renderHtmx("home.eta", { layout: { title: "Welcome", description: "Welcome to your Strata app. Restyle views/home.eta and public/assets/site.css." } }, { request }),
2115
2062
  ),
2116
2063
  };
2117
2064
  },
@@ -2299,7 +2246,7 @@ function renderLayout(layers, projectName) {
2299
2246
  <% if (it.flash && it.flash.message) { %>
2300
2247
  <p class="flash flash-<%= it.flash.level %>"><%= it.flash.message %></p>
2301
2248
  <% } %>
2302
- <%~ it.body %>
2249
+ <div id="page-content"><%~ it.body %></div>
2303
2250
  </main>
2304
2251
  </body>
2305
2252
  </html>
@@ -2324,6 +2271,7 @@ function renderHomeView(projectName, layers) {
2324
2271
  `);
2325
2272
  return `<section class="section hero">
2326
2273
  <h1>Welcome to ${projectName}</h1>
2274
+ <p><a href="/" hx-get="/" hx-target="#page-content" hx-swap="innerHTML">Refresh this page</a></p>
2327
2275
  ${guest}
2328
2276
  <p>Health check: <a href="/health"><code>/health</code></a>.</p>${extras ? `
2329
2277
  ${extras}` : ""}
@@ -3179,9 +3127,9 @@ function renderPackageJson(projectName, options = {}) {
3179
3127
  "@getstrata/cli": "workspace:*",
3180
3128
  "@getstrata/core": "workspace:*"
3181
3129
  } : {
3182
- "@getstrata/bootstrap": "^2.2.12",
3183
- "@getstrata/cli": "^2.2.12",
3184
- "@getstrata/core": "^2.2.12"
3130
+ "@getstrata/bootstrap": "^2.2.14",
3131
+ "@getstrata/cli": "^2.2.14",
3132
+ "@getstrata/core": "^2.2.14"
3185
3133
  };
3186
3134
  coreDeps.eta = "^4.6.0";
3187
3135
  if (options.layers?.database === "mysql") {
@@ -4631,6 +4579,7 @@ import configProvider from "./config.ts";
4631
4579
  import policyProvider from "./policy.ts";
4632
4580
  import queueProvider from "./queue.ts";
4633
4581
  import storageProvider from "./storage.ts";
4582
+ import viewProvider from "./view.ts";
4634
4583
 
4635
4584
  const listenersProvider: ServiceProvider = {
4636
4585
  name: "starter.listeners",
@@ -4650,6 +4599,7 @@ const starterProviders: ServiceProvider[] = [
4650
4599
  storageProvider,
4651
4600
  queueProvider,
4652
4601
  authProvider,
4602
+ viewProvider,
4653
4603
  policyProvider,
4654
4604
  listenersProvider,
4655
4605
  ];
@@ -4785,13 +4735,14 @@ export { createAppContext };
4785
4735
  function renderRoutesTs() {
4786
4736
  return `import { buildModuleRoutes } from "@getstrata/bootstrap/buildModuleRoutes";
4787
4737
  import { buildWebModuleRoutes } from "@getstrata/bootstrap/buildWebModuleRoutes";
4738
+ import { isViewsEnabled } from "@getstrata/core/runtime/frontendMode";
4788
4739
  import type { AppDependencies, AppRouteMap } from "@getstrata/bootstrap/contracts";
4789
4740
 
4790
4741
  export function buildRoutes(dependencies: AppDependencies): AppRouteMap {
4791
4742
  const api = buildModuleRoutes(dependencies);
4792
4743
  return {
4793
4744
  ...api,
4794
- ...buildWebModuleRoutes(dependencies, { clearRegistry: false }),
4745
+ ...(isViewsEnabled() ? buildWebModuleRoutes(dependencies, { clearRegistry: false }) : {}),
4795
4746
  };
4796
4747
  }
4797
4748
  `;
@@ -4922,58 +4873,20 @@ function renderScheduleTs() {
4922
4873
  export { appSchedule };
4923
4874
  `;
4924
4875
  }
4925
- function renderViewTs(layers) {
4926
- const authImport = authNeedsUsers(layers.auth) ? `import { currentAuthUser } from "@getstrata/core/auth/authContext";
4927
- import { resolveCsrfTokenForRequest } from "@getstrata/core/http/csrfToken";
4928
- import { currentRequestMeta } from "@getstrata/core/http/requestMetaContext";
4929
- import { EtaViewEngine, htmlResponse } from "@getstrata/core/view";
4930
- import { starterAuthDirectory } from "../bootstrap/authDirectory.ts";
4931
- ` : `import { resolveCsrfTokenForRequest } from "@getstrata/core/http/csrfToken";
4932
- import { currentRequestMeta } from "@getstrata/core/http/requestMetaContext";
4933
- import { EtaViewEngine, htmlResponse } from "@getstrata/core/view";
4934
- `;
4935
- const userBlock = authNeedsUsers(layers.auth) ? ` let currentUser: { id: number; email: string; name: string | null } | null = null;
4936
- const authUser = currentAuthUser();
4937
- if (authUser) {
4938
- try {
4939
- const row = await starterAuthDirectory.findByIdOrThrow(Number(authUser.id));
4940
- currentUser = { id: row.id, email: row.email ?? "", name: row.name ?? null };
4941
- } catch {
4942
- currentUser = null;
4943
- }
4944
- }` : ` const currentUser = null;`;
4876
+ function renderViewProvider(layers) {
4945
4877
  return `import { join } from "node:path";
4946
- ${authImport}
4947
- const engine = new EtaViewEngine(join(import.meta.dir, "../../views"));
4948
-
4949
- export interface LayoutData {
4950
- title: string;
4951
- description?: string;
4952
- }
4953
-
4954
- export async function renderPage(
4955
- template: string,
4956
- data: Record<string, unknown> & { layout: LayoutData },
4957
- request?: Request,
4958
- status = 200,
4959
- ): Promise<Response> {
4960
- const csrfToken = request ? resolveCsrfTokenForRequest(request) : "";
4961
- const flash = currentRequestMeta().flash ?? null;
4962
- ${userBlock}${layers.extras.oidc ? `
4963
- const oidcLogin =
4964
- process.env.FEATURE_OAUTH === "true" &&
4965
- Boolean(process.env.OIDC_CLIENT_ID?.trim() && process.env.OIDC_CLIENT_SECRET?.trim());` : ""}
4966
- const html = await engine.render(
4967
- template,
4968
- { ...data, csrfToken, flash, currentUser${layers.extras.oidc ? ", oidcLogin" : ""} },
4969
- { request },
4970
- );
4971
- return htmlResponse(html, { status });
4972
- }
4973
-
4974
- export function plainText(body: string, status = 200): Response {
4975
- return new Response(body, { status, headers: { "content-type": "text/plain; charset=utf-8" } });
4976
- }
4878
+ import { createViewProvider } from "@getstrata/bootstrap/providers/view";
4879
+
4880
+ export default createViewProvider({
4881
+ directory: join(import.meta.dir, "../../../views"),
4882
+ data: {
4883
+ userKey: "currentUser",${layers.extras.oidc ? `
4884
+ extra: () => ({
4885
+ oidcLogin: process.env.FEATURE_OAUTH === "true" &&
4886
+ Boolean(process.env.OIDC_CLIENT_ID?.trim() && process.env.OIDC_CLIENT_SECRET?.trim()),
4887
+ }),` : ""}
4888
+ },
4889
+ });
4977
4890
  `;
4978
4891
  }
4979
4892
 
@@ -5675,7 +5588,7 @@ function writeGeneratedFiles(options) {
5675
5588
  removeIfExists(join2(targetDir, "docker/postgres-init"));
5676
5589
  }
5677
5590
  writeText(join2(src, "routes.ts"), renderRoutesTs());
5678
- writeText(join2(src, "lib/view.ts"), renderViewTs(layers));
5591
+ writeText(join2(src, "bootstrap/providers/view.ts"), renderViewProvider(layers));
5679
5592
  writeText(join2(src, "bootstrap/config.ts"), renderConfigTs());
5680
5593
  writeText(join2(src, "bootstrap/preload.ts"), renderPreloadTs(layers, projectName));
5681
5594
  writeText(join2(src, "bootstrap/database.ts"), renderDatabaseTs(layers));
@@ -12,9 +12,9 @@
12
12
  "check": "tsc --noEmit"
13
13
  },
14
14
  "dependencies": {
15
- "@getstrata/bootstrap": "^2.2.12",
16
- "@getstrata/cli": "^2.2.12",
17
- "@getstrata/core": "^2.2.12",
15
+ "@getstrata/bootstrap": "^2.2.14",
16
+ "@getstrata/cli": "^2.2.14",
17
+ "@getstrata/core": "^2.2.14",
18
18
  "eta": "^4.6.0"
19
19
  },
20
20
  "devDependencies": {
@@ -3,12 +3,14 @@ import authProvider from "./auth.ts";
3
3
  import cacheProvider from "./cache.ts";
4
4
  import configProvider from "./config.ts";
5
5
  import storageProvider from "./storage.ts";
6
+ import viewProvider from "./view.ts";
6
7
 
7
8
  const starterProviders: ServiceProvider[] = [
8
9
  configProvider,
9
10
  cacheProvider,
10
11
  storageProvider,
11
12
  authProvider,
13
+ viewProvider,
12
14
  ];
13
15
 
14
16
  export { starterProviders };
@@ -0,0 +1,7 @@
1
+ import { join } from "node:path";
2
+ import { createViewProvider } from "@getstrata/bootstrap/providers/view";
3
+
4
+ export default createViewProvider({
5
+ directory: join(import.meta.dir, "../../../views"),
6
+ data: { userKey: "currentUser" },
7
+ });
@@ -1,25 +1,30 @@
1
1
  import type { AppModule } from "@getstrata/bootstrap/contracts";
2
2
  import { withErrorHandling } from "@getstrata/core/http/response";
3
+ import { CORE_VIEW_RENDERER_TOKEN, textResponse } from "@getstrata/core/view";
3
4
  import { pingDatabase } from "../../bootstrap/database.ts";
4
- import { plainText, renderPage } from "../../lib/view.ts";
5
5
 
6
6
  const siteModule: AppModule = {
7
7
  name: "site",
8
8
  order: 1,
9
- webRoutes({ kernel }) {
9
+ webRoutes({ kernel, dependencies }) {
10
+ const views = dependencies.container.resolve(CORE_VIEW_RENDERER_TOKEN);
10
11
  return {
11
- "/": kernel.wrapWeb(async () =>
12
- renderPage("home.eta", {
13
- layout: {
14
- title: "Home",
15
- description: "A new Strata application",
12
+ "/": kernel.wrapWeb(async (request) =>
13
+ views.renderHtmx(
14
+ "home.eta",
15
+ {
16
+ layout: {
17
+ title: "Home",
18
+ description: "A new Strata application",
19
+ },
16
20
  },
17
- }),
21
+ { request },
22
+ ),
18
23
  ),
19
24
  "/health": kernel.wrapWeb(
20
25
  withErrorHandling(async () => {
21
26
  const dbOk = await pingDatabase();
22
- return plainText(dbOk ? "ok" : "degraded", dbOk ? 200 : 503);
27
+ return textResponse(dbOk ? "ok" : "degraded", { status: dbOk ? 200 : 503 });
23
28
  }),
24
29
  ),
25
30
  };
@@ -1,6 +1,7 @@
1
1
  import { buildWebModuleRoutes } from "@getstrata/bootstrap/buildWebModuleRoutes";
2
2
  import type { AppDependencies, AppRouteMap } from "@getstrata/bootstrap/contracts";
3
+ import { isViewsEnabled } from "@getstrata/core/runtime/frontendMode";
3
4
 
4
5
  export function buildRoutes(dependencies: AppDependencies): AppRouteMap {
5
- return buildWebModuleRoutes(dependencies);
6
+ return isViewsEnabled() ? buildWebModuleRoutes(dependencies) : {};
6
7
  }
@@ -2,4 +2,5 @@
2
2
  <h1>Welcome to Strata</h1>
3
3
  <p>Your app <strong>{{PROJECT_NAME}}</strong> is running.</p>
4
4
  <p>Edit <code>src/routes.ts</code> and <code>views/home.eta</code> to get started.</p>
5
+ <a href="/" hx-get="/" hx-target="#page-content" hx-swap="innerHTML">Refresh welcome</a>
5
6
  </section>
@@ -8,11 +8,12 @@
8
8
  <meta name="description" content="<%= it.layout.description %>" />
9
9
  <% } %>
10
10
  <link rel="stylesheet" href="/assets/site.css" />
11
+ <script src="/assets/htmx.min.js" defer></script>
11
12
  </head>
12
13
  <body>
13
14
  <header class="site-header">
14
15
  <a class="brand" href="/">Strata</a>
15
16
  </header>
16
- <main><%~ it.body %></main>
17
+ <main><div id="page-content"><%~ it.body %></div></main>
17
18
  </body>
18
19
  </html>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@getstrata/starter",
3
- "version": "2.2.12",
3
+ "version": "2.2.14",
4
4
  "description": "Interactive create-strata wizard. Choose each layer; one database engine.",
5
5
  "type": "module",
6
6
  "license": "MIT",
@@ -1,21 +0,0 @@
1
- import { join } from "node:path";
2
- import { EtaViewEngine, htmlResponse } from "@getstrata/core/view";
3
-
4
- const engine = new EtaViewEngine(join(import.meta.dir, "../../views"));
5
-
6
- export interface LayoutData {
7
- title: string;
8
- description?: string;
9
- }
10
-
11
- export async function renderPage(
12
- template: string,
13
- data: Record<string, unknown> & { layout: LayoutData },
14
- ): Promise<Response> {
15
- const html = await engine.render(template, data);
16
- return htmlResponse(html);
17
- }
18
-
19
- export function plainText(body: string, status = 200): Response {
20
- return new Response(body, { status, headers: { "content-type": "text/plain; charset=utf-8" } });
21
- }