@andersundsehr/storybook-typo3 0.1.18 → 0.1.20

package/dist/empty-vite.config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/dist/empty-vite.config.js

@@ -0,0 +1,2 @@
+// to overwrite the user's vite.config.js
+export default {};

package/dist/functions/fetchRenderAction.js

@@ -21,9 +21,8 @@ export async function fetchRenderAction(urlA, id, params, storyContext) {
     if (!storyContext.component) {
         error('No component found in story context. This function requires a Fluid component to render.', 4123764578913);
     }
-    const viewHelper = (typeof storyContext.component === 'string') ? storyContext.component : storyContext.component.fullName;
     const body = {
-        viewHelper: viewHelper,
+        viewHelper: storyContext.component.fullName,
         arguments: params,
         site: storyContext.globals?.site || 'default',
         siteLanguage: storyContext.globals?.language || 'default',
@@ -32,5 +31,6 @@ export async function fetchRenderAction(urlA, id, params, storyContext) {
     return await fetchWithUserRetry(url + '/_storybook/render', {
         method: 'POST',
         body: JSON.stringify(body),
+        signal: storyContext.abortSignal,
     }, 'rendering component', 'text');
 }

package/dist/functions/fetchWithUserRetry.js

@@ -19,10 +19,24 @@ In any case we should get the error in json so we can handle it in the frontend
 Sometimes it can still be text/html so we need to handle that as well.
  */
 let updatableApiKey = import.meta.env.STORYBOOK_TYPO3_KEY;
+function anySignal(...signals) {
+    const controller = new AbortController();
+    for (const s of signals) {
+        if (!s) {
+            continue;
+        }
+        if (s.aborted) {
+            controller.abort(s.reason);
+            break;
+        }
+        s.addEventListener('abort', () => controller.abort(s.reason), { once: true });
+    }
+    return controller.signal;
+}
 export async function fetchWithUserRetry(url, options, message, resultType = 'json') {
     try {
         options = { ...options }; // Clone options to avoid mutating the original
-        options.signal = options.signal || AbortSignal.timeout(5000);
+        options.signal = anySignal(options.signal, AbortSignal.timeout(5000));
         options.headers = {
             ...options.headers,
             'Content-Type': 'application/json',
@@ -48,7 +62,7 @@ async function retry(errorOrResponse, url, options, message, resultType) {
         retry = true;
         confirmationMessage = `🔐 ${errorType.message}\n\n`
             + `🔗 url: ${url}\n\n`
-            + `💬 Please insert the correct API key:\ncan be found in the .env file:\n\n`;
+            + `💬 Please insert the correct API key:\ncan be found in the .env file of your TYPO3:\n\n`;
         // if there was no api key, it will be set into the .env from the php code automatically
         // we wait 1 second to give HMR time to update the .env file and reload the page, otherwise the user has to provide the key
         if (!updatableApiKey) {

package/dist/preset.js

@@ -12,7 +12,13 @@ export const addons = ['@storybook/addon-docs', '@storybook/addon-a11y'];
  */
 export { viteFinal };
 export const core = {
-    builder: getAbsolutePath('@storybook/builder-vite'),
+    builder: {
+        name: '@storybook/builder-vite',
+        options: {
+            // to overwrite the user's vite.config.js
+            viteConfigPath: require.resolve('./empty-vite.config'),
+        },
+    },
     renderer: getAbsolutePath('@storybook/server'),
     disableTelemetry: true,
 };

package/package.json

@@ -49,5 +49,5 @@
     "dist",
     "README.md"
   ],
-  "version": "0.1.18"
+  "version": "0.1.20"
 }