adminforth 1.3.54-next.10 → 1.3.54-next.12

package/dist/modules/codeInjector.js

@@ -478,12 +478,20 @@ class CodeInjector {
                 process.env.HEAVY_DEBUG && console.log('🪲Hash file does not exist, proceeding with npm ci/install');
             }
             yield this.runNpmShell({ command: 'ci', cwd: CodeInjector.SPA_TMP_PATH });
-            if (iconPackageNames.length) {
-                const npmInstallCommand = `install ${[
-                    ...iconPackageNames,
-                    ...usersPackages,
-                    ...pluginPackages.map(({ packages }) => packages.join(' ')),
-                ].join(' ')}`;
+            const allPacks = [
+                ...iconPackageNames,
+                ...usersPackages,
+                ...pluginPackages.map(({ packages }) => packages.join(' ')),
+            ];
+            const EXCLUDE_PACKS = ['@iconify-prerendered/vue-flowbite'];
+            const allPacksFiltered = allPacks.filter((pack) => {
+                // split at last @ because of scoped packages
+                const packName = pack.split('@').slice(0, -1).join('@');
+                return !EXCLUDE_PACKS.includes(packName);
+            });
+            const allPacksUnique = Array.from(new Set(allPacksFiltered));
+            if (allPacks.length) {
+                const npmInstallCommand = `install ${allPacksUnique.join(' ')}`;
                 yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
             }
             yield fs.promises.writeFile(hashPath, fullHash);

package/modules/codeInjector.ts

@@ -551,13 +551,23 @@ class CodeInjector implements ICodeInjector {
     }
 
     await this.runNpmShell({command: 'ci', cwd: CodeInjector.SPA_TMP_PATH});
-    
-    if (iconPackageNames.length) {
-      const npmInstallCommand = `install ${[
-        ...iconPackageNames,
-        ...usersPackages, 
-        ...pluginPackages.map(({ packages }) => packages.join(' ')),
-      ].join(' ')}`;
+
+    const allPacks = [
+      ...iconPackageNames,
+      ...usersPackages, 
+      ...pluginPackages.map(({ packages }) => packages.join(' ')),
+    ];
+    const EXCLUDE_PACKS = ['@iconify-prerendered/vue-flowbite'];
+
+    const allPacksFiltered = allPacks.filter((pack) => {
+      // split at last @ because of scoped packages
+      const packName = pack.split('@').slice(0, -1).join('@');
+      return !EXCLUDE_PACKS.includes(packName);
+    })
+    const allPacksUnique = Array.from(new Set(allPacksFiltered));
+
+    if (allPacks.length) {
+      const npmInstallCommand = `install ${allPacksUnique.join(' ')}`;
       await this.runNpmShell({command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH});
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.3.54-next.10",
+  "version": "1.3.54-next.12",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/renderers/CompactUUID.vue

@@ -21,7 +21,7 @@ import { initFlowbite } from 'flowbite';
 const visualValue = computed(() => {
   // if lenght is more then 8, show only first 4 and last 4 characters, ... in the middle
   const val = props.record[props.column.name];
-  if (val.length > 8) {
+  if (val && val.length > 8) {
     return `${val.substr(0, 4)}...${val.substr(val.length - 4)}`;
   }
   return val;