@hitachivantara/app-shell-vite-plugin 1.10.6 → 2.0.0-next.2

package/dist/vite-configuration-processor-plugin.d.ts

@@ -1,7 +1,5 @@
 import type { PluginOption } from "vite";
-import type { HvAppShellConfig, HvAppShellHeaderAction, HvAppShellProvidersConfig, HvAppShellViewsConfig } from "@hitachivantara/app-shell-shared";
-type BundleDefinition = HvAppShellProvidersConfig | HvAppShellViewsConfig | HvAppShellHeaderAction;
-export declare function replaceReferencesToSelf<T extends BundleDefinition>(bundles: T[], selfAppName: string): T[];
+import type { HvAppShellConfig } from "@hitachivantara/app-shell-shared";
 /**
  * Process configuration, executing several tasks:
  *  - Create rollup configuration to support module creation
@@ -16,4 +14,3 @@ export declare function replaceReferencesToSelf<T extends BundleDefinition>(bund
  * @param modules the set of modules to be created by the rollup
  */
 export default function processConfiguration(root: string, appShellConfig: HvAppShellConfig, selfAppName: string, buildEntryPoint: boolean, inlineConfig: boolean, generateEmptyShell: boolean, modules?: string[]): PluginOption;
-export {};

package/dist/vite-configuration-processor-plugin.js

@@ -1,24 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { getAppModules, getBasePath, replaceSelf, startsWithSelf, } from "./config-utils.js";
-export function replaceReferencesToSelf(bundles, selfAppName) {
-    return bundles.map((bundleDefinition) => {
-        if ("views" in bundleDefinition && bundleDefinition.views != null) {
-            return {
-                ...bundleDefinition,
-                bundle: replaceSelf(bundleDefinition.bundle, `${selfAppName}/`),
-                views: replaceReferencesToSelf(bundleDefinition.views, selfAppName),
-            };
-        }
-        if (startsWithSelf(bundleDefinition.bundle)) {
-            return {
-                ...bundleDefinition,
-                bundle: replaceSelf(bundleDefinition.bundle, `${selfAppName}/`),
-            };
-        }
-        return bundleDefinition;
-    });
-}
+import { getAppModules, getBasePath } from "./config-utils.js";
 /**
  * Process configuration, executing several tasks:
  *  - Create rollup configuration to support module creation
@@ -93,33 +75,16 @@ export default function processConfiguration(root, appShellConfig, selfAppName,
             if (!fs.existsSync(targetDir)) {
                 fs.mkdirSync(targetDir, { recursive: true });
             }
-            // theming structure does not rely on having the 'bundle' prop
-            const { theming } = appShellConfig;
-            if (theming != null) {
-                theming.themes = theming.themes?.map((theme) => {
-                    if (startsWithSelf(theme)) {
-                        const bundleName = replaceSelf(theme);
-                        return `${selfAppName}/${bundleName}`;
-                    }
-                    return theme;
-                });
-            }
             finalAppShellConfig = { ...appShellConfig };
             // if no baseUrl is present on the configuration, then assume the calculated basePath
             if (!finalAppShellConfig.baseUrl) {
                 finalAppShellConfig.baseUrl = basePath;
             }
             finalAppShellConfig.apps = undefined;
-            // also replace implicit references to selfApp in other parts of the configuration
-            if (finalAppShellConfig.providers != null) {
-                finalAppShellConfig.providers = replaceReferencesToSelf(finalAppShellConfig.providers, selfAppName);
-            }
-            if (finalAppShellConfig.mainPanel?.views != null) {
-                finalAppShellConfig.mainPanel.views = replaceReferencesToSelf(finalAppShellConfig.mainPanel.views, selfAppName);
-            }
-            if (finalAppShellConfig.header?.actions != null) {
-                finalAppShellConfig.header.actions = replaceReferencesToSelf(finalAppShellConfig.header?.actions, selfAppName);
-            }
+            // Replace all @self references using simple string replacement
+            let configString = JSON.stringify(finalAppShellConfig);
+            configString = configString.replaceAll(`"@self/`, `"${selfAppName}/`);
+            finalAppShellConfig = JSON.parse(configString);
             if (!inlineConfig) {
                 fs.writeFileSync(path.resolve(targetDir, "app-shell.config.json"), JSON.stringify(finalAppShellConfig));
             }

package/dist/vite-watch-config-plugin.js

@@ -1,32 +1,9 @@
 import path from "node:path";
-import { replaceSelf } from "./config-utils.js";
 import { require } from "./nodeModule.js";
-import { replaceReferencesToSelf } from "./vite-configuration-processor-plugin.js";
 const prepareConfigForDevMode = (config, selfAppName) => {
-    const { mainPanel, header, theming, providers } = config;
-    const replacedConfig = {
-        ...config,
-    };
-    const self = `${selfAppName}/`;
-    // Main panel - Views
-    if (mainPanel?.views && replacedConfig.mainPanel) {
-        replacedConfig.mainPanel.views = replaceReferencesToSelf(mainPanel.views, selfAppName);
-    }
-    // Header - Actions
-    if (header?.actions && replacedConfig.header) {
-        replacedConfig.header.actions = replaceReferencesToSelf(header.actions, selfAppName);
-    }
-    // Theming
-    if (theming?.themes && replacedConfig.theming) {
-        replacedConfig.theming.themes = theming.themes?.map((theme) => {
-            return replaceSelf(theme, self);
-        });
-    }
-    // Providers
-    if (providers) {
-        replacedConfig.providers = replaceReferencesToSelf(providers, selfAppName);
-    }
-    return replacedConfig;
+    let configString = JSON.stringify(config);
+    configString = configString.replaceAll(`"@self/`, `"${selfAppName}/`);
+    return JSON.parse(configString);
 };
 export default function serveAppShellConfig(appShellConfig, root, selfAppName, appShellConfigFile, automaticViewsFolder) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hitachivantara/app-shell-vite-plugin",
-  "version": "1.10.6",
+  "version": "2.0.0-next.2",
   "type": "module",
   "private": false,
   "author": "Hitachi Vantara UI Kit Team",
@@ -20,11 +20,11 @@
   "dependencies": {
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.1",
-    "@hitachivantara/app-shell-services": "^1.1.3",
-    "@hitachivantara/app-shell-shared": "^1.7.11",
-    "@hitachivantara/app-shell-ui": "^1.14.0",
-    "@hitachivantara/uikit-react-icons": "^5.16.9",
-    "@hitachivantara/uikit-react-shared": "^5.5.9",
+    "@hitachivantara/app-shell-services": "^2.0.0-next.2",
+    "@hitachivantara/app-shell-shared": "^2.0.0-next.2",
+    "@hitachivantara/app-shell-ui": "^2.0.0-next.2",
+    "@hitachivantara/uikit-react-icons": "^6.0.0-next.3",
+    "@hitachivantara/uikit-react-shared": "^6.0.0-next.3",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -59,5 +59,5 @@
     },
     "./package.json": "./package.json"
   },
-  "gitHead": "6d8da4ec057c2815bbf32ca60f9464d82443ab8f"
+  "gitHead": "f404f47dd2c0a9d4033b9acccc87282aa9e42119"
 }