keycloakify 11.8.1 → 11.8.3

package/bin/712.index.js

@@ -849,6 +849,7 @@ var isInside = __webpack_require__(90665);
 (0,assert/* assert */.h)();
 async function generateResources(params) {
     var _a;
+    const start = Date.now();
     const { resourcesDirPath, buildContext } = params;
     const [themeName] = buildContext.themeNames;
     if (external_fs_default().existsSync(resourcesDirPath)) {
@@ -1254,13 +1255,13 @@ async function generateResources(params) {
                     break copy_main_theme_to_theme_variant_theme;
                 }
                 (0,transformCodebase/* transformCodebase */.N)({
-                    srcDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeName),
-                    destDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeVariantName),
+                    srcDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeName, themeType),
+                    destDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeVariantName, themeType),
                     transformSourceCode: isNative
                         ? undefined
                         : ({ fileRelativePath, sourceCode }) => {
                             if ((0,external_path_.extname)(fileRelativePath) === ".ftl" &&
-                                fileRelativePath.split(external_path_.sep).length === 2) {
+                                fileRelativePath.split(external_path_.sep).length === 1) {
                                 const modifiedSourceCode = Buffer.from(Buffer.from(sourceCode)
                                     .toString("utf-8")
                                     .replace(`"themeName": "${themeName}"`, `"themeName": "${themeVariantName}"`), "utf8");
@@ -1289,7 +1290,7 @@ async function generateResources(params) {
                     }
                 }
                 const emailThemeDirPath = getThemeTypeDirPath({
-                    themeName,
+                    themeName: themeVariantName,
                     themeType
                 });
                 (0,transformCodebase/* transformCodebase */.N)({
@@ -1302,13 +1303,14 @@ async function generateResources(params) {
                         return {
                             modifiedSourceCode: Buffer.from(sourceCode
                                 .toString("utf8")
-                                .replace(/xKeycloakify\.themeName/g, `"${themeName}"`), "utf8")
+                                .replace(/xKeycloakify\.themeName/g, `"${themeVariantName}"`), "utf8")
                         };
                     }
                 });
             }
         }
     }
+    console.log(`Generated resources in ${Date.now() - start}ms`);
 }
 //# sourceMappingURL=generateResources.js.map
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/index.js

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.8.1",
+    "version": "11.8.3",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",

package/src/bin/keycloakify/generateResources/generateResources.ts

@@ -57,6 +57,8 @@ export async function generateResources(params: {
     buildContext: BuildContextLike;
     resourcesDirPath: string;
 }): Promise<void> {
+    const start = Date.now();
+
     const { resourcesDirPath, buildContext } = params;
 
     const [themeName] = buildContext.themeNames;
@@ -681,14 +683,19 @@ export async function generateResources(params: {
                 }
 
                 transformCodebase({
-                    srcDirPath: pathJoin(resourcesDirPath, "theme", themeName),
-                    destDirPath: pathJoin(resourcesDirPath, "theme", themeVariantName),
+                    srcDirPath: pathJoin(resourcesDirPath, "theme", themeName, themeType),
+                    destDirPath: pathJoin(
+                        resourcesDirPath,
+                        "theme",
+                        themeVariantName,
+                        themeType
+                    ),
                     transformSourceCode: isNative
                         ? undefined
                         : ({ fileRelativePath, sourceCode }) => {
                               if (
                                   pathExtname(fileRelativePath) === ".ftl" &&
-                                  fileRelativePath.split(pathSep).length === 2
+                                  fileRelativePath.split(pathSep).length === 1
                               ) {
                                   const modifiedSourceCode = Buffer.from(
                                       Buffer.from(sourceCode)
@@ -737,7 +744,7 @@ export async function generateResources(params: {
                 }
 
                 const emailThemeDirPath = getThemeTypeDirPath({
-                    themeName,
+                    themeName: themeVariantName,
                     themeType
                 });
 
@@ -755,7 +762,7 @@ export async function generateResources(params: {
                                     .toString("utf8")
                                     .replace(
                                         /xKeycloakify\.themeName/g,
-                                        `"${themeName}"`
+                                        `"${themeVariantName}"`
                                     ),
                                 "utf8"
                             )
@@ -765,4 +772,6 @@ export async function generateResources(params: {
             }
         }
     }
+
+    console.log(`Generated resources in ${Date.now() - start}ms`);
 }