@jahia/vite-plugin 0.5.5 → 0.5.6

package/dist/index.js

@@ -1,11 +1,10 @@
 import multiEntry from '@rollup/plugin-multi-entry';
-import path$1 from 'node:path';
+import path from 'node:path';
 import { styleText } from 'node:util';
 import { globSync } from 'tinyglobby';
 import { print } from 'esrap';
 import { walk } from 'zimmerframe';
 import { createFilter } from '@rollup/pluginutils';
-import path from 'path';
 
 var sharedLibs = {
   // React ships as CJS, so we need our own shims
@@ -29,7 +28,6 @@ const insertFilename = (root, prefix) => {
       const ast = walk(this.parse(code), null, {
         // Only target `export default function`
         ExportDefaultDeclaration(node) {
-          if (node.declaration.type !== "FunctionDeclaration") return;
           return {
             // export default
             type: "ExportDefaultDeclaration",
@@ -49,11 +47,8 @@ const insertFilename = (root, prefix) => {
                 property: { type: "Identifier", name: "defineProperty" }
               },
               arguments: [
-                {
-                  // Original function
-                  ...node.declaration,
-                  type: "FunctionExpression"
-                },
+                // Convert function and class declarations to expressions, keep others as is
+                node.declaration.type === "FunctionDeclaration" ? { ...node.declaration, type: "FunctionExpression" } : node.declaration.type === "ClassDeclaration" ? { ...node.declaration, type: "ClassExpression" } : node.declaration,
                 { type: "Literal", value: "__filename" },
                 {
                   // { value: id, enumerable: false }
@@ -91,14 +86,10 @@ const insertFilename = (root, prefix) => {
 
 const external = Object.keys(sharedLibs);
 function buildSuccessPlugin(callback) {
-  let succeeded = true;
   return {
     name: "build-success-callback",
-    buildEnd(error) {
-      succeeded = !error;
-    },
-    async closeBundle() {
-      if (succeeded) await callback();
+    async closeBundle(error) {
+      if (!error) await callback();
     }
   };
 }
@@ -137,7 +128,7 @@ function jahia(options = {}) {
             build: {
               lib: {
                 entry: Object.fromEntries(
-                  clientEntries.map((file) => [file, path$1.join(clientBaseDir, file)])
+                  clientEntries.map((file) => [file, path.join(clientBaseDir, file)])
                 ),
                 formats: ["es"]
               },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/vite-plugin",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com:Jahia/javascript-modules.git",
@@ -27,7 +27,7 @@
     "@types/node": "^22.13.5",
     "pkgroll": "^2.11.0",
     "publint": "^0.3.6",
-    "rollup": "^4.34.8",
+    "rollup": "^4.35.0",
     "vite": "^6.1.1"
   },
   "peerDependencies": {

package/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>javascript-modules</artifactId>
         <groupId>org.jahia.modules</groupId>
-        <version>0.5.5</version>
+        <version>0.5.6</version>
     </parent>
     <artifactId>vite-plugin</artifactId>
     <name>Vite plugin for Jahia</name>

package/src/index.ts

@@ -12,14 +12,10 @@ const external = Object.keys(sharedLibs);
 
 /** Plugin to execute a callback when a build succeeds. */
 function buildSuccessPlugin(callback: () => void | Promise<void>): Plugin {
-  let succeeded = true;
   return {
     name: "build-success-callback",
-    buildEnd(error) {
-      succeeded = !error;
-    },
-    async closeBundle() {
-      if (succeeded) await callback();
+    async closeBundle(error) {
+      if (!error) await callback();
     },
   };
 }

package/src/insert-filename.ts

@@ -1,9 +1,9 @@
 import { print } from "esrap";
 import type { Node } from "estree";
-import { Plugin } from "rollup";
+import type { Plugin } from "rollup";
 import { walk } from "zimmerframe";
 import { createFilter } from "@rollup/pluginutils";
-import path from "path";
+import path from "node:path";
 
 /**
  * This plugin adds a `__filename` property to all default exports.
@@ -44,7 +44,6 @@ export const insertFilename = (root: string, prefix: string): Plugin => {
       const ast = walk(this.parse(code) as Node, null, {
         // Only target `export default function`
         ExportDefaultDeclaration(node) {
-          if (node.declaration.type !== "FunctionDeclaration") return;
           return {
             // export default
             type: "ExportDefaultDeclaration",
@@ -64,11 +63,12 @@ export const insertFilename = (root: string, prefix: string): Plugin => {
                 property: { type: "Identifier", name: "defineProperty" },
               },
               arguments: [
-                {
-                  // Original function
-                  ...node.declaration,
-                  type: "FunctionExpression",
-                },
+                // Convert function and class declarations to expressions, keep others as is
+                node.declaration.type === "FunctionDeclaration"
+                  ? { ...node.declaration, type: "FunctionExpression" }
+                  : node.declaration.type === "ClassDeclaration"
+                    ? { ...node.declaration, type: "ClassExpression" }
+                    : node.declaration,
                 { type: "Literal", value: "__filename" },
                 {
                   // { value: id, enumerable: false }