Skip to content

fix(marketplace): preserve remote cache ownership #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christso wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(marketplace): preserve remote cache ownership #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions src/cli/commands/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,27 +262,34 @@ const marketplaceListCmd = command({
console.error(`Error: ${msg}`);
process.exit(1);
}
const userRegistryPath = getRegistryPath();
const projectRegistryPath = getProjectRegistryPath(process.cwd());
const loadMarketplaceVersion = (marketplace: ScopedMarketplaceEntry) =>
getMarketplaceVersion(
marketplace,
marketplace.scope === 'project' ? projectRegistryPath : userRegistryPath,
);

let marketplaces: ScopedMarketplaceEntry[];
let overrideNames: string[] = [];

if (!scope) {
// Default: show all scopes merged
const scopedResult = await listMarketplacesWithScope(getRegistryPath(), getProjectRegistryPath(process.cwd()));
const scopedResult = await listMarketplacesWithScope(userRegistryPath, projectRegistryPath);
marketplaces = scopedResult.entries;
overrideNames = scopedResult.overrides;
} else if (scope === 'user') {
const registry = await loadRegistryFromPath(getRegistryPath());
const registry = await loadRegistryFromPath(userRegistryPath);
marketplaces = Object.values(registry.marketplaces).map((mp) => ({ ...mp, scope: 'user' as const }));
} else {
const registry = await loadRegistryFromPath(getProjectRegistryPath(process.cwd()));
const registry = await loadRegistryFromPath(projectRegistryPath);
marketplaces = Object.values(registry.marketplaces).map((mp) => ({ ...mp, scope: 'project' as const }));
}

if (isJsonMode()) {
const enriched = await Promise.all(
marketplaces.map(async (mp) => {
const version = await getMarketplaceVersion(mp);
const version = await loadMarketplaceVersion(mp);
return {
...mp,
...(version && {
Expand Down Expand Up @@ -333,7 +340,7 @@ const marketplaceListCmd = command({
console.log(` ❯ ${mp.name} (${mp.scope})`);
console.log(` Source: ${sourceLabel}`);

const version = await getMarketplaceVersion(mp);
const version = await loadMarketplaceVersion(mp);
if (version) {
const ts = version.date.toISOString().replace('T', ' ').slice(0, 16);
console.log(` Version: ${version.hash} (${ts})`);
Expand Down
2 changes: 1 addition & 1 deletion src/core/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function createGitEnv(): NodeJS.ProcessEnv {
};
}

function createGit(baseDir?: string) {
export function createGit(baseDir?: string) {
return simpleGit(baseDir, {
timeout: { block: CLONE_TIMEOUT_MS },
config: [
Expand Down
Loading