@base44-preview/cli 0.1.6-pr.579.8e3e3da → 0.1.6-pr.580.20770cc

package/dist/assets/templates/backend-and-client/package.json

@@ -9,7 +9,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@base44/sdk": "^0.8.3",
+    "@base44/sdk": "^0.8.40",
+    "@base44/vite-plugin": "^1.0.30",
     "lucide-react": "^0.475.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

package/dist/assets/templates/backend-and-client/src/api/base44Client.js

@@ -0,0 +1,14 @@
+import { createClient } from '@base44/sdk';
+import { appParams } from '@/lib/app-params';
+
+const { appId, token, functionsVersion, appBaseUrl } = appParams;
+
+//Create a client with authentication required
+export const base44 = createClient({
+  appId,
+  token,
+  functionsVersion,
+  serverUrl: '',
+  requiresAuth: false,
+  appBaseUrl
+});

package/dist/assets/templates/backend-and-client/src/lib/app-params.js

@@ -0,0 +1,54 @@
+const isNode = typeof window === 'undefined';
+const windowObj = isNode ? { localStorage: new Map() } : window;
+const storage = windowObj.localStorage;
+
+const toSnakeCase = (str) => {
+	return str.replace(/([A-Z])/g, '_$1').toLowerCase();
+}
+
+const getAppParamValue = (paramName, { defaultValue = undefined, removeFromUrl = false } = {}) => {
+	if (isNode) {
+		return defaultValue;
+	}
+	const storageKey = `base44_${toSnakeCase(paramName)}`;
+	const urlParams = new URLSearchParams(window.location.search);
+	const searchParam = urlParams.get(paramName);
+	if (removeFromUrl) {
+		urlParams.delete(paramName);
+		const newUrl = `${window.location.pathname}${urlParams.toString() ? `?${urlParams.toString()}` : ""
+			}${window.location.hash}`;
+		window.history.replaceState({}, document.title, newUrl);
+	}
+	if (searchParam) {
+		storage.setItem(storageKey, searchParam);
+		return searchParam;
+	}
+	if (defaultValue) {
+		storage.setItem(storageKey, defaultValue);
+		return defaultValue;
+	}
+	const storedValue = storage.getItem(storageKey);
+	if (storedValue) {
+		return storedValue;
+	}
+	return null;
+}
+
+const getAppParams = () => {
+	if (getAppParamValue("clear_access_token") === 'true') {
+		storage.removeItem('base44_access_token');
+		storage.removeItem('token');
+	}
+	return {
+		appId: getAppParamValue("app_id", { defaultValue: import.meta.env.VITE_BASE44_APP_ID }),
+		token: getAppParamValue("access_token", { removeFromUrl: true }),
+		fromUrl: getAppParamValue("from_url", { defaultValue: window.location.href }),
+		functionsVersion: getAppParamValue("functions_version", { defaultValue: import.meta.env.VITE_BASE44_FUNCTIONS_VERSION }),
+		appBaseUrl: getAppParamValue("app_base_url", { defaultValue: import.meta.env.VITE_BASE44_APP_BASE_URL }),
+	}
+}
+
+
+export const appParams = {
+	...getAppParams()
+}

package/dist/assets/templates/backend-and-client/vite.config.js

@@ -1,12 +1,7 @@
-import { defineConfig } from 'vite';
+import base44 from '@base44/vite-plugin';
 import react from '@vitejs/plugin-react';
-import path from 'path';
+import { defineConfig } from 'vite';
 
 export default defineConfig({
-  plugins: [react()],
-  resolve: {
-    alias: {
-      '@': path.resolve(__dirname, './src'),
-    },
-  },
+  plugins: [base44(), react()],
 });

package/dist/cli/index.js

@@ -221304,6 +221304,7 @@ var PROJECT_CONFIG_PATTERNS = [
 ];
 var BASE44_APP_ID_ENV_VAR = "BASE44_APP_ID";
 var DEFAULT_DEV_SERVER_PORT = 4400;
+var BASE44_APP_URL = "https://base44.app";
 var TYPES_OUTPUT_SUBDIR = ".types";
 var TYPES_FILENAME = "types.d.ts";
 var AUTH_CLIENT_ID = "base44_cli";
@@ -256483,7 +256484,11 @@ async function completeProjectSetup({
       const { appUrl } = await runTask2("Installing dependencies...", async (updateMessage) => {
         await execa({ cwd: resolvedPath, shell: true })`${installCommand}`;
         updateMessage("Building project...");
-        await execa({ cwd: resolvedPath, shell: true })`${buildCommand}`;
+        await execa({
+          cwd: resolvedPath,
+          shell: true,
+          env: { VITE_BASE44_APP_ID: projectId }
+        })`${buildCommand}`;
         updateMessage("Deploying site...");
         return await deploySite(join21(resolvedPath, outputDirectory));
       }, {
@@ -258800,10 +258805,6 @@ function stripInternalFields(doc2) {
 var getNowISOTimestamp = () => {
   return new Date().toISOString().replace("Z", "000");
 };
-var deriveFullNameFromEmail = (email3) => {
-  const nameFromEmailMatch = /^([^@]+)/.exec(email3);
-  return nameFromEmailMatch ? nameFromEmailMatch[1] : email3;
-};
 
 // src/cli/dev/dev-server/db/validator.ts
 class EntityValidationError extends Error {
@@ -259216,7 +259217,8 @@ In order to complete registration use this verification code: ${otpCode}
       });
       const collection = db2.getCollection(USER_COLLECTION);
       const now = getNowISOTimestamp();
-      const fullName = deriveFullNameFromEmail(email3);
+      const nameFromEmailMatch = /^([^@]+)/.exec(email3);
+      const fullName = nameFromEmailMatch ? nameFromEmailMatch[1] : email3;
       await collection?.insertAsync({
         id: privateUserData.id,
         email: email3,
@@ -259448,38 +259450,14 @@ async function resolveCurrentUser(db2, req) {
       return { ok: true, user: SERVICE_USER };
     }
     const currentUser = await db2.getCollection(USER_COLLECTION)?.findOneAsync({ email: subject });
-    if (currentUser) {
-      return { ok: true, user: currentUser };
-    }
-    const externallyAuthenticatedUser = await createLocalUser(db2, subject);
-    if (!externallyAuthenticatedUser) {
+    if (!currentUser) {
       return { ok: false, reason: "not_found" };
     }
-    return { ok: true, user: externallyAuthenticatedUser };
+    return { ok: true, user: currentUser };
   } catch {
     return { ok: false, reason: "invalid" };
   }
 }
-async function createLocalUser(db2, email3) {
-  const collection = db2.getCollection(USER_COLLECTION);
-  if (!collection) {
-    return;
-  }
-  const now = getNowISOTimestamp();
-  const inserted = await collection.insertAsync({
-    id: nanoid3(),
-    email: email3,
-    full_name: deriveFullNameFromEmail(email3),
-    is_service: false,
-    is_verified: true,
-    disabled: null,
-    role: "user",
-    collaborator_role: "editor",
-    created_date: now,
-    updated_date: now
-  });
-  return inserted;
-}
 
 // src/cli/dev/dev-server/routes/entities/entities-user-router.ts
 var import_express3 = __toESM(require_express(), 1);
@@ -261722,15 +261700,6 @@ class WatchBase44 extends EventEmitter4 {
 
 // src/cli/dev/dev-server/main.ts
 var DEFAULT_PORT = 4400;
-var BASE44_APP_URL = "https://base44.app";
-function isLocalRedirectTarget(value) {
-  try {
-    const { protocol, hostname: hostname3 } = new URL(value);
-    return (protocol === "http:" || protocol === "https:") && (hostname3 === "localhost" || hostname3 === "127.0.0.1");
-  } catch {
-    return false;
-  }
-}
 async function createDevServer(options8) {
   const { port: userPort } = options8;
   const port = userPort ?? await getPorts({
@@ -261747,13 +261716,6 @@ async function createDevServer(options8) {
     origin: /^http:\/\/localhost(:\d+)?$/,
     credentials: true
   }));
-  app.get("/api/apps/auth/logout", (req, res) => {
-    const fromUrl = req.query.from_url;
-    if (typeof fromUrl === "string" && isLocalRedirectTarget(fromUrl)) {
-      return res.redirect(fromUrl);
-    }
-    res.send("Logged out");
-  });
   const AUTH_ROUTE_PATTERN = /^\/api\/apps\/auth(\/|$)/;
   app.use((req, res, next) => {
     if (AUTH_ROUTE_PATTERN.test(req.path)) {
@@ -261921,6 +261883,37 @@ async function createDevServer(options8) {
   return { port, server, isServingFrontend: serveRunner !== undefined };
 }
 
+// src/cli/dev/remote-serve.ts
+function startRemoteServe(options8) {
+  const runner = createRemoteServeRunner(options8);
+  stopRunnerOnProcessSignals(runner);
+  runner.onExit((code2) => process.exit(code2 ?? 1));
+  runner.start();
+}
+function createRemoteServeRunner({
+  appId,
+  serveCommand,
+  projectRoot
+}) {
+  if (!serveCommand) {
+    throw new ConfigInvalidError("base44 dev --remote serves the frontend against the production backend, but this project has no site.serveCommand in base44/config.jsonc.");
+  }
+  return new ServeRunner({
+    command: serveCommand,
+    cwd: projectRoot,
+    env: {
+      VITE_BASE44_APP_ID: appId,
+      VITE_BASE44_APP_BASE_URL: BASE44_APP_URL
+    },
+    logger: createDevLogger("frontend", theme.colors.base44Orange)
+  });
+}
+function stopRunnerOnProcessSignals(runner) {
+  const stop2 = () => void runner.stop();
+  process.on("SIGINT", stop2);
+  process.on("SIGTERM", stop2);
+}
+
 // src/cli/commands/dev.ts
 function localServerUrl(port) {
   return `http://localhost:${port}`;
@@ -261930,12 +261923,30 @@ function validateDevOptions(command2) {
   if (appId !== undefined) {
     command2.error(`base44 dev cannot be used with --app-id or ${BASE44_APP_ID_ENV_VAR}.`);
   }
+  const { port, remote } = command2.opts();
+  if (remote && port !== undefined) {
+    command2.error("--port applies to the local backend, which --remote does not start.");
+  }
+}
+async function remoteDevAction(app) {
+  const { project: project2 } = await readProjectConfig(app.projectRoot);
+  startRemoteServe({
+    appId: app.id,
+    serveCommand: project2.site?.serveCommand,
+    projectRoot: project2.root
+  });
+  return {
+    outroMessage: `Frontend dev server targets ${theme.styles.bold("production")} — every write hits your live app`
+  };
 }
 async function devAction(ctx, options8) {
   const { log, app } = ctx;
   if (!app?.projectRoot) {
     throw new ConfigInvalidError("base44 dev requires a linked local project. Run it from a project with base44/.app.jsonc.");
   }
+  if (options8.remote) {
+    return remoteDevAction({ id: app.id, projectRoot: app.projectRoot });
+  }
   const port = options8.port ? Number(options8.port) : undefined;
   const appId = app.id;
   const siteUrlPromise = getSiteUrl().catch(() => {
@@ -261956,7 +261967,7 @@ async function devAction(ctx, options8) {
   return { outroMessage };
 }
 function getDevCommand() {
-  return new Base44Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").hook("preAction", validateDevOptions).action(devAction);
+  return new Base44Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").option("--remote", "Serve the frontend against the production backend instead of a local one").hook("preAction", validateDevOptions).action(devAction);
 }
 
 // src/core/exec/run-script.ts
@@ -266468,4 +266479,4 @@ export {
   CLIExitError
 };
 
-//# debugId=A2E6A84191681AAC64756E2164756E21
+//# debugId=D9228B6EC0A3AD0964756E2164756E21