[ci] format
This commit is contained in:
parent
688f8e4bc1
commit
48bde7018e
3 changed files with 42 additions and 36 deletions
|
@ -355,7 +355,7 @@ export function createRouteManifest(
|
|||
let resolved: string;
|
||||
try {
|
||||
resolved = require.resolve(entryPoint, { paths: [cwd || fileURLToPath(config.root)] });
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
resolved = fileURLToPath(new URL(entryPoint, config.root));
|
||||
}
|
||||
const component = slash(path.relative(cwd || fileURLToPath(config.root), resolved));
|
||||
|
|
|
@ -47,7 +47,7 @@ export default function loadFallbackPlugin({
|
|||
return npath.posix.join(npath.posix.dirname(parent), id);
|
||||
} else {
|
||||
let resolved = await this.resolve(id, parent, { skipSelf: true });
|
||||
if(resolved) {
|
||||
if (resolved) {
|
||||
return resolved.id;
|
||||
}
|
||||
return slashify(id);
|
||||
|
|
|
@ -108,47 +108,53 @@ describe('dev container', () => {
|
|||
});
|
||||
|
||||
it('Allows dynamic segments in injected routes', async () => {
|
||||
const fs = createFs({
|
||||
const fs = createFs(
|
||||
{
|
||||
'/src/components/test.astro': `<h1>{Astro.params.slug}</h1>`,
|
||||
'/src/pages/test-[slug].astro': `<h1>{Astro.params.slug}</h1>`,
|
||||
},
|
||||
root
|
||||
);
|
||||
|
||||
await runInContainer({
|
||||
fs,
|
||||
root,
|
||||
userConfig: {
|
||||
output: 'server',
|
||||
integrations: [{
|
||||
name: '@astrojs/test-integration',
|
||||
hooks: {
|
||||
'astro:config:setup': ({ injectRoute }) => {
|
||||
injectRoute({
|
||||
pattern: '/another-[slug]',
|
||||
entryPoint: './src/components/test.astro',
|
||||
});
|
||||
await runInContainer(
|
||||
{
|
||||
fs,
|
||||
root,
|
||||
userConfig: {
|
||||
output: 'server',
|
||||
integrations: [
|
||||
{
|
||||
name: '@astrojs/test-integration',
|
||||
hooks: {
|
||||
'astro:config:setup': ({ injectRoute }) => {
|
||||
injectRoute({
|
||||
pattern: '/another-[slug]',
|
||||
entryPoint: './src/components/test.astro',
|
||||
});
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}]
|
||||
}
|
||||
}, async (container) => {
|
||||
let r = createRequestAndResponse({
|
||||
method: 'GET',
|
||||
url: '/test-one',
|
||||
});
|
||||
container.handle(r.req, r.res);
|
||||
await r.done;
|
||||
expect(r.res.statusCode).to.equal(200);
|
||||
],
|
||||
},
|
||||
},
|
||||
async (container) => {
|
||||
let r = createRequestAndResponse({
|
||||
method: 'GET',
|
||||
url: '/test-one',
|
||||
});
|
||||
container.handle(r.req, r.res);
|
||||
await r.done;
|
||||
expect(r.res.statusCode).to.equal(200);
|
||||
|
||||
// Try with the injected route
|
||||
r = createRequestAndResponse({
|
||||
method: 'GET',
|
||||
url: '/another-two',
|
||||
});
|
||||
container.handle(r.req, r.res);
|
||||
await r.done;
|
||||
expect(r.res.statusCode).to.equal(200);
|
||||
});
|
||||
// Try with the injected route
|
||||
r = createRequestAndResponse({
|
||||
method: 'GET',
|
||||
url: '/another-two',
|
||||
});
|
||||
container.handle(r.req, r.res);
|
||||
await r.done;
|
||||
expect(r.res.statusCode).to.equal(200);
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue