Merge remote-tracking branch 'origin/master' into agent/download-season-queue

# Conflicts:
#	apps/electron-backend/src/app/events/database/download-requests.ts
#	libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.spec.ts
#	libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.ts
#	libs/ui/components/src/lib/season-container/episode-download.util.ts
#	libs/ui/components/src/lib/season-container/episode-utils.spec.ts
#	libs/ui/components/src/lib/season-container/season-container.component.spec.ts
#	libs/ui/components/src/lib/season-container/season-container.component.ts
This commit is contained in:
4gray committed 2026-08-02 18:06:37 +02:00
commit 31ac306bb0
243 files changed
+12935 -1106

No files matched your search

@@ -0,0 +1,105 @@
import { readFile } from 'node:fs/promises';
import { resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
import { parse } from 'yaml';
const EXACT_SEMVER = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/;
export function validateNxVersionSync({ packageJson, lockfile }) {
const diagnostics = [];
const expectedVersion = packageJson.devDependencies?.nx;
if (!expectedVersion) {
diagnostics.push('package.json: devDependencies.nx is required');
} else if (!EXACT_SEMVER.test(expectedVersion)) {
diagnostics.push(
`package.json: nx must use an exact semantic version, found "${expectedVersion}"`
);
}
if (!expectedVersion || !EXACT_SEMVER.test(expectedVersion)) {
return { diagnostics, expectedVersion };
}
for (const sectionName of [
'dependencies',
'devDependencies',
'optionalDependencies',
'peerDependencies',
]) {
const section = packageJson[sectionName] ?? {};
for (const [packageName, specifier] of Object.entries(section)) {
if (
(packageName === 'nx' || packageName.startsWith('@nx/')) &&
specifier !== expectedVersion
) {
diagnostics.push(
`package.json: ${sectionName}["${packageName}"] must match nx@${expectedVersion}, found "${specifier}"`
);
}
}
}
let foundExpectedNx = false;
for (const packageKey of Object.keys(lockfile.packages ?? {}).sort()) {
const nxMatch = /^nx@(.+)$/.exec(packageKey);
if (nxMatch) {
const resolvedVersion = nxMatch[1];
if (resolvedVersion === expectedVersion) {
foundExpectedNx = true;
} else {
diagnostics.push(
`pnpm-lock.yaml: resolved nx@${resolvedVersion} must match nx@${expectedVersion}`
);
}
continue;
}
const officialPackageMatch = /^(@nx\/[^@]+)@(.+)$/.exec(packageKey);
if (
officialPackageMatch &&
officialPackageMatch[2] !== expectedVersion
) {
diagnostics.push(
`pnpm-lock.yaml: resolved ${officialPackageMatch[1]}@${officialPackageMatch[2]} must match nx@${expectedVersion}`
);
}
}
if (!foundExpectedNx) {
diagnostics.push(
`pnpm-lock.yaml: expected nx@${expectedVersion} to be resolved`
);
}
return { diagnostics, expectedVersion };
}
const isMain =
process.argv[1] &&
resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url));
if (isMain) {
const rootDir = process.cwd();
const packageJson = JSON.parse(
await readFile(resolve(rootDir, 'package.json'), 'utf8')
);
const lockfile = parse(
await readFile(resolve(rootDir, 'pnpm-lock.yaml'), 'utf8')
);
const { diagnostics, expectedVersion } = validateNxVersionSync({
packageJson,
lockfile,
});
if (diagnostics.length > 0) {
console.error('Nx dependency version policy failed:');
for (const diagnostic of diagnostics) console.error(`- ${diagnostic}`);
process.exitCode = 1;
} else {
console.log(
`Nx dependency versions are synchronized at ${expectedVersion}.`
);
}
}
@@ -0,0 +1,199 @@
import assert from 'node:assert/strict';
import { spawnSync } from 'node:child_process';
import { mkdtemp, rm, writeFile } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import test from 'node:test';
import { fileURLToPath } from 'node:url';
import { stringify } from 'yaml';
const validatorPath = fileURLToPath(
new URL('./check-nx-version-sync.mjs', import.meta.url)
);
const alignedPackageJson = {
devDependencies: {
'@nx/angular': '22.7.1',
nx: '22.7.1',
'nx-electron': '22.0.0',
},
};
const alignedPackages = {
'@nx/angular@22.7.1': {},
'nx@22.7.1': {},
'nx-electron@22.0.0': {},
};
async function createFixture(t, { packageJson, packages }) {
const rootDir = await mkdtemp(join(tmpdir(), 'nx-version-sync-'));
t.after(() => rm(rootDir, { recursive: true, force: true }));
await writeFile(
join(rootDir, 'package.json'),
`${JSON.stringify(packageJson, null, 2)}\n`
);
await writeFile(
join(rootDir, 'pnpm-lock.yaml'),
stringify({ lockfileVersion: '9.0', packages })
);
return rootDir;
}
function runValidator(rootDir) {
return spawnSync(process.execPath, [validatorPath], {
cwd: rootDir,
encoding: 'utf8',
});
}
test('accepts aligned official Nx packages and ignores nx-electron', async (t) => {
const rootDir = await createFixture(t, {
packageJson: alignedPackageJson,
packages: alignedPackages,
});
const result = runValidator(rootDir);
assert.equal(result.status, 0, result.stderr);
assert.match(
result.stdout,
/Nx dependency versions are synchronized at 22\.7\.1\./
);
});
test('rejects a direct official Nx package mismatch', async (t) => {
const rootDir = await createFixture(t, {
packageJson: {
devDependencies: {
'@nx/angular': '22.7.1',
nx: '22.7.2',
},
},
packages: {
'@nx/angular@22.7.1': {},
'nx@22.7.2': {},
},
});
const result = runValidator(rootDir);
assert.equal(result.status, 1);
assert.match(
result.stderr,
/devDependencies\["@nx\/angular"\] must match nx@22\.7\.2, found "22\.7\.1"/
);
});
test('rejects a direct official Nx peer dependency mismatch', async (t) => {
const rootDir = await createFixture(t, {
packageJson: {
devDependencies: {
nx: '22.7.2',
},
peerDependencies: {
'@nx/angular': '22.7.1',
},
},
packages: {
'@nx/angular@22.7.2': {},
'nx@22.7.2': {},
},
});
const result = runValidator(rootDir);
assert.equal(result.status, 1);
assert.match(
result.stderr,
/peerDependencies\["@nx\/angular"\] must match nx@22\.7\.2, found "22\.7\.1"/
);
});
test('rejects an extra direct Nx declaration mismatch', async (t) => {
const rootDir = await createFixture(t, {
packageJson: {
devDependencies: {
nx: '22.7.2',
},
optionalDependencies: {
nx: '22.7.1',
},
},
packages: {
'nx@22.7.2': {},
},
});
const result = runValidator(rootDir);
assert.equal(result.status, 1);
assert.match(
result.stderr,
/optionalDependencies\["nx"\] must match nx@22\.7\.2, found "22\.7\.1"/
);
});
test('rejects a non-exact root Nx version', async (t) => {
const rootDir = await createFixture(t, {
packageJson: {
devDependencies: {
'@nx/angular': '^22.7.1',
nx: '^22.7.1',
},
},
packages: alignedPackages,
});
const result = runValidator(rootDir);
assert.equal(result.status, 1);
assert.match(
result.stderr,
/nx must use an exact semantic version, found "\^22\.7\.1"/
);
});
test('rejects an extra resolved Nx version', async (t) => {
const rootDir = await createFixture(t, {
packageJson: {
devDependencies: {
'@nx/angular': '22.7.2',
nx: '22.7.2',
},
},
packages: {
'@nx/angular@22.7.2': {},
'nx@22.7.1': {},
'nx@22.7.2': {},
},
});
const result = runValidator(rootDir);
assert.equal(result.status, 1);
assert.match(result.stderr, /resolved nx@22\.7\.1 must match nx@22\.7\.2/);
});
test('rejects a transitive official Nx lockfile mismatch', async (t) => {
const rootDir = await createFixture(t, {
packageJson: {
devDependencies: {
'@nx/angular': '22.7.2',
nx: '22.7.2',
},
},
packages: {
'@nx/angular@22.7.1': {},
'nx@22.7.2': {},
},
});
const result = runValidator(rootDir);
assert.equal(result.status, 1);
assert.match(
result.stderr,
/resolved @nx\/angular@22\.7\.1 must match nx@22\.7\.2/
);
});