@hitachivantara/app-shell-vite-plugin 1.10.0 → 1.10.1

package/dist/vite-importmap-plugin.d.ts

@@ -8,9 +8,8 @@ export declare const getExtraDependenciesString: () => string;
 /**
  * Generate and injects the importmap tag into index.html
  * @param importmapElements The importmap elements to be included
- * @param packageName The application name identifier
  * @param sharedDependencies The shared packages (other than application bundles)
  * @param externalImportMap Flag to control if the importmap should be externalized
  * @param placeholderEntryPoint Flag to control if the importmap should be a placeholder
  */
-export default function generateImportmap(importmapElements: Record<string, string>, packageName: string, sharedDependencies: string[], externalImportMap?: boolean, placeholderEntryPoint?: boolean): PluginOption;
+export default function generateImportmap(importmapElements: Record<string, string>, sharedDependencies: string[], externalImportMap?: boolean, placeholderEntryPoint?: boolean): PluginOption;

package/dist/vite-importmap-plugin.js

@@ -18,15 +18,12 @@ export const getExtraDependenciesString = () => {
     extraDependenciesString = extraDependenciesString.slice(0, -1);
     return extraDependenciesString;
 };
-function replaceIdPrefix(keys, packageName) {
-    const reg = new RegExp(`(/${packageName})?${ID_PREFIX}(${keys.join("|")})`, "g");
+function markExternal(keys) {
     return {
-        name: "vite-plugin-importmap-replace-idprefix",
+        name: "vite-plugin-importmap-mark-external",
         enforce: "pre",
         apply: "serve",
-        // while in dev, we need to prevent 'vite:import-analysis' on runtime modules
-        transform: (code) => reg.test(code) ? code.replace(reg, (m, s1, s2) => s2) : code,
-        // and to say its resolved (as external)
+        // while in dev, we need to mark keys from the importmapElements that match the id as external)
         resolveId: (id) => keys.some((key) => typeof key === "string" ? id.startsWith(key) : key.test(id))
             ? {
                 id,
@@ -44,15 +41,24 @@ function replaceIdPrefix(keys, packageName) {
         },
     };
 }
+function replaceIdPrefix(keys) {
+    const reg = new RegExp(`${ID_PREFIX}(${keys.join("|")})`, "g");
+    return {
+        name: "vite-plugin-importmap-replace-idprefix",
+        enforce: "pre",
+        apply: "serve",
+        // while in dev, we need to prevent 'vite:import-analysis' on runtime modules
+        transform: (code) => reg.test(code) ? code.replace(reg, (m, s1) => s1) : code,
+    };
+}
 /**
  * Generate and injects the importmap tag into index.html
  * @param importmapElements The importmap elements to be included
- * @param packageName The application name identifier
  * @param sharedDependencies The shared packages (other than application bundles)
  * @param externalImportMap Flag to control if the importmap should be externalized
  * @param placeholderEntryPoint Flag to control if the importmap should be a placeholder
  */
-export default function generateImportmap(importmapElements, packageName, sharedDependencies, externalImportMap = false, placeholderEntryPoint = false) {
+export default function generateImportmap(importmapElements, sharedDependencies, externalImportMap = false, placeholderEntryPoint = false) {
     const keys = Object.keys(importmapElements);
     const devKeys = keys.filter((key) => !sharedDependencies.some((lib) => lib.startsWith(key)));
     let devMode = false;
@@ -127,8 +133,23 @@ document.currentScript.after(im);
                 if (!devMode) {
                     return;
                 }
-                // @ts-expect-error an hack: we want to add the plugin only after the config is resolved
-                resolvedConfig.plugins.push(replaceIdPrefix(devKeys, packageName));
+                // this is a hack: we want to add the plugins only after the config is resolved,
+                // however, because vite:react-refresh overrides the `resolveId` hook,
+                // we need to add our `markExternal` before it
+                const index = resolvedConfig.plugins.findIndex((plugin) => plugin.name === "vite:react-refresh");
+                // if the plugin changes its name or is removed, fallback to as it was
+                if (index === -1) {
+                    // @ts-expect-error
+                    resolvedConfig.plugins.push(markExternal(devKeys));
+                }
+                else {
+                    // if present, `markExternal` will be put right before the `vite:react-refresh` plugin
+                    // @ts-expect-error
+                    resolvedConfig.plugins.splice(index, 0, markExternal(devKeys));
+                }
+                // `replaceIdPrefix` transformation can be put at the end as it was
+                // @ts-expect-error
+                resolvedConfig.plugins.push(replaceIdPrefix(devKeys));
             },
             /**
              * Rollup hook with the info for bundle generation

package/dist/vite-plugin.js

@@ -102,7 +102,7 @@ export function HvAppShellVitePlugin(opts = {}, env = {}) {
                     return acc;
                 }, {})
                 : {}),
-        }, packageJson.name, [...SHARED_DEPENDENCIES.map((dep) => dep.moduleId), packageJson.name], externalImportMap && buildEntryPoint, generateEmptyShell),
+        }, [...SHARED_DEPENDENCIES.map((dep) => dep.moduleId), packageJson.name], externalImportMap && buildEntryPoint, generateEmptyShell),
         // inject version metadata in the index.html
         buildEntryPoint && injectMetadata(),
         // set the base tag and replace the title in the index.html

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hitachivantara/app-shell-vite-plugin",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "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": "^1.1.2",
-    "@hitachivantara/app-shell-shared": "^1.7.5",
-    "@hitachivantara/app-shell-ui": "^1.13.5",
-    "@hitachivantara/uikit-react-icons": "^5.16.5",
-    "@hitachivantara/uikit-react-shared": "^5.5.5",
+    "@hitachivantara/app-shell-shared": "^1.7.6",
+    "@hitachivantara/app-shell-ui": "^1.13.6",
+    "@hitachivantara/uikit-react-icons": "^5.16.6",
+    "@hitachivantara/uikit-react-shared": "^5.5.6",
     "@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": "f2e71003d8859dc249fe7b5515738b874abfc6b7"
+  "gitHead": "7d60bff02f58ff47ae19146532553882c2e4b732"
 }