studiocms 0.1.0-beta.24 → 0.1.0-beta.26

package/dist/virtuals/utils.js

@@ -0,0 +1,43 @@
+import fs from "node:fs";
+import { createResolver } from "astro-integration-kit";
+const { resolve } = createResolver(import.meta.url);
+const buildDefaultOnlyVirtual = (mod) => `export default ${JSON.stringify(mod)};`;
+const buildNamedMultiExportVirtual = (items) => Object.entries(items).map(([key, val]) => `export const ${key} = ${JSON.stringify(val)};`).join("\n");
+const buildVirtualConfig = (options) => fs.readFileSync(resolve("./stubs/config.stub.js"), "utf-8").replace(/\$\$options\$\$/g, JSON.stringify(options));
+const buildLoggerVirtual = (verbose) => fs.readFileSync(resolve("./stubs/logger.stub.js"), "utf-8").replace(/\$\$verbose\$\$/g, verbose.toString());
+const VirtualModuleBuilder = (resolve2) => {
+  const dynamicVirtual = (items) => items.map((item) => `export * from ${JSON.stringify(resolve2(item))};`).join("\n");
+  const ambientScripts = (items) => items.map((item) => `import '${resolve2(item)}';`).join("\n");
+  const namedVirtual = ({
+    namedExport,
+    path,
+    exportDefault
+  }) => `
+import { ${namedExport} } from ${JSON.stringify(resolve2(path))};
+export { ${namedExport} };
+${exportDefault ? `export default ${namedExport};` : ""}
+`;
+  const astroComponentVirtual = (items) => Object.entries(items).map(([key, val]) => `export { default as ${key} } from ${JSON.stringify(resolve2(val))}`).join("\n");
+  const dynamicWithAstroVirtual = ({
+    dynamicExports,
+    astroComponents
+  }) => [dynamicVirtual(dynamicExports), astroComponentVirtual(astroComponents)].join("\n");
+  return {
+    dynamicVirtual,
+    ambientScripts,
+    namedVirtual,
+    astroComponentVirtual,
+    dynamicWithAstroVirtual,
+    buildDefaultOnlyVirtual,
+    buildLoggerVirtual,
+    buildNamedMultiExportVirtual,
+    buildVirtualConfig
+  };
+};
+export {
+  VirtualModuleBuilder,
+  buildDefaultOnlyVirtual,
+  buildLoggerVirtual,
+  buildNamedMultiExportVirtual,
+  buildVirtualConfig
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "studiocms",
-  "version": "0.1.0-beta.24",
+  "version": "0.1.0-beta.26",
   "description": "Astro Native CMS for AstroDB. Built from the ground up by the Astro community.",
   "author": {
     "name": "withstudiocms",
@@ -66,15 +66,11 @@
       "types": "./dist/consts.d.ts",
       "default": "./dist/consts.js"
     },
-    "./Renderer": "./dist/components/Renderer.astro",
+    "./Renderer": "./dist/virtuals/components/Renderer.astro",
     "./db/config": {
       "types": "./dist/db/config.d.ts",
       "default": "./dist/db/config.js"
     },
-    "./db/tables": {
-      "types": "./dist/db/tables.d.ts",
-      "default": "./dist/db/tables.js"
-    },
     "./errors": {
       "types": "./dist/errors.d.ts",
       "default": "./dist/errors.js"
@@ -84,16 +80,16 @@
       "default": "./dist/plugins.js"
     },
     "./sdk/base": {
-      "types": "./dist/sdk/index.d.ts",
-      "default": "./dist/sdk/index.js"
+      "types": "./dist/virtuals/sdk/index.d.ts",
+      "default": "./dist/virtuals/sdk/index.js"
     },
     "./sdk/tables": {
-      "types": "./dist/sdk/tables.d.ts",
-      "default": "./dist/sdk/tables.js"
+      "types": "./dist/virtuals/sdk/tables.d.ts",
+      "default": "./dist/virtuals/sdk/tables.js"
     },
     "./sdk/types": {
-      "types": "./dist/sdk/types/index.d.ts",
-      "default": "./dist/sdk/types/index.js"
+      "types": "./dist/virtuals/sdk/types/index.d.ts",
+      "default": "./dist/virtuals/sdk/types/index.js"
     },
     "./schemas": {
       "types": "./dist/schemas/index.d.ts",
@@ -107,21 +103,17 @@
       "types": "./dist/runtime/index.d.ts",
       "default": "./dist/runtime/index.js"
     },
-    "./componentRegistry": {
-      "types": "./dist/componentRegistry/index.d.ts",
-      "default": "./dist/componentRegistry/index.js"
-    },
-    "./componentRegistry/runtime": {
-      "types": "./dist/componentRegistry/runtime.d.ts",
-      "default": "./dist/componentRegistry/runtime.js"
+    "./lib/auth/*": {
+      "types": "./dist/virtuals/auth/*.d.ts",
+      "default": "./dist/virtuals/auth/*.js"
     },
-    "./componentRegistry/types": {
-      "types": "./dist/componentRegistry/types.d.ts",
-      "default": "./dist/componentRegistry/types.js"
+    "./lib/i18n/*": {
+      "types": "./dist/virtuals/i18n/*.d.ts",
+      "default": "./dist/virtuals/i18n/*.js"
     },
     "./lib/*": {
-      "types": "./dist/lib/*.d.ts",
-      "default": "./dist/lib/*"
+      "types": "./dist/virtuals/lib/*.d.ts",
+      "default": "./dist/virtuals/lib/*.js"
     },
     "./types": {
       "types": "./dist/types.d.ts",
@@ -138,8 +130,8 @@
       "default": "./dist/effect.js"
     },
     "./sdk/*": {
-      "types": "./dist/sdk/*.d.ts",
-      "default": "./dist/sdk/*.js"
+      "types": "./dist/virtuals/sdk/*.d.ts",
+      "default": "./dist/virtuals/sdk/*.js"
     },
     "./oAuthUtils": {
       "types": "./dist/oAuthUtils.d.ts",
@@ -150,72 +142,53 @@
   "dependencies": {
     "@clack/core": "0.4.1",
     "@clack/prompts": "0.9.1",
-    "@effect/cli": "^0.69.0",
-    "@effect/cluster": "^0.47.0",
-    "@effect/experimental": "^0.54.4",
-    "@effect/platform": "^0.90.1",
-    "@effect/platform-node": "^0.95.0",
-    "@effect/printer": "^0.45.0",
-    "@effect/printer-ansi": "^0.45.0",
-    "@effect/rpc": "^0.68.3",
-    "@effect/sql": "^0.44.1",
-    "@effect/typeclass": "^0.36.0",
-    "@effect/workflow": "^0.8.3",
-    "@iconify-json/flat-color-icons": "^1.2.1",
-    "@iconify-json/simple-icons": "^1.2.46",
-    "@inox-tools/runtime-logger": "^0.6.0",
+    "@iconify-json/flat-color-icons": "^1.2.3",
+    "@iconify-json/simple-icons": "^1.2.50",
+    "@inox-tools/runtime-logger": "^0.7.0",
     "@nanostores/i18n": "^1.2.2",
     "@nanostores/persistent": "^1.1.0",
-    "@oslojs/binary": "^1.0.0",
-    "@oslojs/crypto": "^1.0.1",
-    "@oslojs/encoding": "^1.1.0",
-    "@studiocms/ui": "^0.4.17",
+    "@studiocms/ui": "^1.0.0-beta.0",
     "@withstudiocms/cli-kit": "^0.1.0",
-    "astro-integration-kit": "^0.18",
+    "astro-integration-kit": "^0.19.0",
     "boxen": "^8.0.1",
-    "chalk": "^5.5.0",
-    "deepmerge-ts": "^7.1.5",
+    "chalk": "^5.6.0",
     "diff": "^8.0.2",
     "diff2html": "^3.4.52",
     "dompurify": "^3.2.6",
-    "dotenv": "^17.2.1",
-    "effect": "^3.17.7",
+    "dotenv": "^17.2.2",
     "fuse.js": "^7.1.0",
-    "jose": "^6.0.12",
-    "markdown-it": "^14.1.0",
+    "jose": "^6.1.0",
+    "micromark": "^4.0.2",
+    "micromark-extension-gfm": "^3.0.0",
     "magicast": "^0.3.5",
-    "mdast-util-from-markdown": "^2.0.2",
     "mdast-util-to-markdown": "^2.1.2",
-    "mdast-util-to-string": "^4.0.0",
     "mrmime": "^2.0.1",
-    "micromatch": "^4.0.8",
     "nanostores": "^1.0.1",
-    "nodemailer": "^7.0.5",
     "package-manager-detector": "^1.3.0",
     "semver": "^7.7.2",
-    "socks": "^2.8.6",
     "three": "0.170.0",
-    "ts-morph": "^26.0.0",
+    "tinyglobby": "^0.2.14",
     "ultrahtml": "^1.6.0",
-    "unist-util-visit": "^5.0.0",
-    "@withstudiocms/config-utils": "0.1.0-beta.2"
+    "@withstudiocms/internal_helpers": "0.1.0-beta.1",
+    "@withstudiocms/auth-kit": "0.1.0-beta.1",
+    "@withstudiocms/component-registry": "0.1.0-beta.2",
+    "@withstudiocms/config-utils": "0.1.0-beta.3",
+    "@withstudiocms/effect": "0.1.0-beta.2"
   },
   "devDependencies": {
     "@types/mdast": "^4.0.4",
-    "@types/micromatch": "^4.0.9",
-    "@types/markdown-it": "^14.1.2",
     "@types/node": "^22.0.0",
-    "@types/nodemailer": "^6.4.17",
-    "@types/semver": "^7.7.0",
+    "@types/semver": "^7.7.1",
     "@types/three": "0.169.0",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
     "@astrojs/db": "^0.17.1",
     "@libsql/client": "^0.15.10",
-    "@studiocms/web-vitals": "^4.4.0",
-    "astro": "^5.12.8",
+    "@studiocms/web-vitals": "^4.4.1",
+    "astro": "^5.12.9",
     "drizzle-orm": "^0.42.0",
+    "effect": "^3.17.13",
     "vite": "^6.3.4"
   },
   "peerDependenciesMeta": {
@@ -224,8 +197,8 @@
     }
   },
   "scripts": {
-    "build": "buildkit build 'src/**/*.{ts,astro,css,json,png,woff2}'",
-    "dev": "buildkit dev 'src/**/*.{ts,astro,css,json,png,woff2}'",
+    "build": "buildkit build 'src/**/*.{ts,astro,css,json,png,webp,woff2,stub.js,d.ts}'",
+    "dev": "buildkit dev 'src/**/*.{ts,astro,css,json,png,webp,woff2,stub.js,d.ts}'",
     "typecheck": "tspc -p tsconfig.tspc.json"
   }
 }

package/src/cli/add/index.ts

@@ -1,11 +1,10 @@
 import { existsSync, promises as fs } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { Args, Command } from '@effect/cli';
 import { cancelled, success } from '@withstudiocms/cli-kit/messages';
 import { exists, pathToFileURL, resolveRoot } from '@withstudiocms/cli-kit/utils';
 import { type ASTNode, builders, loadFile, type ProxifiedModule } from 'magicast';
 import { getDefaultExportOptions } from 'magicast/helpers';
-import { Console, Effect, genLogger, Layer } from '../../effect.js';
+import { Cli, Console, Effect, genLogger, Layer } from '../../effect.js';
 import { CliContext, genContext } from '../utils/context.js';
 import { logger } from '../utils/logger.js';
 import { TryToInstallPlugins } from './tryToInstallPlugins.js';
@@ -103,9 +102,9 @@ export function appendForwardSlash(path: string) {
 	return path.endsWith('/') ? path : `${path}/`;
 }
 
-export const plugin = Args.text({ name: 'plugin' }).pipe(
-	Args.withDescription(' name of the plugin to add'),
-	Args.repeated
+export const plugin = Cli.Args.text({ name: 'plugin' }).pipe(
+	Cli.Args.withDescription(' name of the plugin to add'),
+	Cli.Args.repeated
 );
 
 const resolveOrCreateConfig = (root: URL) =>
@@ -177,7 +176,7 @@ const addPluginDeps = Layer.mergeAll(
 	UpdateStudioCMSConfig.Default
 );
 
-export const addPlugin = Command.make(
+export const addPlugin = Cli.Command.make(
 	'add',
 	{
 		plugin,
@@ -290,4 +289,4 @@ export const addPlugin = Command.make(
 				}
 			}
 		}).pipe(Effect.provide(addPluginDeps))
-).pipe(Command.withDescription('Add StudioCMS plugin(s) to your project'));
+).pipe(Cli.Command.withDescription('Add StudioCMS plugin(s) to your project'));

package/src/cli/crypto/genJWT/index.ts

@@ -1,5 +1,4 @@
 import fs from 'node:fs';
-import { Args, Command, Options } from '@effect/cli';
 import {
 	StudioCMSColorway,
 	StudioCMSColorwayBg,
@@ -8,7 +7,7 @@ import {
 import { boxen, label } from '@withstudiocms/cli-kit/messages';
 import { SignJWT } from 'jose';
 import { importPKCS8 } from 'jose/key/import';
-import { Effect, genLogger } from '../../../effect.js';
+import { Cli, Effect, genLogger } from '../../../effect.js';
 import { genContext } from '../../utils/context.js';
 import { dateAdd } from '../../utils/dateAdd.js';
 import { logger } from '../../utils/logger.js';
@@ -18,23 +17,23 @@ import { logger } from '../../utils/logger.js';
  */
 export const OneYear = 31556926;
 
-export const keyFile = Args.text({ name: 'keyfile' }).pipe(
-	Args.withDescription(
+export const keyFile = Cli.Args.text({ name: 'keyfile' }).pipe(
+	Cli.Args.withDescription(
 		'a relative path (e.g., `../keys/libsql.pem`) from the current directory to your private key file (.pem)'
 	)
 );
 
-export const expire = Options.integer('exp').pipe(
-	Options.withAlias('e'),
-	Options.optional,
-	Options.withDefault(OneYear),
-	Options.withDescription('Expiry date in seconds (>=0) from issued at (iat) time')
+export const expire = Cli.Options.integer('exp').pipe(
+	Cli.Options.withAlias('e'),
+	Cli.Options.optional,
+	Cli.Options.withDefault(OneYear),
+	Cli.Options.withDescription('Expiry date in seconds (>=0) from issued at (iat) time')
 );
 
-export const debug = Options.boolean('debug').pipe(
-	Options.optional,
-	Options.withDefault(false),
-	Options.withDescription('Enable debug mode')
+export const debug = Cli.Options.boolean('debug').pipe(
+	Cli.Options.optional,
+	Cli.Options.withDefault(false),
+	Cli.Options.withDescription('Enable debug mode')
 );
 
 /**
@@ -45,7 +44,7 @@ export const debug = Options.boolean('debug').pipe(
 const convertJwtToBase64Url = (jwtToken: string) =>
 	Effect.try(() => Buffer.from(jwtToken).toString('base64url'));
 
-export const genJWT = Command.make(
+export const genJWT = Cli.Command.make(
 	'gen-jwt',
 	{ keyFile, expire, debug },
 	({ expire, keyFile, debug: _debug }) =>
@@ -161,4 +160,4 @@ export const genJWT = Command.make(
 				return yield* Effect.fail(new Error('JWT ERROR: Unknown'));
 			}
 		})
-).pipe(Command.withDescription('Generate a JWT token from a keyfile'));
+).pipe(Cli.Command.withDescription('Generate a JWT token from a keyfile'));

package/src/cli/crypto/index.ts

@@ -1,7 +1,7 @@
-import { Command } from '@effect/cli';
+import { Cli } from '../../effect.js';
 import { genJWT } from './genJWT/index.js';
 
-export const cryptoCMD = Command.make('crypto').pipe(
-	Command.withDescription('Crypto Utilities for StudioCMS Security'),
-	Command.withSubcommands([genJWT])
+export const cryptoCMD = Cli.Command.make('crypto').pipe(
+	Cli.Command.withDescription('Crypto Utilities for StudioCMS Security'),
+	Cli.Command.withSubcommands([genJWT])
 );

package/src/cli/getTurso/index.ts

@@ -1,8 +1,7 @@
-import { Command } from '@effect/cli';
 import { runInteractiveCommand } from '@withstudiocms/cli-kit/utils';
-import { Effect, genLogger } from '../../effect.js';
+import { Cli, Effect, genLogger } from '../../effect.js';
 
-export const getTurso = Command.make('get-turso', {}, () =>
+export const getTurso = Cli.Command.make('get-turso', {}, () =>
 	genLogger('studiocms/cli/getTurso')(function* () {
 		yield* Effect.tryPromise({
 			try: () =>
@@ -12,4 +11,4 @@ export const getTurso = Command.make('get-turso', {}, () =>
 			catch: (error) => console.error(`Failed to run Turso install: ${(error as Error).message}`),
 		});
 	})
-).pipe(Command.withDescription('Install the Turso CLI'));
+).pipe(Cli.Command.withDescription('Install the Turso CLI'));

package/src/cli/index.ts

@@ -1,7 +1,5 @@
-import { CliConfig, Command } from '@effect/cli';
-import { NodeContext, NodeRuntime } from '@effect/platform-node';
 import { readJson } from '@withstudiocms/cli-kit/utils';
-import { Effect, Layer } from '../effect.js';
+import { Cli, Effect, Layer, PlatformNode } from '../effect.js';
 import { addPlugin } from './add/index.js';
 import { cryptoCMD } from './crypto/index.js';
 import { getTurso } from './getTurso/index.js';
@@ -10,22 +8,25 @@ import { usersCMD } from './users/index.js';
 
 const pkgJson = readJson<{ version: string }>(new URL('../../package.json', import.meta.url));
 
-const command = Command.make('studiocms').pipe(
-	Command.withDescription('StudioCMS CLI Utility Toolkit'),
-	Command.withSubcommands([addPlugin, cryptoCMD, getTurso, initCMD, usersCMD])
+const command = Cli.Command.make('studiocms').pipe(
+	Cli.Command.withDescription('StudioCMS CLI Utility Toolkit'),
+	Cli.Command.withSubcommands([addPlugin, cryptoCMD, getTurso, initCMD, usersCMD])
 );
 
 // Set up the CLI application
-const cli = Command.run(command, {
+const cli = Cli.Command.run(command, {
 	name: 'StudioCMS CLI Utility Toolkit',
 	version: `v${pkgJson.version}`,
 });
 
-const ConfigLive = CliConfig.layer({
+const ConfigLive = Cli.CliConfig.layer({
 	showBuiltIns: true,
 });
 
-const MainLayer = Layer.mergeAll(ConfigLive, NodeContext.layer);
+const MainLayer = Layer.mergeAll(ConfigLive, PlatformNode.NodeContext.layer);
 
 // Prepare and run the CLI application
-Effect.suspend(() => cli(process.argv)).pipe(Effect.provide(MainLayer), NodeRuntime.runMain);
+Effect.suspend(() => cli(process.argv)).pipe(
+	Effect.provide(MainLayer),
+	PlatformNode.NodeRuntime.runMain
+);

package/src/cli/init/index.ts

@@ -1,7 +1,6 @@
-import { Command, Options } from '@effect/cli';
 import { StudioCMSColorwayBg } from '@withstudiocms/cli-kit/colors';
 import { label } from '@withstudiocms/cli-kit/messages';
-import { Console, Effect, genLogger } from '../../effect.js';
+import { Cli, Console, Effect, genLogger } from '../../effect.js';
 import { CliContext, genContext } from '../utils/context.js';
 import { intro } from '../utils/intro.js';
 import { logger } from '../utils/logger.js';
@@ -9,19 +8,19 @@ import type { StepFn } from '../utils/types.js';
 import { env } from './steps/env.js';
 import { next } from './steps/next.js';
 
-export const debug = Options.boolean('debug').pipe(
-	Options.optional,
-	Options.withDefault(false),
-	Options.withDescription('Enable debug mode')
+export const debug = Cli.Options.boolean('debug').pipe(
+	Cli.Options.optional,
+	Cli.Options.withDefault(false),
+	Cli.Options.withDescription('Enable debug mode')
 );
 
-export const dryRun = Options.boolean('dry-run').pipe(
-	Options.optional,
-	Options.withAlias('d'),
-	Options.withDescription('Dry run mode')
+export const dryRun = Cli.Options.boolean('dry-run').pipe(
+	Cli.Options.optional,
+	Cli.Options.withAlias('d'),
+	Cli.Options.withDescription('Dry run mode')
 );
 
-export const initCMD = Command.make('init', { debug, dryRun }, ({ debug: _debug, dryRun }) =>
+export const initCMD = Cli.Command.make('init', { debug, dryRun }, ({ debug: _debug, dryRun }) =>
 	genLogger('studiocms/cli/init')(function* () {
 		let debug: boolean;
 
@@ -113,4 +112,4 @@ export const initCMD = Command.make('init', { debug, dryRun }, ({ debug: _debug,
 		// All done, exit
 		context.exit(0);
 	})
-).pipe(Command.withDescription('Initialize the StudioCMS project after new installation.'));
+).pipe(Cli.Command.withDescription('Initialize the StudioCMS project after new installation.'));

package/src/cli/users/index.ts

@@ -1,7 +1,6 @@
-import { Command, Options } from '@effect/cli';
 import { StudioCMSColorwayBg } from '@withstudiocms/cli-kit/colors';
 import { label } from '@withstudiocms/cli-kit/messages';
-import { Console, Effect, genLogger } from '../../effect.js';
+import { Cli, Console, Effect, genLogger } from '../../effect.js';
 import { type BaseContext, CliContext, genContext } from '../utils/context.js';
 import { intro } from '../utils/intro.js';
 import { logger } from '../utils/logger.js';
@@ -10,16 +9,16 @@ import { libsqlCreateUsers } from './steps/libsqlCreateUsers.js';
 import { libsqlModifyUsers } from './steps/libsqlModifyUsers.js';
 import { next } from './steps/next.js';
 
-export const debug = Options.boolean('debug').pipe(
-	Options.optional,
-	Options.withDefault(false),
-	Options.withDescription('Enable debug mode')
+export const debug = Cli.Options.boolean('debug').pipe(
+	Cli.Options.optional,
+	Cli.Options.withDefault(false),
+	Cli.Options.withDescription('Enable debug mode')
 );
 
-export const dryRun = Options.boolean('dry-run').pipe(
-	Options.optional,
-	Options.withAlias('d'),
-	Options.withDescription('Dry run mode')
+export const dryRun = Cli.Options.boolean('dry-run').pipe(
+	Cli.Options.optional,
+	Cli.Options.withAlias('d'),
+	Cli.Options.withDescription('Dry run mode')
 );
 
 // biome-ignore lint/suspicious/noExplicitAny: this is a valid use case for explicit any
@@ -39,7 +38,7 @@ export enum DBEditOptions {
 	modify = 'modify',
 }
 
-export const usersCMD = Command.make('users', { debug, dryRun }, ({ debug: _debug, dryRun }) =>
+export const usersCMD = Cli.Command.make('users', { debug, dryRun }, ({ debug: _debug, dryRun }) =>
 	genLogger('studiocms/cli/users')(function* () {
 		let debug: boolean;
 
@@ -148,4 +147,4 @@ export const usersCMD = Command.make('users', { debug, dryRun }, ({ debug: _debu
 		// All done, exit
 		context.exit(0);
 	})
-).pipe(Command.withDescription('Utilities for Tweaking Users in StudioCMS'));
+).pipe(Cli.Command.withDescription('Utilities for Tweaking Users in StudioCMS'));

package/src/cli/users/steps/libsqlCreateUsers.ts

@@ -1,8 +1,9 @@
+import type { CheckIfUnsafeError } from '@withstudiocms/auth-kit/errors';
+import { CheckIfUnsafe } from '@withstudiocms/auth-kit/utils/unsafeCheck';
 import { StudioCMSColorwayError, StudioCMSColorwayInfo } from '@withstudiocms/cli-kit/colors';
 import { z } from 'astro/zod';
 import dotenv from 'dotenv';
-import { convertToVanilla, Effect } from '../../../effect.js';
-import { CheckIfUnsafe, type CheckIfUnsafeError } from '../../../lib/auth/utils/unsafeCheck.js';
+import { Effect, runEffect } from '../../../effect.js';
 import { checkRequiredEnvVars } from '../../utils/checkRequiredEnvVars.js';
 import { createUserAvatar } from '../../utils/createUserAvatar.js';
 import { logger } from '../../utils/logger.js';
@@ -135,7 +136,7 @@ export const libsqlCreateUsers: StepFn = async (context, debug, dryRun = false)
 	}
 
 	// Environment variables are already checked by checkRequiredEnvVars
-	const password = await convertToVanilla(hashPassword(newPassword));
+	const password = await runEffect(hashPassword(newPassword));
 
 	const newUserId = crypto.randomUUID();
 

package/src/cli/users/steps/libsqlModifyUsers.ts

@@ -1,8 +1,9 @@
+import type { CheckIfUnsafeError } from '@withstudiocms/auth-kit/errors';
+import { CheckIfUnsafe } from '@withstudiocms/auth-kit/utils/unsafeCheck';
 import { StudioCMSColorwayError, StudioCMSColorwayInfo } from '@withstudiocms/cli-kit/colors';
 import dotenv from 'dotenv';
 import { eq } from 'drizzle-orm';
-import { convertToVanilla, Effect } from '../../../effect.js';
-import { CheckIfUnsafe, type CheckIfUnsafeError } from '../../../lib/auth/utils/unsafeCheck.js';
+import { Effect, runEffect } from '../../../effect.js';
 import { checkRequiredEnvVars } from '../../utils/checkRequiredEnvVars.js';
 import { logger } from '../../utils/logger.js';
 import type { StepFn } from '../../utils/types.js';
@@ -239,7 +240,7 @@ export const libsqlModifyUsers: StepFn = async (context, debug, dryRun = false)
 					task: async (message) => {
 						try {
 							// Environment variables are already checked by checkRequiredEnvVars
-							const hashedPassword = await convertToVanilla(hashPassword(newPassword));
+							const hashedPassword = await runEffect(hashPassword(newPassword));
 
 							await db
 								.update(Users)

package/src/{layouts → components}/auth/FallbackCanvas.astro

@@ -2,7 +2,7 @@
 import { Image } from 'astro:assets';
 import { validImages } from 'studiocms:auth/utils/validImages';
 import type { SiteConfigCacheObject } from 'studiocms:sdk/types';
-import StudioCMSLogoSVG from '../../components/auth/StudioCMSLogoSVG.astro';
+import StudioCMSLogoSVG from './StudioCMSLogoSVG.astro';
 
 interface Props {
 	config: SiteConfigCacheObject;

package/src/components/auth/OAuthButton.astro

@@ -1,5 +1,5 @@
 ---
-import { Button } from 'studiocms:ui/components';
+import { Button } from 'studiocms:ui/components/button';
 
 interface Props {
 	href: string;

package/src/components/auth/OAuthButtonStack.astro

@@ -1,10 +1,10 @@
 ---
 import { useTranslations } from 'studiocms:i18n';
-import { Divider } from 'studiocms:ui/components';
+import { Divider } from 'studiocms:ui/components/divider';
 import OAuthButton from './OAuthButton.astro';
 import { providerData, showOAuth } from './oAuthButtonProviders.js';
 
-const lang = Astro.locals.defaultLang;
+const lang = Astro.locals.StudioCMS.defaultLang;
 const t = useTranslations(lang, '@studiocms/auth:oauth-stack');
 
 const shouldShowOAuth = showOAuth && providerData.some(({ enabled }) => enabled);

package/src/components/auth/StaticAuthCheck.astro

@@ -2,18 +2,18 @@
 import type { UserSessionData } from 'studiocms:auth/lib/types';
 
 interface Props {
-	userData: UserSessionData;
+	userData?: UserSessionData | null;
 }
 
 const { userData } = Astro.props as Props;
 
-const isLoggedIn = userData.isLoggedIn;
+const isLoggedIn = userData?.isLoggedIn ?? false;
 ---
 <div 
   id="login-check" 
   style="display: none;" 
   data-is_logged_in={`${isLoggedIn}`}
-  data-redirect_route={Astro.locals.routeMap.mainLinks.dashboardIndex}
+  data-redirect_route={Astro.locals.StudioCMS.routeMap.mainLinks.dashboardIndex}
   ></div>
 
 <script is:inline>

package/src/{scripts → components/auth/component-scripts}/formListener.ts

@@ -1,4 +1,8 @@
-import { toast } from 'studiocms:ui/components';
+/**
+ * This tool is used by Auth Login pages
+ */
+
+import { toast } from 'studiocms:ui/components/toaster';
 
 /**
  * Handles form submission events for login and registration forms.