keycloakify 11.8.47-rc.2 → 11.8.47-rc.3

package/bin/254.index.js

@@ -146,7 +146,7 @@ async function command(params) {
     }
     {
         const moduleName = "@keycloakify/login-ui";
-        const latestVersion = await getModuleLatestVersion({ moduleName });
+        const latestVersion = getModuleLatestVersion({ moduleName });
         ((_c = parsedPackageJson.dependencies) !== null && _c !== void 0 ? _c : (parsedPackageJson.dependencies = {}))[moduleName] = `~${latestVersion}`;
         if (parsedPackageJson.devDependencies !== undefined) {
             delete parsedPackageJson.devDependencies[moduleName];
@@ -157,10 +157,48 @@ async function command(params) {
             break install_stories;
         }
         const moduleName = "@keycloakify/login-ui-storybook";
-        const latestVersion = await getModuleLatestVersion({ moduleName });
+        const latestVersion = getModuleLatestVersion({ moduleName });
         ((_d = parsedPackageJson.devDependencies) !== null && _d !== void 0 ? _d : (parsedPackageJson.devDependencies = {}))[moduleName] = `~${latestVersion}`;
         delete parsedPackageJson.dependencies[moduleName];
     }
+    update_main_dev: {
+        for (const fileBasename of ["main-kc.dev.tsx", "main.dev.tsx"]) {
+            const filePath = (0,path__WEBPACK_IMPORTED_MODULE_1__.join)(buildContext.themeSrcDirPath, fileBasename);
+            if (!(await (0,_tools_fs_existsAsync__WEBPACK_IMPORTED_MODULE_10__/* .existsAsync */ .o)(filePath))) {
+                continue;
+            }
+            const content = (await fs_promises__WEBPACK_IMPORTED_MODULE_2__.readFile(filePath)).toString("utf8");
+            if (!content.includes("export {}")) {
+                break update_main_dev;
+            }
+            let content_new = [
+                `import { createRoot } from "react-dom/client";`,
+                `import { StrictMode } from "react";`,
+                `import { KcPage } from "./kc.gen";`,
+                `import { getKcContextMock } from "./login/mocks/getKcContextMock";`,
+                ``,
+                `const kcContext = getKcContextMock({`,
+                `    pageId: "login.ftl",`,
+                `    overrides: {}`,
+                `});`,
+                ``,
+                `createRoot(document.getElementById("root")!).render(`,
+                `    <StrictMode>`,
+                `        <KcPage kcContext={kcContext} />`,
+                `    </StrictMode>`,
+                `);`,
+                ``
+            ].join("\n");
+            if (await (0,_tools_runPrettier__WEBPACK_IMPORTED_MODULE_5__/* .getIsPrettierAvailable */ .MT)()) {
+                content_new = await (0,_tools_runPrettier__WEBPACK_IMPORTED_MODULE_5__/* .runPrettier */ .eY)({
+                    sourceCode: content_new,
+                    filePath
+                });
+            }
+            await fs_promises__WEBPACK_IMPORTED_MODULE_2__.writeFile(filePath, content_new);
+            break;
+        }
+    }
     {
         let sourceCode = JSON.stringify(parsedPackageJson, null, 2);
         if (await (0,_tools_runPrettier__WEBPACK_IMPORTED_MODULE_5__/* .getIsPrettierAvailable */ .MT)()) {
@@ -175,7 +213,7 @@ async function command(params) {
         packageJsonDirPath: (0,path__WEBPACK_IMPORTED_MODULE_1__.dirname)(buildContext.packageJsonFilePath)
     });
 }
-async function getModuleLatestVersion(params) {
+function getModuleLatestVersion(params) {
     const { moduleName } = params;
     const versions = (() => {
         const cmdOutput = child_process__WEBPACK_IMPORTED_MODULE_7__.execSync(`npm show ${moduleName} versions --json`)

package/bin/main.js

@@ -72,10 +72,7 @@ function getProxyFetchOptions(params) {
     var _a, _b, _c;
     const { npmConfigGetCwd } = params;
     const cfg = (() => {
-        const output = external_child_process_.execSync("npm config get", {
-            cwd: npmConfigGetCwd,
-            stdio: ["pipe", "pipe", "ignore"]
-        })
+        const output = external_child_process_.execSync("npm config get", { cwd: npmConfigGetCwd })
             .toString("utf8");
         return output
             .split("\n")
@@ -203,12 +200,18 @@ function getBuildContext(params) {
             undefined) {
             return { resolvedViteConfig: undefined };
         }
-        const output = external_child_process_.execSync("npx vite", {
-            cwd: projectDirPath,
-            stdio: ["pipe", "pipe", "ignore"],
-            env: Object.assign(Object.assign({}, process.env), { [constants/* VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG */.TE.RESOLVE_VITE_CONFIG]: "true" })
-        })
-            .toString("utf8");
+        let output;
+        try {
+            output = external_child_process_.execSync("npx vite", {
+                cwd: projectDirPath,
+                stdio: ["pipe", "pipe", "ignore"],
+                env: Object.assign(Object.assign({}, process.env), { [constants/* VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG */.TE.RESOLVE_VITE_CONFIG]: "true" })
+            })
+                .toString("utf8");
+        }
+        catch (error) {
+            throw new Error(`Failed to run \`npx vite\`: ${error}`);
+        }
         (0,assert/* assert */.h)(output.includes(constants/* VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG */.TE.RESOLVE_VITE_CONFIG), "Seems like the Keycloakify's Vite plugin is not installed.");
         const resolvedViteConfigStr = output
             .split(constants/* VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG */.TE.RESOLVE_VITE_CONFIG)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.8.47-rc.2",
+    "version": "11.8.47-rc.3",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",

package/src/bin/initialize-login-theme.ts

@@ -168,7 +168,7 @@ export async function command(params: { buildContext: BuildContext }) {
     {
         const moduleName = "@keycloakify/login-ui";
 
-        const latestVersion = await getModuleLatestVersion({ moduleName });
+        const latestVersion = getModuleLatestVersion({ moduleName });
 
         (parsedPackageJson.dependencies ??= {})[moduleName] = `~${latestVersion}`;
 
@@ -184,13 +184,59 @@ export async function command(params: { buildContext: BuildContext }) {
 
         const moduleName = "@keycloakify/login-ui-storybook";
 
-        const latestVersion = await getModuleLatestVersion({ moduleName });
+        const latestVersion = getModuleLatestVersion({ moduleName });
 
         (parsedPackageJson.devDependencies ??= {})[moduleName] = `~${latestVersion}`;
 
         delete parsedPackageJson.dependencies[moduleName];
     }
 
+    update_main_dev: {
+        for (const fileBasename of ["main-kc.dev.tsx", "main.dev.tsx"]) {
+            const filePath = pathJoin(buildContext.themeSrcDirPath, fileBasename);
+
+            if (!(await existsAsync(filePath))) {
+                continue;
+            }
+
+            const content = (await fs.readFile(filePath)).toString("utf8");
+
+            if (!content.includes("export {}")) {
+                break update_main_dev;
+            }
+
+            let content_new = [
+                `import { createRoot } from "react-dom/client";`,
+                `import { StrictMode } from "react";`,
+                `import { KcPage } from "./kc.gen";`,
+                `import { getKcContextMock } from "./login/mocks/getKcContextMock";`,
+                ``,
+                `const kcContext = getKcContextMock({`,
+                `    pageId: "login.ftl",`,
+                `    overrides: {}`,
+                `});`,
+                ``,
+                `createRoot(document.getElementById("root")!).render(`,
+                `    <StrictMode>`,
+                `        <KcPage kcContext={kcContext} />`,
+                `    </StrictMode>`,
+                `);`,
+                ``
+            ].join("\n");
+
+            if (await getIsPrettierAvailable()) {
+                content_new = await runPrettier({
+                    sourceCode: content_new,
+                    filePath
+                });
+            }
+
+            await fs.writeFile(filePath, content_new);
+
+            break;
+        }
+    }
+
     {
         let sourceCode = JSON.stringify(parsedPackageJson, null, 2);
 
@@ -212,7 +258,7 @@ export async function command(params: { buildContext: BuildContext }) {
     });
 }
 
-async function getModuleLatestVersion(params: { moduleName: string }) {
+function getModuleLatestVersion(params: { moduleName: string }) {
     const { moduleName } = params;
 
     const versions = ((): string[] => {

package/src/bin/shared/buildContext.ts

@@ -178,16 +178,22 @@ export function getBuildContext(params: {
             return { resolvedViteConfig: undefined };
         }
 
-        const output = child_process
-            .execSync("npx vite", {
-                cwd: projectDirPath,
-                stdio: ["pipe", "pipe", "ignore"],
-                env: {
-                    ...process.env,
-                    [VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG]: "true"
-                }
-            })
-            .toString("utf8");
+        let output: string;
+
+        try {
+            output = child_process
+                .execSync("npx vite", {
+                    cwd: projectDirPath,
+                    stdio: ["pipe", "pipe", "ignore"],
+                    env: {
+                        ...process.env,
+                        [VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG]: "true"
+                    }
+                })
+                .toString("utf8");
+        } catch (error) {
+            throw new Error(`Failed to run \`npx vite\`: ${error}`);
+        }
 
         assert(
             output.includes(VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG),

package/src/bin/tools/fetchProxyOptions.ts

@@ -17,10 +17,7 @@ export function getProxyFetchOptions(params: {
 
     const cfg = (() => {
         const output = child_process
-            .execSync("npm config get", {
-                cwd: npmConfigGetCwd,
-                stdio: ["pipe", "pipe", "ignore"]
-            })
+            .execSync("npm config get", { cwd: npmConfigGetCwd })
             .toString("utf8");
 
         return output

package/vite-plugin/index.js

@@ -286,10 +286,7 @@ function getProxyFetchOptions(params) {
     var _a, _b, _c;
     const { npmConfigGetCwd } = params;
     const cfg = (() => {
-        const output = external_child_process_.execSync("npm config get", {
-            cwd: npmConfigGetCwd,
-            stdio: ["pipe", "pipe", "ignore"]
-        })
+        const output = external_child_process_.execSync("npm config get", { cwd: npmConfigGetCwd })
             .toString("utf8");
         return output
             .split("\n")
@@ -417,12 +414,18 @@ function getBuildContext(params) {
             undefined) {
             return { resolvedViteConfig: undefined };
         }
-        const output = external_child_process_.execSync("npx vite", {
-            cwd: projectDirPath,
-            stdio: ["pipe", "pipe", "ignore"],
-            env: Object.assign(Object.assign({}, process.env), { [constants.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG]: "true" })
-        })
-            .toString("utf8");
+        let output;
+        try {
+            output = external_child_process_.execSync("npx vite", {
+                cwd: projectDirPath,
+                stdio: ["pipe", "pipe", "ignore"],
+                env: Object.assign(Object.assign({}, process.env), { [constants.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG]: "true" })
+            })
+                .toString("utf8");
+        }
+        catch (error) {
+            throw new Error(`Failed to run \`npx vite\`: ${error}`);
+        }
         (0,assert/* assert */.h)(output.includes(constants.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG), "Seems like the Keycloakify's Vite plugin is not installed.");
         const resolvedViteConfigStr = output
             .split(constants.VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RESOLVE_VITE_CONFIG)