adminforth 2.25.0-test.2 → 2.25.0-test.21

package/dist/spa/vite.config.ts

@@ -15,46 +15,6 @@ async function getNextAvailablePort(startPort: number | undefined) {
   return await portfinder.getPortPromise({ port: startPort });
 };
 
-function ignoreTailwindErrors(): Plugin {
-  return {
-    name: 'ignore-tailwind-errors',
-    configureServer(server) {
-      server.middlewares.use((req, res, next) => {
-        const originalWrite = res.write;
-        res.write = function(chunk) {
-          if (typeof chunk === 'string' && chunk.includes('tailwind')) {
-            return true;
-          }
-          return originalWrite.call(this, chunk);
-        };
-        next();
-      });
-    },
-    config(config, { command }) {
-      if (command === 'build') {
-        // Override PostCSS config for build
-        config.css = config.css || {};
-        config.css.postcss = {
-          plugins: [
-            {
-              postcssPlugin: 'ignore-tailwind-errors',
-              Once(root, helpers) {
-                try {
-                  return tailwindcss()(root, helpers);
-                } catch (error: any) {
-                  console.warn('TailwindCSS warning ignored:', error.message);
-                  return;
-                }
-              }
-            }
-          ]
-        };
-      }
-    }
-  };
-}
-
-
 const appPort = await getNextAvailablePort(5173);
 const hmrPort = await getNextAvailablePort(5273);
 console.log(`SPA port: ${appPort}. HMR port: ${hmrPort}`);
@@ -89,6 +49,26 @@ export default defineConfig({
             return id.toString().split('node_modules/')[1].split('/')[0].toString();
           }
         },
+
+        // by default servers doesnt returns dotfiles
+        // so if we'll generate file with name like ".pnpm-BLnlxqcJ.js"
+        // it won't be loaded
+        assetFileNames: (assetInfo) => {
+          return assetInfo.name?.startsWith('.pnpm') 
+            ? `assets/${assetInfo.name.replace(/^\.pnpm/, 'pnpm')}`
+            : `assets/${assetInfo.name}`;
+        },
+        
+        entryFileNames: (chunkInfo) => {
+          return chunkInfo.name?.startsWith('.pnpm') 
+            ? `assets/${chunkInfo.name.replace(/^\.pnpm/, 'pnpm')}.js`
+            : `assets/${chunkInfo.name}.js`;
+        },
+        chunkFileNames: (chunkInfo) => {
+          return chunkInfo.name?.startsWith('.pnpm') 
+            ? `assets/${chunkInfo.name.replace(/^\.pnpm/, 'pnpm')}.js`
+            : `assets/${chunkInfo.name}.js`;
+        },
       },
     },
   },

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "adminforth",
-  "version": "2.25.0-test.2",
+  "version": "2.25.0-test.21",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
-    "commands/**/*"
+    "commands/**/*",
+    "scripts/**/*"
   ],
   "bin": {
     "adminforth": "./commands/cli.js"
@@ -20,7 +21,7 @@
     "rollout-doc": "cd documentation && pnpm build && pnpm deploy",
     "docs": "typedoc",
     "--comment_postinstall": "postinstall executed after package installed in other project package and when we do pnpm i in the package",
-    "postinstall": "node -e \"const fs=require('fs');const path=require('path');const spaPath=path.join(__dirname,'dist','spa');if(fs.existsSync(spaPath) && !process.env.PNPM_INSTALL_SPA){process.env.PNPM_INSTALL_SPA=1;require('child_process').execSync('pnpm install --frozen-lockfile',{cwd:spaPath,stdio:'inherit'});console.log('installed spa dependencies');}\""
+    "postinstall": "node scripts/postinstall.js"
   },
   "release": {
     "plugins": [

package/scripts/postinstall.js

@@ -0,0 +1,25 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const nodeBinary = process.execPath;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const spaPath=path.join(__dirname,'dist','spa');
+
+const pnpmPotentionalPath=path.join(nodeBinary,'..','pnpm');
+const doesUserProjectHasPnpm = fs.existsSync(pnpmPotentionalPath)
+console.log('doesUserProjectHasPnpm', doesUserProjectHasPnpm);
+if (doesUserProjectHasPnpm) {
+  if(fs.existsSync(spaPath) && !process.env.PNPM_INSTALL_SPA){
+    process.env.PNPM_INSTALL_SPA=1;
+    require('child_process').execSync('pnpm install --frozen-lockfile',{cwd:spaPath,stdio:'inherit'});
+  }
+} else {
+  if(fs.existsSync(spaPath)){
+    process.chdir(spaPath);
+    require('child_process').execSync('npm ci',{stdio:'inherit'});
+  }
+}
+
+console.log('installed spa dependencies');