Skip to content

Commit

Permalink
fix(presetter): move generated config to .presetter
Browse files Browse the repository at this point in the history
  • Loading branch information
alvis committed Jan 4, 2024
1 parent ba270fe commit 063e53a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions packages/presetter/source/preset/mapping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ export async function getDestinationMap(
): Promise<Record<string, string>> {
const {
custom: { noSymlinks },
target: { root },
target: { root, name },
} = context;
// make sure we use the path of presetter under the target project, not the one via npx
const presetterDir = resolvePackage('presetter', { cwd: root });
const outDir = resolve(presetterDir!, 'generated', context.target.name);
const outDir = resolve(presetterDir!, '..', '.presetter', name);

const relativePaths = [...Object.keys(template)];

Expand Down
12 changes: 6 additions & 6 deletions packages/presetter/spec/preset/content.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ describe('fn:bootstrapContent', () => {
},
{
'link/pointed/to/other': resolve(
'/presetter/generated/client/link/pointed/to/other',
'/.presetter/client/link/pointed/to/other',
),
'link/pointed/to/preset': resolve(
'/presetter/generated/client/link/pointed/to/preset',
'/.presetter/client/link/pointed/to/preset',
),
'link/rewritten/by/project': resolve(
'/presetter/generated/client/link/rewritten/by/project',
'/.presetter/client/link/rewritten/by/project',
),
'path/to/file': resolve('/project/path/to/file'),
},
Expand All @@ -70,13 +70,13 @@ describe('fn:bootstrapContent', () => {
{
'path/to/file': resolve('/project/path/to/file'),
'link/pointed/to/preset': resolve(
'/presetter/generated/client/link/pointed/to/preset',
'/.presetter/client/link/pointed/to/preset',
),
'link/pointed/to/other': resolve(
'/presetter/generated/client/link/pointed/to/other',
'/.presetter/client/link/pointed/to/other',
),
'link/rewritten/by/project': resolve(
'/presetter/generated/client/link/rewritten/by/project',
'/.presetter/client/link/rewritten/by/project',
),
},
{ force: false },
Expand Down
4 changes: 2 additions & 2 deletions packages/presetter/spec/preset/mapping.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('fn:getDestinationMap', () => {
createDummyContext(),
),
).toEqual({
config: resolve('/presetter/generated/client/config'),
config: resolve('/.presetter/client/config'),
});
});

Expand All @@ -50,7 +50,7 @@ describe('fn:getDestinationMap', () => {
),
).toEqual({
noSymlink: resolve('/project/noSymlink'),
symlink: resolve('/presetter/generated/client/symlink'),
symlink: resolve('/.presetter/client/symlink'),
});
});
});
6 changes: 3 additions & 3 deletions packages/presetter/spec/preset/unset.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ describe('fn:unsetPreset', () => {
it('clean up any artifacts installed on the project root', async () => {
expect(unlinkFiles).toHaveBeenCalledWith('/project', {
'link/pointed/to/other': resolve(
'/presetter/generated/client/link/pointed/to/other',
'/.presetter/client/link/pointed/to/other',
),
'link/pointed/to/preset': resolve(
'/presetter/generated/client/link/pointed/to/preset',
'/.presetter/client/link/pointed/to/preset',
),
'link/rewritten/by/project': resolve(
'/presetter/generated/client/link/rewritten/by/project',
'/.presetter/client/link/rewritten/by/project',
),
'path/to/file': resolve('/project/path/to/file'),
});
Expand Down

0 comments on commit 063e53a

Please sign in to comment.