adminforth 2.25.0-test.2 → 2.25.0-test.4

package/commands/createApp/templates/Dockerfile.hbs

@@ -1,7 +1,7 @@
-FROM node:{{nodeMajor}}-slim
+FROM devforth/node20-pnpm:latest
 WORKDIR /code/
-ADD package.json package-lock.json /code/
-RUN npm ci  
+ADD package.json pnpm-lock.yaml pnpm-workspace.yaml /code/
+RUN pnpm i  
 ADD . /code/
-RUN npx adminforth bundle
-CMD ["sh", "-c", "npm run migrate:prod && npm run prod"]
+RUN pnpm exec adminforth bundle
+CMD ["sh", "-c", "pnpm migrate:prod && pnpm prod"]

package/commands/createApp/templates/readme.md.hbs

@@ -26,7 +26,7 @@ Open `schema.prisma` and change schema as needed: add new tables, columns, etc (
 Run the following command to generate a new migration and apply it instantly in local database:
 
 ```bash
-pnpm makemigration -- --name <name_of_changes>
+pnpm makemigration --name <name_of_changes>
 ```
 
 Your colleagues will need to pull the changes and run `pnpm migrate:local` to apply the migration in their local database.

package/commands/createApp/utils.js

@@ -317,11 +317,6 @@ async function writeTemplateFiles(dirname, cwd, options) {
       dest: 'resources/adminuser.ts',
       data: {},
     },
-    {
-      src: 'custom/package.json.hbs',
-      dest: 'custom/package.json',
-      data: {},
-    },
     {
       src: 'custom/tsconfig.json.hbs',
       dest: 'custom/tsconfig.json',

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,12 @@ export default defineConfig({
             return id.toString().split('node_modules/')[1].split('/')[0].toString();
           }
         },
+        assetFileNames: (assetInfo) => {
+          return assetInfo.name?.startsWith('.pnpm') 
+            ? assetInfo.name.replace(/^\.pnpm/, 'pnpm') 
+            : assetInfo.name;
+        },
+
       },
     },
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.25.0-test.2",
+  "version": "2.25.0-test.4",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/commands/createApp/templates/custom/package.json.hbs

@@ -1,12 +0,0 @@
-{
-  "name": "custom",
-  "version": "1.0.0",
-  "main": "index.ts",
-  "scripts": {
-      "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": ""
-}