create-nextblock 0.2.69 → 0.2.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextblock",
-  "version": "0.2.69",
+  "version": "0.2.71",
   "description": "",
   "main": "index.js",
   "bin": {

package/scripts/sync-template.js

@@ -11,7 +11,11 @@ const PROJECT_ROOT = resolve(__dirname, '..');
 const SOURCE_DIR = resolve(PROJECT_ROOT, '../nextblock');
 const TARGET_DIR = resolve(PROJECT_ROOT, 'templates/nextblock-template');
 const REPO_ROOT = resolve(PROJECT_ROOT, '..', '..');
-const UI_GLOBALS_SOURCE = resolve(PROJECT_ROOT, '../../libs/ui/src/styles/globals.css');
+const ROOT_PACKAGE_JSON = resolve(REPO_ROOT, 'package.json');
+const UI_GLOBALS_SOURCE = resolve(
+  PROJECT_ROOT,
+  '../../libs/ui/src/styles/globals.css',
+);
 const UI_PROXY_MODULES = [
   'avatar',
   'badge',
@@ -47,7 +51,6 @@ const IGNORED_SEGMENTS = new Set([
   'backups',
 ]);
 
-
 async function ensureTemplateSync() {
   const sourceExists = await fs.pathExists(SOURCE_DIR);
   if (!sourceExists) {
@@ -88,6 +91,9 @@ async function ensureTemplateSync() {
   await sanitizeUiImports();
   await ensureUiProxies();
   await removeBackups();
+  await ensureUiProxies();
+  await removeBackups();
+  await syncPackageVersions();
   await removeTemplateProjectJson();
 
   console.log(chalk.green('Template sync complete.'));
@@ -195,7 +201,8 @@ async function ensureClientTranslations() {
       .replace(legacyImportRegex, wrapperImportStatement);
   } else if (!content.includes(wrapperImportStatement)) {
     const lines = content.split(/\r?\n/);
-    const insertIndex = lines.findIndex((line) => line.startsWith('import')) + 1;
+    const insertIndex =
+      lines.findIndex((line) => line.startsWith('import')) + 1;
     if (insertIndex > 0) {
       lines.splice(insertIndex, 0, wrapperImportStatement);
       content = lines.join('\n');
@@ -213,7 +220,10 @@ async function ensureClientTranslations() {
 }
 
 async function sanitizeBlockEditorImports() {
-  const blockEditorPath = resolve(TARGET_DIR, 'app/cms/blocks/components/BlockEditorArea.tsx');
+  const blockEditorPath = resolve(
+    TARGET_DIR,
+    'app/cms/blocks/components/BlockEditorArea.tsx',
+  );
   if (!(await fs.pathExists(blockEditorPath))) {
     return;
   }
@@ -249,7 +259,10 @@ async function sanitizeUiImports() {
 
   for (const filePath of filesToProcess) {
     const original = await fs.readFile(filePath, 'utf8');
-    const replaced = original.replace(/@nextblock-cms\/ui\/(?!styles\/)[A-Za-z0-9/_-]+/g, '@nextblock-cms/ui');
+    const replaced = original.replace(
+      /@nextblock-cms\/ui\/(?!styles\/)[A-Za-z0-9/_-]+/g,
+      '@nextblock-cms/ui',
+    );
 
     if (replaced !== original) {
       await fs.writeFile(filePath, replaced);
@@ -296,11 +309,7 @@ async function removeBackups() {
   ];
 
   await Promise.all(
-    targets.map((dir) =>
-      fs
-        .remove(dir)
-        .catch(() => undefined),
-    ),
+    targets.map((dir) => fs.remove(dir).catch(() => undefined)),
   );
 }
 
@@ -309,8 +318,87 @@ async function removeTemplateProjectJson() {
   await fs.remove(projectJsonPath).catch(() => undefined);
 }
 
+async function syncPackageVersions() {
+  const targetPackageJsonPath = resolve(TARGET_DIR, 'package.json');
+  if (!(await fs.pathExists(targetPackageJsonPath))) return;
+  if (!(await fs.pathExists(ROOT_PACKAGE_JSON))) return;
+
+  const rootPkg = await fs.readJson(ROOT_PACKAGE_JSON);
+  const targetPkg = await fs.readJson(targetPackageJsonPath);
+
+  const keysToSync = [
+    'next',
+    'react',
+    'react-dom',
+    'next-themes',
+    'tailwindcss',
+    'postcss',
+    'autoprefixer',
+    'typescript',
+    'eslint',
+    'eslint-config-next',
+    '@tailwindcss/postcss',
+  ];
+
+  let modified = false;
+
+  // Helper to find version in root (dev or regular dependencies)
+  const getRootVersion = (key) => {
+    return (
+      (rootPkg.dependencies && rootPkg.dependencies[key]) ||
+      (rootPkg.devDependencies && rootPkg.devDependencies[key])
+    );
+  };
+
+  keysToSync.forEach((key) => {
+    const rootVersion = getRootVersion(key);
+    if (!rootVersion) return;
+
+    // Update in dependencies
+    if (targetPkg.dependencies && targetPkg.dependencies[key]) {
+      if (targetPkg.dependencies[key] !== rootVersion) {
+        targetPkg.dependencies[key] = rootVersion;
+        modified = true;
+      }
+    }
+    // Update in devDependencies
+    else if (targetPkg.devDependencies && targetPkg.devDependencies[key]) {
+      if (targetPkg.devDependencies[key] !== rootVersion) {
+        targetPkg.devDependencies[key] = rootVersion;
+        modified = true;
+      }
+    }
+    // If missing but needed (like next-themes), add it to dependencies
+    else if (key === 'next-themes' && !targetPkg.dependencies[key]) {
+      targetPkg.dependencies[key] = rootVersion;
+      modified = true;
+    }
+  });
+
+  // Ensure @tailwindcss/postcss is in devDependencies if tailwind matches v4
+  const tailwindVersion = getRootVersion('tailwindcss');
+  if (
+    (tailwindVersion && tailwindVersion.startsWith('^4')) ||
+    (tailwindVersion && tailwindVersion.startsWith('4'))
+  ) {
+    const postcssPluginVersion = getRootVersion('@tailwindcss/postcss');
+    if (postcssPluginVersion) {
+      targetPkg.devDependencies = targetPkg.devDependencies || {};
+      targetPkg.devDependencies['@tailwindcss/postcss'] = postcssPluginVersion;
+      modified = true;
+    }
+  }
+
+  if (modified) {
+    console.log(chalk.green('Synced dependencies with root package.json'));
+    await fs.writeJson(targetPackageJsonPath, targetPkg, { spaces: 2 });
+  }
+}
+
 ensureTemplateSync().catch((error) => {
-  console.error(chalk.red(error instanceof Error ? error.message : String(error)));
+  console.error(
+    chalk.red(error instanceof Error ? error.message : String(error)),
+  );
   process.exit(1);
 });
 
@@ -322,7 +410,11 @@ async function emptyDirWithRetry(dir, retries = 5, delay = 1000) {
     } catch (err) {
       if (i === retries - 1) throw err;
       if (err.code === 'EBUSY' || err.code === 'EPERM') {
-        console.log(chalk.yellow(`Locked file encountered. Retrying in ${delay}ms... (${i + 1}/${retries})`));
+        console.log(
+          chalk.yellow(
+            `Locked file encountered. Retrying in ${delay}ms... (${i + 1}/${retries})`,
+          ),
+        );
         await new Promise((resolve) => setTimeout(resolve, delay));
       } else {
         throw err;

package/templates/nextblock-template/package.json

@@ -1,55 +1,58 @@
-{
-  "name": "@nextblock-cms/template",
-  "version": "0.2.46",
-  "private": true,
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start",
-    "lint": "next lint",
-    "deploy:supabase": "node tools/deploy-supabase.js"
-  },
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.920.0",
-    "@aws-sdk/s3-request-presigner": "^3.920.0",
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/sortable": "^10.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
-    "@supabase/ssr": "^0.6.1",
-    "@supabase/supabase-js": "^2.47.2",
-    "@tiptap/react": "^3.3.0",
-    "date-fns": "^3.6.0",
-    "dotenv": "^16.5.0",
-    "fast-json-patch": "^3.1.1",
-    "html-react-parser": "^5.2.6",
-    "js-cookie": "^3.0.5",
-    "lodash.debounce": "^4.0.8",
-    "lucide-react": "^0.534.0",
-    "next": "15.5.9",
-    "nodemailer": "^7.0.4",
-    "plaiceholder": "^3.0.0",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
-    "react-hot-toast": "^2.4.1",
-    "sharp": "^0.34.2",
-    "uuid": "^10.0.0",
-    "zod": "^3.25.76",
-    "@nextblock-cms/ui": "workspace:*",
-    "@nextblock-cms/utils": "workspace:*",
-    "@nextblock-cms/db": "workspace:*",
-    "@nextblock-cms/editor": "workspace:*",
-    "@nextblock-cms/sdk": "workspace:*"
-  },
-  "devDependencies": {
-    "@types/node": "22.10.2",
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "19.0.2",
-    "autoprefixer": "^10.4.13",
-    "eslint": "^9.8.0",
-    "eslint-config-next": "^15.5.4",
-    "postcss": "^8.4.38",
-    "tailwindcss": "^3.4.3",
-    "typescript": "~5.8.2",
-    "typescript-eslint": "^8.0.0"
-  }
-}
+{
+  "name": "@nextblock-cms/template",
+  "version": "0.2.48",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint",
+    "deploy:supabase": "node tools/deploy-supabase.js"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.920.0",
+    "@aws-sdk/s3-request-presigner": "^3.920.0",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@supabase/ssr": "^0.6.1",
+    "@supabase/supabase-js": "^2.47.2",
+    "@tiptap/react": "^3.3.0",
+    "critters": "^0.0.25",
+    "date-fns": "^3.6.0",
+    "dotenv": "^16.5.0",
+    "fast-json-patch": "^3.1.1",
+    "html-react-parser": "^5.2.6",
+    "js-cookie": "^3.0.5",
+    "lodash.debounce": "^4.0.8",
+    "lucide-react": "^0.534.0",
+    "next": "16.0.10",
+    "next-themes": "^0.4.6",
+    "nodemailer": "^7.0.4",
+    "plaiceholder": "^3.0.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
+    "react-hot-toast": "^2.4.1",
+    "sharp": "^0.34.2",
+    "uuid": "^10.0.0",
+    "zod": "^3.25.76",
+    "@nextblock-cms/ui": "workspace:*",
+    "@nextblock-cms/utils": "workspace:*",
+    "@nextblock-cms/db": "workspace:*",
+    "@nextblock-cms/editor": "workspace:*",
+    "@nextblock-cms/sdk": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "22.10.2",
+    "@types/react": "^19.2.2",
+    "@types/react-dom": "^19.2.2",
+    "@tailwindcss/postcss": "^4.1.16",
+    "autoprefixer": "^10.4.21",
+    "eslint": "^9.38.0",
+    "eslint-config-next": "^16.0.6",
+    "postcss": "^8.5.6",
+    "tailwindcss": "^4.1.16",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.2"
+  }
+}