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

[ci] format

Browse source
This commit is contained in:
natemoo-re 2022-04-06 21:38:53 +00:00 committed by GitHub Actions
parent 25cc9218f8
commit aa8fb4af51
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/astro/src/core/config.ts
View file

@ -379,14 +379,20 @@ export async function loadConfig(configOptions: LoadConfigOptions): Promise<Astr
if (flags?.config) { if (flags?.config) {
userConfigPath = /^\.*\//.test(flags.config) ? flags.config : `./${flags.config}`; userConfigPath = /^\.*\//.test(flags.config) ? flags.config : `./${flags.config}`;
userConfigPath = fileURLToPath(new URL(userConfigPath, appendForwardSlash(pathToFileURL(root).toString()))); userConfigPath = fileURLToPath(
new URL(userConfigPath, appendForwardSlash(pathToFileURL(root).toString()))
);
} }
// Automatically load config file using Proload // Automatically load config file using Proload
// If `userConfigPath` is `undefined`, Proload will search for `astro.config.[cm]?[jt]s` // If `userConfigPath` is `undefined`, Proload will search for `astro.config.[cm]?[jt]s`
let config; let config;
try { try {
config = await load('astro', { mustExist: !!userConfigPath, cwd: root, filePath: userConfigPath }); config = await load('astro', {
mustExist: !!userConfigPath,
cwd: root,
filePath: userConfigPath,
});
} catch (err) { } catch (err) {
if (err instanceof ProloadError && flags.config) { if (err instanceof ProloadError && flags.config) {
throw new Error(`Unable to resolve --config "${flags.config}"! Does the file exist?`); throw new Error(`Unable to resolve --config "${flags.config}"! Does the file exist?`);

10
packages/astro/test/config.test.js
View file

@ -78,7 +78,7 @@ describe('config', () => {
const localURL = new URL(local); const localURL = new URL(local);
expect(localURL.port).to.equal('8080'); expect(localURL.port).to.equal('8080');
}); });
}) });
describe('relative path with leading ./', () => { describe('relative path with leading ./', () => {
it('can be passed via relative --config', async () => { it('can be passed via relative --config', async () => {
@ -94,7 +94,7 @@ describe('config', () => {
const localURL = new URL(local); const localURL = new URL(local);
expect(localURL.port).to.equal('8080'); expect(localURL.port).to.equal('8080');
}); });
}) });
describe('incorrect path', () => { describe('incorrect path', () => {
it('fails and exits when config does not exist', async () => { it('fails and exits when config does not exist', async () => {
@ -113,10 +113,10 @@ describe('config', () => {
exit = 1; exit = 1;
} }
} }
expect(exit).to.equal(1, "Throws helpful error message when --config does not exist"); expect(exit).to.equal(1, 'Throws helpful error message when --config does not exist');
}); });
}) });
describe('port', () => { describe('port', () => {
it('can be specified in astro.config.mjs', async () => { it('can be specified in astro.config.mjs', async () => {

6
packages/astro/test/test-utils.js
View file

@ -171,7 +171,7 @@ export async function parseCliDevStart(proc) {
if (stderr) { if (stderr) {
throw new Error(stderr); throw new Error(stderr);
} }
const messages = stdout const messages = stdout
.split('\n') .split('\n')
.filter((ln) => !!ln.trim()) .filter((ln) => !!ln.trim())
@ -185,8 +185,8 @@ export async function cliServerLogSetup(flags = [], cmd = 'dev') {
const { messages } = await parseCliDevStart(proc); const { messages } = await parseCliDevStart(proc);
const local = messages.find(msg => msg.includes('Local'))?.replace(/Local\s*/g, ''); const local = messages.find((msg) => msg.includes('Local'))?.replace(/Local\s*/g, '');
const network = messages.find(msg => msg.includes('Network'))?.replace(/Network\s*/g, ''); const network = messages.find((msg) => msg.includes('Network'))?.replace(/Network\s*/g, '');
return { local, network }; return { local, network };
} }