keycloakify 10.0.0-rc.130 → 10.0.0-rc.132
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/31.index.js +0 -2
- package/bin/526.index.js +18 -10
- package/bin/599.index.js +6 -5
- package/bin/932.index.js +14 -9
- package/bin/main.js +2 -2
- package/bin/shared/getLatestsSemVersionedTag.d.ts +6 -1
- package/bin/shared/getLatestsSemVersionedTag.js.map +1 -1
- package/bin/shared/promptKeycloakVersion.d.ts +3 -1
- package/bin/shared/promptKeycloakVersion.js.map +1 -1
- package/package.json +1 -1
- package/src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts +7 -5
- package/src/bin/initialize-email-theme.ts +1 -1
- package/src/bin/shared/getLatestsSemVersionedTag.ts +20 -6
- package/src/bin/shared/promptKeycloakVersion.ts +14 -5
- package/src/bin/start-keycloak/start-keycloak.ts +9 -2
- package/src/bin/tools/assertNoPnpmDlx.ts +4 -2
- package/src/bin/tools/fetchProxyOptions.ts +0 -3
- package/vite-plugin/index.js +0 -2
package/bin/31.index.js
CHANGED
package/bin/526.index.js
CHANGED
@@ -155,9 +155,10 @@ var __rest = (undefined && undefined.__rest) || function (s, e) {
|
|
155
155
|
|
156
156
|
let getLatestsSemVersionedTag_stateless = undefined;
|
157
157
|
const CACHE_VERSION = 1;
|
158
|
+
(0,assert.assert)();
|
158
159
|
async function getLatestsSemVersionedTag(_a) {
|
159
|
-
var {
|
160
|
-
const cacheFilePath = (0,external_path_.join)(cacheDirPath, "latest-sem-versioned-tags.json");
|
160
|
+
var { buildContext } = _a, params = __rest(_a, ["buildContext"]);
|
161
|
+
const cacheFilePath = (0,external_path_.join)(buildContext.cacheDirPath, "latest-sem-versioned-tags.json");
|
161
162
|
const cacheLookupResult = (() => {
|
162
163
|
const getResult_currentCache = (currentCacheEntries) => ({
|
163
164
|
hasCachedResult: false,
|
@@ -240,7 +241,7 @@ async function getLatestsSemVersionedTag(_a) {
|
|
240
241
|
getLatestsSemVersionedTag_stateless !== null && getLatestsSemVersionedTag_stateless !== void 0 ? getLatestsSemVersionedTag_stateless : (getLatestsSemVersionedTag_stateless = (() => {
|
241
242
|
const octokit = (() => {
|
242
243
|
const githubToken = process.env.GITHUB_TOKEN;
|
243
|
-
const octokit = new dist_node.Octokit(githubToken === undefined ?
|
244
|
+
const octokit = new dist_node.Octokit(Object.assign(Object.assign({}, (githubToken === undefined ? {} : { auth: githubToken })), { request: buildContext.fetchOptions }));
|
244
245
|
return octokit;
|
245
246
|
})();
|
246
247
|
const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
|
@@ -276,19 +277,23 @@ async function getLatestsSemVersionedTag(_a) {
|
|
276
277
|
/* harmony import */ var _getLatestsSemVersionedTag__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97189);
|
277
278
|
/* harmony import */ var cli_select__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99398);
|
278
279
|
/* harmony import */ var cli_select__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(cli_select__WEBPACK_IMPORTED_MODULE_1__);
|
279
|
-
/* harmony import */ var
|
280
|
+
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(88078);
|
281
|
+
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(tsafe_assert__WEBPACK_IMPORTED_MODULE_2__);
|
282
|
+
/* harmony import */ var _tools_SemVer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12171);
|
283
|
+
|
280
284
|
|
281
285
|
|
282
286
|
|
287
|
+
(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_2__.assert)();
|
283
288
|
async function promptKeycloakVersion(params) {
|
284
|
-
const { startingFromMajor, excludeMajorVersions,
|
289
|
+
const { startingFromMajor, excludeMajorVersions, buildContext } = params;
|
285
290
|
const semVersionedTagByMajor = new Map();
|
286
291
|
const semVersionedTags = await (0,_getLatestsSemVersionedTag__WEBPACK_IMPORTED_MODULE_0__/* .getLatestsSemVersionedTag */ ._)({
|
287
|
-
cacheDirPath,
|
288
292
|
count: 50,
|
289
293
|
owner: "keycloak",
|
290
294
|
repo: "keycloak",
|
291
|
-
doIgnoreReleaseCandidates: true
|
295
|
+
doIgnoreReleaseCandidates: true,
|
296
|
+
buildContext
|
292
297
|
});
|
293
298
|
semVersionedTags.forEach(semVersionedTag => {
|
294
299
|
if (startingFromMajor !== undefined &&
|
@@ -300,7 +305,7 @@ async function promptKeycloakVersion(params) {
|
|
300
305
|
}
|
301
306
|
const currentSemVersionedTag = semVersionedTagByMajor.get(semVersionedTag.version.major);
|
302
307
|
if (currentSemVersionedTag !== undefined &&
|
303
|
-
|
308
|
+
_tools_SemVer__WEBPACK_IMPORTED_MODULE_3__/* .SemVer.compare */ .h.compare(semVersionedTag.version, currentSemVersionedTag.version) === -1) {
|
304
309
|
return;
|
305
310
|
}
|
306
311
|
semVersionedTagByMajor.set(semVersionedTag.version.major, semVersionedTag);
|
@@ -575,11 +580,14 @@ async function command(params) {
|
|
575
580
|
keycloakMajorNumber: SemVer/* SemVer.parse */.h.parse(cliCommandOptions.keycloakVersion).major
|
576
581
|
};
|
577
582
|
}
|
578
|
-
console.log(
|
583
|
+
console.log([
|
584
|
+
source_default().cyan("On which version of Keycloak do you want to test your theme?"),
|
585
|
+
source_default().gray("You can also explicitly provide the version with `npx keycloakify start-keycloak --keycloak-version 25.0.2` (or any other version)")
|
586
|
+
].join("\n"));
|
579
587
|
const { keycloakVersion } = await (0,promptKeycloakVersion/* promptKeycloakVersion */.s)({
|
580
588
|
startingFromMajor: 18,
|
581
589
|
excludeMajorVersions: [22],
|
582
|
-
|
590
|
+
buildContext
|
583
591
|
});
|
584
592
|
console.log(`→ ${keycloakVersion}`);
|
585
593
|
return { keycloakVersion };
|
package/bin/599.index.js
CHANGED
@@ -143,11 +143,11 @@ async function initializeAccountTheme_singlePage(params) {
|
|
143
143
|
const OWNER = "keycloakify";
|
144
144
|
const REPO = "keycloak-account-ui";
|
145
145
|
const [semVersionedTag] = await (0,getLatestsSemVersionedTag/* getLatestsSemVersionedTag */._)({
|
146
|
-
cacheDirPath: buildContext.cacheDirPath,
|
147
146
|
owner: OWNER,
|
148
147
|
repo: REPO,
|
149
148
|
count: 1,
|
150
|
-
doIgnoreReleaseCandidates: false
|
149
|
+
doIgnoreReleaseCandidates: false,
|
150
|
+
buildContext
|
151
151
|
});
|
152
152
|
const dependencies = await lib_default()(`https://raw.githubusercontent.com/${OWNER}/${REPO}/${semVersionedTag.tag}/dependencies.gen.json`, buildContext.fetchOptions)
|
153
153
|
.then(r => r.json())
|
@@ -359,9 +359,10 @@ var __rest = (undefined && undefined.__rest) || function (s, e) {
|
|
359
359
|
|
360
360
|
let getLatestsSemVersionedTag_stateless = undefined;
|
361
361
|
const CACHE_VERSION = 1;
|
362
|
+
(0,assert.assert)();
|
362
363
|
async function getLatestsSemVersionedTag(_a) {
|
363
|
-
var {
|
364
|
-
const cacheFilePath = (0,external_path_.join)(cacheDirPath, "latest-sem-versioned-tags.json");
|
364
|
+
var { buildContext } = _a, params = __rest(_a, ["buildContext"]);
|
365
|
+
const cacheFilePath = (0,external_path_.join)(buildContext.cacheDirPath, "latest-sem-versioned-tags.json");
|
365
366
|
const cacheLookupResult = (() => {
|
366
367
|
const getResult_currentCache = (currentCacheEntries) => ({
|
367
368
|
hasCachedResult: false,
|
@@ -444,7 +445,7 @@ async function getLatestsSemVersionedTag(_a) {
|
|
444
445
|
getLatestsSemVersionedTag_stateless !== null && getLatestsSemVersionedTag_stateless !== void 0 ? getLatestsSemVersionedTag_stateless : (getLatestsSemVersionedTag_stateless = (() => {
|
445
446
|
const octokit = (() => {
|
446
447
|
const githubToken = process.env.GITHUB_TOKEN;
|
447
|
-
const octokit = new dist_node.Octokit(githubToken === undefined ?
|
448
|
+
const octokit = new dist_node.Octokit(Object.assign(Object.assign({}, (githubToken === undefined ? {} : { auth: githubToken })), { request: buildContext.fetchOptions }));
|
448
449
|
return octokit;
|
449
450
|
})();
|
450
451
|
const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
|
package/bin/932.index.js
CHANGED
@@ -37,7 +37,7 @@ async function command(params) {
|
|
37
37
|
// NOTE: This is arbitrary
|
38
38
|
startingFromMajor: 17,
|
39
39
|
excludeMajorVersions: [],
|
40
|
-
|
40
|
+
buildContext
|
41
41
|
});
|
42
42
|
const { defaultThemeDirPath } = await (0,_shared_downloadKeycloakDefaultTheme__WEBPACK_IMPORTED_MODULE_0__/* .downloadKeycloakDefaultTheme */ .x)({
|
43
43
|
keycloakVersion,
|
@@ -210,9 +210,10 @@ var __rest = (undefined && undefined.__rest) || function (s, e) {
|
|
210
210
|
|
211
211
|
let getLatestsSemVersionedTag_stateless = undefined;
|
212
212
|
const CACHE_VERSION = 1;
|
213
|
+
(0,assert.assert)();
|
213
214
|
async function getLatestsSemVersionedTag(_a) {
|
214
|
-
var {
|
215
|
-
const cacheFilePath = (0,external_path_.join)(cacheDirPath, "latest-sem-versioned-tags.json");
|
215
|
+
var { buildContext } = _a, params = __rest(_a, ["buildContext"]);
|
216
|
+
const cacheFilePath = (0,external_path_.join)(buildContext.cacheDirPath, "latest-sem-versioned-tags.json");
|
216
217
|
const cacheLookupResult = (() => {
|
217
218
|
const getResult_currentCache = (currentCacheEntries) => ({
|
218
219
|
hasCachedResult: false,
|
@@ -295,7 +296,7 @@ async function getLatestsSemVersionedTag(_a) {
|
|
295
296
|
getLatestsSemVersionedTag_stateless !== null && getLatestsSemVersionedTag_stateless !== void 0 ? getLatestsSemVersionedTag_stateless : (getLatestsSemVersionedTag_stateless = (() => {
|
296
297
|
const octokit = (() => {
|
297
298
|
const githubToken = process.env.GITHUB_TOKEN;
|
298
|
-
const octokit = new dist_node.Octokit(githubToken === undefined ?
|
299
|
+
const octokit = new dist_node.Octokit(Object.assign(Object.assign({}, (githubToken === undefined ? {} : { auth: githubToken })), { request: buildContext.fetchOptions }));
|
299
300
|
return octokit;
|
300
301
|
})();
|
301
302
|
const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
|
@@ -331,19 +332,23 @@ async function getLatestsSemVersionedTag(_a) {
|
|
331
332
|
/* harmony import */ var _getLatestsSemVersionedTag__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97189);
|
332
333
|
/* harmony import */ var cli_select__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99398);
|
333
334
|
/* harmony import */ var cli_select__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(cli_select__WEBPACK_IMPORTED_MODULE_1__);
|
334
|
-
/* harmony import */ var
|
335
|
+
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(88078);
|
336
|
+
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(tsafe_assert__WEBPACK_IMPORTED_MODULE_2__);
|
337
|
+
/* harmony import */ var _tools_SemVer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12171);
|
338
|
+
|
335
339
|
|
336
340
|
|
337
341
|
|
342
|
+
(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_2__.assert)();
|
338
343
|
async function promptKeycloakVersion(params) {
|
339
|
-
const { startingFromMajor, excludeMajorVersions,
|
344
|
+
const { startingFromMajor, excludeMajorVersions, buildContext } = params;
|
340
345
|
const semVersionedTagByMajor = new Map();
|
341
346
|
const semVersionedTags = await (0,_getLatestsSemVersionedTag__WEBPACK_IMPORTED_MODULE_0__/* .getLatestsSemVersionedTag */ ._)({
|
342
|
-
cacheDirPath,
|
343
347
|
count: 50,
|
344
348
|
owner: "keycloak",
|
345
349
|
repo: "keycloak",
|
346
|
-
doIgnoreReleaseCandidates: true
|
350
|
+
doIgnoreReleaseCandidates: true,
|
351
|
+
buildContext
|
347
352
|
});
|
348
353
|
semVersionedTags.forEach(semVersionedTag => {
|
349
354
|
if (startingFromMajor !== undefined &&
|
@@ -355,7 +360,7 @@ async function promptKeycloakVersion(params) {
|
|
355
360
|
}
|
356
361
|
const currentSemVersionedTag = semVersionedTagByMajor.get(semVersionedTag.version.major);
|
357
362
|
if (currentSemVersionedTag !== undefined &&
|
358
|
-
|
363
|
+
_tools_SemVer__WEBPACK_IMPORTED_MODULE_3__/* .SemVer.compare */ .h.compare(semVersionedTag.version, currentSemVersionedTag.version) === -1) {
|
359
364
|
return;
|
360
365
|
}
|
361
366
|
semVersionedTagByMajor.set(semVersionedTag.version.major, semVersionedTag);
|
package/bin/main.js
CHANGED
@@ -11256,9 +11256,9 @@ var source_default = /*#__PURE__*/__nccwpck_require__.n(source);
|
|
11256
11256
|
function assertNoPnpmDlx() {
|
11257
11257
|
if (__dirname.includes(`${external_path_.sep}pnpm${external_path_.sep}dlx${external_path_.sep}`)) {
|
11258
11258
|
console.log([
|
11259
|
-
source_default().red("Please don't use `pnpm dlx keycloakify`"),
|
11259
|
+
source_default().red("Please don't use `pnpm dlx keycloakify` (download and execute)"),
|
11260
11260
|
"\nUse `npx keycloakify` or `pnpm exec keycloakify` instead since you want to use the keycloakify",
|
11261
|
-
"version that is installed in your project and not the latest version
|
11261
|
+
"version that is installed in your project and not download and run the latest NPM version of keycloakify."
|
11262
11262
|
].join(" "));
|
11263
11263
|
process.exit(1);
|
11264
11264
|
}
|
@@ -1,10 +1,15 @@
|
|
1
1
|
import { getLatestsSemVersionedTagFactory } from "../tools/octokit-addons/getLatestsSemVersionedTag";
|
2
2
|
import type { ReturnType } from "tsafe";
|
3
3
|
import type { Param0 } from "tsafe";
|
4
|
+
import type { BuildContext } from "./buildContext";
|
4
5
|
type GetLatestsSemVersionedTag = ReturnType<typeof getLatestsSemVersionedTagFactory>["getLatestsSemVersionedTag"];
|
5
6
|
type Params = Param0<GetLatestsSemVersionedTag>;
|
6
7
|
type R = ReturnType<GetLatestsSemVersionedTag>;
|
7
|
-
export
|
8
|
+
export type BuildContextLike = {
|
8
9
|
cacheDirPath: string;
|
10
|
+
fetchOptions: BuildContext["fetchOptions"];
|
11
|
+
};
|
12
|
+
export declare function getLatestsSemVersionedTag({ buildContext, ...params }: Params & {
|
13
|
+
buildContext: BuildContextLike;
|
9
14
|
}): Promise<R>;
|
10
15
|
export {};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getLatestsSemVersionedTag.js","sourceRoot":"","sources":["../../src/bin/shared/getLatestsSemVersionedTag.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,mDAAmD,CAAC;AACrG,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,MAAM,EAAe,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAE9B,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;
|
1
|
+
{"version":3,"file":"getLatestsSemVersionedTag.js","sourceRoot":"","sources":["../../src/bin/shared/getLatestsSemVersionedTag.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,9 @@
|
|
1
|
+
import { type BuildContextLike as BuildContextLike_getLatestsSemVersionedTag } from "./getLatestsSemVersionedTag";
|
2
|
+
export type BuildContextLike = BuildContextLike_getLatestsSemVersionedTag & {};
|
1
3
|
export declare function promptKeycloakVersion(params: {
|
2
4
|
startingFromMajor: number | undefined;
|
3
5
|
excludeMajorVersions: number[];
|
4
|
-
|
6
|
+
buildContext: BuildContextLike;
|
5
7
|
}): Promise<{
|
6
8
|
keycloakVersion: string;
|
7
9
|
}>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"promptKeycloakVersion.js","sourceRoot":"","sources":["../../src/bin/shared/promptKeycloakVersion.ts"],"names":[],"mappings":"AAAA,OAAO,
|
1
|
+
{"version":3,"file":"promptKeycloakVersion.js","sourceRoot":"","sources":["../../src/bin/shared/promptKeycloakVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,yBAAyB,EAE5B,MAAM,6BAA6B,CAAC;AACrC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAKzC,MAAM,EAAwD,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAI3C;IACG,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEzE,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAA4C,CAAC;IAEnF,MAAM,gBAAgB,GAAG,MAAM,yBAAyB,CAAC;QACrD,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,UAAU;QACjB,IAAI,EAAE,UAAU;QAChB,yBAAyB,EAAE,IAAI;QAC/B,YAAY;KACf,CAAC,CAAC;IAEH,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QACvC,IACI,iBAAiB,KAAK,SAAS;YAC/B,eAAe,CAAC,OAAO,CAAC,KAAK,GAAG,iBAAiB,EACnD;YACE,OAAO;SACV;QAED,IAAI,oBAAoB,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC9D,OAAO;SACV;QAED,MAAM,sBAAsB,GAAG,sBAAsB,CAAC,GAAG,CACrD,eAAe,CAAC,OAAO,CAAC,KAAK,CAChC,CAAC;QAEF,IACI,sBAAsB,KAAK,SAAS;YACpC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAChF;YACE,OAAO;SACV;QAED,sBAAsB,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CACrE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CACnB,CAAC;IAEF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,CAAS;QACtC,MAAM,EAAE,iBAAiB;KAC5B,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5C,OAAO,EAAE,eAAe,EAAE,CAAC;AAC/B,CAAC"}
|
package/package.json
CHANGED
@@ -2,7 +2,10 @@ import { join as pathJoin, relative as pathRelative, dirname as pathDirname } fr
|
|
2
2
|
import type { BuildContext } from "../shared/buildContext";
|
3
3
|
import * as fs from "fs";
|
4
4
|
import chalk from "chalk";
|
5
|
-
import {
|
5
|
+
import {
|
6
|
+
getLatestsSemVersionedTag,
|
7
|
+
type BuildContextLike as BuildContextLike_getLatestsSemVersionedTag
|
8
|
+
} from "../shared/getLatestsSemVersionedTag";
|
6
9
|
import fetch from "make-fetch-happen";
|
7
10
|
import { z } from "zod";
|
8
11
|
import { assert, type Equals } from "tsafe/assert";
|
@@ -12,8 +15,7 @@ import { npmInstall } from "../tools/npmInstall";
|
|
12
15
|
import { copyBoilerplate } from "./copyBoilerplate";
|
13
16
|
import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath";
|
14
17
|
|
15
|
-
type BuildContextLike = {
|
16
|
-
cacheDirPath: string;
|
18
|
+
type BuildContextLike = BuildContextLike_getLatestsSemVersionedTag & {
|
17
19
|
fetchOptions: BuildContext["fetchOptions"];
|
18
20
|
packageJsonFilePath: string;
|
19
21
|
};
|
@@ -30,11 +32,11 @@ export async function initializeAccountTheme_singlePage(params: {
|
|
30
32
|
const REPO = "keycloak-account-ui";
|
31
33
|
|
32
34
|
const [semVersionedTag] = await getLatestsSemVersionedTag({
|
33
|
-
cacheDirPath: buildContext.cacheDirPath,
|
34
35
|
owner: OWNER,
|
35
36
|
repo: REPO,
|
36
37
|
count: 1,
|
37
|
-
doIgnoreReleaseCandidates: false
|
38
|
+
doIgnoreReleaseCandidates: false,
|
39
|
+
buildContext
|
38
40
|
});
|
39
41
|
|
40
42
|
const dependencies = await fetch(
|
@@ -30,7 +30,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
|
|
30
30
|
// NOTE: This is arbitrary
|
31
31
|
startingFromMajor: 17,
|
32
32
|
excludeMajorVersions: [],
|
33
|
-
|
33
|
+
buildContext
|
34
34
|
});
|
35
35
|
|
36
36
|
const { defaultThemeDirPath } = await downloadKeycloakDefaultTheme({
|
@@ -9,6 +9,7 @@ import { assert, type Equals } from "tsafe/assert";
|
|
9
9
|
import { id } from "tsafe/id";
|
10
10
|
import type { SemVer } from "../tools/SemVer";
|
11
11
|
import { same } from "evt/tools/inDepth/same";
|
12
|
+
import type { BuildContext } from "./buildContext";
|
12
13
|
|
13
14
|
type GetLatestsSemVersionedTag = ReturnType<
|
14
15
|
typeof getLatestsSemVersionedTagFactory
|
@@ -31,11 +32,23 @@ type Cache = {
|
|
31
32
|
}[];
|
32
33
|
};
|
33
34
|
|
35
|
+
export type BuildContextLike = {
|
36
|
+
cacheDirPath: string;
|
37
|
+
fetchOptions: BuildContext["fetchOptions"];
|
38
|
+
};
|
39
|
+
|
40
|
+
assert<BuildContext extends BuildContextLike ? true : false>();
|
41
|
+
|
34
42
|
export async function getLatestsSemVersionedTag({
|
35
|
-
|
43
|
+
buildContext,
|
36
44
|
...params
|
37
|
-
}: Params & {
|
38
|
-
|
45
|
+
}: Params & {
|
46
|
+
buildContext: BuildContextLike;
|
47
|
+
}): Promise<R> {
|
48
|
+
const cacheFilePath = pathJoin(
|
49
|
+
buildContext.cacheDirPath,
|
50
|
+
"latest-sem-versioned-tags.json"
|
51
|
+
);
|
39
52
|
|
40
53
|
const cacheLookupResult = (() => {
|
41
54
|
const getResult_currentCache = (currentCacheEntries: Cache["entries"]) => ({
|
@@ -144,9 +157,10 @@ export async function getLatestsSemVersionedTag({
|
|
144
157
|
const octokit = (() => {
|
145
158
|
const githubToken = process.env.GITHUB_TOKEN;
|
146
159
|
|
147
|
-
const octokit = new Octokit(
|
148
|
-
githubToken === undefined ?
|
149
|
-
|
160
|
+
const octokit = new Octokit({
|
161
|
+
...(githubToken === undefined ? {} : { auth: githubToken }),
|
162
|
+
request: buildContext.fetchOptions
|
163
|
+
});
|
150
164
|
|
151
165
|
return octokit;
|
152
166
|
})();
|
@@ -1,22 +1,31 @@
|
|
1
|
-
import {
|
1
|
+
import {
|
2
|
+
getLatestsSemVersionedTag,
|
3
|
+
type BuildContextLike as BuildContextLike_getLatestsSemVersionedTag
|
4
|
+
} from "./getLatestsSemVersionedTag";
|
2
5
|
import cliSelect from "cli-select";
|
6
|
+
import { assert } from "tsafe/assert";
|
3
7
|
import { SemVer } from "../tools/SemVer";
|
8
|
+
import type { BuildContext } from "./buildContext";
|
9
|
+
|
10
|
+
export type BuildContextLike = BuildContextLike_getLatestsSemVersionedTag & {};
|
11
|
+
|
12
|
+
assert<BuildContext extends BuildContextLike ? true : false>();
|
4
13
|
|
5
14
|
export async function promptKeycloakVersion(params: {
|
6
15
|
startingFromMajor: number | undefined;
|
7
16
|
excludeMajorVersions: number[];
|
8
|
-
|
17
|
+
buildContext: BuildContextLike;
|
9
18
|
}) {
|
10
|
-
const { startingFromMajor, excludeMajorVersions,
|
19
|
+
const { startingFromMajor, excludeMajorVersions, buildContext } = params;
|
11
20
|
|
12
21
|
const semVersionedTagByMajor = new Map<number, { tag: string; version: SemVer }>();
|
13
22
|
|
14
23
|
const semVersionedTags = await getLatestsSemVersionedTag({
|
15
|
-
cacheDirPath,
|
16
24
|
count: 50,
|
17
25
|
owner: "keycloak",
|
18
26
|
repo: "keycloak",
|
19
|
-
doIgnoreReleaseCandidates: true
|
27
|
+
doIgnoreReleaseCandidates: true,
|
28
|
+
buildContext
|
20
29
|
});
|
21
30
|
|
22
31
|
semVersionedTags.forEach(semVersionedTag => {
|
@@ -97,13 +97,20 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
|
|
97
97
|
}
|
98
98
|
|
99
99
|
console.log(
|
100
|
-
|
100
|
+
[
|
101
|
+
chalk.cyan(
|
102
|
+
"On which version of Keycloak do you want to test your theme?"
|
103
|
+
),
|
104
|
+
chalk.gray(
|
105
|
+
"You can also explicitly provide the version with `npx keycloakify start-keycloak --keycloak-version 25.0.2` (or any other version)"
|
106
|
+
)
|
107
|
+
].join("\n")
|
101
108
|
);
|
102
109
|
|
103
110
|
const { keycloakVersion } = await promptKeycloakVersion({
|
104
111
|
startingFromMajor: 18,
|
105
112
|
excludeMajorVersions: [22],
|
106
|
-
|
113
|
+
buildContext
|
107
114
|
});
|
108
115
|
|
109
116
|
console.log(`→ ${keycloakVersion}`);
|
@@ -5,9 +5,11 @@ export function assertNoPnpmDlx() {
|
|
5
5
|
if (__dirname.includes(`${pathSep}pnpm${pathSep}dlx${pathSep}`)) {
|
6
6
|
console.log(
|
7
7
|
[
|
8
|
-
chalk.red(
|
8
|
+
chalk.red(
|
9
|
+
"Please don't use `pnpm dlx keycloakify` (download and execute)"
|
10
|
+
),
|
9
11
|
"\nUse `npx keycloakify` or `pnpm exec keycloakify` instead since you want to use the keycloakify",
|
10
|
-
"version that is installed in your project and not the latest version
|
12
|
+
"version that is installed in your project and not download and run the latest NPM version of keycloakify."
|
11
13
|
].join(" ")
|
12
14
|
);
|
13
15
|
process.exit(1);
|
package/vite-plugin/index.js
CHANGED