keycloakify 10.1.2 → 10.1.4

package/bin/193.index.js

@@ -64,6 +64,10 @@ function copyKeycloakResourcesToPublic(params) {
         force: true,
         recursive: true
     });
+    (0,fs_rmSync/* rmSync */.a)((0,external_path_.join)((0,external_path_.dirname)(destDirPath), ".keycloakify"), {
+        force: true,
+        recursive: true
+    });
     external_fs_.mkdirSync(destDirPath, { recursive: true });
     external_fs_.writeFileSync((0,external_path_.join)(destDirPath, ".gitignore"), Buffer.from("*", "utf8"));
     (0,transformCodebase/* transformCodebase */.N)({

package/bin/shared/copyKeycloakResourcesToPublic.js.map

@@ -1 +1 @@
-{"version":3,"file":"copyKeycloakResourcesToPublic.js","sourceRoot":"","sources":["../../src/bin/shared/copyKeycloakResourcesToPublic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAMjF,MAAM,EAAwD,CAAC;AAE/D,MAAM,UAAU,6BAA6B,CAAC,MAE7C;IACG,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,WAAW,GAAG,QAAQ,CACxB,YAAY,CAAC,aAAa,EAC1B,8BAA8B,CAAC,yBAAyB,CAC3D,CAAC;IAEF,MAAM,4BAA4B,GAAG,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;IAEpF,MAAM,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAC1C;QACI,kBAAkB,EAAE,yBAAyB,EAAE;KAClD,EACD,IAAI,EACJ,CAAC,CACJ,CAAC;IAEF,oBAAoB,EAAE;QAClB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,4BAA4B,CAAC,EAAE;YAC9C,MAAM,oBAAoB,CAAC;SAC9B;QAED,MAAM,mCAAmC,GAAG,EAAE;aACzC,YAAY,CAAC,4BAA4B,CAAC;aAC1C,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEtB,IAAI,mCAAmC,KAAK,uBAAuB,EAAE;YACjE,MAAM,oBAAoB,CAAC;SAC9B;QAED,OAAO;KACV;IAED,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtD,6EAA6E;IAC7E,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,EAAE;QAC7D,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/C,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhF,iBAAiB,CAAC;QACd,UAAU,EAAE,QAAQ,CAChB,0BAA0B,EAAE,EAC5B,KAAK,EACL,QAAQ,EACR,8BAA8B,CAAC,yBAAyB,CAC3D;QACD,WAAW;KACd,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,CACZ,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,EACnC,MAAM,CAAC,IAAI;IACP,kBAAkB;IAClB;QACI,wDAAwD;QACxD,2CAA2C;QAC3C,2CAA2C;KAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CACJ,CAAC;IAEF,EAAE,CAAC,aAAa,CACZ,4BAA4B,EAC5B,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAC/C,CAAC;AACN,CAAC"}
+{"version":3,"file":"copyKeycloakResourcesToPublic.js","sourceRoot":"","sources":["../../src/bin/shared/copyKeycloakResourcesToPublic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAMjF,MAAM,EAAwD,CAAC;AAE/D,MAAM,UAAU,6BAA6B,CAAC,MAE7C;IACG,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,WAAW,GAAG,QAAQ,CACxB,YAAY,CAAC,aAAa,EAC1B,8BAA8B,CAAC,yBAAyB,CAC3D,CAAC;IAEF,MAAM,4BAA4B,GAAG,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;IAEpF,MAAM,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAC1C;QACI,kBAAkB,EAAE,yBAAyB,EAAE;KAClD,EACD,IAAI,EACJ,CAAC,CACJ,CAAC;IAEF,oBAAoB,EAAE;QAClB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,4BAA4B,CAAC,EAAE;YAC9C,MAAM,oBAAoB,CAAC;SAC9B;QAED,MAAM,mCAAmC,GAAG,EAAE;aACzC,YAAY,CAAC,4BAA4B,CAAC;aAC1C,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEtB,IAAI,mCAAmC,KAAK,uBAAuB,EAAE;YACjE,MAAM,oBAAoB,CAAC;SAC9B;QAED,OAAO;KACV;IAED,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtD,6EAA6E;IAC7E,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,EAAE;QAC7D,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,cAAc,CAAC,EAAE;QACvD,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/C,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhF,iBAAiB,CAAC;QACd,UAAU,EAAE,QAAQ,CAChB,0BAA0B,EAAE,EAC5B,KAAK,EACL,QAAQ,EACR,8BAA8B,CAAC,yBAAyB,CAC3D;QACD,WAAW;KACd,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,CACZ,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,EACnC,MAAM,CAAC,IAAI;IACP,kBAAkB;IAClB;QACI,wDAAwD;QACxD,2CAA2C;QAC3C,2CAA2C;KAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CACJ,CAAC;IAEF,EAAE,CAAC,aAAa,CACZ,4BAA4B,EAC5B,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAC/C,CAAC;AACN,CAAC"}

package/login/Template.useStylesAndScripts.js

@@ -31,14 +31,7 @@ export function useStylesAndScripts(params) {
     const { insertScriptTags } = useInsertScriptTags({
         componentOrHookName: "Template",
         scriptTags: [
-            {
-                type: "importmap",
-                textContent: JSON.stringify({
-                    imports: {
-                        rfc4648: `${url.resourcesCommonPath}/node_modules/rfc4648/lib/rfc4648.js`
-                    }
-                })
-            },
+            // NOTE: The importmap is added in by the FTL script because it's too late to add it here.
             {
                 type: "module",
                 src: `${url.resourcesPath}/js/menu-button-links.js`

package/login/Template.useStylesAndScripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"Template.useStylesAndScripts.js","sourceRoot":"","sources":["../src/login/Template.useStylesAndScripts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAexE,MAAM,EAA8D,CAAC;AACrE,MAAM,EAAkD,CAAC;AAEzD,MAAM,UAAU,mBAAmB,CAAC,MAGnC;IACG,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IAE9C,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IAE3C,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QAE5C,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAClC,OAAO;SACV;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,EAAE,uBAAuB,EAAE,GAAG,iBAAiB,CAAC;QAClD,mBAAmB,EAAE,UAAU;QAC/B,KAAK,EAAE,CAAC,eAAe;YACnB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACI,GAAG,GAAG,CAAC,mBAAmB,yDAAyD;gBACnF,GAAG,GAAG,CAAC,mBAAmB,sDAAsD;gBAChF,GAAG,GAAG,CAAC,mBAAmB,gEAAgE;gBAC1F,GAAG,GAAG,CAAC,mBAAmB,wBAAwB;gBAClD,GAAG,GAAG,CAAC,aAAa,gBAAgB;aACvC;KACV,CAAC,CAAC;IAEH,MAAM,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CAAC;QAC7C,mBAAmB,EAAE,UAAU;QAC/B,UAAU,EAAE;YACR;gBACI,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;oBACxB,OAAO,EAAE;wBACL,OAAO,EAAE,GAAG,GAAG,CAAC,mBAAmB,sCAAsC;qBAC5E;iBACJ,CAAC;aACL;YACD;gBACI,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,GAAG,GAAG,CAAC,aAAa,0BAA0B;aACtD;YACD,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACnB,IAAI,EAAE,iBAA0B;gBAChC,GAAG;aACN,CAAC,CAAC;YACH;gBACI,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE;+DACkC,GAAG,CAAC,aAAa;;;2BAGrD,GAAG,CAAC,sBAAsB;;iBAEpC;aACJ;SACJ;KACJ,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,uBAAuB,EAAE;YACzB,gBAAgB,EAAE,CAAC;SACtB;IACL,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAE9B,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,CAAC;AACxD,CAAC"}
+{"version":3,"file":"Template.useStylesAndScripts.js","sourceRoot":"","sources":["../src/login/Template.useStylesAndScripts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAexE,MAAM,EAA8D,CAAC;AACrE,MAAM,EAAkD,CAAC;AAEzD,MAAM,UAAU,mBAAmB,CAAC,MAGnC;IACG,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IAE9C,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;IAE3C,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QAE5C,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAClC,OAAO;SACV;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,EAAE,uBAAuB,EAAE,GAAG,iBAAiB,CAAC;QAClD,mBAAmB,EAAE,UAAU;QAC/B,KAAK,EAAE,CAAC,eAAe;YACnB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACI,GAAG,GAAG,CAAC,mBAAmB,yDAAyD;gBACnF,GAAG,GAAG,CAAC,mBAAmB,sDAAsD;gBAChF,GAAG,GAAG,CAAC,mBAAmB,gEAAgE;gBAC1F,GAAG,GAAG,CAAC,mBAAmB,wBAAwB;gBAClD,GAAG,GAAG,CAAC,aAAa,gBAAgB;aACvC;KACV,CAAC,CAAC;IAEH,MAAM,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CAAC;QAC7C,mBAAmB,EAAE,UAAU;QAC/B,UAAU,EAAE;YACR,0FAA0F;YAC1F;gBACI,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,GAAG,GAAG,CAAC,aAAa,0BAA0B;aACtD;YACD,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACnB,IAAI,EAAE,iBAA0B;gBAChC,GAAG;aACN,CAAC,CAAC;YACH;gBACI,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE;+DACkC,GAAG,CAAC,aAAa;;;2BAGrD,GAAG,CAAC,sBAAsB;;iBAEpC;aACJ;SACJ;KACJ,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,uBAAuB,EAAE;YACzB,gBAAgB,EAAE,CAAC;SACtB;IACL,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAE9B,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,CAAC;AACxD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.1.2",
+    "version": "10.1.4",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",

package/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl

@@ -85,6 +85,19 @@ attributes_to_attributesByName: {
     });
 }
 window.kcContext = kcContext;
+
+<#if xKeycloakify.themeType == "login" >
+    const script = document.createElement("script");
+    script.type = "importmap";
+    script.textContent = JSON.stringify({
+      imports: {
+        "rfc4648": kcContext.url.resourcesCommonPath + "/node_modules/rfc4648/lib/rfc4648.js"
+      }
+    }, null, 2); 
+
+    document.head.appendChild(script);
+</#if>
+
 function decodeHtmlEntities(htmlStr){
     var element = decodeHtmlEntities.element;
     if (!element) {

package/src/bin/shared/copyKeycloakResourcesToPublic.ts

@@ -57,6 +57,10 @@ export function copyKeycloakResourcesToPublic(params: {
         force: true,
         recursive: true
     });
+    rmSync(pathJoin(pathDirname(destDirPath), ".keycloakify"), {
+        force: true,
+        recursive: true
+    });
 
     fs.mkdirSync(destDirPath, { recursive: true });
 

package/src/login/Template.useStylesAndScripts.ts

@@ -55,14 +55,7 @@ export function useStylesAndScripts(params: {
     const { insertScriptTags } = useInsertScriptTags({
         componentOrHookName: "Template",
         scriptTags: [
-            {
-                type: "importmap",
-                textContent: JSON.stringify({
-                    imports: {
-                        rfc4648: `${url.resourcesCommonPath}/node_modules/rfc4648/lib/rfc4648.js`
-                    }
-                })
-            },
+            // NOTE: The importmap is added in by the FTL script because it's too late to add it here.
             {
                 type: "module",
                 src: `${url.resourcesPath}/js/menu-button-links.js`

package/src/tools/useInsertScriptTags.ts

@@ -6,7 +6,7 @@ export type ScriptTag = ScriptTag.TextContent | ScriptTag.Src;
 
 export namespace ScriptTag {
     type Common = {
-        type: "text/javascript" | "module" | "importmap";
+        type: "text/javascript" | "module";
     };
 
     export type TextContent = Common & {

package/tools/useInsertScriptTags.d.ts

@@ -1,7 +1,7 @@
 export type ScriptTag = ScriptTag.TextContent | ScriptTag.Src;
 export declare namespace ScriptTag {
     type Common = {
-        type: "text/javascript" | "module" | "importmap";
+        type: "text/javascript" | "module";
     };
     export type TextContent = Common & {
         textContent: string | (() => string);

package/vite-plugin/index.js

@@ -979,6 +979,10 @@ function copyKeycloakResourcesToPublic(params) {
         force: true,
         recursive: true
     });
+    rmSync((0,external_path_.join)((0,external_path_.dirname)(destDirPath), ".keycloakify"), {
+        force: true,
+        recursive: true
+    });
     external_fs_.mkdirSync(destDirPath, { recursive: true });
     external_fs_.writeFileSync((0,external_path_.join)(destDirPath, ".gitignore"), Buffer.from("*", "utf8"));
     transformCodebase({