@jahia/vite-plugin 0.5.5 → 0.6.0

package/README.md

@@ -2,11 +2,9 @@
 
 A Vite plugin to develop JavaScript Modules for the Jahia platform.
 
-This README will be updated soon.
-
 ## Installation
 
-Using our project creation CLI should set you up correctly. It will ship with good defaults to get you started, but your workflow might need more advanced settings. For that, the `jahia` Vite plugin can take an object of options:
+Using our [project creation CLI (@jahia/create-module)](https://www.npmjs.com/package/@jahia/create-module) should set you up correctly. It will ship with good defaults to get you started, but your workflow might need more advanced settings. For that, the `jahia` Vite plugin can take an object of options:
 
 ```js
 import { defineConfig } from "vite";
@@ -18,10 +16,14 @@ export default defineConfig({
     jahia({
       // Client options
       client: {
-        input: "./src/client/index.js",
-        // /!\ This path is currently hard-coded in the engine loader,
-        // it cannot be changed yet.
-        output: "./javascript/client/index.js",
+        input: {
+          // Parent directory of client-side code
+          dir: "./src/client",
+          // Glob pattern to match all client-side code in dir
+          glob: "**‍/*.jsx",
+        }
+        // Output directory for client-side code
+        output: "./javascript/client/",
       },
 
       // Server options
@@ -31,6 +33,7 @@ export default defineConfig({
         output: {
           dir: "./javascript/server",
           fileName: "index", // Will produce index.js and index.css
+          // A known bug causes the css file to be named style.css regardless of this setting
         },
       },
 

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.6.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com:Jahia/javascript-modules.git",
@@ -12,6 +12,9 @@
     "types": "./dist/index.d.ts",
     "import": "./dist/index.js"
   },
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "pkgroll && publint"
   },
@@ -27,7 +30,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/node/yarn/dist/LICENSE

@@ -1,26 +0,0 @@
-BSD 2-Clause License
-
-For Yarn software
-
-Copyright (c) 2016-present, Yarn Contributors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/node/yarn/dist/README.md

@@ -1,60 +0,0 @@
-<p align="center">
-  <a href="https://yarnpkg.com/">
-    <img alt="Yarn" src="https://github.com/yarnpkg/assets/blob/master/yarn-kitten-full.png?raw=true" width="546">
-  </a>
-</p>
-
-<p align="center">
-  Fast, reliable, and secure dependency management.
-</p>
-
-<p align="center">
-  <a href="https://circleci.com/gh/yarnpkg/yarn"><img alt="Circle Status" src="https://circleci.com/gh/yarnpkg/yarn.svg?style=shield&circle-token=5f0a78473b0f440afb218bf2b82323cc6b3cb43f"></a>
-  <a href="https://ci.appveyor.com/project/kittens/yarn/branch/master"><img alt="Appveyor Status" src="https://ci.appveyor.com/api/projects/status/0xdv8chwe2kmk463?svg=true"></a>
-  <a href="https://dev.azure.com/yarnpkg/yarn/_build"><img alt="Azure Pipelines status" src="https://dev.azure.com/yarnpkg/yarn/_apis/build/status/Yarn%20Acceptance%20Tests"></a>
-  <a href="https://discord.gg/yarnpkg"><img alt="Discord Chat" src="https://img.shields.io/discord/226791405589233664.svg"></a>
-  <a href="http://commitizen.github.io/cz-cli/"><img alt="Commitizen friendly" src="https://img.shields.io/badge/commitizen-friendly-brightgreen.svg"></a>
-</p>
-
----
-
-**Fast:** Yarn caches every package it has downloaded, so it never needs to download the same package again. It also does almost everything concurrently to maximize resource utilization. This means even faster installs.
-
-**Reliable:** Using a detailed but concise lockfile format and a deterministic algorithm for install operations, Yarn is able to guarantee that any installation that works on one system will work exactly the same on another system.
-
-**Secure:** Yarn uses checksums to verify the integrity of every installed package before its code is executed.
-
-## Features
-
-* **Offline Mode.** If you've installed a package before, then you can install it again without an internet connection.
-* **Deterministic.** The same dependencies will be installed in the same exact way on any machine, regardless of installation order.
-* **Network Performance.** Yarn efficiently queues requests and avoids request waterfalls in order to maximize network utilization.
-* **Network Resilience.** A single request that fails will not cause the entire installation to fail. Requests are automatically retried upon failure.
-* **Flat Mode.** Yarn resolves mismatched versions of dependencies to a single version to avoid creating duplicates.
-* **More emojis.** 🐈
-
-## Installing Yarn
-
-Read the [Installation Guide](https://yarnpkg.com/en/docs/install) on our website for detailed instructions on how to install Yarn.
-
-## Using Yarn
-
-Read the [Usage Guide](https://yarnpkg.com/en/docs/usage) on our website for detailed instructions on how to use Yarn.
-
-## Contributing to Yarn
-
-Contributions are always welcome, no matter how large or small. Substantial feature requests should be proposed as an [RFC](https://github.com/yarnpkg/rfcs). Before contributing, please read the [code of conduct](CODE_OF_CONDUCT.md).
-
-See [Contributing](https://yarnpkg.com/org/contributing/).
-
-## Prior art
-
-Yarn wouldn't exist if it wasn't for excellent prior art. Yarn has been inspired by the following projects:
-
- - [Bundler](https://github.com/bundler/bundler)
- - [Cargo](https://github.com/rust-lang/cargo)
- - [npm](https://github.com/npm/cli)
-
-## Credits
-
-Thanks to [Sam Holmes](https://github.com/samholmes) for donating the npm package name!

package/node/yarn/dist/bin/yarn

@@ -1,35 +0,0 @@
-#!/bin/sh
-argv0=$(echo "$0" | sed -e 's,\\,/,g')
-basedir=$(dirname "$(readlink "$0" || echo "$argv0")")
-
-case "$(uname -s)" in
-  Darwin) basedir="$( cd "$( dirname "$argv0" )" && pwd )";;
-  Linux) basedir=$(dirname "$(readlink -f "$0" || echo "$argv0")");;
-  *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-  *MSYS*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-command_exists() {
-  command -v "$1" >/dev/null 2>&1;
-}
-
-if command_exists node; then
-  if [ "$YARN_FORCE_WINPTY" = 1 ] || command_exists winpty && test -t 1; then
-    winpty node "$basedir/yarn.js" "$@"
-  else
-    exec node "$basedir/yarn.js" "$@"
-  fi
-  ret=$?
-# Debian and Ubuntu use "nodejs" as the name of the binary, not "node", so we
-# search for that too. See:
-# https://lists.debian.org/debian-devel-announce/2012/07/msg00002.html
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614907
-elif command_exists nodejs; then
-  exec nodejs "$basedir/yarn.js" "$@"
-  ret=$?
-else
-  >&2 echo 'Yarn requires Node.js 4.0 or higher to be installed.'
-  ret=1
-fi
-
-exit $ret

package/node/yarn/dist/bin/yarn.cmd

@@ -1,2 +0,0 @@
-@echo off
-node "%~dp0\yarn.js" %*

package/node/yarn/dist/bin/yarn.js

@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-
-/* eslint-disable no-var */
-/* eslint-disable flowtype/require-valid-file-annotation */
-'use strict';
-
-var ver = process.versions.node;
-var majorVer = parseInt(ver.split('.')[0], 10);
-
-if (majorVer < 4) {
-  console.error('Node version ' + ver + ' is not supported, please use Node.js 4.0 or higher.');
-  process.exit(1); // eslint-disable-line no-process-exit
-} else {
-  try {
-    require(__dirname + '/../lib/v8-compile-cache.js');
-  } catch (err) {
-    // We don't have/need this on legacy builds and dev builds
-  }
-
-  // Just requiring this package will trigger a yarn run since the
-  // `require.main === module` check inside `cli/index.js` will always
-  // be truthy when built with webpack :(
-  // `lib/cli` may be `lib/cli/index.js` or `lib/cli.js` depending on the build.
-  var cli = require(__dirname + '/../lib/cli');
-  if (!cli.autoRun) {
-    cli.default().catch(function(error) {
-      console.error(error.stack || error.message || error);
-      process.exitCode = 1;
-    });
-  }
-}

package/node/yarn/dist/bin/yarnpkg

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-require('./yarn.js');

package/node/yarn/dist/bin/yarnpkg.cmd

@@ -1,2 +0,0 @@
-@echo off
-"%~dp0\yarn.cmd" %*