betterstart-cli 0.0.15 → 0.0.17

package/dist/assets/adapters/next/templates/init/types/index.ts

@@ -91,12 +91,17 @@ export interface PaginatedResponse<T> {
   totalPages: number
 }
 
+type TableRowId<TData extends import('@tanstack/react-table').RowData> = TData extends {
+  id: infer TId
+}
+  ? TId
+  : string
+
 /** TanStack Table meta augmentation */
 declare module '@tanstack/react-table' {
-  // biome-ignore lint/correctness/noUnusedVariables: augmenting module
   interface TableMeta<TData extends import('@tanstack/react-table').RowData> {
     reorderMode?: boolean
-    onMoveRow?: (id: string, direction: 'up' | 'down') => void
+    onMoveRow?: (id: TableRowId<TData>, direction: 'up' | 'down') => void
     currentUser?: {
       id: string
       email: string

package/dist/assets/shared-assets/react-admin/dependencies.ts

@@ -4,6 +4,7 @@ export const REACT_ADMIN_DEPS = [
   '@codemirror/lang-javascript',
   '@codemirror/lang-json',
   '@codemirror/lang-markdown',
+  '@codemirror/state',
   '@codemirror/view',
   '@dnd-kit/core',
   '@dnd-kit/sortable',

package/dist/assets/shared-assets/react-admin/ui/chart.tsx

@@ -2,13 +2,13 @@
 
 import { cn } from '@admin/utils/shared/cn'
 import * as React from 'react'
-import type { TooltipValueType } from 'recharts'
 import * as RechartsPrimitive from 'recharts'
 
 // Format: { THEME_NAME: CSS_SELECTOR }
 const THEMES = { light: '', dark: '.dark' } as const
 
 const INITIAL_DIMENSION = { width: 320, height: 200 } as const
+type TooltipValueType = number | string | ReadonlyArray<number | string>
 type TooltipNameType = number | string
 
 export type ChartConfig = Record<

package/dist/cli.js

@@ -895,6 +895,7 @@ var REACT_ADMIN_DEPS = [
   "@codemirror/lang-javascript",
   "@codemirror/lang-json",
   "@codemirror/lang-markdown",
+  "@codemirror/state",
   "@codemirror/view",
   "@dnd-kit/core",
   "@dnd-kit/sortable",
@@ -965,6 +966,18 @@ var REACT_ADMIN_DEV_DEPS = ["@tailwindcss/typography"];
 // adapters/next/init/scaffolders/dependencies.ts
 var CLI_PACKAGE_NAME = "betterstart-cli";
 var LOCAL_PACKAGE_PREFIXES = ["workspace:", "link:", "file:", "portal:"];
+var TIPTAP_PACKAGE_PREFIX = "@tiptap/";
+var TIPTAP_PACKAGE_VERSION_SPEC = "^3.26.0";
+var CODEMIRROR_PACKAGE_SPECS = {
+  "@codemirror/commands": "^6.10.3",
+  "@codemirror/lang-javascript": "^6.2.5",
+  "@codemirror/lang-json": "^6.0.2",
+  "@codemirror/lang-markdown": "^6.5.0",
+  "@codemirror/state": "^6.6.0",
+  "@codemirror/view": "^6.43.0",
+  "@uiw/codemirror-theme-github": "^4.25.10",
+  "@uiw/react-codemirror": "^4.25.10"
+};
 var requireFromCli = createRequire(import.meta.url);
 var PNPM_PACKAGE_EXTENSION_DEFINITIONS = [
   {
@@ -1059,6 +1072,70 @@ function hasDeclaredPackage(pkg, name) {
   if (!pkg) return false;
   return Object.hasOwn(pkg.dependencies ?? {}, name) || Object.hasOwn(pkg.devDependencies ?? {}, name) || Object.hasOwn(pkg.optionalDependencies ?? {}, name);
 }
+function getDeclaredRuntimePackageNames(pkg) {
+  if (!pkg) return [];
+  return Object.keys({
+    ...pkg.dependencies ?? {},
+    ...pkg.optionalDependencies ?? {}
+  });
+}
+function getDeclaredDevPackageNames(pkg) {
+  if (!pkg) return [];
+  return Object.keys(pkg.devDependencies ?? {}).filter(
+    (name) => !Object.hasOwn(pkg.dependencies ?? {}, name)
+  );
+}
+function isTiptapPackageName(name) {
+  return name.startsWith(TIPTAP_PACKAGE_PREFIX);
+}
+function getAlignedPackageSpec(name) {
+  if (isTiptapPackageName(name)) {
+    return `${name}@${TIPTAP_PACKAGE_VERSION_SPEC}`;
+  }
+  const versionSpec = CODEMIRROR_PACKAGE_SPECS[name];
+  return versionSpec ? `${name}@${versionSpec}` : null;
+}
+function hasAlignedPackageSpec(spec) {
+  return getAlignedPackageSpec(packageNameFromSpec(spec)) !== null;
+}
+function alignDependencySpecs(dependencies) {
+  return dependencies.map((dependency) => {
+    const name = packageNameFromSpec(dependency);
+    return getAlignedPackageSpec(name) ?? dependency;
+  });
+}
+function getAlignedDeclaredDependencies(packageNames) {
+  return packageNames.flatMap((name) => {
+    const alignedSpec = getAlignedPackageSpec(name);
+    return alignedSpec ? [alignedSpec] : [];
+  });
+}
+function resolveDependencyInstallPlan(options) {
+  const pkg = readProjectPackageJson(options.cwd);
+  const dependencies = alignDependencySpecs(options.dependencies);
+  const devDependencies = alignDependencySpecs(options.devDependencies);
+  const needsPackageAlignment = [...options.dependencies, ...options.devDependencies].some(
+    hasAlignedPackageSpec
+  );
+  if (!needsPackageAlignment) {
+    return {
+      ...options,
+      dependencies: unique(dependencies),
+      devDependencies: unique(devDependencies)
+    };
+  }
+  return {
+    ...options,
+    dependencies: unique([
+      ...dependencies,
+      ...getAlignedDeclaredDependencies(getDeclaredRuntimePackageNames(pkg))
+    ]),
+    devDependencies: unique([
+      ...devDependencies,
+      ...getAlignedDeclaredDependencies(getDeclaredDevPackageNames(pkg))
+    ])
+  };
+}
 function canResolveFromProject(cwd, name) {
   try {
     requireFromCli.resolve(name, { paths: [cwd] });
@@ -1198,21 +1275,27 @@ async function installDependenciesAsync({
   dependencies,
   devDependencies
 }) {
+  const installPlan = resolveDependencyInstallPlan({ cwd, pm, dependencies, devDependencies });
   try {
     if (pm === "pnpm") {
-      ensurePnpmPackageExtensions(cwd, dependencies);
+      ensurePnpmPackageExtensions(cwd, installPlan.dependencies);
     }
-    if (dependencies.length > 0) {
-      await spawnAsync(pm, buildAddArgs(pm, dependencies, false), cwd);
+    if (installPlan.dependencies.length > 0) {
+      await spawnAsync(pm, buildAddArgs(pm, installPlan.dependencies, false), cwd);
     }
-    if (devDependencies.length > 0) {
-      await spawnAsync(pm, buildAddArgs(pm, devDependencies, true), cwd);
+    if (installPlan.devDependencies.length > 0) {
+      await spawnAsync(pm, buildAddArgs(pm, installPlan.devDependencies, true), cwd);
     }
-    return { dependencies, devDeps: devDependencies, success: true, error: null };
+    return {
+      dependencies: installPlan.dependencies,
+      devDeps: installPlan.devDependencies,
+      success: true,
+      error: null
+    };
   } catch (err) {
     return {
-      dependencies,
-      devDeps: devDependencies,
+      dependencies: installPlan.dependencies,
+      devDeps: installPlan.devDependencies,
       success: false,
       error: err instanceof Error ? err.message : "Install failed"
     };
@@ -20728,7 +20811,7 @@ ${styleText(
       },
       {
         value: "cloudflare",
-        label: "Cloudflare",
+        label: `Cloudflare ${styleText("dim", "(coming soon)")}`,
         disabled: true
       }
     ],
@@ -24970,6 +25053,7 @@ var CODEMIRROR_PACKAGE_DEPS = [
   "@codemirror/lang-javascript",
   "@codemirror/lang-json",
   "@codemirror/lang-markdown",
+  "@codemirror/state",
   "@codemirror/view",
   "@uiw/codemirror-theme-github",
   "@uiw/react-codemirror"