@athenna/http 5.14.0 → 5.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/http",
-  "version": "5.14.0",
+  "version": "5.16.0",
   "description": "The Athenna Http server. Built on top of fastify.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -82,13 +82,13 @@
     "@athenna/test": "^5.2.0",
     "@athenna/tsconfig": "^5.0.0",
     "@athenna/view": "^5.1.0",
+    "@athenna/vite": "^5.1.0",
     "@fastify/cors": "^10.0.1",
     "@fastify/helmet": "^13.0.0",
     "@fastify/rate-limit": "^10.2.1",
     "@fastify/static": "^8.0.3",
     "@fastify/swagger": "^9.4.0",
     "@fastify/swagger-ui": "^5.2.0",
-    "@fastify/vite": "^7.0.1",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "autocannon": "^7.15.0",

package/src/context/Response.js

@@ -100,7 +100,9 @@ export class Response {
             .createRenderer()
             .share({ request: this.request })
             .render(view, data);
-        await this.safeHeader('Content-Type', 'text/html; charset=utf-8').send(content);
+        await this.header('Content-Security-Policy', "default-src 'self' 'unsafe-inline'")
+            .safeHeader('Content-Type', 'text/html; charset=utf-8')
+            .send(content);
         this.response.body = content;
         return this;
     }

package/src/kernels/HttpKernel.d.ts

@@ -33,7 +33,7 @@ export declare class HttpKernel {
      */
     registerRTracer(trace?: boolean): Promise<void>;
     /**
-     * Register the @fastify/vite plugin in the Http server.
+     * Register the @athenna/vite plugin in the Http server.
      */
     registerVite(trace?: boolean): Promise<void>;
     /**

package/src/kernels/HttpKernel.js

@@ -22,7 +22,7 @@ const swaggerUiPlugin = await Module.safeImport('@fastify/swagger-ui');
 const rateLimitPlugin = await Module.safeImport('@fastify/rate-limit');
 const staticPlugin = await Module.safeImport('@fastify/static');
 const rTracerPlugin = await Module.safeImport('cls-rtracer');
-const vitePlugin = await Module.safeImport('@fastify/vite');
+const vitePlugin = await Module.safeImport('@athenna/vite/plugins/fastify');
 export class HttpKernel {
     /**
      * Register the @fastify/cors plugin in the Http server.
@@ -130,7 +130,7 @@ export class HttpKernel {
         await Server.plugin(rTracerPlugin.fastifyPlugin, this.getConfig('http.rTracer'));
     }
     /**
-     * Register the @fastify/vite plugin in the Http server.
+     * Register the @athenna/vite plugin in the Http server.
      */
     async registerVite(trace) {
         if (trace === false) {
@@ -142,7 +142,7 @@ export class HttpKernel {
             return;
         }
         if (!vitePlugin) {
-            debug('Not able to register vite plugin. Install @fastify/vite package.');
+            debug('Not able to register vite plugin. Install @athenna/vite package.');
             return;
         }
         await Server.plugin(vitePlugin, this.getConfig('http.vite'));

package/src/providers/HttpServerProvider.d.ts

@@ -9,6 +9,5 @@
 import { ServiceProvider } from '@athenna/ioc';
 export declare class HttpServerProvider extends ServiceProvider {
     register(): void;
-    boot(): void;
     shutdown(): Promise<void>;
 }

package/src/providers/HttpServerProvider.js

@@ -6,41 +6,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import { View } from '@athenna/view';
-import { Vite } from '#src/vite/index';
-import { EdgeError } from 'edge-error';
 import { ServiceProvider } from '@athenna/ioc';
 import { ServerImpl } from '#src/server/ServerImpl';
 export class HttpServerProvider extends ServiceProvider {
     register() {
         this.container.instance('Athenna/Core/HttpServer', new ServerImpl(Config.get('http.fastify')));
     }
-    boot() {
-        View.edge.global('vite', new Vite());
-        View.edge.registerTag({
-            tagName: 'vite',
-            seekable: true,
-            block: false,
-            compile(parser, buffer, token) {
-                /**
-                 * Ensure an argument is defined
-                 */
-                if (!token.properties.jsArg.trim()) {
-                    throw new EdgeError('Missing entrypoint name', 'E_RUNTIME_EXCEPTION', {
-                        filename: token.filename,
-                        line: token.loc.start.line,
-                        col: token.loc.start.col
-                    });
-                }
-                const parsed = parser.utils.transformAst(parser.utils.generateAST(token.properties.jsArg, token.loc, token.filename), token.filename, parser);
-                const entrypoints = parser.utils.stringify(parsed);
-                const methodCall = parsed.type === 'SequenceExpression'
-                    ? `generateEntryPointsTags${entrypoints}`
-                    : `generateEntryPointsTags(${entrypoints})`;
-                buffer.outputExpression(`(await state.vite.${methodCall}).join('\\n')`, token.filename, token.loc.start.line, false);
-            }
-        });
-    }
     async shutdown() {
         const Server = this.container.use('Athenna/Core/HttpServer');
         if (!Server) {

package/src/vite/config.d.ts

@@ -1,22 +0,0 @@
-/**
- * @athenna/http
- *
- * (c) João Lenon <lenon@athenna.io>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import type { ConfigEnv, Plugin, UserConfig } from 'vite';
-import type { PluginOptions } from '#src/types/vite/PluginOptions';
-/**
- * Resolve the `config.base` value
- */
-export declare function resolveBase(config: UserConfig, options: Required<PluginOptions>, command: 'build' | 'serve'): string;
-/**
- * Vite config hook
- */
-export declare function configHook(options: Required<PluginOptions>, userConfig: UserConfig, { command }: ConfigEnv): UserConfig;
-/**
- * Update the user vite config to match Athenna requirements.
- */
-export declare const config: (options: Required<PluginOptions>) => Plugin;

package/src/vite/config.js

@@ -1,57 +0,0 @@
-/**
- * @athenna/http
- *
- * (c) João Lenon <lenon@athenna.io>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { join } from 'node:path';
-/**
- * Resolve the `config.base` value
- */
-export function resolveBase(config, options, command) {
-    if (config.base)
-        return config.base;
-    if (command === 'build') {
-        return options.assetsUrl.endsWith('/')
-            ? options.assetsUrl
-            : options.assetsUrl + '/';
-    }
-    return '/';
-}
-/**
- * Vite config hook
- */
-export function configHook(options, userConfig, { command }) {
-    const config = {
-        publicDir: userConfig.publicDir ?? false,
-        base: resolveBase(userConfig, options, command),
-        /**
-         * Disable the vite dev server cors handling. Otherwise, it will
-         * override the cors settings defined by @fastify/cors.
-         */
-        server: { cors: userConfig.server?.cors ?? false },
-        build: {
-            assetsDir: '',
-            emptyOutDir: true,
-            manifest: userConfig.build?.manifest ?? true,
-            outDir: userConfig.build?.outDir ?? options.buildDirectory,
-            assetsInlineLimit: userConfig.build?.assetsInlineLimit ?? 0,
-            rollupOptions: {
-                input: options.entrypoints.map(entrypoint => join(userConfig.root || '', entrypoint))
-            }
-        }
-    };
-    return config;
-}
-/**
- * Update the user vite config to match Athenna requirements.
- */
-export const config = (options) => {
-    return {
-        name: 'vite-plugin-athenna:config',
-        enforce: 'post',
-        config: configHook.bind(null, options)
-    };
-};

package/src/vite/index.d.ts

@@ -1,92 +0,0 @@
-/**
- * @athenna/http
- *
- * (c) João Lenon <lenon@athenna.io>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import type { Manifest, ModuleNode } from 'vite';
-export declare class Vite {
-    /**
-     * We cache the manifest file content in production
-     * to avoid reading the file multiple times.
-     */
-    manifestCache?: Manifest;
-    /**
-     * Verify if vite is running in development mode.
-     */
-    get isViteRunning(): boolean;
-    /**
-     * Reads the file contents as JSON.
-     */
-    readFileAsJSON(filePath: string): any;
-    /**
-     * Returns a new array with unique items by the given key
-     */
-    uniqueBy<T>(array: T[], key: keyof T): T[];
-    /**
-     * Convert Record of attributes to a valid HTML string.
-     */
-    makeAttributes(attributes: Record<string, string | boolean>): string;
-    /**
-     * Generates a JSON element with a custom toString implementation.
-     */
-    generateElement(element: any): any;
-    /**
-     * Returns the script needed for the HMR working with Vite.
-     */
-    getViteHmrScript(): any;
-    /**
-     * Check if the given path is a CSS path.
-     */
-    isCssPath(path: string): boolean;
-    /**
-     * If the module is a style module.
-     */
-    isStyleModule(mod: ModuleNode): boolean;
-    /**
-     * Create a style tag for the given path
-     */
-    makeStyleTag(url: string, attributes?: any): any;
-    /**
-     * Create a script tag for the given path
-     */
-    makeScriptTag(url: string, attributes?: any): any;
-    /**
-     * Generate a HTML tag for the given asset
-     */
-    generateTag(asset: string, attributes?: any): any;
-    /**
-     * Get a chunk from the manifest file for a given file name
-     */
-    chunk(manifest: Manifest, entrypoint: string): import("vite").ManifestChunk;
-    /**
-     * Get a list of chunks for a given filename
-     */
-    chunksByFile(manifest: Manifest, file: string): import("vite").ManifestChunk[];
-    /**
-     * Generate preload tag for a given url
-     */
-    makePreloadTagForUrl(url: string): any;
-    /**
-     * Generate style and script tags for the given entrypoints
-     * Also adds the @vite/client script
-     */
-    generateEntryPointsTagsForDevMode(entryPoints: string[], attributes?: any): Promise<any[]>;
-    /**
-     * Generate style and script tags for the given entrypoints
-     * using the manifest file
-     */
-    generateEntryPointsTagsWithManifest(entryPoints: string[], attributes?: any): any[];
-    /**
-     * Generate tags for the entry points
-     */
-    generateEntryPointsTags(entryPoints: string[] | string, attributes?: any): Promise<any[]>;
-    /**
-     * Returns the manifest file contents
-     *
-     * @throws Will throw an exception when running in dev
-     */
-    manifest(): Manifest;
-}

package/src/vite/index.js

@@ -1,238 +0,0 @@
-/**
- * @athenna/http
- *
- * (c) João Lenon <lenon@athenna.io>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { File, Path } from '@athenna/common';
-const styleFileRegex = /\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\?)/;
-export class Vite {
-    /**
-     * Verify if vite is running in development mode.
-     */
-    get isViteRunning() {
-        return process.argv.includes('--vite');
-    }
-    /**
-     * Reads the file contents as JSON.
-     */
-    readFileAsJSON(filePath) {
-        return new File(filePath).getContentAsJsonSync();
-    }
-    /**
-     * Returns a new array with unique items by the given key
-     */
-    uniqueBy(array, key) {
-        const seen = new Set();
-        return array.filter(item => {
-            const k = item[key];
-            return seen.has(k) ? false : seen.add(k);
-        });
-    }
-    /**
-     * Convert Record of attributes to a valid HTML string.
-     */
-    makeAttributes(attributes) {
-        return Object.keys(attributes)
-            .map(key => {
-            const value = attributes[key];
-            if (value === true) {
-                return key;
-            }
-            if (!value) {
-                return null;
-            }
-            return `${key}="${value}"`;
-        })
-            .filter(attr => attr !== null)
-            .join(' ');
-    }
-    /**
-     * Generates a JSON element with a custom toString implementation.
-     */
-    generateElement(element) {
-        const makeAttributes = this.makeAttributes;
-        return {
-            ...element,
-            toString() {
-                const attributes = `${makeAttributes(element.attributes)}`;
-                if (element.tag === 'link') {
-                    return `<${element.tag} ${attributes}/>`;
-                }
-                return `<${element.tag} ${attributes}>${element.children.join('\n')}</${element.tag}>`;
-            }
-        };
-    }
-    /**
-     * Returns the script needed for the HMR working with Vite.
-     */
-    getViteHmrScript() {
-        return this.generateElement({
-            tag: 'script',
-            attributes: {
-                type: 'module',
-                src: '/@vite/client'
-            },
-            children: []
-        });
-    }
-    /**
-     * Check if the given path is a CSS path.
-     */
-    isCssPath(path) {
-        return path.match(styleFileRegex) !== null;
-    }
-    /**
-     * If the module is a style module.
-     */
-    isStyleModule(mod) {
-        if (this.isCssPath(mod.url) ||
-            (mod.id && /\?vue&type=style/.test(mod.id))) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Create a style tag for the given path
-     */
-    makeStyleTag(url, attributes) {
-        return this.generateElement({
-            tag: 'link',
-            attributes: { rel: 'stylesheet', href: url, ...attributes }
-        });
-    }
-    /**
-     * Create a script tag for the given path
-     */
-    makeScriptTag(url, attributes) {
-        return this.generateElement({
-            tag: 'script',
-            attributes: { type: 'module', src: url, ...attributes },
-            children: []
-        });
-    }
-    /**
-     * Generate a HTML tag for the given asset
-     */
-    generateTag(asset, attributes) {
-        let url = '';
-        if (this.isViteRunning) {
-            url = `/${asset}`;
-        }
-        else {
-            url = asset;
-        }
-        if (this.isCssPath(asset)) {
-            return this.makeStyleTag(url, attributes);
-        }
-        return this.makeScriptTag(url, attributes);
-    }
-    /**
-     * Get a chunk from the manifest file for a given file name
-     */
-    chunk(manifest, entrypoint) {
-        const chunk = manifest[entrypoint];
-        if (!chunk) {
-            throw new Error(`Cannot find "${entrypoint}" chunk in the manifest file`);
-        }
-        return chunk;
-    }
-    /**
-     * Get a list of chunks for a given filename
-     */
-    chunksByFile(manifest, file) {
-        return Object.entries(manifest)
-            .filter(([, chunk]) => chunk.file === file)
-            .map(([_, chunk]) => chunk);
-    }
-    /**
-     * Generate preload tag for a given url
-     */
-    makePreloadTagForUrl(url) {
-        const attributes = this.isCssPath(url)
-            ? { rel: 'preload', as: 'style', href: url }
-            : { rel: 'modulepreload', href: url };
-        return this.generateElement({ tag: 'link', attributes });
-    }
-    /**
-     * Generate style and script tags for the given entrypoints
-     * Also adds the @vite/client script
-     */
-    async generateEntryPointsTagsForDevMode(entryPoints, attributes) {
-        const tags = entryPoints.map(entrypoint => this.generateTag(entrypoint, attributes));
-        const viteHmr = this.getViteHmrScript();
-        const result = [viteHmr, tags];
-        return result.sort(tag => (tag.tag === 'link' ? -1 : 1));
-    }
-    /**
-     * Generate style and script tags for the given entrypoints
-     * using the manifest file
-     */
-    generateEntryPointsTagsWithManifest(entryPoints, attributes) {
-        const manifest = this.manifest();
-        const tags = [];
-        const preloads = [];
-        for (const entryPoint of entryPoints) {
-            const chunk = this.chunk(manifest, entryPoint);
-            preloads.push({ path: chunk.file });
-            tags.push({
-                path: chunk.file,
-                tag: this.generateTag(chunk.file, {
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
-                    integrity: chunk.integrity
-                })
-            });
-            for (const css of chunk.css || []) {
-                preloads.push({ path: css });
-                tags.push({ path: css, tag: this.generateTag(css) });
-            }
-            for (const importNode of chunk.imports || []) {
-                preloads.push({ path: manifest[importNode].file });
-                for (const css of manifest[importNode].css || []) {
-                    const subChunk = this.chunksByFile(manifest, css);
-                    preloads.push({ path: css });
-                    tags.push({
-                        path: css,
-                        tag: this.generateTag(css, {
-                            ...attributes,
-                            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                            // @ts-ignore
-                            integrity: subChunk[0]?.integrity
-                        })
-                    });
-                }
-            }
-        }
-        const preloadsElements = this.uniqueBy(preloads, 'path')
-            .sort(preload => (this.isCssPath(preload.path) ? -1 : 1))
-            .map(preload => this.makePreloadTagForUrl(preload.path));
-        return preloadsElements.concat(tags.map(({ tag }) => tag));
-    }
-    /**
-     * Generate tags for the entry points
-     */
-    async generateEntryPointsTags(entryPoints, attributes) {
-        entryPoints = Array.isArray(entryPoints) ? entryPoints : [entryPoints];
-        if (this.isViteRunning) {
-            return this.generateEntryPointsTagsForDevMode(entryPoints, attributes);
-        }
-        return this.generateEntryPointsTagsWithManifest(entryPoints, attributes);
-    }
-    /**
-     * Returns the manifest file contents
-     *
-     * @throws Will throw an exception when running in dev
-     */
-    manifest() {
-        if (this.isViteRunning) {
-            throw new Error('Cannot read the manifest file when running in dev mode');
-        }
-        if (!this.manifestCache) {
-            this.manifestCache = this.readFileAsJSON(Path.public('assets/.vite/manifest.json'));
-        }
-        return this.manifestCache;
-    }
-}

package/src/vite/plugin.d.ts

@@ -1,11 +0,0 @@
-/**
- * @athenna/http
- *
- * (c) João Lenon <lenon@athenna.io>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import type { PluginOption } from 'vite';
-import type { PluginOptions } from '#src/types/vite/PluginOptions';
-export declare function athenna(options: PluginOptions): PluginOption[];

package/src/vite/plugin.js

@@ -1,18 +0,0 @@
-/**
- * @athenna/http
- *
- * (c) João Lenon <lenon@athenna.io>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import PluginRestart from 'vite-plugin-restart';
-import { config } from '#src/vite/config';
-export function athenna(options) {
-    const fullOptions = Object.assign({
-        assetsUrl: '/assets',
-        buildDirectory: 'public/assets',
-        reload: ['./src/resources/views/**/*.edge']
-    }, options);
-    return [PluginRestart({ reload: fullOptions.reload }), config(fullOptions)];
-}