@adonisjs/vite 1.0.0 → 2.0.1

package/README.md

@@ -2,7 +2,7 @@
 
 <br />
 
-[![gh-workflow-image]][gh-workflow-url] [![npm-image]][npm-url] ![][typescript-image] [![license-image]][license-url] [![snyk-image]][snyk-url]
+[![gh-workflow-image]][gh-workflow-url] [![npm-image]][npm-url] ![][typescript-image] [![license-image]][license-url]
 
 ## Introduction
 Package to add [Vite](https://vitejs.dev/) as an assets bundler to AdonisJS.
@@ -21,8 +21,8 @@ In order to ensure that the AdonisJS community is welcoming to all, please revie
 ## License
 AdonisJS static files middleware is open-sourced software licensed under the [MIT license](LICENSE.md).
 
-[gh-workflow-image]: https://img.shields.io/github/actions/workflow/status/adonisjs/vite/test.yml?style=for-the-badge
-[gh-workflow-url]: https://github.com/adonisjs/vite/actions/workflows/test.yml "Github action"
+[gh-workflow-image]: https://img.shields.io/github/actions/workflow/status/adonisjs/vite/checks.yml?style=for-the-badge
+[gh-workflow-url]: https://github.com/adonisjs/vite/actions/workflows/checks.yml "Github action"
 
 [npm-image]: https://img.shields.io/npm/v/@adonisjs/vite/latest.svg?style=for-the-badge&logo=npm
 [npm-url]: https://www.npmjs.com/package/@adonisjs/vite/v/latest "npm"
@@ -31,6 +31,3 @@ AdonisJS static files middleware is open-sourced software licensed under the [MI
 
 [license-url]: LICENSE.md
 [license-image]: https://img.shields.io/github/license/adonisjs/vite?style=for-the-badge
-
-[snyk-image]: https://img.shields.io/snyk/vulnerabilities/github/adonisjs/vite?label=Snyk%20Vulnerabilities&style=for-the-badge
-[snyk-url]: https://snyk.io/test/github/adonisjs/vite?targetFile=package.json "snyk"

package/build/providers/vite_provider.js

@@ -16,16 +16,11 @@ export default class ViteServiceProvider {
      * Registers edge plugin when edge is installed
      */
     async registerEdgePlugin() {
-        let edge = null;
-        try {
-            const edgeExports = await import('edge.js');
-            edge = edgeExports.default;
-        }
-        catch { }
-        if (edge) {
+        if (this.app.usingEdgeJS) {
+            const edge = await import('edge.js');
             const vite = await this.app.container.make('vite');
             const { edgePluginVite } = await import('../src/backend/plugins/edge.js');
-            edge.use(edgePluginVite(vite));
+            edge.default.use(edgePluginVite(vite));
         }
     }
     /**

package/build/src/backend/define_config.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 { join } from 'node:path';
 /**
  * Define the backend config for resolving vite assets
  */
@@ -14,6 +15,9 @@ export function defineConfig(config) {
         buildDirectory: 'public/assets',
         hotFile: 'public/assets/hot.json',
         assetsUrl: '/assets',
+        manifestFile: config.buildDirectory
+            ? join(config.buildDirectory, '.vite/manifest.json')
+            : 'public/assets/.vite/manifest.json',
         ...config,
     };
 }

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

@@ -45,6 +45,13 @@ export type ViteOptions = {
      * @default 'public/assets'
      */
     buildDirectory: string;
+    /**
+     * Path to the manifest file relative from the root of
+     * the application
+     *
+     * @default 'public/assets/.vite/manifest.json'
+     */
+    manifestFile: string;
     /**
      * The URL to prefix when generating assets URLs. For example: This
      * could the CDN URL when generating the production build

package/build/src/backend/vite.js

@@ -6,7 +6,6 @@
  * 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 { existsSync, readFileSync } from 'node:fs';
 import debug from './debug.js';
 import { makeAttributes, uniqBy } from './utils.js';
@@ -15,10 +14,6 @@ import { makeAttributes, uniqBy } from './utils.js';
  * assets processed using vite.
  */
 export class Vite {
-    /**
-     * Manifest file name
-     */
-    #manifestFilename = 'manifest.json';
     /**
      * We cache the manifest file content in production
      * to avoid reading the file multiple times
@@ -156,10 +151,9 @@ export class Vite {
                 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, { ...attributes, integrity: cssChunk.integrity }),
+                    path: css,
+                    tag: this.#generateTag(css),
                 });
             }
         }
@@ -177,16 +171,6 @@ export class Vite {
         }
         return chunk;
     }
-    /**
-     * Get a chunk from the manifest file for a given hashed file name
-     */
-    #chunkByFile(manifest, fileName) {
-        const chunk = Object.values(manifest).find((c) => c.file === fileName);
-        if (!chunk) {
-            throw new Error(`Cannot find "${fileName}" chunk in the manifest file`);
-        }
-        return chunk;
-    }
     /**
      * Check if the given path is a CSS path
      */
@@ -244,7 +228,7 @@ export class Vite {
             throw new Error('Cannot read the manifest file when running in hot mode');
         }
         if (!this.#manifestCache) {
-            this.#manifestCache = this.#readFileAsJSON(join(this.#options.buildDirectory, this.#manifestFilename));
+            this.#manifestCache = this.#readFileAsJSON(this.#options.manifestFile);
         }
         return this.#manifestCache;
     }

package/build/src/client/main.js

@@ -9,7 +9,6 @@
 import { defu } from 'defu';
 import PluginRestart from 'vite-plugin-restart';
 import { config } from './config.js';
-const VitePluginRestart = PluginRestart;
 /**
  * Vite plugin for adonisjs
  */
@@ -20,5 +19,5 @@ export default function adonisjs(options) {
         hotFile: 'public/assets/hot.json',
         reload: ['./resources/views/**/*.edge'],
     });
-    return [VitePluginRestart({ reload: fullOptions.reload }), config(fullOptions)];
+    return [PluginRestart({ reload: fullOptions.reload }), config(fullOptions)];
 }

package/build/src/client/utils.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 { networkInterfaces } from 'node:os';
 /**
  * Resolve the dev server URL from the server address and configuration.
  */
@@ -20,6 +21,19 @@ export const resolveDevServerUrl = (address, config) => {
     if (host === '::1') {
         host = 'localhost';
     }
+    else if (host === '::') {
+        const networkAddress = Object.values(networkInterfaces())
+            .flatMap((nInterface) => nInterface ?? [])
+            .find((detail) => {
+            return (detail &&
+                detail.address &&
+                detail.family === 'IPv4' &&
+                !detail.address.includes('127.0.0.1'));
+        });
+        if (networkAddress) {
+            host = networkAddress.address;
+        }
+    }
     return `${protocol}://${host}:${address.port}`;
 };
 /**

package/build/stubs/config.stub

@@ -11,6 +11,12 @@ const viteBackendConfig = defineConfig({
    */
   buildDirectory: 'public/assets',
 
+  /**
+   * The path to the manifest file generated by the
+   * "vite build" command.
+   */
+  manifestFile: 'public/assets/.vite/manifest.json',
+
   /**
    * Feel free to change the value of the "assetsUrl" to
    * point to a CDN in production.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/vite",
   "description": "Vite plugin for Adonis.js",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -34,51 +34,53 @@
     "quick:test": "node --enable-source-maps --loader=ts-node/esm bin/test.ts",
     "pretest": "npm run lint",
     "test": "c8 npm run quick:test",
-    "compile": "npm run lint && npm run clean && tsc && npm run copy:templates",
+    "precompile": "npm run lint && npm run clean ",
+    "compile": "tsc",
+    "postcompile": "npm run copy:templates",
     "build": "npm run compile",
-    "postbuild": "npm run copy:templates",
     "release": "np",
     "version": "npm run build",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^6.1.3-25",
-    "@adonisjs/core": "^6.1.5-28",
-    "@adonisjs/eslint-config": "^1.1.8",
-    "@adonisjs/prettier-config": "^1.1.8",
-    "@adonisjs/shield": "^8.0.0-8",
-    "@adonisjs/tsconfig": "^1.1.8",
-    "@commitlint/cli": "^17.8.0",
-    "@commitlint/config-conventional": "^17.8.0",
-    "@japa/assert": "^2.0.0",
+    "@adonisjs/assembler": "^6.1.3-28",
+    "@adonisjs/core": "^6.1.5-32",
+    "@adonisjs/eslint-config": "^1.1.9",
+    "@adonisjs/prettier-config": "^1.1.9",
+    "@adonisjs/session": "^7.0.0-14",
+    "@adonisjs/shield": "^8.0.0-9",
+    "@adonisjs/tsconfig": "^1.1.9",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
+    "@japa/assert": "^2.0.1",
     "@japa/expect-type": "^2.0.0",
-    "@japa/file-system": "^2.0.0",
-    "@japa/runner": "^3.0.2",
-    "@swc/core": "1.3.82",
-    "@types/node": "^20.8.6",
+    "@japa/file-system": "^2.0.1",
+    "@japa/runner": "^3.1.0",
+    "@swc/core": "^1.3.99",
+    "@types/node": "^20.10.0",
     "c8": "^8.0.0",
     "copyfiles": "^2.4.1",
     "del-cli": "^5.1.0",
-    "edge.js": "^6.0.0-8",
-    "eslint": "^8.51.0",
+    "edge.js": "^6.0.0",
+    "eslint": "^8.54.0",
     "husky": "^8.0.3",
     "np": "^8.0.4",
-    "prettier": "^3.0.3",
-    "rollup": "^4.1.4",
+    "prettier": "^3.1.0",
+    "rollup": "^4.6.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.2.2",
-    "vite": "^4.4.11"
+    "typescript": "5.2.2",
+    "vite": "^5.0.2"
   },
   "dependencies": {
-    "defu": "^6.1.2",
-    "edge-error": "^4.0.0-0",
-    "vite-plugin-restart": "^0.3.1"
+    "defu": "^6.1.3",
+    "edge-error": "^4.0.0",
+    "vite-plugin-restart": "^0.4.0"
   },
   "peerDependencies": {
-    "@adonisjs/core": "^6.1.5-28",
-    "@adonisjs/shield": "^8.0.0-8",
-    "edge.js": "^6.0.0-8",
-    "vite": "^4.4.11"
+    "@adonisjs/core": "^6.1.5-32",
+    "@adonisjs/shield": "^8.0.0-9",
+    "edge.js": "^6.0.0",
+    "vite": "^4.0.0 || ^5.0.0"
   },
   "peerDependenciesMeta": {
     "vite": {