Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-27 22:19:04 -05:00
Code Issues Activity

Fix inline root resolve logic (#7977)

Browse source
This commit is contained in:
Bjorn Lu 2023-08-07 21:43:03 +08:00 • committed by GitHub
parent 51028f85c6
commit a4a637c8f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/quick-eagles-impress.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix inline root resolve logic

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

@ -211,6 +211,10 @@ async function loadConfig(
} }
} }
/**
* `AstroInlineConfig` is a union of `AstroUserConfig` and `AstroInlineOnlyConfig`.
* This functions splits it up.
*/
function splitInlineConfig(inlineConfig: AstroInlineConfig): { function splitInlineConfig(inlineConfig: AstroInlineConfig): {
inlineUserConfig: AstroUserConfig; inlineUserConfig: AstroUserConfig;
inlineOnlyConfig: AstroInlineOnlyConfig; inlineOnlyConfig: AstroInlineOnlyConfig;
@ -231,6 +235,12 @@ interface ResolveConfigResult {
astroConfig: AstroConfig; astroConfig: AstroConfig;
} }
/**
* Resolves the Astro config with a given inline config.
*
* @param inlineConfig An inline config that takes highest priority when merging and resolving the final config.
* @param command The running command that uses this config. Usually 'dev' or 'build'.
*/
export async function resolveConfig( export async function resolveConfig(
inlineConfig: AstroInlineConfig, inlineConfig: AstroInlineConfig,
command: string, command: string,
@ -239,6 +249,11 @@ export async function resolveConfig(
const root = resolveRoot(inlineConfig.root); const root = resolveRoot(inlineConfig.root);
const { inlineUserConfig, inlineOnlyConfig } = splitInlineConfig(inlineConfig); const { inlineUserConfig, inlineOnlyConfig } = splitInlineConfig(inlineConfig);
// If the root is specified, assign the resolved path so it takes the highest priority
if (inlineConfig.root) {
inlineUserConfig.root = root;
}
const userConfig = await loadConfig(root, inlineOnlyConfig.configFile, fsMod); const userConfig = await loadConfig(root, inlineOnlyConfig.configFile, fsMod);
const mergedConfig = mergeConfig(userConfig, inlineUserConfig); const mergedConfig = mergeConfig(userConfig, inlineUserConfig);
const astroConfig = await validateConfig(mergedConfig, root, command); const astroConfig = await validateConfig(mergedConfig, root, command);

18
packages/astro/test/units/config/config-resolve.test.js Normal file
View file

@ -0,0 +1,18 @@
import { expect } from 'chai';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { resolveConfig } from '../../../dist/core/config/index.js';
describe('resolveConfig', () => {
it('resolves relative inline root correctly', async () => {
const { astroConfig } = await resolveConfig(
{
configFile: false,
root: 'relative/path',
},
'dev'
);
const expectedRoot = path.join(process.cwd(), 'relative/path/');
expect(fileURLToPath(astroConfig.root)).to.equal(expectedRoot);
});
});