@hitachivantara/app-shell-vite-plugin 2.1.7 → 2.1.8

package/dist/config-utils.d.ts

@@ -4,10 +4,10 @@ export interface ConfigReplacement {
     token: string;
     value: string;
 }
-export type AppShellConfigFunction = (pluginOptions: AppShellVitePluginOptions, env: Record<string, string>) => HvAppShellConfig;
+export type AppShellConfigFunction = (pluginOptions: AppShellVitePluginOptions, env: Record<string, string>) => HvAppShellConfig | Promise<HvAppShellConfig>;
 export declare const DEFAULT_CONFIG_FILES: string[];
 export declare function findAppShellConfigFile(root: string): string | undefined;
-export declare function loadConfigFile(appShellConfigFile: string | undefined, opts: AppShellVitePluginOptions, env?: Record<string, string>): HvAppShellConfig;
+export declare function loadConfigFile(appShellConfigFile: string | undefined, opts: AppShellVitePluginOptions, env?: Record<string, string>): Promise<HvAppShellConfig>;
 /**
  * Returns the extensionless module name of the output bundle
  * for a given entry point module name.

package/dist/config-utils.js

@@ -1,13 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
-import { createEsmHooks, register } from "ts-node";
-import { require } from "./nodeModule.js";
-createEsmHooks(register({
-    transpileOnly: true,
-    moduleTypes: {
-        "app-shell.config.ts": "cjs",
-    },
-}));
+import { createJiti } from "jiti";
+// moduleCache is disabled so that config file changes are always picked up
+// on Vite server restart (which re-runs the full plugin pipeline in-process)
+const jiti = createJiti(import.meta.url, { moduleCache: false });
 export const DEFAULT_CONFIG_FILES = [
     "app-shell.config.ts",
     "app-shell.config.js",
@@ -20,7 +16,7 @@ export function findAppShellConfigFile(root) {
     }
     return undefined;
 }
-export function loadConfigFile(appShellConfigFile, opts, env = {}) {
+export async function loadConfigFile(appShellConfigFile, opts, env = {}) {
     if (!appShellConfigFile) {
         // an empty configuration is actually valid
         // and with the automatic views option, it can even make sense
@@ -34,13 +30,12 @@ export function loadConfigFile(appShellConfigFile, opts, env = {}) {
         });
         return JSON.parse(appShellConfigRaw);
     }
-    // using require instead of import to avoid using --experimental-loader ts-node/esm
-    // eslint-disable-next-line import/no-dynamic-require
-    const loadedAppShellConfig = require(appShellConfigFile).default;
-    if (typeof loadedAppShellConfig === "function") {
-        return loadedAppShellConfig(opts, env);
+    // jiti handles .ts and .js transpilation and loading
+    const loadedConfig = await jiti.import(appShellConfigFile, { default: true });
+    if (typeof loadedConfig === "function") {
+        return loadedConfig(opts, env);
     }
-    return loadedAppShellConfig;
+    return loadedConfig;
 }
 /**
  * Returns the extensionless module name of the output bundle

package/dist/vite-plugin.d.ts

@@ -103,4 +103,4 @@ export interface AppShellVitePluginOptions {
  * @param opts Plugin options
  * @param env Environment variable
  */
-export declare function HvAppShellVitePlugin(opts?: AppShellVitePluginOptions, env?: Record<string, string>): PluginOption;
+export declare function HvAppShellVitePlugin(opts?: AppShellVitePluginOptions, env?: Record<string, string>): Promise<PluginOption[]>;

package/dist/vite-plugin.js

@@ -24,7 +24,7 @@ const ViteBuildMode = {
  * @param opts Plugin options
  * @param env Environment variable
  */
-export function HvAppShellVitePlugin(opts = {}, env = {}) {
+export async function HvAppShellVitePlugin(opts = {}, env = {}) {
     const { root = process.cwd(), mode = ViteBuildMode.PRODUCTION, externalImportMap = false, viewsFolder = "src/pages", autoViewsAndRoutes = false, autoMenu = false, inlineConfig = opts.generateEmptyShell ?? false, generateEmptyShell = false, modules = [], disableAppsKeyNormalization = false, } = opts;
     const globalEnv = loadEnv(mode, process.cwd(), "");
     const { type = globalEnv.CI ? "bundle" : "app" } = opts;
@@ -37,7 +37,7 @@ export function HvAppShellVitePlugin(opts = {}, env = {}) {
     const appShellConfigFile = !generateEmptyShell
         ? findAppShellConfigFile(root)
         : undefined;
-    const appShellConfiguration = loadConfigFile(appShellConfigFile, opts, env);
+    const appShellConfiguration = await loadConfigFile(appShellConfigFile, opts, env);
     let autoViewsBundles = [];
     if (!generateEmptyShell) {
         if (autoViewsAndRoutes) {

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

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { require } from "./nodeModule.js";
 const prepareConfigForDevMode = (config, selfAppName) => {
     let configString = JSON.stringify(config);
     configString = configString.replaceAll(`"@self/`, `"${selfAppName}/`);
@@ -13,7 +12,6 @@ export default function serveAppShellConfig(appShellConfig, root, selfAppName, a
             const restartServer = (file) => {
                 if (appShellConfigFile != null && file.endsWith(appShellConfigFile)) {
                     console.info("App Shell configuration file changed. Reloading...");
-                    delete require.cache[require.resolve(appShellConfigFile)];
                     server
                         .restart()
                         .catch((e) => console.error(`Restart failed with: ${e}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hitachivantara/app-shell-vite-plugin",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "type": "module",
   "private": false,
   "author": "Hitachi Vantara UI Kit Team",
@@ -21,10 +21,10 @@
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.1",
     "@hitachivantara/app-shell-services": "^2.0.2",
-    "@hitachivantara/app-shell-shared": "^2.2.2",
-    "@hitachivantara/app-shell-ui": "^2.2.2",
-    "@hitachivantara/uikit-react-icons": "^6.0.2",
-    "@hitachivantara/uikit-react-shared": "^6.0.2",
+    "@hitachivantara/app-shell-shared": "^2.2.3",
+    "@hitachivantara/app-shell-ui": "^2.2.3",
+    "@hitachivantara/uikit-react-icons": "^6.0.3",
+    "@hitachivantara/uikit-react-shared": "^6.0.3",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -32,15 +32,15 @@
     "@rollup/plugin-terser": "^0.4.0",
     "@rollup/plugin-virtual": "^3.0.1",
     "es-module-shims": "^1.6.3",
+    "jiti": "^2.6.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.9.0",
     "rollup": "^4.57.1",
-    "ts-node": "^10.9.1",
     "vite-plugin-static-copy": "^3.1.0"
   },
   "peerDependencies": {
-    "vite": "^4.1.4 || ^5.0.4 || ^6.0.0 || ^7.0.0"
+    "vite": "^4.1.4 || ^5.0.4 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "files": [
     "dist"
@@ -59,5 +59,5 @@
     },
     "./package.json": "./package.json"
   },
-  "gitHead": "0985fa0fa2f1fdff7a57fced4fcb1385544cb457"
+  "gitHead": "a80406b1865bb35a4e5c23e1c4fa2e7266f77f4e"
 }