@adonisjs/vite 0.0.1-6 → 0.0.1-7

package/build/configure.js

@@ -6,19 +6,18 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
 /**
  * Configures the package
  */
 export async function configure(command) {
-    const stubDestination = join(fileURLToPath(command.app.appRoot), 'vite.config.js');
-    await command.publishStub('client_config.stub', {
-        destination: stubDestination,
-    });
     await command.publishStub('config.stub');
+    await command.publishStub('client_config.stub');
+    await command.publishStub('js_entrypoint.stub');
     await command.updateRcFile((rcFile) => {
         rcFile.addProvider('@adonisjs/vite/vite_provider');
+        rcFile.addMetaFile('public/**', false);
     });
-    await command.installPackages([{ name: 'vite', isDevDependency: true }]);
+    if (await command.prompt.confirm('Do you want to install "vite"?')) {
+        await command.installPackages([{ name: 'vite', isDevDependency: true }]);
+    }
 }

package/build/providers/vite_provider.d.ts

@@ -1,5 +1,5 @@
+import type { Edge } from 'edge.js';
 import type { ApplicationService } from '@adonisjs/core/types';
-import { Edge } from 'edge.js';
 export default class ViteServiceProvider {
     protected app: ApplicationService;
     constructor(app: ApplicationService);

package/build/providers/vite_provider.js

@@ -6,6 +6,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+import debug from '../src/backend/debug.js';
 export default class ViteServiceProvider {
     app;
     constructor(app) {
@@ -17,6 +18,7 @@ export default class ViteServiceProvider {
     async getEdge() {
         try {
             const { default: edge } = await import('edge.js');
+            debug('Detected edge.js package. Adding Vite primitives to it');
             return edge;
         }
         catch {

package/build/services/vite.d.ts

@@ -1,3 +1,3 @@
-import { Vite } from '../index.js';
+import type { Vite } from '../src/backend/vite.js';
 declare let vite: Vite;
 export { vite as default };

package/build/src/backend/define_config.js

@@ -13,6 +13,7 @@ export function defineConfig(config) {
     return {
         buildDirectory: 'public/assets',
         hotFile: 'public/assets/hot.json',
+        assetsUrl: '/assets',
         ...config,
     };
 }

package/build/src/backend/types/extended.d.ts

@@ -7,3 +7,8 @@ declare module '@adonisjs/core/types' {
         vite: Vite;
     }
 }
+declare module 'vite' {
+    interface ManifestChunk {
+        integrity: string;
+    }
+}

package/build/src/backend/utils.js

@@ -23,10 +23,12 @@ export function makeAttributes(attributes) {
     return Object.keys(attributes)
         .map((key) => {
         const value = attributes[key];
-        if (value === true)
+        if (value === true) {
             return key;
-        if (value === false)
+        }
+        if (!value) {
             return null;
+        }
         return `${key}="${value}"`;
     })
         .filter((attr) => attr !== null)

package/build/src/backend/vite.js

@@ -70,30 +70,28 @@ export class Vite {
     /**
      * Create a script tag for the given path
      */
-    #makeScriptTag(src, url) {
+    #makeScriptTag(src, url, attributes) {
         const customAttributes = this.#unwrapAttributes(src, url, this.#options.scriptAttributes);
-        const attributes = { type: 'module', ...customAttributes, src: url };
         return this.#generateElement({
             tag: 'script',
-            attributes,
+            attributes: { type: 'module', ...customAttributes, ...attributes, src: url },
             children: [],
         });
     }
     /**
      * Create a style tag for the given path
      */
-    #makeStyleTag(src, url) {
+    #makeStyleTag(src, url, attributes) {
         const customAttributes = this.#unwrapAttributes(src, url, this.#options.styleAttributes);
-        const attributes = { rel: 'stylesheet', ...customAttributes, href: url };
         return this.#generateElement({
             tag: 'link',
-            attributes,
+            attributes: { rel: 'stylesheet', ...customAttributes, ...attributes, href: url },
         });
     }
     /**
      * Generate a HTML tag for the given asset
      */
-    #generateTag(asset) {
+    #generateTag(asset, attributes) {
         let url = '';
         if (this.#isRunningHot()) {
             url = this.#hotAsset(asset);
@@ -102,9 +100,9 @@ export class Vite {
             url = `${this.#options.assetsUrl}/${asset}`;
         }
         if (this.#isCssPath(asset)) {
-            return this.#makeStyleTag(asset, url);
+            return this.#makeStyleTag(asset, url, attributes);
         }
-        return this.#makeScriptTag(asset, url);
+        return this.#makeScriptTag(asset, url, attributes);
     }
     /**
      * Generates a JSON element with a custom toString implementation
@@ -138,24 +136,30 @@ export class Vite {
      * Generate style and script tags for the given entrypoints
      * Also adds the @vite/client script
      */
-    #generateEntryPointsTagsForHotMode(entryPoints) {
+    #generateEntryPointsTagsForHotMode(entryPoints, attributes) {
         const viteHmr = this.#getViteHmrScript();
-        const tags = entryPoints.map((entrypoint) => this.#generateTag(entrypoint));
+        const tags = entryPoints.map((entrypoint) => this.#generateTag(entrypoint, attributes));
         return viteHmr ? [viteHmr].concat(tags) : tags;
     }
     /**
      * Generate style and script tags for the given entrypoints
      * using the manifest file
      */
-    #generateEntryPointsTagsWithManifest(entryPoints) {
+    #generateEntryPointsTagsWithManifest(entryPoints, attributes) {
         const manifest = this.manifest();
         const tags = [];
         for (const entryPoint of entryPoints) {
             const chunk = this.#chunk(manifest, entryPoint);
-            tags.push({ path: chunk.file, tag: this.#generateTag(chunk.file) });
+            tags.push({
+                path: chunk.file,
+                tag: this.#generateTag(chunk.file, { ...attributes, integrity: chunk.integrity }),
+            });
             for (const css of chunk.css || []) {
                 const cssChunk = this.#chunkByFile(manifest, css);
-                tags.push({ path: cssChunk.file, tag: this.#generateTag(cssChunk.file) });
+                tags.push({
+                    path: cssChunk.file,
+                    tag: this.#generateTag(cssChunk.file, { ...attributes, integrity: cssChunk.integrity }),
+                });
             }
         }
         return uniqBy(tags, 'path')

package/build/stubs/client_config.stub

@@ -1,5 +1,5 @@
 ---
-to: {{ destination }}
+to: {{ app.makePath('vite.config.js') }}
 ---
 import { defineConfig } from 'vite'
 import adonisjs from '@adonisjs/vite/client'

package/build/stubs/js_entrypoint.stub

@@ -0,0 +1,4 @@
+---
+to: {{ app.makePath('resources/js/app.js') }}
+---
+console.log('Log from JS entrypoint')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/vite",
   "description": "Vite plugin for Adonis.js",
-  "version": "0.0.1-6",
+  "version": "0.0.1-7",
   "engines": {
     "node": ">=18.16.0"
   },