Unread chats tab

.scripts/add-catalogs.js

@@ -0,0 +1,96 @@
+const fs = require('fs')
+const path = require('path')
+const YAML = require('yaml')
+const { execSync } = require('child_process')
+
+const scriptDir = path.resolve(__dirname)
+const rootDir = path.resolve(scriptDir, '..')
+const workspaceConfigPath = path.join(rootDir, 'pnpm-workspace.yaml')
+
+const loadWorkspaceCatalogs = () => {
+  const workspaceContent = fs.readFileSync(workspaceConfigPath, 'utf8')
+  const workspaceConfig = YAML.parse(workspaceContent)
+  const rootCatalog = workspaceConfig.catalog || {}
+  const catalogs = workspaceConfig.catalogs || {}
+
+  return { rootCatalog, catalogs }
+}
+
+const getCatalogNameForDependency = (dependency, catalogs) => {
+  for (const [catalogName, catalogDeps] of Object.entries(catalogs)) {
+    if (catalogDeps[dependency]) {
+      return catalogName
+    }
+  }
+  return null
+}
+
+const replaceVersionsWithCatalogs = (packageJsonPath, rootCatalog, catalogs) => {
+  const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf8')
+  const packageJson = JSON.parse(packageJsonContent)
+
+  ;['dependencies', 'devDependencies', 'peerDependencies', 'resolutions'].forEach(
+    (dependencyType) => {
+      if (packageJson[dependencyType]) {
+        Object.keys(packageJson[dependencyType]).forEach((dependency) => {
+          const version = packageJson[dependencyType][dependency]
+
+          if (!version.startsWith('catalog:')) {
+            let catalogVersion = null
+
+            if (rootCatalog[dependency]) {
+              catalogVersion = 'catalog:'
+            } else {
+              const catalogName = getCatalogNameForDependency(dependency, catalogs)
+              if (catalogName) {
+                catalogVersion = `catalog:${catalogName}`
+              }
+            }
+
+            if (catalogVersion) {
+              packageJson[dependencyType][dependency] = catalogVersion
+            }
+          }
+        })
+      }
+    },
+  )
+
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n')
+}
+
+const updatePackagesDependencies = (selectedPackages) => {
+  const { rootCatalog, catalogs } = loadWorkspaceCatalogs()
+  const packagesPath = path.join(rootDir, 'packages')
+  const packageFolders = fs.readdirSync(packagesPath)
+
+  const foldersToProcess =
+    selectedPackages.length > 0
+      ? packageFolders.filter((folder) => selectedPackages.includes(folder))
+      : packageFolders
+
+  foldersToProcess.forEach((folder) => {
+    const packageJsonPath = path.join(packagesPath, folder, 'package.json')
+    if (fs.existsSync(packageJsonPath)) {
+      replaceVersionsWithCatalogs(packageJsonPath, rootCatalog, catalogs)
+    }
+  })
+}
+
+const selectedPackages = process.argv.slice(2)
+updatePackagesDependencies(selectedPackages)
+console.log(
+  'Dependencies have been replaced with catalog references successfully. Be sure to double-check the changes made. 😉',
+)
+
+console.log('Regenerating pnpm-lock.yaml...')
+try {
+  execSync('pnpm install --lockfile-only', { stdio: 'inherit', cwd: rootDir })
+  console.log('pnpm-lock.yaml has been successfully regenerated.')
+} catch (error) {
+  console.error('An error occurred while regenerating pnpm-lock.yaml:', error)
+}
+
+console.log(
+  'The catalog references are now set. Remember to ensure these changes are appropriate before committing.',
+)

replace-catalogs.js → .scripts/replace-catalogs.js

@@ -3,7 +3,9 @@ const path = require('path')
 const YAML = require('yaml')
 const { execSync } = require('child_process')
 
-const workspaceConfigPath = path.resolve(__dirname, 'pnpm-workspace.yaml')
+const scriptDir = path.resolve(__dirname)
+const rootDir = path.resolve(scriptDir, '..')
+const workspaceConfigPath = path.join(rootDir, 'pnpm-workspace.yaml')
 
 const loadWorkspaceCatalogs = () => {
   const workspaceContent = fs.readFileSync(workspaceConfigPath, 'utf8')
@@ -18,34 +20,37 @@ const replaceCatalogDependencies = (packageJsonPath, rootCatalog, catalogs) => {
   const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf8')
   const packageJson = JSON.parse(packageJsonContent)
 
-  ;['dependencies', 'devDependencies', 'peerDependencies', 'resolutions'].forEach((depType) => {
-    if (packageJson[depType]) {
-      Object.keys(packageJson[depType]).forEach((dep) => {
-        const version = packageJson[depType][dep]
-        if (version.startsWith('catalog:')) {
-          const catalogName = version.split(':')[1]
+  ;['dependencies', 'devDependencies', 'peerDependencies', 'resolutions'].forEach(
+    (dependencyType) => {
+      if (packageJson[dependencyType]) {
+        Object.keys(packageJson[dependencyType]).forEach((dependency) => {
+          const version = packageJson[dependencyType][dependency]
+          if (version.startsWith('catalog:')) {
+            const catalogName = version.split(':')[1]
 
-          let resolvedVersion =
-            rootCatalog[dep] || (catalogs[catalogName] && catalogs[catalogName][dep])
+            let resolvedVersion =
+              rootCatalog[dependency] ||
+              (catalogs[catalogName] && catalogs[catalogName][dependency])
 
-          if (resolvedVersion) {
-            packageJson[depType][dep] = resolvedVersion
-          } else {
-            console.warn(
-              `Could not find a matching version for ${dep} in catalog "${catalogName}" or root catalog.`,
-            )
+            if (resolvedVersion) {
+              packageJson[dependencyType][dependency] = resolvedVersion
+            } else {
+              console.warn(
+                `Could not find a matching version for ${dependency} in catalog "${catalogName}" or root catalog.`,
+              )
+            }
           }
-        }
-      })
-    }
-  })
+        })
+      }
+    },
+  )
 
   fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n')
 }
 
 const updatePackagesDependencies = (selectedPackages) => {
   const { rootCatalog, catalogs } = loadWorkspaceCatalogs()
-  const packagesPath = path.resolve(__dirname, 'packages')
+  const packagesPath = path.join(rootDir, 'packages')
   const packageFolders = fs.readdirSync(packagesPath)
 
   const foldersToProcess =
@@ -69,7 +74,7 @@ console.log(
 
 console.log('Regenerating pnpm-lock.yaml...')
 try {
-  execSync('pnpm install --lockfile-only', { stdio: 'inherit' })
+  execSync('pnpm install --lockfile-only', { stdio: 'inherit', cwd: rootDir })
   console.log('pnpm-lock.yaml has been successfully regenerated.')
 } catch (error) {
   console.error('An error occurred while regenerating pnpm-lock.yaml:', error)

README.md

@@ -115,10 +115,10 @@ If you need to install a package version that hasn't been published yet, follow
 
   ```bash
   # will replace catalogs for utils and authentication packages
-  node replace-catalogs.js utils authentication
+  pnpm replace-catalogs utils authentication
 
   # will replace catalogs for all packages
-  node replace-catalogs.js
+  pnpm replace-catalogs
   ```
 
 2. **Commit and Push**:
@@ -141,13 +141,29 @@ If you need to install a package version that hasn't been published yet, follow
   "@baseapp-frontend/components": "git+https://github.com/silverlogic/baseapp-frontend.git#<commit-hash>&path:packages/components",
   ```
 
-5. **Undo Changes and Merge**:
+5. **Restore Catalog Entries and Merge**:
 
-  Once you’ve finished testing or using the non-published version, undo the commit that removed the catalogs. You can now proceed with merging and publishing the changes.
+  Once you’ve finished testing or using the non-published version, you can restore the catalog entries in one of two ways:
 
-  ```bash
-  git revert <commit-hash>
-  ```
+  - Option 1: Revert the Commit
+
+    Revert the commit that removed the catalogs to restore them to their previous state:
+
+    ```bash
+    git revert <commit-hash>
+    ```
+    This will effectively undo the catalog removal and bring back the original entries.
+
+  - Option 2: Run the `add-catalogs` script
+
+    Run the `add-catalogs` script to reapply catalog entries without reverting the commit:
+
+    ```bash
+    pnpm add-catalogs
+    ```
+    This will update all package.json files to include catalog entries again.
+
+After using either option, proceed with committing and merging the changes
 
 ## Packages Versioning and Publishing
 

package.json

@@ -13,7 +13,8 @@
     "release": "turbo run build && changeset publish",
     "clean": "turbo clean && git clean -xdf node_modules",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
-    "replace-catalogs": "node replace-catalogs.js",
+    "add-catalogs": "node .scripts/add-catalogs.js",
+    "replace-catalogs": "node .scripts/replace-catalogs.js",
     "prepare": "husky"
   },
   "devDependencies": {

packages/authentication/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @baseapp-frontend/authentication
 
+## 4.0.2
+
+### Patch Changes
+
+- asd
+- Updated dependencies
+  - @baseapp-frontend/utils@3.0.4
+
 ## 4.0.1
 
 ### Patch Changes

packages/authentication/modules/user/useJWTUser/index.ts

@@ -41,12 +41,10 @@
   })
 
   useEffect(() => {
-    console.log('useJWTUser error:', query.error) // Check if this gets printed
     if ((query.error as any)?.response?.status === 401) {
-      console.log('useJWTUser 401 error triggered')
       queryClient.resetQueries({ queryKey: USER_API_KEY.getUser() })
     }
   }, [query.error])
 
   return { user, ...query }
 }

packages/authentication/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@baseapp-frontend/authentication",
   "description": "Authentication modules.",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "main": "./index.ts",
   "types": "dist/index.d.ts",
   "sideEffects": false,

packages/components/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @baseapp-frontend/components
 
+## 0.0.20
+
+### Patch Changes
+
+- Add Active Tab functionality to the `messages` module.
+- Several tweaks on the messages modules in general.
+- Adapt `ChatRoomListItem` so it uses a fragment.
+- Add `ViewportHeightContainer` component and make sure `MainCointainer` uses variables from the navigation's constants.
+- Updated dependencies
+  - @baseapp-frontend/authentication@4.0.2
+  - @baseapp-frontend/design-system@0.0.21
+  - @baseapp-frontend/graphql@1.1.12
+  - @baseapp-frontend/utils@3.0.4
+
 ## 0.0.19
 
 ### Patch Changes