@evershop/evershop 2.1.0 → 2.1.2

package/dist/lib/webpack/dev/createConfigClient.js

@@ -2,34 +2,61 @@ import path from 'path';
 import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 import webpack from 'webpack';
 import { getEnabledExtensions } from '../../../bin/extension/index.js';
-import { getComponentsByRoute } from '../../componee/getComponentsByRoute.js';
 import { CONSTANTS } from '../../helpers.js';
 import { createBaseConfig } from '../createBaseConfig.js';
 import { GraphqlPlugin } from '../plugins/GraphqlPlugin.js';
+import { InjectTailwindSources } from '../plugins/InjectTailwindSources.js';
 import { ThemeWatcherPlugin } from '../plugins/ThemeWatcherPlugin.js';
-export function createConfigClient(route, tailwindConfig) {
+import { getTailwindSources } from '../util/getTailwindSources.js';
+export function createConfigClient(isAdmin = false) {
     const extensions = getEnabledExtensions();
+    const tailwindSources = getTailwindSources();
     const config = createBaseConfig(false);
-    config.name = route.id;
+    config.name = isAdmin ? 'bundle-client-admin' : 'bundle-client-frontstore';
+    // Set different output filenames for admin and frontstore to avoid conflicts
+    config.output.filename = isAdmin ? 'admin-[name].js' : '[name].js';
+    config.output.publicPath = isAdmin ? '/backend/' : '/';
     const loaders = config.module.rules;
     loaders.unshift({
         test: /common[\\/]react[\\/]client[\\/]Index\.js$/i,
         use: [
             {
                 loader: path.resolve(CONSTANTS.LIBPATH, 'webpack/loaders/AreaLoader.js'),
+                options: { isAdmin }
+            }
+        ]
+    });
+    loaders.push({
+        test: /\.css$/i,
+        use: [
+            {
+                loader: 'style-loader'
+            },
+            {
+                loader: 'css-loader',
+                options: {
+                    url: false
+                }
+            },
+            {
+                loader: 'postcss-loader',
                 options: {
-                    getComponents: () => getComponentsByRoute(route),
-                    route
+                    postcssOptions: {
+                        plugins: [
+                            InjectTailwindSources(tailwindSources),
+                            '@tailwindcss/postcss',
+                            'autoprefixer'
+                        ]
+                    }
                 }
             }
         ]
     });
     loaders.push({
-        test: /\.(css|scss)$/i,
+        test: /\.scss$/i,
         use: [
             {
-                loader: 'style-loader',
-                options: {}
+                loader: 'style-loader'
             },
             {
                 loader: 'css-loader',
@@ -42,12 +69,8 @@ export function createConfigClient(route, tailwindConfig) {
                 options: {
                     postcssOptions: {
                         plugins: [
-                            [
-                                'tailwindcss',
-                                {
-                                    config: tailwindConfig
-                                }
-                            ],
+                            InjectTailwindSources(tailwindSources),
+                            '@tailwindcss/postcss',
                             'autoprefixer'
                         ]
                     }
@@ -62,19 +85,8 @@ export function createConfigClient(route, tailwindConfig) {
             }
         ]
     });
-    loaders.push({
-        test: /Client\.js$/,
-        use: [
-            {
-                loader: path.resolve(CONSTANTS.LIBPATH, 'webpack/loaders/GraphQLAPILoader.js'),
-                options: {
-                    isAdmin: route.isAdmin
-                }
-            }
-        ]
-    });
     const { plugins } = config;
-    plugins.push(new GraphqlPlugin(route));
+    plugins.push(new GraphqlPlugin(isAdmin));
     plugins.push(new webpack.ProgressPlugin());
     plugins.push(new webpack.HotModuleReplacementPlugin());
     plugins.push(new ReactRefreshWebpackPlugin({
@@ -82,11 +94,11 @@ export function createConfigClient(route, tailwindConfig) {
     }));
     plugins.push(new ThemeWatcherPlugin());
     config.entry = () => {
-        const entry = {};
-        entry[route.id] = [
-            ...getComponentsByRoute(route),
+        const entry = [
             path.resolve(CONSTANTS.MODULESPATH, '../components/common/react/client/Index.js'),
-            `webpack-hot-middleware/client?path=/eHot/${route.id}&reload=true&overlay=true`
+            isAdmin
+                ? `webpack-hot-middleware/client?path=/__webpack_hmr_admin&reload=true&overlay=true`
+                : `webpack-hot-middleware/client?path=/__webpack_hmr_frontstore&reload=true&overlay=true`
         ];
         return entry;
     };

package/dist/lib/webpack/dev/createConfigClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createConfigClient.js","sourceRoot":"","sources":["../../../../src/lib/webpack/dev/createConfigClient.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"createConfigClient.js","sourceRoot":"","sources":["../../../../src/lib/webpack/dev/createConfigClient.js"],"names":[],"mappings":"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"}

package/dist/lib/webpack/isBuildRequired.js

@@ -1,5 +1,8 @@
 export const isBuildRequired = (route) => {
-    if ((route === null || route === void 0 ? void 0 : route.isApi) || ['staticAsset', 'adminStaticAsset'].includes(route.id)) {
+    if (!route) {
+        return false;
+    }
+    if (route.isApi || ['staticAsset', 'adminStaticAsset'].includes(route.id)) {
         return false;
     }
     else {

package/dist/lib/webpack/isBuildRequired.js.map

@@ -1 +1 @@
-{"version":3,"file":"isBuildRequired.js","sourceRoot":"","sources":["../../../src/lib/webpack/isBuildRequired.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IAC9C,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,KAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"isBuildRequired.js","sourceRoot":"","sources":["../../../src/lib/webpack/isBuildRequired.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;QAC1E,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}

package/dist/lib/webpack/loaders/AreaLoader.js

@@ -3,16 +3,13 @@ import { pathToFileURL } from 'url';
 import { inspect } from 'util';
 import JSON5 from 'json5';
 import { getEnabledWidgets } from '../../../lib/widget/widgetManager.js';
+import { getAllRouteComponents } from '../../componee/getComponentsByRoute.js';
 import { error } from '../../log/logger.js';
-import { generateComponentKey } from '../util/keyGenerator.js';
-export default function AreaLoader(c) {
-    this.cacheable(false);
-    const components = this.getOptions().getComponents();
-    const { route } = this.getOptions();
+import { getRoutes } from '../../router/Router.js';
+import { generateComponentKey } from '../../util/keyGenerator.js';
+function buildComponentsPerRoute(components, imports) {
     const areas = {};
-    const imports = [];
     components.forEach((module) => {
-        this.addDependency(module);
         if (!fs.existsSync(module)) {
             return;
         }
@@ -29,7 +26,13 @@ export default function AreaLoader(c) {
                 const layout = JSON5.parse(check);
                 const id = generateComponentKey(module);
                 const url = pathToFileURL(module).toString();
-                imports.push(`import ${id} from '${url}';`);
+                // Check if this import already exists by url
+                // Get all key of current imports
+                const keys = Array.from(imports.keys());
+                const exists = keys.find((key) => key.url === url);
+                if (!exists) {
+                    imports.set({ id, url }, `import ${id} from '${url}';`);
+                }
                 areas[layout.areaId] = areas[layout.areaId] || {};
                 areas[layout.areaId][id] = {
                     id,
@@ -45,27 +48,59 @@ export default function AreaLoader(c) {
             }
         }
     });
-    const widgets = getEnabledWidgets();
-    areas['*'] = areas['*'] || {};
+    return areas;
+}
+const buildWidgetComponentsPerRoute = (route, widgets, imports) => {
+    const components = {};
     widgets.forEach((widget) => {
-        const url = pathToFileURL(route.isAdmin ? widget.settingComponent : widget.component).toString();
-        imports.push(`import ${widget.type} from '${url}';`);
-        areas['*'][widget.type] = {
-            id: widget.type,
+        const componentPath = route.isAdmin
+            ? widget.settingComponent
+            : widget.component;
+        const url = pathToFileURL(componentPath).toString();
+        // Check if this import already exists by url
+        // Get all key of current imports
+        const keys = Array.from(imports.keys());
+        const exists = keys.find((key) => key.url === url);
+        const id = generateComponentKey(route.isAdmin ? `admin_widget_${widget.type}` : `widget_${widget.type}`);
+        if (!exists) {
+            imports.set({ id: id, url }, `import ${id} from '${url}';`);
+        }
+        components[id] = {
+            id: id,
             sortOrder: widget.sortOrder || 0,
             component: {
-                default: `---${widget.type}---`
+                default: `---${id}---`
             }
         };
     });
-    const content = `${imports.join('\r\n')}\r\nArea.defaultProps.components = ${inspect(areas, { depth: 5 })
+    return components;
+};
+export default function AreaLoader(c) {
+    const isAdmin = this.getOptions().isAdmin;
+    this.cacheable(false);
+    const components = getAllRouteComponents(isAdmin);
+    const routes = getRoutes().filter((route) => route.isApi === false && route.isAdmin === isAdmin);
+    const allRootComponents = {};
+    const widgets = getEnabledWidgets();
+    const imports = new Map(); // This map has a key as an object {id, url} to avoid duplicate imports
+    try {
+        Object.keys(components).forEach((routeId) => {
+            allRootComponents[routeId] = buildComponentsPerRoute(components[routeId], imports);
+            const route = routes.find((r) => r.id === routeId);
+            const widgetComponents = buildWidgetComponentsPerRoute(route, widgets, imports);
+            Object.assign(allRootComponents[routeId], { '*': widgetComponents });
+        });
+    }
+    catch (e) {
+        error('Error in AreaLoader:');
+        error(e);
+    }
+    const content = `${Array.from(imports.values()).join('\r\n')}\r\nconst components = ${inspect(allRootComponents, { depth: 5 })
         .replace(/"---/g, '')
         .replace(/---"/g, '')
         .replace(/'---/g, '')
-        .replace(/---'/g, '')} ;`;
-    const result = c
-        .replace('/** render */', content)
-        .replace('/eHot', `/eHot/${route.id}`);
+        .replace(/---'/g, '')}\r\nArea.defaultProps.components = components[window.eContext.config.pageMeta.route.id] ;\r\n`;
+    const result = c.replace('/** render */', content);
     return result;
 }
 //# sourceMappingURL=AreaLoader.js.map

package/dist/lib/webpack/loaders/AreaLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"AreaLoader.js","sourceRoot":"","sources":["../../../../src/lib/webpack/loaders/AreaLoader.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"AreaLoader.js","sourceRoot":"","sources":["../../../../src/lib/webpack/loaders/AreaLoader.js"],"names":[],"mappings":"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"}

package/dist/lib/webpack/plugins/GraphqlPlugin.d.ts

@@ -1,7 +1,6 @@
 export const GraphqlPlugin: {
-    new (route: any, outputFile?: undefined): {
-        route: any;
-        outputFile: string;
+    new (isAdmin?: boolean): {
+        isAdmin: boolean;
         query: {};
         fragments: {};
         variables: any[];

package/dist/lib/webpack/plugins/GraphqlPlugin.js

@@ -1,9 +1,8 @@
-import { getComponentsByRoute } from '../../componee/getComponentsByRoute.js';
+import { getAllRouteComponents, getComponentsByRoute } from '../../componee/getComponentsByRoute.js';
 import { parseGraphql } from '../util/parseGraphql.js';
 export const GraphqlPlugin = class GraphqlPlugin {
-    constructor(route, outputFile = undefined) {
-        this.route = route;
-        this.outputFile = outputFile || 'query.graphql';
+    constructor(isAdmin = false) {
+        this.isAdmin = isAdmin;
         this.query = {};
         this.fragments = {};
         this.variables = [];
@@ -13,8 +12,13 @@ export const GraphqlPlugin = class GraphqlPlugin {
         const { RawSource } = webpack.sources;
         compiler.hooks.thisCompilation.tap('GraphqlPlugin', (compilation) => {
             // TODO: Can we get list of module without calling getComponentsByRoute again?
-            const components = getComponentsByRoute(this.route);
-            compilation.emitAsset(this.outputFile, new RawSource(JSON.stringify(parseGraphql(components))));
+            const components = getAllRouteComponents(this.isAdmin);
+            // Store one file per route instead of a single file
+            Object.keys(components).forEach((routeId) => {
+                const routeGraphqlQueries = parseGraphql(components[routeId]);
+                const filename = `query-${routeId}.graphql`;
+                compilation.emitAsset(filename, new RawSource(JSON.stringify(routeGraphqlQueries, null, 2)));
+            });
         });
     }
 };

package/dist/lib/webpack/plugins/GraphqlPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"GraphqlPlugin.js","sourceRoot":"","sources":["../../../../src/lib/webpack/plugins/GraphqlPlugin.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,aAAa;IAC9C,YAAY,KAAK,EAAE,UAAU,GAAG,SAAS;QACvC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC;QAChD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAEtC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,WAAW,EAAE,EAAE;YAClE,8EAA8E;YAC9E,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpD,WAAW,CAAC,SAAS,CACnB,IAAI,CAAC,UAAU,EACf,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CACxD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"GraphqlPlugin.js","sourceRoot":"","sources":["../../../../src/lib/webpack/plugins/GraphqlPlugin.js"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,aAAa;IAC9C,YAAY,OAAO,GAAG,KAAK;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAEtC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,WAAW,EAAE,EAAE;YAClE,8EAA8E;YAC9E,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEvD,oDAAoD;YACpD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC1C,MAAM,mBAAmB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9D,MAAM,QAAQ,GAAG,SAAS,OAAO,UAAU,CAAC;gBAE5C,WAAW,CAAC,SAAS,CACnB,QAAQ,EACR,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAC5D,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/lib/webpack/plugins/InjectTailwindSources.d.ts

@@ -0,0 +1,8 @@
+declare const InjectTailwindSources: (sources: any) => {
+    (): {
+        postcssPlugin: string;
+        Once(root: any): void;
+    };
+    postcss: boolean;
+};
+export { InjectTailwindSources };

package/dist/lib/webpack/plugins/InjectTailwindSources.js

@@ -0,0 +1,23 @@
+// Inject Tailwind @source directives for Tailwind v4
+const InjectTailwindSources = (sources) => {
+    const uniqueSources = Array.from(new Set(sources));
+    const plugin = () => ({
+        postcssPlugin: 'inject-tailwind-sources',
+        Once(root) {
+            // Only inject if this CSS imports Tailwind
+            const hasTailwindImport = root.nodes.some((node) => node.type === 'atrule' &&
+                node.name === 'import' &&
+                node.params.includes('tailwindcss'));
+            if (!hasTailwindImport)
+                return;
+            // Prepend @source entries so Tailwind scans the intended files
+            uniqueSources.forEach((src) => {
+                root.prepend(`@source "${src}";`);
+            });
+        }
+    });
+    plugin.postcss = true;
+    return plugin;
+};
+export { InjectTailwindSources };
+//# sourceMappingURL=InjectTailwindSources.js.map

package/dist/lib/webpack/plugins/InjectTailwindSources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InjectTailwindSources.js","sourceRoot":"","sources":["../../../../src/lib/webpack/plugins/InjectTailwindSources.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,MAAM,qBAAqB,GAAG,CAAC,OAAO,EAAE,EAAE;IACxC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC;QACpB,aAAa,EAAE,yBAAyB;QACxC,IAAI,CAAC,IAAI;YACP,2CAA2C;YAC3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CACvC,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,QAAQ;gBACtB,IAAI,CAAC,IAAI,KAAK,QAAQ;gBACtB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CACtC,CAAC;YAEF,IAAI,CAAC,iBAAiB;gBAAE,OAAO;YAE/B,+DAA+D;YAC/D,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5B,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;IACH,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC"}

package/dist/lib/webpack/plugins/Tailwindcss.d.ts

@@ -1,14 +1,14 @@
 import webpack from 'webpack';
 import { Route } from '../../../types/route.js';
 type WebpackCompiler = webpack.Compiler;
+type WebpackCompilation = webpack.Compilation;
 type WebpackAssets = webpack.Compilation['assets'];
 export declare class Tailwindcss {
     private route;
     constructor(route: Route);
     apply(compiler: WebpackCompiler): void;
-    processRouteAssets(assets: WebpackAssets): Promise<void>;
-    getRouteJSContent(assets: WebpackAssets, route: Route): string;
+    processRouteAssetsAfterEmit(compilation: WebpackCompilation): Promise<void>;
     getRouteCSSAssets(assets: WebpackAssets, route: Route): string[];
-    processCSSWithTailwind(cssAssetName: string, jsContent: string, route: Route, assets: WebpackAssets): Promise<void>;
+    processCSSWithTailwindFromDisk(cssAssetName: string, outputPath: string): Promise<void>;
 }
 export {};

package/dist/lib/webpack/plugins/Tailwindcss.js

@@ -1,55 +1,36 @@
+import fs from 'fs';
+import path from 'path';
+import tailwindcss from '@tailwindcss/postcss';
 import CleanCSS from 'clean-css';
 import postcss from 'postcss';
-import tailwindcss from 'tailwindcss';
-import webpack from 'webpack';
 import { error } from '../../log/logger.js';
-import { getTailwindConfig } from '../util/getTailwindConfig.js';
-const { Compilation, sources } = webpack;
 export class Tailwindcss {
     constructor(route) {
         this.route = route;
     }
     apply(compiler) {
-        compiler.hooks.compilation.tap('Tailwindcss', (compilation) => {
-            compilation.hooks.processAssets.tapAsync({
-                name: 'Tailwindcss',
-                stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_INLINE
-            }, async (assets, callback) => {
-                try {
-                    await this.processRouteAssets(assets);
-                    callback();
-                }
-                catch (err) {
-                    callback(err);
-                }
-            });
+        compiler.hooks.afterEmit.tapAsync('Tailwindcss', async (compilation, callback) => {
+            try {
+                await this.processRouteAssetsAfterEmit(compilation);
+                callback();
+            }
+            catch (err) {
+                callback(err);
+            }
         });
     }
-    async processRouteAssets(assets) {
+    async processRouteAssetsAfterEmit(compilation) {
+        const outputPath = compilation.outputOptions.path;
+        if (!outputPath) {
+            return;
+        }
         const processingPromises = [];
-        const routeJSContent = this.getRouteJSContent(assets, this.route);
-        const routeCSSAssets = this.getRouteCSSAssets(assets, this.route);
+        const routeCSSAssets = this.getRouteCSSAssets(compilation.assets, this.route);
         for (const cssAsset of routeCSSAssets) {
-            processingPromises.push(this.processCSSWithTailwind(cssAsset, routeJSContent, this.route, assets));
+            processingPromises.push(this.processCSSWithTailwindFromDisk(cssAsset, outputPath));
         }
         await Promise.all(processingPromises);
     }
-    getRouteJSContent(assets, route) {
-        let combinedJSContent = '';
-        const jsFiles = Object.keys(assets).filter((name) => {
-            // Normalize path separators for cross-platform compatibility
-            const normalizedName = name.replace(/\\/g, '/');
-            return ((normalizedName.includes(route.id + '/') ||
-                /^\d/.test(normalizedName)) &&
-                normalizedName.endsWith('.js'));
-        });
-        for (const jsFile of jsFiles) {
-            const source = assets[jsFile].source();
-            combinedJSContent +=
-                typeof source === 'string' ? source : source.toString();
-        }
-        return combinedJSContent;
-    }
     getRouteCSSAssets(assets, route) {
         const results = Object.keys(assets).filter((name) => {
             // Normalize path separators for cross-platform compatibility
@@ -60,30 +41,47 @@ export class Tailwindcss {
         });
         return results;
     }
-    async processCSSWithTailwind(cssAssetName, jsContent, route, assets) {
-        const originalCSSSource = assets[cssAssetName].source();
-        const originalCSS = typeof originalCSSSource === 'string'
-            ? originalCSSSource
-            : originalCSSSource.toString();
-        const tailwindDirectives = `
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-`;
-        const cssWithDirectives = tailwindDirectives + originalCSS;
-        const tailwindConfig = await getTailwindConfig(route.isAdmin);
-        Object.assign(tailwindConfig, {
-            content: [{ raw: jsContent, extension: 'js' }]
-        });
+    async processCSSWithTailwindFromDisk(cssAssetName, outputPath) {
+        const cssFilePath = path.resolve(outputPath, cssAssetName);
+        // Read the CSS file from disk
+        if (!fs.existsSync(cssFilePath)) {
+            error(`CSS file not found: ${cssFilePath}`);
+            return;
+        }
+        const originalCSS = fs.readFileSync(cssFilePath, 'utf-8');
+        // Process CSS with Tailwind
+        let processedCSS = originalCSS;
+        if (cssAssetName.includes(this.route.id)) {
+            // Get the directory where the CSS file is located
+            const cssDir = path.dirname(cssFilePath);
+            // Find all JS files in the same directory (already on disk)
+            const jsFiles = fs
+                .readdirSync(cssDir)
+                .filter((file) => file.endsWith('.js'));
+            if (jsFiles.length === 0) {
+                error(`No JS files found in ${cssDir}`);
+                return;
+            }
+            // Reference the JS files for Tailwind scanning
+            const sourceDirectives = jsFiles
+                .map((file) => `@source "./${file}";`)
+                .join('\n');
+            processedCSS = `${sourceDirectives}
+${originalCSS}`;
+        }
         try {
-            const result = await postcss([tailwindcss(tailwindConfig)]).process(cssAssetName.includes(route.id) ? cssWithDirectives : originalCSS, { from: undefined });
+            // Process with Tailwind
+            const result = await postcss([tailwindcss()]).process(processedCSS, {
+                from: cssFilePath
+            });
+            // Minify the result
             const cleanCSS = new CleanCSS({
-                level: 2, // Advanced optimizations
+                level: 2,
                 returnPromise: true
             });
             const minified = await cleanCSS.minify(result.css);
-            assets[cssAssetName] = new sources.RawSource(minified.styles);
+            // Write the processed CSS back to disk
+            fs.writeFileSync(cssFilePath, minified.styles, 'utf-8');
         }
         catch (e) {
             error(e);

package/dist/lib/webpack/plugins/Tailwindcss.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tailwindcss.js","sourceRoot":"","sources":["../../../../src/lib/webpack/plugins/Tailwindcss.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Tailwindcss.js","sourceRoot":"","sources":["../../../../src/lib/webpack/plugins/Tailwindcss.ts"],"names":[],"mappings":"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"}