Fix Vitest VSCode extention
This commit is contained in:
parent
055b15bd46
commit
f94f9b51c9
@ -20,7 +20,7 @@ import { maybeDelegateCommandToCustomHandler } from "./shared/customHandler_dele
|
|||||||
export async function command(params: { buildContext: BuildContext }) {
|
export async function command(params: { buildContext: BuildContext }) {
|
||||||
const { buildContext } = params;
|
const { buildContext } = params;
|
||||||
|
|
||||||
const { hasBeenHandled } = maybeDelegateCommandToCustomHandler({
|
const { hasBeenHandled } = await maybeDelegateCommandToCustomHandler({
|
||||||
commandName: "add-story",
|
commandName: "add-story",
|
||||||
buildContext
|
buildContext
|
||||||
});
|
});
|
||||||
|
@ -11,7 +11,7 @@ import { getThisCodebaseRootDirPath } from "./tools/getThisCodebaseRootDirPath";
|
|||||||
export async function command(params: { buildContext: BuildContext }) {
|
export async function command(params: { buildContext: BuildContext }) {
|
||||||
const { buildContext } = params;
|
const { buildContext } = params;
|
||||||
|
|
||||||
const { hasBeenHandled } = maybeDelegateCommandToCustomHandler({
|
const { hasBeenHandled } = await maybeDelegateCommandToCustomHandler({
|
||||||
commandName: "copy-keycloak-resources-to-public",
|
commandName: "copy-keycloak-resources-to-public",
|
||||||
buildContext
|
buildContext
|
||||||
});
|
});
|
||||||
|
@ -22,7 +22,7 @@ import { runPrettier, getIsPrettierAvailable } from "./tools/runPrettier";
|
|||||||
export async function command(params: { buildContext: BuildContext }) {
|
export async function command(params: { buildContext: BuildContext }) {
|
||||||
const { buildContext } = params;
|
const { buildContext } = params;
|
||||||
|
|
||||||
const { hasBeenHandled } = maybeDelegateCommandToCustomHandler({
|
const { hasBeenHandled } = await maybeDelegateCommandToCustomHandler({
|
||||||
commandName: "eject-page",
|
commandName: "eject-page",
|
||||||
buildContext
|
buildContext
|
||||||
});
|
});
|
||||||
|
@ -12,7 +12,7 @@ import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath"
|
|||||||
export async function command(params: { buildContext: BuildContext }) {
|
export async function command(params: { buildContext: BuildContext }) {
|
||||||
const { buildContext } = params;
|
const { buildContext } = params;
|
||||||
|
|
||||||
const { hasBeenHandled } = maybeDelegateCommandToCustomHandler({
|
const { hasBeenHandled } = await maybeDelegateCommandToCustomHandler({
|
||||||
commandName: "initialize-account-theme",
|
commandName: "initialize-account-theme",
|
||||||
buildContext
|
buildContext
|
||||||
});
|
});
|
||||||
|
@ -7,7 +7,7 @@ import { command as updateKcGenCommand } from "./update-kc-gen";
|
|||||||
export async function command(params: { buildContext: BuildContext }) {
|
export async function command(params: { buildContext: BuildContext }) {
|
||||||
const { buildContext } = params;
|
const { buildContext } = params;
|
||||||
|
|
||||||
const { hasBeenHandled } = maybeDelegateCommandToCustomHandler({
|
const { hasBeenHandled } = await maybeDelegateCommandToCustomHandler({
|
||||||
commandName: "initialize-admin-theme",
|
commandName: "initialize-admin-theme",
|
||||||
buildContext
|
buildContext
|
||||||
});
|
});
|
||||||
|
@ -17,7 +17,7 @@ import chalk from "chalk";
|
|||||||
export async function command(params: { buildContext: BuildContext }) {
|
export async function command(params: { buildContext: BuildContext }) {
|
||||||
const { buildContext } = params;
|
const { buildContext } = params;
|
||||||
|
|
||||||
const { hasBeenHandled } = maybeDelegateCommandToCustomHandler({
|
const { hasBeenHandled } = await maybeDelegateCommandToCustomHandler({
|
||||||
commandName: "initialize-account-theme",
|
commandName: "initialize-account-theme",
|
||||||
buildContext
|
buildContext
|
||||||
});
|
});
|
||||||
|
@ -13,13 +13,15 @@ import * as fs from "fs";
|
|||||||
|
|
||||||
assert<Equals<ApiVersion, "v1">>();
|
assert<Equals<ApiVersion, "v1">>();
|
||||||
|
|
||||||
export function maybeDelegateCommandToCustomHandler(params: {
|
export async function maybeDelegateCommandToCustomHandler(params: {
|
||||||
commandName: CommandName;
|
commandName: CommandName;
|
||||||
buildContext: BuildContext;
|
buildContext: BuildContext;
|
||||||
}): { hasBeenHandled: boolean } {
|
}): Promise<{ hasBeenHandled: boolean }> {
|
||||||
const { commandName, buildContext } = params;
|
const { commandName, buildContext } = params;
|
||||||
|
|
||||||
const nodeModulesBinDirPath = getNodeModulesBinDirPath();
|
const nodeModulesBinDirPath = await getNodeModulesBinDirPath({
|
||||||
|
packageJsonFilePath: buildContext.packageJsonFilePath
|
||||||
|
});
|
||||||
|
|
||||||
if (!fs.readdirSync(nodeModulesBinDirPath).includes(BIN_NAME)) {
|
if (!fs.readdirSync(nodeModulesBinDirPath).includes(BIN_NAME)) {
|
||||||
return { hasBeenHandled: false };
|
return { hasBeenHandled: false };
|
||||||
|
@ -1,10 +1,29 @@
|
|||||||
import { sep as pathSep } from "path";
|
import { sep as pathSep, dirname as pathDirname, join as pathJoin } from "path";
|
||||||
|
import { getThisCodebaseRootDirPath } from "./getThisCodebaseRootDirPath";
|
||||||
|
import { getInstalledModuleDirPath } from "./getInstalledModuleDirPath";
|
||||||
|
import { existsAsync } from "./fs.existsAsync";
|
||||||
|
import { z } from "zod";
|
||||||
|
import * as fs from "fs/promises";
|
||||||
|
import { assert, is, type Equals } from "tsafe/assert";
|
||||||
|
import { id } from "tsafe/id";
|
||||||
|
|
||||||
let cache: string | undefined = undefined;
|
let cache_bestEffort: string | undefined = undefined;
|
||||||
|
|
||||||
export function getNodeModulesBinDirPath() {
|
/** NOTE: Careful, this function can fail when the binary
|
||||||
if (cache !== undefined) {
|
* Used is not in the node_modules directory of the project
|
||||||
return cache;
|
* (for example when running tests with vscode extension we'll get
|
||||||
|
* '/Users/dylan/.vscode/extensions/vitest.explorer-1.16.0/dist/worker.js'
|
||||||
|
*
|
||||||
|
* instead of
|
||||||
|
* '/Users/joseph/.nvm/versions/node/v22.12.0/bin/node'
|
||||||
|
* or
|
||||||
|
* '/Users/joseph/github/keycloakify-starter/node_modules/.bin/vite'
|
||||||
|
*
|
||||||
|
* as the value of process.argv[1]
|
||||||
|
*/
|
||||||
|
function getNodeModulesBinDirPath_bestEffort() {
|
||||||
|
if (cache_bestEffort !== undefined) {
|
||||||
|
return cache_bestEffort;
|
||||||
}
|
}
|
||||||
|
|
||||||
const binPath = process.argv[1];
|
const binPath = process.argv[1];
|
||||||
@ -30,9 +49,122 @@ export function getNodeModulesBinDirPath() {
|
|||||||
segments.unshift(segment);
|
segments.unshift(segment);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!foundNodeModules) {
|
||||||
|
throw new Error(`Could not find node_modules in path ${binPath}`);
|
||||||
|
}
|
||||||
|
|
||||||
const nodeModulesBinDirPath = segments.join(pathSep);
|
const nodeModulesBinDirPath = segments.join(pathSep);
|
||||||
|
|
||||||
cache = nodeModulesBinDirPath;
|
cache_bestEffort = nodeModulesBinDirPath;
|
||||||
|
|
||||||
return nodeModulesBinDirPath;
|
return nodeModulesBinDirPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let cache_withPackageJsonFileDirPath:
|
||||||
|
| { packageJsonFilePath: string; nodeModulesBinDirPath: string }
|
||||||
|
| undefined = undefined;
|
||||||
|
|
||||||
|
async function getNodeModulesBinDirPath_withPackageJsonFileDirPath(params: {
|
||||||
|
packageJsonFilePath: string;
|
||||||
|
}): Promise<string> {
|
||||||
|
const { packageJsonFilePath } = params;
|
||||||
|
|
||||||
|
use_cache: {
|
||||||
|
if (cache_withPackageJsonFileDirPath === undefined) {
|
||||||
|
break use_cache;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
cache_withPackageJsonFileDirPath.packageJsonFilePath !== packageJsonFilePath
|
||||||
|
) {
|
||||||
|
cache_withPackageJsonFileDirPath = undefined;
|
||||||
|
break use_cache;
|
||||||
|
}
|
||||||
|
|
||||||
|
return cache_withPackageJsonFileDirPath.nodeModulesBinDirPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
// [...]node_modules/keycloakify
|
||||||
|
const installedModuleDirPath = await getInstalledModuleDirPath({
|
||||||
|
// Here it will always be "keycloakify" but since we are in tools/ we make something generic
|
||||||
|
moduleName: await (async () => {
|
||||||
|
type ParsedPackageJson = {
|
||||||
|
name: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const zParsedPackageJson = (() => {
|
||||||
|
type TargetType = ParsedPackageJson;
|
||||||
|
|
||||||
|
const zTargetType = z.object({
|
||||||
|
name: z.string()
|
||||||
|
});
|
||||||
|
|
||||||
|
assert<Equals<z.infer<typeof zTargetType>, TargetType>>;
|
||||||
|
|
||||||
|
return id<z.ZodType<TargetType>>(zTargetType);
|
||||||
|
})();
|
||||||
|
|
||||||
|
const parsedPackageJson = JSON.parse(
|
||||||
|
(
|
||||||
|
await fs.readFile(
|
||||||
|
pathJoin(getThisCodebaseRootDirPath(), "package.json")
|
||||||
|
)
|
||||||
|
).toString("utf8")
|
||||||
|
);
|
||||||
|
|
||||||
|
zParsedPackageJson.parse(parsedPackageJson);
|
||||||
|
|
||||||
|
assert(is<ParsedPackageJson>(parsedPackageJson));
|
||||||
|
|
||||||
|
return parsedPackageJson.name;
|
||||||
|
})(),
|
||||||
|
packageJsonDirPath: pathDirname(packageJsonFilePath)
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = installedModuleDirPath.split(pathSep);
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
const segment = segments.pop();
|
||||||
|
|
||||||
|
if (segment === undefined) {
|
||||||
|
throw new Error(
|
||||||
|
`Could not find .bin directory relative to ${packageJsonFilePath}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (segment !== "node_modules") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const candidate = pathJoin(segments.join(pathSep), segment, ".bin");
|
||||||
|
|
||||||
|
if (!(await existsAsync(candidate))) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
cache_withPackageJsonFileDirPath = {
|
||||||
|
packageJsonFilePath,
|
||||||
|
nodeModulesBinDirPath: candidate
|
||||||
|
};
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return cache_withPackageJsonFileDirPath.nodeModulesBinDirPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getNodeModulesBinDirPath(params: {
|
||||||
|
packageJsonFilePath: string;
|
||||||
|
}): Promise<string>;
|
||||||
|
export function getNodeModulesBinDirPath(params: {
|
||||||
|
packageJsonFilePath: undefined;
|
||||||
|
}): string;
|
||||||
|
export function getNodeModulesBinDirPath(params: {
|
||||||
|
packageJsonFilePath: string | undefined;
|
||||||
|
}): string | Promise<string> {
|
||||||
|
const { packageJsonFilePath } = params ?? {};
|
||||||
|
|
||||||
|
return packageJsonFilePath === undefined
|
||||||
|
? getNodeModulesBinDirPath_bestEffort()
|
||||||
|
: getNodeModulesBinDirPath_withPackageJsonFileDirPath({ packageJsonFilePath });
|
||||||
|
}
|
||||||
|
@ -15,7 +15,9 @@ export async function getIsPrettierAvailable(): Promise<boolean> {
|
|||||||
return getIsPrettierAvailable.cache;
|
return getIsPrettierAvailable.cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
const nodeModulesBinDirPath = getNodeModulesBinDirPath();
|
const nodeModulesBinDirPath = getNodeModulesBinDirPath({
|
||||||
|
packageJsonFilePath: undefined
|
||||||
|
});
|
||||||
|
|
||||||
const prettierBinPath = pathJoin(nodeModulesBinDirPath, "prettier");
|
const prettierBinPath = pathJoin(nodeModulesBinDirPath, "prettier");
|
||||||
|
|
||||||
@ -51,7 +53,7 @@ export async function getPrettier(): Promise<PrettierAndConfigHash> {
|
|||||||
// We make sure to only do that when linking, otherwise we import properly.
|
// We make sure to only do that when linking, otherwise we import properly.
|
||||||
if (readThisNpmPackageVersion().startsWith("0.0.0")) {
|
if (readThisNpmPackageVersion().startsWith("0.0.0")) {
|
||||||
eval(
|
eval(
|
||||||
`${symToStr({ prettier })} = require("${pathResolve(pathJoin(getNodeModulesBinDirPath(), "..", "prettier"))}")`
|
`${symToStr({ prettier })} = require("${pathResolve(pathJoin(getNodeModulesBinDirPath({ packageJsonFilePath: undefined }), "..", "prettier"))}")`
|
||||||
);
|
);
|
||||||
|
|
||||||
assert(!is<undefined>(prettier));
|
assert(!is<undefined>(prettier));
|
||||||
@ -64,7 +66,7 @@ export async function getPrettier(): Promise<PrettierAndConfigHash> {
|
|||||||
|
|
||||||
const configHash = await (async () => {
|
const configHash = await (async () => {
|
||||||
const configFilePath = await prettier.resolveConfigFile(
|
const configFilePath = await prettier.resolveConfigFile(
|
||||||
pathJoin(getNodeModulesBinDirPath(), "..")
|
pathJoin(getNodeModulesBinDirPath({ packageJsonFilePath: undefined }), "..")
|
||||||
);
|
);
|
||||||
|
|
||||||
if (configFilePath === null) {
|
if (configFilePath === null) {
|
||||||
|
@ -19,7 +19,7 @@ export async function command(params: { buildContext: BuildContext }) {
|
|||||||
await command({ buildContext });
|
await command({ buildContext });
|
||||||
}
|
}
|
||||||
|
|
||||||
const { hasBeenHandled } = maybeDelegateCommandToCustomHandler({
|
const { hasBeenHandled } = await maybeDelegateCommandToCustomHandler({
|
||||||
commandName: "update-kc-gen",
|
commandName: "update-kc-gen",
|
||||||
buildContext
|
buildContext
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user