Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .changeset/327f9106.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@croco/cli": patch
---

- fix: preserve verification evidence after output failures
- fix: keep publish-profile CLI tests deterministic
13 changes: 13 additions & 0 deletions packages/cli/src/tests/CliTestContract.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { readFileSync } from "node:fs";
import { describe, expect, it } from "vitest";

describe("CLI test contract", () => {
it("keeps integration tests out of the unit test task", () => {
const packageJson = JSON.parse(
readFileSync(new URL("../../package.json", import.meta.url), "utf8"),
) as { readonly scripts?: Readonly<Record<string, string>> };

expect(packageJson.scripts?.test).toBe('vitest run --exclude "src/tests/integration/**"');
expect(packageJson.scripts?.["test:e2e"]).toBe("vitest run src/tests/integration");
});
});
14 changes: 2 additions & 12 deletions scripts/package-bin-smoke.mts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSyn
import { tmpdir } from "node:os";
import { dirname, join, relative, resolve } from "node:path";
import { fileURLToPath } from "node:url";
import { findPackageJsonFiles } from "./package-manifest-contracts.mjs";
import { effectivePublishManifest, findPackageJsonFiles } from "./package-manifest-contracts.mjs";

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
Expand Down Expand Up @@ -147,7 +147,7 @@ function packageIndexFor(packageJsonFiles: readonly string[]): ReadonlyMap<strin
packageDir: dirname(packagePath),
packageName,
packagePath,
publishManifest: publishManifestFor(sourceManifest),
publishManifest: effectivePublishManifest(sourceManifest) as PackageJson,
sourceManifest,
});
}
Expand All @@ -167,16 +167,6 @@ function packageNameFor(pkg: PackageJson, packagePath: string): string {
throw new Error(`${packagePath}: package name is required`);
}

function publishManifestFor(sourceManifest: PackageJson): PackageJson {
const publishManifest = {
...sourceManifest,
...sourceManifest.publishConfig,
};
delete publishManifest.publishConfig;

return publishManifest;
}

function hasBinTargets(pkg: PackageJson): boolean {
return binTargetsFromManifest(pkg, "package").length > 0;
}
Expand Down
9 changes: 9 additions & 0 deletions scripts/package-manifest-contracts.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ export function fieldMatchesPath(source, rootFieldName, publishFieldPath) {
return valuesMatch(rootValue, publishValue);
}

export function effectivePublishManifest(sourceManifest) {
const publishManifest = {
...sourceManifest,
...sourceManifest.publishConfig,
};
delete publishManifest.publishConfig;
return publishManifest;
}

function valuesMatch(left, right) {
if (Object.is(left, right)) {
return true;
Expand Down
Loading
Loading