@jahia/vite-plugin 0.5.2 → 0.5.4

package/dist/index.js

@@ -1,10 +1,10 @@
 import multiEntry from '@rollup/plugin-multi-entry';
-import { createFilter, addExtension } from '@rollup/pluginutils';
-import { extname } from 'node:path';
+import path$1 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 = {
@@ -103,10 +103,8 @@ function buildSuccessPlugin(callback) {
   };
 }
 function jahia(options = {}) {
-  const clientEntries = globSync(options.client?.input?.glob ?? "**/*.jsx", {
-    cwd: options.client?.input?.dir ?? "./src/client/",
-    absolute: true
-  });
+  const clientBaseDir = options.client?.input?.dir ?? "./src/client/";
+  const clientEntries = globSync(options.client?.input?.glob ?? "**/*.jsx", { cwd: clientBaseDir });
   if (clientEntries.length === 0) {
     console.warn(
       `${styleText("yellowBright", "[@jahia/vite-plugin] Skipping client build because there are no entry files...")}
@@ -127,26 +125,25 @@ function jahia(options = {}) {
      * @see https://vite.dev/guide/api-plugin.html#config
      */
     config(config) {
-      config.builder ??= { sharedConfigBuild: true };
       config.esbuild ??= { jsx: "automatic" };
       return {
+        // Build all environments https://vite.dev/guide/api-environment-frameworks.html#environments-during-build
+        builder: { sharedConfigBuild: true },
+        // Enforce bundling of all dependencies
+        ssr: { noExternal: true },
+        // Define the environments (client and ssr)
         environments: {
           client: {
             build: {
               lib: {
-                // Single entry point for the client, all other files must be imported in this one
-                entry: clientEntries,
+                entry: Object.fromEntries(
+                  clientEntries.map((file) => [file, path$1.join(clientBaseDir, file)])
+                ),
                 formats: ["es"]
               },
               rollupOptions: {
                 output: {
-                  dir: options.client?.output ?? "./javascript/client/",
-                  entryFileNames: ({ facadeModuleId, name }) => facadeModuleId ? (
-                    // Keep the original extension, add .js after it
-                    `${addExtension(name, extname(facadeModuleId))}.js`
-                  ) : addExtension(name),
-                  preserveModules: true,
-                  preserveModulesRoot: options.client?.input?.dir ?? "./src/client/"
+                  dir: options.client?.output ?? "./javascript/client/"
                 },
                 external,
                 plugins: [
@@ -197,6 +194,10 @@ function jahia(options = {}) {
                   )
                 },
                 external: [...external, "@jahia/javascript-modules-library"],
+                treeshake: {
+                  // Manually mark useEffect as pure to have it removed from the SSR bundle
+                  manualPureFunctions: ["useEffect"]
+                },
                 plugins: [
                   multiEntry({
                     exports: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/vite-plugin",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com:Jahia/javascript-modules.git",

package/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>javascript-modules</artifactId>
         <groupId>org.jahia.modules</groupId>
-        <version>0.5.2</version>
+        <version>0.5.4</version>
     </parent>
     <artifactId>vite-plugin</artifactId>
     <name>Vite plugin for Jahia</name>
@@ -29,11 +29,10 @@
                 <executions>
                     <!-- Executions bound on the "initialize" phase (executed in order of declaration): -->
                     <execution>
-                        <id>install node, yarn and npm</id>
+                        <id>install node and yarn</id>
                         <phase>initialize</phase>
                         <goals>
                             <goal>install-node-and-yarn</goal>
-                            <goal>install-node-and-npm</goal>
                         </goals>
                     </execution>
                     <execution>

package/src/index.ts

@@ -1,7 +1,6 @@
 import multiEntry from "@rollup/plugin-multi-entry";
-import { addExtension } from "@rollup/pluginutils";
 import sharedLibs from "javascript-modules-engine/shared-libs.mjs";
-import { extname } from "node:path";
+import path from "node:path";
 import { styleText } from "node:util";
 import type { Plugin } from "rollup";
 import { globSync } from "tinyglobby";
@@ -94,10 +93,8 @@ export default function jahia(
     watchCallback?: () => void | Promise<void>;
   } = {},
 ): PluginOption {
-  const clientEntries = globSync(options.client?.input?.glob ?? "**/*.jsx", {
-    cwd: options.client?.input?.dir ?? "./src/client/",
-    absolute: true,
-  });
+  const clientBaseDir = options.client?.input?.dir ?? "./src/client/";
+  const clientEntries = globSync(options.client?.input?.glob ?? "**/*.jsx", { cwd: clientBaseDir });
 
   if (clientEntries.length === 0) {
     console.warn(
@@ -122,31 +119,27 @@ export default function jahia(
      */
     config(config) {
       // Mutate the configuration to set base settings if they are not already set
-      // Build all environments https://vite.dev/guide/api-environment-frameworks.html#environments-during-build
-      config.builder ??= { sharedConfigBuild: true };
-
       // Enable the modern JSX runtime
       config.esbuild ??= { jsx: "automatic" };
 
       return {
+        // Build all environments https://vite.dev/guide/api-environment-frameworks.html#environments-during-build
+        builder: { sharedConfigBuild: true },
+        // Enforce bundling of all dependencies
+        ssr: { noExternal: true },
+        // Define the environments (client and ssr)
         environments: {
           client: {
             build: {
               lib: {
-                // Single entry point for the client, all other files must be imported in this one
-                entry: clientEntries,
+                entry: Object.fromEntries(
+                  clientEntries.map((file) => [file, path.join(clientBaseDir, file)]),
+                ),
                 formats: ["es"],
               },
               rollupOptions: {
                 output: {
                   dir: options.client?.output ?? "./javascript/client/",
-                  entryFileNames: ({ facadeModuleId, name }) =>
-                    facadeModuleId
-                      ? // Keep the original extension, add .js after it
-                        `${addExtension(name, extname(facadeModuleId))}.js`
-                      : addExtension(name),
-                  preserveModules: true,
-                  preserveModulesRoot: options.client?.input?.dir ?? "./src/client/",
                 },
                 external,
                 plugins: [
@@ -197,6 +190,10 @@ export default function jahia(
                   ),
                 },
                 external: [...external, "@jahia/javascript-modules-library"],
+                treeshake: {
+                  // Manually mark useEffect as pure to have it removed from the SSR bundle
+                  manualPureFunctions: ["useEffect"],
+                },
                 plugins: [
                   multiEntry({
                     exports: false,

package/node/npm

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-# This is used by the Node.js installer, which expects the cygwin/mingw
-# shell script to already be present in the npm dependency folder.
-
-(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
-
-basedir=`dirname "$0"`
-
-case `uname` in
-  *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ `uname` = 'Linux' ] && type wslpath &>/dev/null ; then
-  IS_WSL="true"
-fi
-
-function no_node_dir {
-  # if this didn't work, then everything else below will fail
-  echo "Could not determine Node.js install directory" >&2
-  exit 1
-}
-
-NODE_EXE="$basedir/node.exe"
-if ! [ -x "$NODE_EXE" ]; then
-  NODE_EXE="$basedir/node"
-fi
-if ! [ -x "$NODE_EXE" ]; then
-  NODE_EXE=node
-fi
-
-# this path is passed to node.exe, so it needs to match whatever
-# kind of paths Node.js thinks it's using, typically win32 paths.
-CLI_BASEDIR="$("$NODE_EXE" -p 'require("path").dirname(process.execPath)' 2> /dev/null)"
-if [ $? -ne 0 ]; then
-  # this fails under WSL 1 so add an additional message. we also suppress stderr above
-  # because the actual error raised is not helpful. in WSL 1 node.exe cannot handle
-  # output redirection properly. See https://github.com/microsoft/WSL/issues/2370
-  if [ "$IS_WSL" == "true" ]; then
-    echo "WSL 1 is not supported. Please upgrade to WSL 2 or above." >&2
-  fi
-  no_node_dir
-fi
-NPM_PREFIX_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-prefix.js"
-NPM_CLI_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-cli.js"
-NPM_PREFIX=`"$NODE_EXE" "$NPM_PREFIX_JS"`
-if [ $? -ne 0 ]; then
-  no_node_dir
-fi
-NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
-
-# a path that will fail -f test on any posix bash
-NPM_WSL_PATH="/.."
-
-# WSL can run Windows binaries, so we have to give it the win32 path
-# however, WSL bash tests against posix paths, so we need to construct that
-# to know if npm is installed globally.
-if [ "$IS_WSL" == "true" ]; then
-  NPM_WSL_PATH=`wslpath "$NPM_PREFIX_NPM_CLI_JS"`
-fi
-if [ -f "$NPM_PREFIX_NPM_CLI_JS" ] || [ -f "$NPM_WSL_PATH" ]; then
-  NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
-fi
-
-"$NODE_EXE" "$NPM_CLI_JS" "$@"

package/node/npm.cmd

@@ -1,20 +0,0 @@
-:: Created by npm, please don't edit manually.
-@ECHO OFF
-
-SETLOCAL
-
-SET "NODE_EXE=%~dp0\node.exe"
-IF NOT EXIST "%NODE_EXE%" (
-  SET "NODE_EXE=node"
-)
-
-SET "NPM_PREFIX_JS=%~dp0\node_modules\npm\bin\npm-prefix.js"
-SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
-FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_PREFIX_JS%"') DO (
-  SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
-)
-IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
-  SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
-)
-
-"%NODE_EXE%" "%NPM_CLI_JS%" %*

package/node/npx

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-
-# This is used by the Node.js installer, which expects the cygwin/mingw
-# shell script to already be present in the npm dependency folder.
-
-(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
-
-basedir=`dirname "$0"`
-
-case `uname` in
-  *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ `uname` = 'Linux' ] && type wslpath &>/dev/null ; then
-  IS_WSL="true"
-fi
-
-function no_node_dir {
-  # if this didn't work, then everything else below will fail
-  echo "Could not determine Node.js install directory" >&2
-  exit 1
-}
-
-NODE_EXE="$basedir/node.exe"
-if ! [ -x "$NODE_EXE" ]; then
-  NODE_EXE="$basedir/node"
-fi
-if ! [ -x "$NODE_EXE" ]; then
-  NODE_EXE=node
-fi
-
-# this path is passed to node.exe, so it needs to match whatever
-# kind of paths Node.js thinks it's using, typically win32 paths.
-CLI_BASEDIR="$("$NODE_EXE" -p 'require("path").dirname(process.execPath)' 2> /dev/null)"
-if [ $? -ne 0 ]; then
-  # this fails under WSL 1 so add an additional message. we also suppress stderr above
-  # because the actual error raised is not helpful. in WSL 1 node.exe cannot handle
-  # output redirection properly. See https://github.com/microsoft/WSL/issues/2370
-  if [ "$IS_WSL" == "true" ]; then
-    echo "WSL 1 is not supported. Please upgrade to WSL 2 or above." >&2
-  fi
-  no_node_dir
-fi
-NPM_PREFIX_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-prefix.js"
-NPX_CLI_JS="$CLI_BASEDIR/node_modules/npm/bin/npx-cli.js"
-NPM_PREFIX=`"$NODE_EXE" "$NPM_PREFIX_JS"`
-if [ $? -ne 0 ]; then
-  no_node_dir
-fi
-NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
-
-# a path that will fail -f test on any posix bash
-NPX_WSL_PATH="/.."
-
-# WSL can run Windows binaries, so we have to give it the win32 path
-# however, WSL bash tests against posix paths, so we need to construct that
-# to know if npm is installed globally.
-if [ "$IS_WSL" == "true" ]; then
-  NPX_WSL_PATH=`wslpath "$NPM_PREFIX_NPX_CLI_JS"`
-fi
-if [ -f "$NPM_PREFIX_NPX_CLI_JS" ] || [ -f "$NPX_WSL_PATH" ]; then
-  NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
-fi
-
-"$NODE_EXE" "$NPX_CLI_JS" "$@"

package/node/npx.cmd

@@ -1,20 +0,0 @@
-:: Created by npm, please don't edit manually.
-@ECHO OFF
-
-SETLOCAL
-
-SET "NODE_EXE=%~dp0\node.exe"
-IF NOT EXIST "%NODE_EXE%" (
-  SET "NODE_EXE=node"
-)
-
-SET "NPM_PREFIX_JS=%~dp0\node_modules\npm\bin\npm-prefix.js"
-SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
-FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_PREFIX_JS%"') DO (
-  SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
-)
-IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
-  SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
-)
-
-"%NODE_EXE%" "%NPX_CLI_JS%" %*