From 47708d222efb81ce71b3769436c20d79999196e6 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Mon, 22 Feb 2021 12:11:00 +0100 Subject: [PATCH] minor update --- package-lock.json | 12 ++++++------ src/test/build-keycloak-theme.ts | 18 +++++++++++++----- src/test/generateKeycloakThemeResources.ts | 7 +++++-- src/test/setupSampleReactProject.ts | 2 -- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index f35e1b01..2478e806 100644 --- a/package-lock.json +++ b/package-lock.json @@ -938,9 +938,9 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.5", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.5.tgz", - "integrity": "sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg==", + "version": "20.2.6", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.6.tgz", + "integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==", "dev": true, "engines": { "node": ">=10" @@ -1699,9 +1699,9 @@ } }, "yargs-parser": { - "version": "20.2.5", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.5.tgz", - "integrity": "sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg==", + "version": "20.2.6", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.6.tgz", + "integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==", "dev": true } } diff --git a/src/test/build-keycloak-theme.ts b/src/test/build-keycloak-theme.ts index 7f36ae67..3cf942c6 100644 --- a/src/test/build-keycloak-theme.ts +++ b/src/test/build-keycloak-theme.ts @@ -1,15 +1,23 @@ -import { setupSampleReactProject } from "./setupSampleReactProject"; +import { + setupSampleReactProject, + sampleReactProjectDirPath +} from "./setupSampleReactProject"; import * as st from "scripting-tools"; import { join as pathJoin } from "path"; -const { sampleReactProjectDirPath } = setupSampleReactProject(); + +setupSampleReactProject(); + console.log(`Running main in ${sampleReactProjectDirPath}`); -st.execSync( - `node ${pathJoin(__dirname, "../bin/build-keycloak-theme")}`, - { "cwd": sampleReactProjectDirPath } +console.log( + st.execSync( + `node ${pathJoin(__dirname, "../bin/build-keycloak-theme")}`, + { "cwd": sampleReactProjectDirPath } + ) ); + diff --git a/src/test/generateKeycloakThemeResources.ts b/src/test/generateKeycloakThemeResources.ts index 3153ebfc..f0835181 100644 --- a/src/test/generateKeycloakThemeResources.ts +++ b/src/test/generateKeycloakThemeResources.ts @@ -1,9 +1,12 @@ import { join as pathJoin } from "path"; import { generateKeycloakThemeResources } from "../bin/build-keycloak-theme/generateKeycloakThemeResources"; -import { setupSampleReactProject } from "./setupSampleReactProject"; +import { + setupSampleReactProject, + sampleReactProjectDirPath +} from "./setupSampleReactProject"; -const { sampleReactProjectDirPath } = setupSampleReactProject(); +setupSampleReactProject(); generateKeycloakThemeResources({ "themeName": "onyxia-ui", diff --git a/src/test/setupSampleReactProject.ts b/src/test/setupSampleReactProject.ts index 718157f4..66cb6a06 100644 --- a/src/test/setupSampleReactProject.ts +++ b/src/test/setupSampleReactProject.ts @@ -16,6 +16,4 @@ export function setupSampleReactProject() { ...["unzip", "rm"].map(prg => `${prg} ${pathBasename(url)}`) ].forEach(cmd => st.execSync(cmd, { "cwd": sampleReactProjectDirPath })); - return { sampleReactProjectDirPath }; - } \ No newline at end of file