feat(scripts): improvement

pivanov · Dec 12, 2024 · fcd72be · fcd72be
1 parent e6c3d9c
commit fcd72be
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -2,12 +2,12 @@
   "name": "root",
   "private": true,
   "scripts": {
-    "build": "WORKSPACE_BUILD=true pnpm --parallel --filter=!extension build && node scripts/version-warning.mjs",
-    "version-warning": "node scripts/version-warning.mjs",
-    "dev": "pnpm --parallel --filter=!extension dev",
-    "pack": "pnpm --parallel --filter=!extension pack",
+    "build": "WORKSPACE_BUILD=true pnpm --parallel build",
+    "postbuild": "node scripts/version-warning.mjs",
+    "dev": "pnpm --parallel dev",
+    "pack": "pnpm --parallel pack",
     "pack:bump": "pnpm --filter scan pack:bump",
-    "lint": "pnpm --parallel --filter=!extension lint",
+    "lint": "pnpm --parallel lint",
     "prettier": "prettier --write packages/*",
     "eslint:fix": "eslint --fix packages/*"
   },

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "react-scanner-extension",
+  "name": "@react-scan/extension",
   "version": "1.0.0",
   "private": true,
   "type": "module",

diff --git a/packages/kitchen-sink/package.json b/packages/kitchen-sink/package.json
@@ -1,6 +1,9 @@
 {
+  "name": "@react-scan/kitchen-sink",
+  "version": "0.0.0",
   "scripts": {
     "build": "vite build",
+    "postbuild": "node ../../scripts/version-warning.mjs",
     "dev": "vite",
     "preview": "vite preview"
   },

diff --git a/packages/scan/src/core/web/toolbar.tsx b/packages/scan/src/core/web/toolbar.tsx
@@ -2,7 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'preact/hooks'
 import { signal, useSignalEffect, type Signal } from '@preact/signals';
 import { render } from 'preact';
 import { cn, throttle } from '@web-utils/helpers';
-import { ReactScanInternals, setOptions, Store } from '../../index';
+import {
+  // ReactScanInternals,
+  setOptions,
+  Store
+} from '../../index';
 import {
   INSPECT_TOGGLE_ID,
   type States,
@@ -24,25 +28,25 @@ const saveCornerPosition = (corner: Corner) => {
   localStorage.setItem(CORNER_KEY, corner);
 };
 
-// Update initial position signals
-const toolbarX = signal(
-  parseInt(
-    typeof window !== 'undefined'
-      ? localStorage.getItem('react-scan-toolbar-x') ?? '0'
-      : '0',
-  ),
-);
-
-const toolbarY = signal(
-  parseInt(
-    typeof window !== 'undefined'
-      ? localStorage.getItem('react-scan-toolbar-y') ?? '0'
-      : '0',
-  ),
-);
-
-const isDragging = signal(false);
-const isResizing = signal(false);
+// // Update initial position signals
+// const toolbarX = signal(
+//   parseInt(
+//     typeof window !== 'undefined'
+//       ? localStorage.getItem('react-scan-toolbar-x') ?? '0'
+//       : '0',
+//   ),
+// );
+
+// const toolbarY = signal(
+//   parseInt(
+//     typeof window !== 'undefined'
+//       ? localStorage.getItem('react-scan-toolbar-y') ?? '0'
+//       : '0',
+//   ),
+// );
+
+// const isDragging = signal(false);
+// const isResizing = signal(false);
 
 // Separate references for resizing and dragging
 const initialWidthRef = { current: 0 }; // Used only for resizing

diff --git a/scripts/version-warning.mjs b/scripts/version-warning.mjs
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import boxen from 'boxen';
+import { readFileSync, readdirSync } from 'node:fs';
+import { resolve, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import chalk from 'chalk';
-import { readFileSync, readdirSync } from 'fs';
-import { resolve, dirname } from 'path';
-import { fileURLToPath } from 'url';
+import boxen from 'boxen';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -34,20 +34,24 @@ function getWorkspacePackages() {
 
   try {
     const dirs = readdirSync(packagesDir, { withFileTypes: true })
-      .filter(dirent => dirent.isDirectory() && dirent.name !== 'extension');
+      .filter(dirent => dirent.isDirectory());
 
     for (const dir of dirs) {
       const pkgPath = resolve(packagesDir, dir.name, 'package.json');
       try {
         const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-        packages[pkg.name] = pkg.version;
+        if (pkg.version) {
+          packages[pkg.name] = pkg.version;
+        }
       } catch (err) {
+        // eslint-disable-next-line no-console
         console.error(`Error reading ${dir.name}/package.json:`, err);
       }
     }
 
     return packages;
   } catch (err) {
+    // eslint-disable-next-line no-console
     console.error('Error reading packages directory:', err);
     process.exit(1);
   }
@@ -78,14 +82,17 @@ function getPackageInfo() {
 const pkgInfo = getPackageInfo();
 
 const message = pkgInfo.versions
-  ? `${styles.text(MESSAGES.workspace.text)}\n\n` +
-  `${styles.header(MESSAGES.workspace.header)}\n` +
-  Object.entries(pkgInfo.versions)
-    .map(([pkg, version]) => `${styles.dim(pkg.padEnd(12))}${styles.version(`v${version}`)}`)
+  ? `${styles.text(MESSAGES.workspace.text)}\n\n${styles.header(MESSAGES.workspace.header)}\n${Object.entries(pkgInfo.versions).sort(([a], [b]) => a.localeCompare(b))
+    .map(([pkg, version], index, array) => {
+      const prevPkg = index > 0 ? array[index - 1][0] : '';
+      const needsSpace = prevPkg.startsWith('@') && pkg === 'react-scan';
+      return `${needsSpace ? '\n' : ''}${styles.dim(pkg.padEnd(32))}${styles.version(`v${version}`)}`;
+    })
     .join('\n')
-  : `${styles.text(MESSAGES.package.text)}\n\n` +
-  `${styles.dim(pkgInfo.name.padEnd(12))}${styles.version(`v${pkgInfo.version}`)}`;
+  }`
+  : `${styles.text(MESSAGES.package.text)}\n\n${styles.dim(pkgInfo.name.padEnd(12))}${styles.version(`v${pkgInfo.version}`)}`;
 
+// eslint-disable-next-line no-console
 console.log(boxen(message, {
   padding: 1,
   margin: 1,