Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18,267 changes: 9,013 additions & 9,254 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 28 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"author": "Louis Lambeau <louis.lambeau@enspirit.be>",
"license": "ISC",
"description": "A replacement for our Makefile-for-monorepos",
"repository": {
"type": "git",
"url": "https://github.com/enspirit/emb"
},
"bin": {
"emb": "./bin/run.js"
},
Expand Down Expand Up @@ -43,13 +47,13 @@
"version": "oclif readme && git add README.md"
},
"dependencies": {
"@fastify/deepmerge": "^3.1.0",
"@fastify/deepmerge": "^3.2.0",
"@kubernetes/client-node": "1.4.0",
"@listr2/manager": "^3.0.5",
"@listr2/manager": "^4.0.0",
"@oclif/core": "^4.8.0",
"@oclif/plugin-autocomplete": "^3.2.39",
"@oclif/plugin-help": "^6.2.36",
"@oclif/plugin-update": "^4.7.16",
"@oclif/plugin-autocomplete": "^3.2.40",
"@oclif/plugin-help": "^6.2.37",
"@oclif/plugin-update": "^4.7.17",
"@oclif/table": "^0.5.1",
"ajv": "^8.17.1",
"ansi-escapes": "^7.2.0",
Expand All @@ -60,48 +64,48 @@
"execa": "^9.6.1",
"fast-json-patch": "^3.1.1",
"fdir": "^6.5.0",
"find-up": "^7.0.0",
"glob": "^11.1.0",
"find-up": "^8.0.0",
"glob": "^13.0.0",
"graphlib": "^2.1.8",
"@inquirer/prompts": "^7.10.1",
"@listr2/prompt-adapter-inquirer": "^3.0.5",
"listr2": "^9.0.5",
"@inquirer/prompts": "^8.2.0",
"@listr2/prompt-adapter-inquirer": "^4.0.0",
"listr2": "^10.0.0",
"luxon": "^3.7.2",
"open": "^10.1.0",
"openid-client": "^6.4.3",
"protobufjs": "^7.5.4",
"open": "^11.0.0",
"openid-client": "^6.8.1",
"protobufjs": "^8.0.0",
"p-map": "^7.0.4",
"simple-git": "^3.30.0",
"yaml": "^2.8.2",
"zod": "^4.3.5"
},
"devDependencies": {
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.34.0",
"@eslint/eslintrc": "^3.3.3",
"@eslint/js": "^9.39.2",
"@oclif/prettier-config": "^0.2.1",
"@oclif/test": "^4",
"@tsconfig/node20": "^20.1.8",
"@types/dockerode": "^3.3.47",
"@types/dockerode": "^4.0.1",
"@types/graphlib": "^2.1.12",
"@types/luxon": "^3.7.1",
"@types/node": "^24.10.8",
"@typescript-eslint/eslint-plugin": "^8.41.0",
"@typescript-eslint/parser": "^8.41.0",
"@types/node": "^25.0.10",
"@typescript-eslint/eslint-plugin": "^8.53.1",
"@typescript-eslint/parser": "^8.53.1",
"eslint": "^9.39.2",
"eslint-config-oclif": "^6",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.4",
"eslint-plugin-prettier": "^5.5.5",
"json-schema-to-typescript": "^15.0.4",
"oclif": "^4",
"prettier": "^3.7.4",
"prettier": "^3.8.1",
"rimraf": "^6.1.2",
"shx": "^0.4.0",
"ts-node": "^10.9.2",
"tsc-alias": "^1.8.16",
"tsx": "^4.21.0",
"typescript": "^5.9.3",
"vitest": "^3.2.4",
"vite-tsconfig-paths": "^5.1.4"
"vitest": "^4.0.17",
"vite-tsconfig-paths": "^6.0.4"
},
"engines": {
"node": ">=20.0.0"
Expand Down Expand Up @@ -154,5 +158,5 @@
}
}
},
"packageManager": "pnpm@10.28.0"
"packageManager": "pnpm@10.28.1"
}
2 changes: 1 addition & 1 deletion tests/unit/config/syntax/components.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
import { validateUserConfig } from '@/config';

describe('Config syntax - Components', () => {
let vConfig: ReturnType<typeof vi.fn>;
let vConfig: ReturnType<typeof vi.fn<typeof validateUserConfig>>;

beforeEach(() => {
vConfig = vi.fn(validateUserConfig);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/config/syntax/defaults.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
import { validateUserConfig } from '@/config';

describe('Config syntax - Defaults', () => {
let vConfig: ReturnType<typeof vi.fn>;
let vConfig: ReturnType<typeof vi.fn<typeof validateUserConfig>>;

beforeEach(() => {
vConfig = vi.fn(validateUserConfig);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/config/syntax/flavors.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
import { validateUserConfig } from '@/config';

describe('Config syntax - Flavors', () => {
let vConfig: ReturnType<typeof vi.fn>;
let vConfig: ReturnType<typeof vi.fn<typeof validateUserConfig>>;

beforeEach(() => {
vConfig = vi.fn(validateUserConfig);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/config/syntax/plugins.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
import { validateUserConfig } from '@/config';

describe('Config syntax - Plugins', () => {
let vConfig: ReturnType<typeof vi.fn>;
let vConfig: ReturnType<typeof vi.fn<typeof validateUserConfig>>;

beforeEach(() => {
vConfig = vi.fn(validateUserConfig);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/config/syntax/project.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
import { validateUserConfig } from '@/config';

describe('Config syntax - Project', () => {
let vConfig: ReturnType<typeof vi.fn>;
let vConfig: ReturnType<typeof vi.fn<typeof validateUserConfig>>;

beforeEach(() => {
vConfig = vi.fn(validateUserConfig);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { EmbContext, getContext } from '@';
import { EventEmitter } from 'node:events';
import { PassThrough } from 'node:stream';
import { createTestContext } from 'tests/setup/set.context.js';
import { beforeEach, describe, expect, Mock, test, vi } from 'vitest';

import { ContainerExecOperation } from '@/docker';
import { createTestContext } from 'tests/setup/set.context.js';

describe('Docker / ContainerExecOperation', () => {
let context: EmbContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { EmbContext, getContext } from '@';
import { createTestContext } from 'tests/setup/set.context.js';
import { beforeEach, describe, expect, Mock, test } from 'vitest';

import { ListContainersOperation } from '@/docker';
import { createTestContext } from 'tests/setup/set.context.js';

describe('Docker / ListContainersOperation', () => {
let context: EmbContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { EmbContext, getContext } from '@';
import { createTestContext } from 'tests/setup/set.context.js';
import { beforeEach, describe, expect, Mock, test } from 'vitest';

import { PruneContainersOperation } from '@/docker';
import { createTestContext } from 'tests/setup/set.context.js';

describe('Docker / PruneContainersOperation', () => {
let context: EmbContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { EmbContext, getContext } from '@';
import { ContainerInfo } from 'dockerode';
import { createTestContext } from 'tests/setup/set.context.js';
import { beforeEach, describe, expect, Mock, test } from 'vitest';

import { GetComponentContainerOperation } from '../../../../../src/monorepo/operations/components/GetComponentContainerOperation.js';
import { createTestContext } from 'tests/setup/set.context.js';

describe('Monorepo / Operations / GetComponentContainerOperation', () => {
let context: EmbContext;
Expand Down
95 changes: 95 additions & 0 deletions vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/**
* Vitest Configuration
*
* Updated for Vitest 4.x using the new `test.projects` API.
*/
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
import tsconfigPaths from 'vite-tsconfig-paths';
import { defineConfig } from 'vitest/config';

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);

const sharedConfig = {
plugins: [
tsconfigPaths({
// Ignore errors from website/tsconfig.json which extends astro/tsconfigs/strict
// (Astro is not installed in the main project, only in the website workspace)
ignoreConfigErrors: true,
}),
],
resolve: {
alias: {
'@/': resolve(__dirname, './src/'),
'@/cli': resolve(__dirname, './src/cli/index.js'),
'@/config': resolve(__dirname, './src/config/index.js'),
'@/docker': resolve(__dirname, './src/docker/index.js'),
'@/monorepo': resolve(__dirname, './src/monorepo/index.js'),
'@/operations': resolve(__dirname, './src/operations/index.js'),
'@/prerequisites': resolve(__dirname, './src/prerequisites/index.js'),
'@/utils': resolve(__dirname, './src/utils/index.js'),
},
extensions: ['.js', '.ts', '.json'],
},
};

export default defineConfig({
test: {
projects: [
{
// Unit tests with mocked context
...sharedConfig,
test: {
name: 'unit',
include: ['tests/unit/**/*.spec.ts'],
disableConsoleIntercept: true,
setupFiles: ['tsx/esm', './tests/setup/set.context.ts'],
},
},
{
// Feature-based integration tests using example monorepos (no Docker)
...sharedConfig,
test: {
name: 'integration-features',
include: ['tests/integration/features/**/*.spec.ts'],
exclude: ['tests/integration/features/**/*.docker.spec.ts'],
disableConsoleIntercept: true,
setupFiles: ['tsx/esm'],
// Longer timeout for CI environments which may be slower
testTimeout: 30_000,
},
},
{
// Feature-based integration tests that require real Docker
...sharedConfig,
test: {
name: 'integration-features-docker',
include: ['tests/integration/features/**/*.docker.spec.ts'],
disableConsoleIntercept: true,
// Sequential execution to avoid Docker conflicts
pool: 'forks',
singleFork: true,
// Longer timeout for Docker operations
testTimeout: 120_000,
},
},
{
// Vault secrets integration tests
...sharedConfig,
test: {
name: 'integration-secrets',
include: ['tests/integration/secrets/**/*.spec.ts'],
disableConsoleIntercept: true,
setupFiles: ['tsx/esm'],
globalSetup: './tests/integration/secrets/global-setup.ts',
// Sequential execution to avoid conflicts
pool: 'forks',
singleFork: true,
// Longer timeout for container operations
testTimeout: 60_000,
},
},
],
},
});
98 changes: 0 additions & 98 deletions vitest.workspace.ts

This file was deleted.

Loading