diff --git a/packages/presetter/source/preset/mapping.ts b/packages/presetter/source/preset/mapping.ts index d6a5216f..5b1e5e72 100644 --- a/packages/presetter/source/preset/mapping.ts +++ b/packages/presetter/source/preset/mapping.ts @@ -31,11 +31,11 @@ export async function getDestinationMap( ): Promise> { 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)]; diff --git a/packages/presetter/spec/preset/content.spec.ts b/packages/presetter/spec/preset/content.spec.ts index 1b69ec32..6bc4aa2f 100644 --- a/packages/presetter/spec/preset/content.spec.ts +++ b/packages/presetter/spec/preset/content.spec.ts @@ -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'), }, @@ -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 }, diff --git a/packages/presetter/spec/preset/mapping.spec.ts b/packages/presetter/spec/preset/mapping.spec.ts index f541206b..5718c1d9 100644 --- a/packages/presetter/spec/preset/mapping.spec.ts +++ b/packages/presetter/spec/preset/mapping.spec.ts @@ -35,7 +35,7 @@ describe('fn:getDestinationMap', () => { createDummyContext(), ), ).toEqual({ - config: resolve('/presetter/generated/client/config'), + config: resolve('/.presetter/client/config'), }); }); @@ -50,7 +50,7 @@ describe('fn:getDestinationMap', () => { ), ).toEqual({ noSymlink: resolve('/project/noSymlink'), - symlink: resolve('/presetter/generated/client/symlink'), + symlink: resolve('/.presetter/client/symlink'), }); }); }); diff --git a/packages/presetter/spec/preset/unset.spec.ts b/packages/presetter/spec/preset/unset.spec.ts index af1ea100..4606a3bd 100644 --- a/packages/presetter/spec/preset/unset.spec.ts +++ b/packages/presetter/spec/preset/unset.spec.ts @@ -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'), });