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

Implements import.meta.request (#46)

Browse source 
This adds `import.meta.request` to pages (not components).
This commit is contained in:
Matthew Phillips 2021-03-31 16:47:03 -04:00 committed by GitHub
parent d5b15a3851
commit 7c10d563f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/compiler/index.ts
View file

@ -1,12 +1,12 @@
import type { LogOptions } from '../logger.js'; import type { LogOptions } from '../logger.js';
import type { AstroConfig } from '../@types/astro'; import type { AstroConfig, CompileResult, TransformResult } from '../@types/astro';
import path from 'path'; import path from 'path';
import micromark from 'micromark'; import micromark from 'micromark';
import gfmSyntax from 'micromark-extension-gfm'; import gfmSyntax from 'micromark-extension-gfm';
import matter from 'gray-matter'; import matter from 'gray-matter';
import gfmHtml from 'micromark-extension-gfm/html.js'; import gfmHtml from 'micromark-extension-gfm/html.js';
import { CompileResult, TransformResult } from '../@types/astro';
import { parse } from '../parser/index.js'; import { parse } from '../parser/index.js';
import { createMarkdownHeadersCollector } from '../micromark-collect-headers.js'; import { createMarkdownHeadersCollector } from '../micromark-collect-headers.js';
import { encodeMarkdown } from '../micromark-encode.js'; import { encodeMarkdown } from '../micromark-encode.js';
@ -130,13 +130,12 @@ export default __render;
// triggered by loading a component directly by URL. // triggered by loading a component directly by URL.
export async function __renderPage({request, children, props}) { export async function __renderPage({request, children, props}) {
const currentChild = { const currentChild = {
setup: typeof setup === 'undefined' ? (passthrough) => passthrough : setup,
layout: typeof __layout === 'undefined' ? undefined : __layout, layout: typeof __layout === 'undefined' ? undefined : __layout,
content: typeof __content === 'undefined' ? undefined : __content, content: typeof __content === 'undefined' ? undefined : __content,
__render, __render,
}; };
await currentChild.setup({request}); import.meta.request = request;
const childBodyResult = await currentChild.__render(props, children); const childBodyResult = await currentChild.__render(props, children);
// find layout, if one was given. // find layout, if one was given.

19
test/astro-request.test.js Normal file
View file

@ -0,0 +1,19 @@
import { suite } from 'uvu';
import * as assert from 'uvu/assert';
import { doc } from './test-utils.js';
import { setup } from './helpers.js';
const Request = suite('import.meta.request');
setup(Request, './fixtures/astro-request');
Request('import.meta.request available', async (context) => {
const result = await context.runtime.load('/');
assert.equal(result.statusCode, 200);
const $ = doc(result.contents);
assert.equal($('h1').text(), '/');
});
Request.run();

5
test/fixtures/astro-request/astro.config.mjs vendored Normal file
View file

@ -0,0 +1,5 @@
export default {
projectRoot: '.',
astroRoot: './astro',
dist: './_site'
};

10
test/fixtures/astro-request/astro/pages/index.astro vendored Normal file
View file

@ -0,0 +1,10 @@
---
let path = import.meta.request.path;
---
<html>
<head><title>Test</title></head>
<body>
<h1>{path}</h1>
</body>
</html>