Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-16 21:46:22 -05:00
Code Issues Activity

[ci] yarn format

Browse source
This commit is contained in:
matthewp 2021-06-21 16:29:33 +00:00 committed by GitHub Actions
parent b547892411
commit b2a72ccac4
5 changed files with 34 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/astro/src/compiler/index.ts
View file

@ -102,13 +102,10 @@ async function transformFromSource(
interface CompileComponentOptions {
compileOptions: CompileOptions;
filename: string;
projectRoot: string,
projectRoot: string;
isPage?: boolean;
}
export async function compileComponent(
source: string,
{ compileOptions, filename, projectRoot, isPage }: CompileComponentOptions
): Promise<CompileResult> {
export async function compileComponent(source: string, { compileOptions, filename, projectRoot, isPage }: CompileComponentOptions): Promise<CompileResult> {
const result = await transformFromSource(source, { compileOptions, filename, projectRoot });
const site = compileOptions.astroConfig.buildOptions.site || `http://localhost:${compileOptions.astroConfig.devOptions.port}`;

52
packages/astro/src/compiler/transform/head.ts
View file

@ -17,7 +17,7 @@ export default function (opts: TransformOptions): Transformer {
},
leave(node) {
eoh.leave(node);
}
},
},
InlineComponent: {
enter(node) {
@ -33,7 +33,7 @@ export default function (opts: TransformOptions): Transformer {
},
leave(node) {
eoh.leave(node);
}
},
},
},
},
@ -59,10 +59,7 @@ export default function (opts: TransformOptions): Transformer {
start: 0,
end: 0,
type: 'Expression',
codeChunks: [
'Astro.css.map(css => (',
'))'
],
codeChunks: ['Astro.css.map(css => (', '))'],
children: [
{
type: 'Element',
@ -75,9 +72,9 @@ export default function (opts: TransformOptions): Transformer {
{
type: 'Text',
raw: 'stylesheet',
data: 'stylesheet'
}
]
data: 'stylesheet',
},
],
},
{
name: 'href',
@ -91,22 +88,20 @@ export default function (opts: TransformOptions): Transformer {
start: 0,
end: 0,
type: 'Expression',
codeChunks: [
'css'
],
children: []
}
}
]
}
codeChunks: ['css'],
children: [],
},
},
],
},
],
start: 0,
end: 0,
children: []
}
]
}
]
children: [],
},
],
},
],
});
if (hasComponents) {
@ -157,19 +152,16 @@ export default function (opts: TransformOptions): Transformer {
start: 0,
end: 0,
type: 'Expression',
codeChunks: [
'Astro.isPage ? (',
') : null'
],
codeChunks: ['Astro.isPage ? (', ') : null'],
children: [
{
start: 0,
end: 0,
type: 'Fragment',
children
}
]
}
children,
},
],
};
eoh.append(conditionalNode);
},

23
packages/astro/src/compiler/transform/util/end-of-head.ts
View file

@ -1,22 +1,13 @@
import type { TemplateNode } from '@astrojs/parser';
const validHeadElements = new Set([
'!doctype',
'title',
'meta',
'link',
'style',
'script',
'noscript',
'base'
]);
const validHeadElements = new Set(['!doctype', 'title', 'meta', 'link', 'style', 'script', 'noscript', 'base']);
export class EndOfHead {
private head: TemplateNode | null = null;
private firstNonHead: TemplateNode | null = null;
private parent: TemplateNode | null = null;
private stack: TemplateNode[] = [];
public append: (...node: TemplateNode[]) => void = () => void 0;
get found(): boolean {
@ -24,27 +15,27 @@ export class EndOfHead {
}
enter(node: TemplateNode) {
if(this.found) {
if (this.found) {
return;
}
this.stack.push(node);
// Fragment has no name
if(!node.name) {
if (!node.name) {
return;
}
const name = node.name.toLowerCase();
if(name === 'head') {
if (name === 'head') {
this.head = node;
this.parent = this.stack[this.stack.length - 2];
this.append = this.appendToHead;
return;
}
if(!validHeadElements.has(name)) {
if (!validHeadElements.has(name)) {
this.firstNonHead = node;
this.parent = this.stack[this.stack.length - 2];
this.append = this.prependToFirstNonHead;
@ -66,4 +57,4 @@ export class EndOfHead {
let idx: number = this.parent?.children!.indexOf(this.firstNonHead!) || 0;
this.parent?.children?.splice(idx, 0, ...nodes);
}
}
}

2
packages/astro/src/runtime.ts
View file

@ -228,7 +228,7 @@ async function load(config: RuntimeConfig, rawPathname: string | undefined): Pro
},
children: [],
props: { collection },
css: Array.isArray(mod.css) ? mod.css : typeof mod.css === 'string' ? [mod.css] : []
css: Array.isArray(mod.css) ? mod.css : typeof mod.css === 'string' ? [mod.css] : [],
})) as string;
return {

5
packages/astro/test/no-head-el.test.js
View file

@ -7,8 +7,8 @@ const NoHeadEl = suite('Documents without a head');
setup(NoHeadEl, './fixtures/no-head-el', {
runtimeOptions: {
mode: 'development'
}
mode: 'development',
},
});
NoHeadEl('Places style and scripts before the first non-head element', async ({ runtime }) => {
@ -25,5 +25,4 @@ NoHeadEl('Places style and scripts before the first non-head element', async ({
assert.equal($('script[src="/_snowpack/hmr-client.js"]').length, 1, 'Only the hmr client for the page');
});
NoHeadEl.run();