@fernir2/saas-kit-cli 0.1.39 → 0.1.41-1096

package/cli/public/logo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 266.91 351.64"><defs><style>.cls-1{fill:url(#linear-gradient);stroke-width:0px;}</style><linearGradient id="linear-gradient" x1="52.57" y1="336.74" x2="182.98" y2="13.98" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ed1e2d"/><stop offset="1" stop-color="#f7c920"/></linearGradient></defs><g id="Layer_1-2"><path class="cls-1" d="m266.84,114.65c-.25,2.67-.58,5.33-.95,7.99-.87,6.29-4.15,11.06-9.56,14.25-7.12,4.2-14.35,8.21-21.52,12.31-11.43,6.53-20.63,15.15-25.84,27.52-.07.16-.17.3-.26.45-.05-.05-.09-.1-.36-.39,0-.17-.08-.6.01-1,3.93-15.87,12.81-28.02,27.17-36.03,4.36-2.43,8.84-4.67,13.09-7.27,3.83-2.35,7.5-5.12,8.29-9.97.2-1.24-.24-3.25-1.1-3.83-1.06-.7-3.29-.9-4.3-.23-12.78,8.46-27.44,12.08-41.83,16.3-12.22,3.58-24.69,6.34-36.85,10.12-8.82,2.74-17.24,6.82-24.47,12.69-6.95,5.64-13.13,12.11-16.79,20.53-.37.86-.83,1.68-1.31,2.64-1.52-3.02,2.7-16.98,7.6-25.58,4.52-7.95,10.64-14.49,17.67-20.5-.84.26-1.72.42-2.5.8-7.33,3.52-14.79,6.83-21.94,10.69-11.14,6.02-21.28,13.52-29.59,23.1-13.23,15.23-24.37,31.73-28.89,51.87-2.32,10.32-2.05,20.62.21,30.9.17.76.34,1.51.25,2.36-10.51-13.14-16.53-28.21-19.39-44.81-.48,1.94-1.25,3.85-1.41,5.82-.99,12.44-1.62,24.9-.52,37.37,2.1,23.9,8.36,46.63,19.04,68.13,5.36,10.79,11.97,20.78,19.06,30.47-.15.08-.27.17-.38.3-7.03-6.57-14.46-12.76-21.02-19.78-22.78-24.4-38.54-52.99-48.73-84.65-4.05-12.59-7.06-25.47-8.53-38.79-.51,2.81-1.15,5.61-1.49,8.44-.37,3.04-.54,6.11-.65,9.17-.11,2.97-.02,5.95-.26,8.98C3.08,220.12.15,204.69,0,188.7c-.15-16.13,2.72-31.69,8.68-46.65,5.96-14.95,14.46-28.33,25.27-40.35-7.51,3.96-13.58,9.65-19.52,15.97,2.19-19.77,40.46-53.84,64.69-57.74,1.52,6.94,3.54,13.76,7.85,19.76-.38-1.97-.79-3.93-1.13-5.9-2.05-12.02,1.29-22.96,6.26-33.77,7.41-16.12,20.17-26.38,35.69-33.74,5.17-2.45,10.59-4.38,16.06-6.28-6.6,14.65-8.88,29.52-5.36,45.28.8,0,1.49.09,2.14-.01,12.82-2.1,24.64,1.06,36.03,6.69,8.54,4.23,15.25,10.55,20.89,18.06,12.58,16.76,29.83,25.51,49.94,29.46,3.35.66,6.72,1.24,10.04,2,6.45,1.48,9.93,6.44,9.32,13.16ZM180.48,29.72c.96-5.04,2.86-9.9,4.39-14.97-15,3.39-27.7,10.7-38.13,23.05,11.84-.15,22.3,2.9,32.26,7.69.47-5.37.51-10.65,1.49-15.77Z"/></g></svg>

package/cli/server.ts

@@ -1,40 +1,48 @@
-import { createServer } from "node:http";
-import { parse } from "url";
-import next from "next";
-import {
-    checkAndHandleWebSocketRequest,
-    initSocket,
-    initializeResourceMetaCache,
-} from "@fernir2/saas-kit/server";
-import { envSettingKeys, getNumberEnvSetting, isDev } from "@fernir2/saas-kit";
-
-const dev = isDev();
-const port = getNumberEnvSetting(envSettingKeys.port) ?? 3000;
-
-const app = next({ dev, port });
-const nextRequestHandler = app.getRequestHandler();
-
-async function run() {
-    await app.prepare();
-
-    const httpServer = createServer((req, res) => {
-        checkAndHandleWebSocketRequest(req, res);
-
-        nextRequestHandler(req, res, parse(req.url!, true));
-    });
-
-    initSocket(httpServer);
-
-    httpServer
-        .once("error", (err) => {
-            console.error(err);
-            process.exit(1);
-        })
-        .listen(port, () => {
-            console.log(`> Ready on http://localhost:${port}`);
-        });
-
-    await initializeResourceMetaCache();
-}
-
-run();
+// Import "next/dist/server/node-environment-baseline" is temporary hack
+// Required to initialize AsyncLocalStorage in runtime. Without it, Next.js fails with:
+// "Invariant: AsyncLocalStorage accessed in runtime where it is not available"
+import "next/dist/server/node-environment-baseline";
+import { createServer } from "node:http";
+import { parse } from "url";
+import next from "next";
+import { getNumberEnvSetting } from "@fd-toolbox/infra/env-functions";
+import { envSettingKeys } from "@common/infra/env-setting-keys";
+import {
+    checkAndHandleWebSocketRequest,
+    initSocket,
+} from "@server/fd/fd-toolbox-web/services/socket/web-socket-server";
+import { initializeResourceMetaCache } from "@meta/server/resources/init-internal-resource-metas-from-json";
+import { logErrorRaw } from "@fd-toolbox/logging/loggers";
+import { cliLogInfo } from "@fd-toolbox/logging/cli-logger";
+import { environmentVariables } from "@infra/ci/constants/ci-constants";
+import { getServerEnvSetting } from "@base-repo/process";
+
+const dev = getServerEnvSetting(environmentVariables.nodeEnv) === "development";
+const port = getNumberEnvSetting(envSettingKeys.port) ?? 3000;
+
+const app = next({ dev, port });
+const nextRequestHandler = app.getRequestHandler();
+
+async function run() {
+    await app.prepare();
+
+    const httpServer = createServer((req, res) => {
+        checkAndHandleWebSocketRequest(req, res);
+        nextRequestHandler(req, res, parse(req.url!, true));
+    });
+
+    initSocket(httpServer);
+
+    httpServer
+        .once("error", (error) => {
+            logErrorRaw(error);
+            process.exit(1);
+        })
+        .listen(port, () => {
+            cliLogInfo(`[Server ready] > Server listening at http://localhost:${port}`);
+        });
+
+    await initializeResourceMetaCache();
+}
+
+run();

package/cli/src/app/api/v1/(f)/[resourceName]/[id]/route.ts

@@ -1,11 +1,18 @@
-import {
-    deleteResourceByIdRoute,
-    getResourceByIdRoute,
-    putResourceByIdRoute,
-} from "@meta/server/basic-crud/crud-api";
-
-export const GET = getResourceByIdRoute;
-
-export const PUT = putResourceByIdRoute;
-
-export const DELETE = deleteResourceByIdRoute;
+import {
+    deleteResourceByIdRoute,
+    getResourceByIdRoute,
+    putResourceByIdRoute,
+} from "@meta/server/basic-crud/crud-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(getResourceByIdRoute);
+
+export { get as GET };
+
+const put = httpApiWrapper(putResourceByIdRoute);
+
+export { put as PUT };
+
+const del = httpApiWrapper(deleteResourceByIdRoute);
+
+export { del as DELETE };

package/cli/src/app/api/v1/(f)/[resourceName]/route.ts

@@ -1,14 +1,23 @@
-import {
-    deleteResourceRoute,
-    getResourceRoute,
-    postResourceRoute,
-    putResourceRoute,
-} from "@meta/server/basic-crud/crud-api";
-
-export const PUT = putResourceRoute;
-
-export const GET = getResourceRoute;
-
-export const POST = postResourceRoute;
-
-export const DELETE = deleteResourceRoute;
+import {
+    deleteResourceRoute,
+    getResourceRoute,
+    postResourceRoute,
+    putResourceRoute,
+} from "@meta/server/basic-crud/crud-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const put = httpApiWrapper(putResourceRoute);
+
+export { put as PUT };
+
+const get = httpApiWrapper(getResourceRoute);
+
+export { get as GET };
+
+const post = httpApiWrapper(postResourceRoute);
+
+export { post as POST };
+
+const del = httpApiWrapper(deleteResourceRoute);
+
+export { del as DELETE };

package/cli/src/app/api/v1/(f)/[resourceName]/upsert/route.ts

@@ -1,3 +1,6 @@
-import { upsertResourceRoute } from "@meta/server/basic-crud/crud-api";
-
-export const POST = upsertResourceRoute;
+import { upsertResourceRoute } from "@meta/server/basic-crud/crud-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(upsertResourceRoute);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/blob/route.ts

@@ -1,7 +1,14 @@
-import { mediaDeleteRoute, mediaGetRoute, mediaPostRoute } from "@server/media/media-api";
-
-export const GET = mediaGetRoute;
-
-export const POST = mediaPostRoute;
-
-export const DELETE = mediaDeleteRoute;
+import { mediaDeleteRoute, mediaGetRoute, mediaPostRoute } from "@server/media/media-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(mediaGetRoute);
+
+export { get as GET };
+
+const post = httpApiWrapper(mediaPostRoute);
+
+export { post as POST };
+
+const del = httpApiWrapper(mediaDeleteRoute);
+
+export { del as DELETE };

package/cli/src/app/api/v1/(f)/log/route.ts

@@ -1,7 +1,14 @@
-import { logDeleteRoute, logGetRoute, logPostRoute } from "@server/fd/fd-toolbox-web/logging/log-api";
-
-export const POST = logPostRoute;
-
-export const GET = logGetRoute;
-
-export const DELETE = logDeleteRoute;
+import { logDeleteRoute, logGetRoute, logPostRoute } from "@server/fd/fd-toolbox-web/logging/log-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(logPostRoute, { anonymous: true });
+
+export { post as POST };
+
+const get = httpApiWrapper(logGetRoute, { anonymous: true });
+
+export { get as GET };
+
+const del = httpApiWrapper(logDeleteRoute, { anonymous: true });
+
+export { del as DELETE };

package/cli/src/app/api/v1/(f)/markdown/route.ts

@@ -0,0 +1,6 @@
+import { markdownPostRoute } from "@server/markdown/markdown-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(markdownPostRoute);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/other-user/[id]/route.ts

@@ -1,14 +1,23 @@
-import {
-    otheruserIdGetRoute,
-    otheruserIdPostRoute,
-    otheruserIdPutRoute,
-    otheruserIdDeleteRoute,
-} from "@server/otheruser/id/otheruser-id-api";
-
-export const GET = otheruserIdGetRoute;
-
-export const POST = otheruserIdPostRoute;
-
-export const PUT = otheruserIdPutRoute;
-
-export const DELETE = otheruserIdDeleteRoute;
+import {
+    otheruserIdDeleteRoute,
+    otheruserIdGetRoute,
+    otheruserIdPostRoute,
+    otheruserIdPutRoute,
+} from "@server/otheruser/id/otheruser-id-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(otheruserIdGetRoute);
+
+export { get as GET };
+
+const post = httpApiWrapper(otheruserIdPostRoute);
+
+export { post as POST };
+
+const put = httpApiWrapper(otheruserIdPutRoute);
+
+export { put as PUT };
+
+const del = httpApiWrapper(otheruserIdDeleteRoute);
+
+export { del as DELETE };

package/cli/src/app/api/v1/(f)/other-user/route.ts

@@ -1,7 +1,14 @@
-import { otheruserGetRoute, otheruserPostRoute, otheruserPutRoute } from "@server/otheruser/otheruser-api";
-
-export const POST = otheruserPostRoute;
-
-export const PUT = otheruserPutRoute;
-
-export const GET = otheruserGetRoute;
+import { otheruserGetRoute, otheruserPostRoute, otheruserPutRoute } from "@server/otheruser/otheruser-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(otheruserPostRoute);
+
+export { post as POST };
+
+const put = httpApiWrapper(otheruserPutRoute);
+
+export { put as PUT };
+
+const get = httpApiWrapper(otheruserGetRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/password/forgot-password/route.ts

@@ -1,3 +1,6 @@
-import { forgotpasswordPostRoute } from "@server/password/forgotpassword/forgotpassword-api";
-
-export const POST = forgotpasswordPostRoute;
+import { forgotpasswordPostRoute } from "@server/password/forgotpassword/forgotpassword-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(forgotpasswordPostRoute, { anonymous: true });
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/password/reset-password/route.ts

@@ -1,3 +1,6 @@
-import { resetpasswordPostRoute } from "@server/password/resetpassword/resetpassword-api";
-
-export const POST = resetpasswordPostRoute;
+import { resetpasswordPostRoute } from "@server/password/resetpassword/resetpassword-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(resetpasswordPostRoute, { anonymous: true });
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/payment/method/route.ts

@@ -1,4 +1,9 @@
-import { paymentMethodGetRoute, paymentMethodPutRoute } from "@server/payment/method/payment-method-api";
-
-export const PUT = paymentMethodPutRoute;
-export const GET = paymentMethodGetRoute;
+import { paymentMethodGetRoute, paymentMethodPutRoute } from "@server/payment/method/payment-method-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const put = httpApiWrapper(paymentMethodPutRoute);
+
+export { put as PUT };
+const get = httpApiWrapper(paymentMethodGetRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/payment/route.ts

@@ -1,3 +1,6 @@
-import { registerPaymentCustomerAndCreateWorkspaceSubscriptionApi } from "@server/payments/payments/payments-api";
-
-export const POST = registerPaymentCustomerAndCreateWorkspaceSubscriptionApi;
+import { registerPaymentCustomerAndCreateWorkspaceSubscriptionApi } from "@server/payments/payments/payments-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(registerPaymentCustomerAndCreateWorkspaceSubscriptionApi);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/payment/verify-fail/route.ts

@@ -1,3 +1,6 @@
-import { paymentVerifyFailPostRoute } from "@server/payment/verify-fail/payment-verify-fail-api";
-
-export const POST = paymentVerifyFailPostRoute;
+import { paymentVerifyFailPostRoute } from "@server/payment/verify-fail/payment-verify-fail-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(paymentVerifyFailPostRoute);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/payment/verify-success/route.ts

@@ -1,3 +1,6 @@
-import { paymentVerifySuccessPostRoute } from "@server/payment/verify-success/payment-verify-success";
-
-export const POST = paymentVerifySuccessPostRoute;
+import { paymentVerifySuccessPostRoute } from "@server/payment/verify-success/payment-verify-success";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(paymentVerifySuccessPostRoute);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/search-result/route.ts

@@ -1,3 +1,6 @@
-import { getSearchResultRoute } from "@server/search/search-result-api";
-
-export const GET = getSearchResultRoute;
+import { getSearchResultRoute } from "@server/search/search-result-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(getSearchResultRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/searchable-resources/route.ts

@@ -1,3 +1,6 @@
-import { getSearchableResourcesRoute } from "@meta/server/resources/searchable-resources-api";
-
-export const GET = getSearchableResourcesRoute;
+import { getSearchableResourcesRoute } from "@meta/server/resources/searchable-resources-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(getSearchableResourcesRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/sign-in/route.ts

@@ -1,3 +1,6 @@
-import { signInApi } from "@server/auth/sign-in-api";
-
-export const POST = signInApi;
+import { signInApi } from "@server/auth/sign-in-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(signInApi, { anonymous: true });
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/sign-out/route.ts

@@ -1,3 +1,6 @@
-import { signOutGetRoute } from "@server/auth/sign-out-api";
-
-export const GET = signOutGetRoute;
+import { signOutGetRoute } from "@server/auth/sign-out-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(signOutGetRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/sign-up/route.ts

@@ -1,3 +1,6 @@
-import { signUpApi } from "@server/auth/sign-up-api";
-
-export const POST = signUpApi;
+import { signUpApi } from "@server/auth/sign-up-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(signUpApi, { anonymous: true });
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/subscription/cancel/route.ts

@@ -1,3 +1,6 @@
-import { subscriptionCancelPostRoute } from "@server/subscription/cancel/subscription-cancel-api";
-
-export const POST = subscriptionCancelPostRoute;
+import { subscriptionCancelPostRoute } from "@server/subscription/cancel/subscription-cancel-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(subscriptionCancelPostRoute);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/subscription/create/route.ts

@@ -1,3 +1,6 @@
-import { subscriptionCreatePostRoute } from "@server/subscription/create/subscription-create-api";
-
-export const POST = subscriptionCreatePostRoute;
+import { subscriptionCreatePostRoute } from "@server/subscription/create/subscription-create-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(subscriptionCreatePostRoute);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/subscription/update/route.ts

@@ -1,3 +1,6 @@
-import { subscriptionUpdatePostRoute } from "@server/subscription/update/subscription-update-api";
-
-export const POST = subscriptionUpdatePostRoute;
+import { subscriptionUpdatePostRoute } from "@server/subscription/update/subscription-update-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(subscriptionUpdatePostRoute);
+
+export { post as POST };

package/cli/src/app/api/v1/(f)/uimeta/route.ts

@@ -1,3 +1,6 @@
-import { uiMetaRoute } from "@meta/server/ui/ui-metas-api";
-
-export const GET = uiMetaRoute;
+import { uiMetaRoute } from "@meta/server/ui/ui-metas-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(uiMetaRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/uimetas/route.ts

@@ -1,3 +1,6 @@
-import { uiMetasRoute } from "@meta/server/ui/ui-metas-api";
-
-export const GET = uiMetasRoute;
+import { uiMetasRoute } from "@meta/server/ui/ui-metas-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(uiMetasRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/user-feature/isenabled/route.ts

@@ -1,3 +1,6 @@
-import { userfeatureIsenabledGetRoute } from "@server/userfeature/isenabled/userfeature-isenabled-api";
-
-export const GET = userfeatureIsenabledGetRoute;
+import { userFeatureIsEnabledGetRoute } from "@server/userfeature/isenabled/userfeature-isenabled-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(userFeatureIsEnabledGetRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/user-permission/route.ts

@@ -1,3 +1,6 @@
-import { permissionRoute } from "@server/fd/fd-toolbox-web/permissions/permission-api";
-
-export const GET = permissionRoute;
+import { permissionRoute } from "@server/fd/fd-toolbox-web/permissions/permission-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(permissionRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/visible-workspace/route.ts

@@ -1,5 +1,10 @@
-import { visibleWorkspaceGetRoute, visibleWorkspacePostRoute } from "@server/workspace/visible-workspace-api";
-
-export const POST = visibleWorkspacePostRoute;
-
-export const GET = visibleWorkspaceGetRoute;
+import { visibleWorkspaceGetRoute, visibleWorkspacePostRoute } from "@server/workspace/visible-workspace-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const post = httpApiWrapper(visibleWorkspacePostRoute);
+
+export { post as POST };
+
+const get = httpApiWrapper(visibleWorkspaceGetRoute);
+
+export { get as GET };

package/cli/src/app/api/v1/(f)/workspace/change/route.ts

@@ -1,5 +1,10 @@
-import { workspaceGetRoute, workspacePostRoute } from "@server/workspace/workspace-api";
-
-export const GET = workspaceGetRoute;
-
-export const POST = workspacePostRoute;
+import { workspaceGetRoute, workspacePostRoute } from "@server/workspace/workspace-api";
+import { httpApiWrapper } from "@/app/http-wrappers";
+
+const get = httpApiWrapper(workspaceGetRoute);
+
+export { get as GET };
+
+const post = httpApiWrapper(workspacePostRoute);
+
+export { post as POST };

package/cli/src/app/f/(not-signed-in)/edit-password/page.tsx

@@ -1,8 +1,8 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import EditPasswordPage from "@client/pages/edit-password-page/EditPasswordPage";
-
-const Page = httpWrapper(async () => {
-    return <EditPasswordPage />;
-});
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import EditPasswordPage from "@client/pages/edit-password-page/EditPasswordPage";
+
+const Page = httpWrapper(async () => {
+    return <EditPasswordPage />;
+});
+
+export default Page;

package/cli/src/app/f/(not-signed-in)/forgot-password/page.tsx

@@ -1,13 +1,13 @@
-import ForgotPasswordPage from "@client/pages/forgot-password-page/ForgotPasswordPage";
-import { httpWrapper } from "@server/web/http-wrapper";
-
-export const dynamic = "force-dynamic";
-
-const Page = httpWrapper(
-    async () => {
-        return <ForgotPasswordPage />;
-    },
-    { isAnonymous: true },
-);
-
-export default Page;
+import ForgotPasswordPage from "@client/pages/forgot-password-page/ForgotPasswordPage";
+import { httpWrapper } from "@/app/http-wrappers";
+
+export const dynamic = "force-dynamic";
+
+const Page = httpWrapper(
+    async () => {
+        return <ForgotPasswordPage />;
+    },
+    { anonymous: true },
+);
+
+export default Page;

package/cli/src/app/f/(not-signed-in)/reset-password/page.tsx

@@ -1,11 +1,11 @@
-import ResetPasswordPage from "@client/pages/reset-password-page/ResetPasswordPage";
-import { httpWrapper } from "@server/web/http-wrapper";
-
-const Page = httpWrapper(
-    async () => {
-        return <ResetPasswordPage />;
-    },
-    { isAnonymous: true },
-);
-
-export default Page;
+import ResetPasswordPage from "@client/pages/reset-password-page/ResetPasswordPage";
+import { httpWrapper } from "@/app/http-wrappers";
+
+const Page = httpWrapper(
+    async () => {
+        return <ResetPasswordPage />;
+    },
+    { anonymous: true },
+);
+
+export default Page;

package/cli/src/app/f/(not-signed-in)/sign-in/microsoft/page.tsx

@@ -1,8 +1,8 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import MicrosoftPage from "@client/pages/microsoft-page/MicrosoftPage";
-
-const Page = httpWrapper(async () => {
-    return <MicrosoftPage />;
-});
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import MicrosoftPage from "@client/pages/microsoft-page/MicrosoftPage";
+
+const Page = httpWrapper(async () => {
+    return <MicrosoftPage />;
+});
+
+export default Page;