michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ci] format

Browse source
This commit is contained in:
ematipico 2023-08-22 10:19:52 +00:00 • committed by astrobot-houston
parent 5821323285
commit f224c539c8
2 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/astro/src/core/config/schema.ts
View file

@ -376,7 +376,8 @@ export function createRelativeSchema(cmd: string, fileProtocolRoot: string) {
.optional() .optional()
.default({}) .default({})
), ),
}).transform((config) => { })
.transform((config) => {
// If the user changed outDir but not build.server, build.config, adjust so those // If the user changed outDir but not build.server, build.config, adjust so those
// are relative to the outDir, as is the expected default. // are relative to the outDir, as is the expected default.
if ( if (
@ -410,8 +411,10 @@ A future version of Astro will stop using the site pathname when producing <link
} }
return config; return config;
}).refine((obj) => !obj.outDir.toString().startsWith(obj.publicDir.toString()), { })
message: '`outDir` must not be placed inside `publicDir` to prevent an infinite loop. Please adjust the directory configuration and try again' .refine((obj) => !obj.outDir.toString().startsWith(obj.publicDir.toString()), {
message:
'`outDir` must not be placed inside `publicDir` to prevent an infinite loop. Please adjust the directory configuration and try again',
}); });
return AstroConfigRelativeSchema; return AstroConfigRelativeSchema;

10
packages/astro/test/units/config/config-validate.test.js
View file

@ -69,9 +69,13 @@ describe('Config Validation', () => {
expect(configError).to.be.not.instanceOf(Error); expect(configError).to.be.not.instanceOf(Error);
}); });
it('Error when outDir is placed within publicDir', async () => { it('Error when outDir is placed within publicDir', async () => {
const configError = await validateConfig({ outDir: './public/dist' }, process.cwd()).catch((err) => err); const configError = await validateConfig({ outDir: './public/dist' }, process.cwd()).catch(
(err) => err
);
expect(configError instanceof z.ZodError).to.equal(true); expect(configError instanceof z.ZodError).to.equal(true);
expect(configError.errors[0].message).to.equal('`outDir` must not be placed inside `publicDir` to prevent an infinite loop. \ expect(configError.errors[0].message).to.equal(
Please adjust the directory configuration and try again') '`outDir` must not be placed inside `publicDir` to prevent an infinite loop. \
Please adjust the directory configuration and try again'
);
}); });
}); });