keycloakify 10.0.0-rc.102 → 10.0.0-rc.104
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/193.index.js +1 -1
- package/bin/31.index.js +16 -12
- package/bin/440.index.js +107 -47
- package/bin/{893.index.js → 622.index.js} +224 -220
- package/bin/932.index.js +1 -1
- package/bin/main.js +3 -3
- package/bin/shared/KeycloakVersionRange.d.ts +3 -3
- package/bin/shared/buildContext.d.ts +4 -2
- package/bin/shared/buildContext.js.map +1 -1
- package/bin/shared/downloadKeycloakDefaultTheme.js.map +1 -1
- package/package.json +2 -2
- package/src/bin/keycloakify/buildJars/buildJar.ts +15 -2
- package/src/bin/keycloakify/buildJars/buildJars.ts +6 -2
- package/src/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.ts +5 -5
- package/src/bin/keycloakify/generateFtl/generateFtl.ts +6 -3
- package/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl +2 -1
- package/src/bin/keycloakify/generateResources/generateResourcesForMainTheme.ts +102 -40
- package/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts +3 -2
- package/src/bin/shared/KeycloakVersionRange.ts +4 -4
- package/src/bin/shared/buildContext.ts +22 -14
- package/src/bin/shared/downloadKeycloakDefaultTheme.ts +1 -1
- package/src/bin/tools/downloadAndExtractArchive.ts +3 -3
- package/vite-plugin/index.js +19 -15
package/bin/193.index.js
CHANGED
@@ -114,7 +114,7 @@ async function command(params) {
|
|
114
114
|
/* harmony import */ var _tools_transformCodebase__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(60332);
|
115
115
|
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(71017);
|
116
116
|
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
|
117
|
-
/* harmony import */ var _downloadKeycloakDefaultTheme__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(
|
117
|
+
/* harmony import */ var _downloadKeycloakDefaultTheme__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(60597);
|
118
118
|
/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(173);
|
119
119
|
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(88078);
|
120
120
|
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(tsafe_assert__WEBPACK_IMPORTED_MODULE_4__);
|
package/bin/31.index.js
CHANGED
@@ -137,7 +137,7 @@ var __rest = (undefined && undefined.__rest) || function (s, e) {
|
|
137
137
|
|
138
138
|
|
139
139
|
function getBuildContext(params) {
|
140
|
-
var _a, _b, _c, _d, _e, _f;
|
140
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
141
141
|
const { cliCommandOptions } = params;
|
142
142
|
const projectDirPath = cliCommandOptions.projectDirPath !== undefined
|
143
143
|
? (0,getAbsoluteAndInOsFormatPath/* getAbsoluteAndInOsFormatPath */.c)({
|
@@ -268,7 +268,8 @@ function getBuildContext(params) {
|
|
268
268
|
(0,assert.assert)();
|
269
269
|
}
|
270
270
|
return zKeycloakVersionTargets;
|
271
|
-
})()).optional()
|
271
|
+
})()).optional(),
|
272
|
+
doUseAccountV3: lib.z.boolean().optional()
|
272
273
|
});
|
273
274
|
{
|
274
275
|
(0,assert.assert)();
|
@@ -326,6 +327,7 @@ function getBuildContext(params) {
|
|
326
327
|
return (0,external_path_.join)(projectDirPath, resolvedViteConfig.buildDir);
|
327
328
|
})();
|
328
329
|
const bundler = resolvedViteConfig !== undefined ? "vite" : "webpack";
|
330
|
+
const doUseAccountV3 = (_a = buildOptions.doUseAccountV3) !== null && _a !== void 0 ? _a : false;
|
329
331
|
return {
|
330
332
|
bundler: resolvedViteConfig !== undefined
|
331
333
|
? { type: "vite" }
|
@@ -340,7 +342,7 @@ function getBuildContext(params) {
|
|
340
342
|
packageJsonScripts: scripts !== null && scripts !== void 0 ? scripts : {}
|
341
343
|
};
|
342
344
|
})(),
|
343
|
-
themeVersion: (
|
345
|
+
themeVersion: (_c = (_b = buildOptions.themeVersion) !== null && _b !== void 0 ? _b : parsedPackageJson.version) !== null && _c !== void 0 ? _c : "0.0.0",
|
344
346
|
themeNames,
|
345
347
|
extraThemeProperties: buildOptions.extraThemeProperties,
|
346
348
|
groupId: (() => {
|
@@ -351,8 +353,8 @@ function getBuildContext(params) {
|
|
351
353
|
: (_e = (_d = (_c = (0,external_url_.parse)(parsedPackageJson.homepage)
|
352
354
|
.host) === null || _c === void 0 ? void 0 : _c.replace(/:[0-9]+$/, "")) === null || _d === void 0 ? void 0 : _d.split(".").reverse().join(".")) !== null && _e !== void 0 ? _e : fallbackGroupId) + ".keycloak");
|
353
355
|
})(),
|
354
|
-
artifactId: (
|
355
|
-
loginThemeResourcesFromKeycloakVersion: (
|
356
|
+
artifactId: (_e = (_d = process.env.KEYCLOAKIFY_ARTIFACT_ID) !== null && _d !== void 0 ? _d : buildOptions.artifactId) !== null && _e !== void 0 ? _e : `${themeNames[0]}-keycloak-theme`,
|
357
|
+
loginThemeResourcesFromKeycloakVersion: (_f = buildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _f !== void 0 ? _f : "24.0.4",
|
356
358
|
projectDirPath,
|
357
359
|
projectBuildDirPath,
|
358
360
|
keycloakifyBuildDirPath: (() => {
|
@@ -445,7 +447,7 @@ function getBuildContext(params) {
|
|
445
447
|
}
|
446
448
|
return buildOptions.kcContextExclusionsFtl;
|
447
449
|
})(),
|
448
|
-
environmentVariables: (
|
450
|
+
environmentVariables: (_g = buildOptions.environmentVariables) !== null && _g !== void 0 ? _g : [],
|
449
451
|
recordIsImplementedByThemeType,
|
450
452
|
themeSrcDirPath,
|
451
453
|
fetchOptions: getProxyFetchOptions({
|
@@ -483,8 +485,8 @@ function getBuildContext(params) {
|
|
483
485
|
break build_for_specific_keycloak_major_version;
|
484
486
|
}
|
485
487
|
const keycloakVersionRange = (() => {
|
486
|
-
const
|
487
|
-
if (
|
488
|
+
const doesImplementAccountV1Theme = !doUseAccountV3 && recordIsImplementedByThemeType.account;
|
489
|
+
if (doesImplementAccountV1Theme) {
|
488
490
|
const keycloakVersionRange = (() => {
|
489
491
|
if (buildForKeycloakMajorVersionNumber <= 21) {
|
490
492
|
return "21-and-below";
|
@@ -539,7 +541,7 @@ function getBuildContext(params) {
|
|
539
541
|
}
|
540
542
|
const jarTargets_default = (() => {
|
541
543
|
const jarTargets = [];
|
542
|
-
if (recordIsImplementedByThemeType.account) {
|
544
|
+
if (!doUseAccountV3 && recordIsImplementedByThemeType.account) {
|
543
545
|
for (const keycloakVersionRange of [
|
544
546
|
"21-and-below",
|
545
547
|
"23",
|
@@ -570,8 +572,9 @@ function getBuildContext(params) {
|
|
570
572
|
if (buildOptions.keycloakVersionTargets === undefined) {
|
571
573
|
return jarTargets_default;
|
572
574
|
}
|
573
|
-
if (buildOptions.keycloakVersionTargets.hasAccountTheme !==
|
574
|
-
|
575
|
+
if (buildOptions.keycloakVersionTargets.hasAccountTheme !== doUseAccountV3
|
576
|
+
? false
|
577
|
+
: recordIsImplementedByThemeType.account) {
|
575
578
|
console.log(source_default().red((() => {
|
576
579
|
const { keycloakVersionTargets } = buildOptions;
|
577
580
|
let message = `Bad ${(0,symToStr/* symToStr */.r)({ keycloakVersionTargets })} configuration.\n`;
|
@@ -646,7 +649,8 @@ function getBuildContext(params) {
|
|
646
649
|
process.exit(1);
|
647
650
|
}
|
648
651
|
return jarTargets;
|
649
|
-
})()
|
652
|
+
})(),
|
653
|
+
doUseAccountV3
|
650
654
|
};
|
651
655
|
}
|
652
656
|
//# sourceMappingURL=buildContext.js.map
|
package/bin/440.index.js
CHANGED
@@ -354,7 +354,7 @@ const { readAssetsDirSync } = (() => {
|
|
354
354
|
|
355
355
|
(0,assert.assert)();
|
356
356
|
function replaceImportsInCssCode(params) {
|
357
|
-
const { cssCode, cssFileRelativeDirPath, buildContext } = params;
|
357
|
+
const { cssCode, cssFileRelativeDirPath, buildContext, isAccountV3 } = params;
|
358
358
|
const fixedCssCode = cssCode.replace(/url\(["']?(\/[^/][^)"']+)["']?\)/g, (match, assetFileAbsoluteUrlPathname) => {
|
359
359
|
if (buildContext.urlPathname !== undefined) {
|
360
360
|
if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
|
@@ -367,7 +367,7 @@ function replaceImportsInCssCode(params) {
|
|
367
367
|
if (cssFileRelativeDirPath !== undefined) {
|
368
368
|
break inline_style_in_html;
|
369
369
|
}
|
370
|
-
return `url(\${url.resourcesPath}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}${assetFileAbsoluteUrlPathname})`;
|
370
|
+
return `url(\${${!isAccountV3 ? "url.resourcesPath" : "resourceUrl"}}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}${assetFileAbsoluteUrlPathname})`;
|
371
371
|
}
|
372
372
|
const assetFileRelativeUrlPathname = external_path_.posix.relative(cssFileRelativeDirPath.replace(/\\/g, "/"), assetFileAbsoluteUrlPathname.replace(/^\//, ""));
|
373
373
|
return `url(${assetFileRelativeUrlPathname})`;
|
@@ -391,7 +391,7 @@ var getThisCodebaseRootDirPath = __webpack_require__(58822);
|
|
391
391
|
(0,assert.assert)();
|
392
392
|
function generateFtlFilesCodeFactory(params) {
|
393
393
|
var _a;
|
394
|
-
const { themeName, indexHtmlCode, buildContext, keycloakifyVersion, themeType, fieldNames } = params;
|
394
|
+
const { themeName, indexHtmlCode, buildContext, keycloakifyVersion, themeType, fieldNames, isAccountV3 } = params;
|
395
395
|
const $ = esm/* default.load */.ZP.load(indexHtmlCode);
|
396
396
|
fix_imports_statements: {
|
397
397
|
$("script:not([src])").each((...[, element]) => {
|
@@ -409,7 +409,8 @@ function generateFtlFilesCodeFactory(params) {
|
|
409
409
|
const { fixedCssCode } = replaceImportsInCssCode({
|
410
410
|
cssCode,
|
411
411
|
cssFileRelativeDirPath: undefined,
|
412
|
-
buildContext
|
412
|
+
buildContext,
|
413
|
+
isAccountV3
|
413
414
|
});
|
414
415
|
$(element).text(fixedCssCode);
|
415
416
|
});
|
@@ -422,7 +423,7 @@ function generateFtlFilesCodeFactory(params) {
|
|
422
423
|
if (href === undefined) {
|
423
424
|
return;
|
424
425
|
}
|
425
|
-
$(element).attr(attrName, href.replace(new RegExp(`^${((_a = buildContext.urlPathname) !== null && _a !== void 0 ? _a : "/").replace(/\//g, "\\/")}`), `\${url.resourcesPath}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/`));
|
426
|
+
$(element).attr(attrName, href.replace(new RegExp(`^${((_a = buildContext.urlPathname) !== null && _a !== void 0 ? _a : "/").replace(/\//g, "\\/")}`), `\${${!isAccountV3 ? "url.resourcesPath" : "resourceUrl"}}/${constants/* basenameOfTheKeycloakifyResourcesDir */.M}/`));
|
426
427
|
}));
|
427
428
|
}
|
428
429
|
//FTL is no valid html, we can't insert with cheerio, we put placeholder for injecting later.
|
@@ -587,8 +588,8 @@ function readExtraPagesNames(params) {
|
|
587
588
|
//# sourceMappingURL=readExtraPageNames.js.map
|
588
589
|
// EXTERNAL MODULE: ./dist/bin/keycloakify/generateResources/generateMessageProperties.js
|
589
590
|
var generateMessageProperties = __webpack_require__(73817);
|
590
|
-
// EXTERNAL MODULE: ./dist/bin/shared/downloadKeycloakDefaultTheme.js
|
591
|
-
var downloadKeycloakDefaultTheme = __webpack_require__(
|
591
|
+
// EXTERNAL MODULE: ./dist/bin/shared/downloadKeycloakDefaultTheme.js
|
592
|
+
var downloadKeycloakDefaultTheme = __webpack_require__(60597);
|
592
593
|
;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/bringInAccountV1.js
|
593
594
|
|
594
595
|
|
@@ -674,6 +675,8 @@ function writeMetaInfKeycloakThemes(params) {
|
|
674
675
|
var objectEntries = __webpack_require__(39612);
|
675
676
|
// EXTERNAL MODULE: ./dist/bin/tools/escapeStringForPropertiesFile.js
|
676
677
|
var escapeStringForPropertiesFile = __webpack_require__(27190);
|
678
|
+
// EXTERNAL MODULE: ./dist/bin/tools/downloadAndExtractArchive.js
|
679
|
+
var downloadAndExtractArchive = __webpack_require__(38367);
|
677
680
|
;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/generateResourcesForMainTheme.js
|
678
681
|
|
679
682
|
|
@@ -693,6 +696,7 @@ var escapeStringForPropertiesFile = __webpack_require__(27190);
|
|
693
696
|
|
694
697
|
|
695
698
|
|
699
|
+
|
696
700
|
(0,assert.assert)();
|
697
701
|
async function generateResourcesForMainTheme(params) {
|
698
702
|
var _a;
|
@@ -702,6 +706,7 @@ async function generateResourcesForMainTheme(params) {
|
|
702
706
|
return (0,external_path_.join)(resourcesDirPath, "theme", themeName, themeType);
|
703
707
|
};
|
704
708
|
for (const themeType of ["login", "account"]) {
|
709
|
+
const isAccountV3 = themeType === "account" && buildContext.doUseAccountV3;
|
705
710
|
if (!buildContext.recordIsImplementedByThemeType[themeType]) {
|
706
711
|
continue;
|
707
712
|
}
|
@@ -742,7 +747,8 @@ async function generateResourcesForMainTheme(params) {
|
|
742
747
|
const { fixedCssCode } = replaceImportsInCssCode({
|
743
748
|
cssCode: sourceCode.toString("utf8"),
|
744
749
|
cssFileRelativeDirPath: (0,external_path_.dirname)(fileRelativePath),
|
745
|
-
buildContext
|
750
|
+
buildContext,
|
751
|
+
isAccountV3
|
746
752
|
});
|
747
753
|
return {
|
748
754
|
modifiedSourceCode: Buffer.from(fixedCssCode, "utf8")
|
@@ -771,7 +777,8 @@ async function generateResourcesForMainTheme(params) {
|
|
771
777
|
fieldNames: readFieldNameUsage({
|
772
778
|
themeSrcDirPath: buildContext.themeSrcDirPath,
|
773
779
|
themeType
|
774
|
-
})
|
780
|
+
}),
|
781
|
+
isAccountV3
|
775
782
|
});
|
776
783
|
[
|
777
784
|
...(() => {
|
@@ -779,51 +786,64 @@ async function generateResourcesForMainTheme(params) {
|
|
779
786
|
case "login":
|
780
787
|
return constants/* loginThemePageIds */.MN;
|
781
788
|
case "account":
|
782
|
-
return constants/* accountThemePageIds */.UX;
|
789
|
+
return isAccountV3 ? ["index.ftl"] : constants/* accountThemePageIds */.UX;
|
783
790
|
}
|
784
791
|
})(),
|
785
|
-
...
|
786
|
-
|
787
|
-
|
788
|
-
|
792
|
+
...(isAccountV3
|
793
|
+
? []
|
794
|
+
: readExtraPagesNames({
|
795
|
+
themeType,
|
796
|
+
themeSrcDirPath: buildContext.themeSrcDirPath
|
797
|
+
}))
|
789
798
|
].forEach(pageId => {
|
790
799
|
const { ftlCode } = generateFtlFilesCode({ pageId });
|
791
800
|
external_fs_.writeFileSync((0,external_path_.join)(themeTypeDirPath, pageId), Buffer.from(ftlCode, "utf8"));
|
792
801
|
});
|
793
|
-
|
794
|
-
|
795
|
-
|
796
|
-
|
797
|
-
|
798
|
-
|
799
|
-
|
802
|
+
i18n_messages_generation: {
|
803
|
+
if (isAccountV3) {
|
804
|
+
break i18n_messages_generation;
|
805
|
+
}
|
806
|
+
(0,generateMessageProperties/* generateMessageProperties */.k)({
|
807
|
+
themeSrcDirPath: buildContext.themeSrcDirPath,
|
808
|
+
themeType
|
809
|
+
}).forEach(({ languageTag, propertiesFileSource }) => {
|
810
|
+
const messagesDirPath = (0,external_path_.join)(themeTypeDirPath, "messages");
|
811
|
+
external_fs_.mkdirSync((0,external_path_.join)(themeTypeDirPath, "messages"), {
|
812
|
+
recursive: true
|
813
|
+
});
|
814
|
+
const propertiesFilePath = (0,external_path_.join)(messagesDirPath, `messages_${languageTag}.properties`);
|
815
|
+
external_fs_.writeFileSync(propertiesFilePath, Buffer.from(propertiesFileSource, "utf8"));
|
800
816
|
});
|
801
|
-
|
802
|
-
|
803
|
-
|
804
|
-
|
805
|
-
|
806
|
-
|
807
|
-
|
808
|
-
|
809
|
-
|
810
|
-
|
811
|
-
|
812
|
-
|
813
|
-
|
814
|
-
|
815
|
-
|
816
|
-
|
817
|
+
}
|
818
|
+
keycloak_static_resources: {
|
819
|
+
if (isAccountV3) {
|
820
|
+
break keycloak_static_resources;
|
821
|
+
}
|
822
|
+
await (0,downloadKeycloakStaticResources/* downloadKeycloakStaticResources */.p)({
|
823
|
+
keycloakVersion: (() => {
|
824
|
+
switch (themeType) {
|
825
|
+
case "account":
|
826
|
+
return constants/* lastKeycloakVersionWithAccountV1 */.v$;
|
827
|
+
case "login":
|
828
|
+
return buildContext.loginThemeResourcesFromKeycloakVersion;
|
829
|
+
}
|
830
|
+
})(),
|
831
|
+
themeDirPath: (0,external_path_.resolve)((0,external_path_.join)(themeTypeDirPath, "..")),
|
832
|
+
themeType,
|
833
|
+
buildContext
|
834
|
+
});
|
835
|
+
}
|
817
836
|
external_fs_.writeFileSync((0,external_path_.join)(themeTypeDirPath, "theme.properties"), Buffer.from([
|
818
837
|
`parent=${(() => {
|
819
838
|
switch (themeType) {
|
820
839
|
case "account":
|
821
|
-
return constants/* accountV1ThemeName */.y_;
|
840
|
+
return isAccountV3 ? "base" : constants/* accountV1ThemeName */.y_;
|
822
841
|
case "login":
|
823
842
|
return "keycloak";
|
824
843
|
}
|
825
844
|
(0,assert.assert)(false);
|
826
845
|
})()}`,
|
846
|
+
...(isAccountV3 ? ["deprecatedMode=false"] : []),
|
827
847
|
...((_a = buildContext.extraThemeProperties) !== null && _a !== void 0 ? _a : []),
|
828
848
|
...buildContext.environmentVariables.map(({ name, default: defaultValue }) => `${name}=\${env.${name}:${(0,escapeStringForPropertiesFile/* escapeStringForPropertiesFile */.y)(defaultValue)}}`)
|
829
849
|
].join("\n\n"), "utf8"));
|
@@ -838,12 +858,41 @@ async function generateResourcesForMainTheme(params) {
|
|
838
858
|
destDirPath: getThemeTypeDirPath({ themeType: "email" })
|
839
859
|
});
|
840
860
|
}
|
841
|
-
|
861
|
+
bring_in_account_v1: {
|
862
|
+
if (buildContext.doUseAccountV3) {
|
863
|
+
break bring_in_account_v1;
|
864
|
+
}
|
865
|
+
if (!buildContext.recordIsImplementedByThemeType.account) {
|
866
|
+
break bring_in_account_v1;
|
867
|
+
}
|
842
868
|
await bringInAccountV1({
|
843
869
|
resourcesDirPath,
|
844
870
|
buildContext
|
845
871
|
});
|
846
872
|
}
|
873
|
+
bring_in_account_v3_i18n_messages: {
|
874
|
+
if (!buildContext.doUseAccountV3) {
|
875
|
+
break bring_in_account_v3_i18n_messages;
|
876
|
+
}
|
877
|
+
const { extractedDirPath } = await (0,downloadAndExtractArchive/* downloadAndExtractArchive */.I)({
|
878
|
+
url: "https://repo1.maven.org/maven2/org/keycloak/keycloak-account-ui/25.0.1/keycloak-account-ui-25.0.1.jar",
|
879
|
+
cacheDirPath: buildContext.cacheDirPath,
|
880
|
+
fetchOptions: buildContext.fetchOptions,
|
881
|
+
uniqueIdOfOnArchiveFile: "bring_in_account_v3_i18n_messages",
|
882
|
+
onArchiveFile: async ({ fileRelativePath, writeFile }) => {
|
883
|
+
if (!fileRelativePath.startsWith((0,external_path_.join)("theme", "keycloak.v3", "account", "messages"))) {
|
884
|
+
return;
|
885
|
+
}
|
886
|
+
await writeFile({
|
887
|
+
fileRelativePath: (0,external_path_.basename)(fileRelativePath)
|
888
|
+
});
|
889
|
+
}
|
890
|
+
});
|
891
|
+
(0,transformCodebase/* transformCodebase */.N)({
|
892
|
+
srcDirPath: extractedDirPath,
|
893
|
+
destDirPath: (0,external_path_.join)(getThemeTypeDirPath({ themeType: "account" }), "messages")
|
894
|
+
});
|
895
|
+
}
|
847
896
|
{
|
848
897
|
const metaInfKeycloakThemes = { themes: [] };
|
849
898
|
metaInfKeycloakThemes.themes.push({
|
@@ -950,8 +999,8 @@ const keycloakThemeAdditionalInfoExtensionVersions = [null, "1.1.5"];
|
|
950
999
|
;// CONCATENATED MODULE: ./dist/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.js
|
951
1000
|
|
952
1001
|
function getKeycloakVersionRangeForJar(params) {
|
953
|
-
const { keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion,
|
954
|
-
if (
|
1002
|
+
const { keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, doesImplementAccountV1Theme } = params;
|
1003
|
+
if (doesImplementAccountV1Theme) {
|
955
1004
|
const keycloakVersionRange = (() => {
|
956
1005
|
switch (keycloakAccountV1Version) {
|
957
1006
|
case null:
|
@@ -1097,14 +1146,14 @@ var isInside = __webpack_require__(90665);
|
|
1097
1146
|
|
1098
1147
|
(0,assert.assert)();
|
1099
1148
|
async function buildJar(params) {
|
1100
|
-
const { jarFileBasename, keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, resourcesDirPath, buildContext } = params;
|
1149
|
+
const { jarFileBasename, keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, resourcesDirPath, doesImplementAccountV1Theme, buildContext } = params;
|
1101
1150
|
const keycloakifyBuildTmpDirPath = (0,external_path_.join)(buildContext.cacheDirPath, jarFileBasename.replace(".jar", ""));
|
1102
1151
|
(0,fs_rmSync/* rmSync */.a)(keycloakifyBuildTmpDirPath, { recursive: true, force: true });
|
1103
1152
|
const tmpResourcesDirPath = (0,external_path_.join)(keycloakifyBuildTmpDirPath, "src", "main", "resources");
|
1104
1153
|
(0,transformCodebase/* transformCodebase */.N)({
|
1105
1154
|
srcDirPath: resourcesDirPath,
|
1106
1155
|
destDirPath: tmpResourcesDirPath,
|
1107
|
-
transformSourceCode: keycloakAccountV1Version !== null
|
1156
|
+
transformSourceCode: !doesImplementAccountV1Theme || keycloakAccountV1Version !== null
|
1108
1157
|
? undefined
|
1109
1158
|
: (params) => {
|
1110
1159
|
const { fileRelativePath, sourceCode } = params;
|
@@ -1127,7 +1176,15 @@ async function buildJar(params) {
|
|
1127
1176
|
return { modifiedSourceCode: sourceCode };
|
1128
1177
|
}
|
1129
1178
|
});
|
1130
|
-
|
1179
|
+
remove_account_v1_in_meta_inf: {
|
1180
|
+
if (!doesImplementAccountV1Theme) {
|
1181
|
+
// NOTE: We do not have account v1 anyway
|
1182
|
+
break remove_account_v1_in_meta_inf;
|
1183
|
+
}
|
1184
|
+
if (keycloakAccountV1Version !== null) {
|
1185
|
+
// NOTE: No, we need to keep account-v1 in meta-inf
|
1186
|
+
break remove_account_v1_in_meta_inf;
|
1187
|
+
}
|
1131
1188
|
writeMetaInfKeycloakThemes({
|
1132
1189
|
resourcesDirPath: tmpResourcesDirPath,
|
1133
1190
|
getNewMetaInfKeycloakTheme: ({ metaInfKeycloakTheme }) => {
|
@@ -1151,6 +1208,7 @@ async function buildJar(params) {
|
|
1151
1208
|
return true;
|
1152
1209
|
}
|
1153
1210
|
})();
|
1211
|
+
// TODO: Remove this optimization, it's a bit hacky.
|
1154
1212
|
if (doBreak) {
|
1155
1213
|
break route_legacy_pages;
|
1156
1214
|
}
|
@@ -1203,10 +1261,11 @@ async function buildJar(params) {
|
|
1203
1261
|
(0,assert.assert)();
|
1204
1262
|
async function buildJars(params) {
|
1205
1263
|
const { resourcesDirPath, buildContext } = params;
|
1206
|
-
const
|
1264
|
+
const doesImplementAccountV1Theme = buildContext.recordIsImplementedByThemeType.account &&
|
1265
|
+
!buildContext.doUseAccountV3;
|
1207
1266
|
await Promise.all(keycloakAccountV1Versions.map(keycloakAccountV1Version => keycloakThemeAdditionalInfoExtensionVersions.map(keycloakThemeAdditionalInfoExtensionVersion => {
|
1208
1267
|
const keycloakVersionRange = getKeycloakVersionRangeForJar({
|
1209
|
-
|
1268
|
+
doesImplementAccountV1Theme,
|
1210
1269
|
keycloakAccountV1Version,
|
1211
1270
|
keycloakThemeAdditionalInfoExtensionVersion
|
1212
1271
|
});
|
@@ -1223,6 +1282,7 @@ async function buildJars(params) {
|
|
1223
1282
|
keycloakAccountV1Version,
|
1224
1283
|
keycloakThemeAdditionalInfoExtensionVersion,
|
1225
1284
|
resourcesDirPath,
|
1285
|
+
doesImplementAccountV1Theme,
|
1226
1286
|
buildContext
|
1227
1287
|
});
|
1228
1288
|
}))
|
@@ -1330,7 +1390,7 @@ async function command(params) {
|
|
1330
1390
|
/* harmony import */ var _tools_transformCodebase__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(60332);
|
1331
1391
|
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(71017);
|
1332
1392
|
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
|
1333
|
-
/* harmony import */ var _downloadKeycloakDefaultTheme__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(
|
1393
|
+
/* harmony import */ var _downloadKeycloakDefaultTheme__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(60597);
|
1334
1394
|
/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(173);
|
1335
1395
|
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(88078);
|
1336
1396
|
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(tsafe_assert__WEBPACK_IMPORTED_MODULE_4__);
|