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

[ci] format

Browse source
This commit is contained in:
matthewp 2022-07-18 15:35:14 +00:00 • committed by fredkbot
parent 3acb9ec264
commit b282cdb21f
6 changed files with 71 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/astro/src/core/render/dev/index.ts
View file

@ -16,8 +16,8 @@ import { render as coreRender } from '../core.js';
import { RouteCache } from '../route-cache.js'; import { RouteCache } from '../route-cache.js';
import { collectMdMetadata } from '../util.js'; import { collectMdMetadata } from '../util.js';
import { getStylesForURL } from './css.js'; import { getStylesForURL } from './css.js';
import { getScriptsForURL } from './scripts.js';
import { resolveClientDevPath } from './resolve.js'; import { resolveClientDevPath } from './resolve.js';
import { getScriptsForURL } from './scripts.js';
export interface SSROptions { export interface SSROptions {
/** an instance of the AstroConfig */ /** an instance of the AstroConfig */

16
packages/astro/src/core/render/dev/scripts.ts
View file

@ -1,17 +1,17 @@
import type { AstroConfig, SSRElement } from '../../../@types/astro';
import type { ModuleInfo } from 'rollup'; import type { ModuleInfo } from 'rollup';
import type { PluginMetadata as AstroPluginMetadata } from '../../../vite-plugin-astro/types';
import vite from 'vite';
import slash from 'slash'; import slash from 'slash';
import { fileURLToPath } from 'url';
import vite from 'vite';
import type { AstroConfig, SSRElement } from '../../../@types/astro';
import type { PluginMetadata as AstroPluginMetadata } from '../../../vite-plugin-astro/types';
import { viteID } from '../../util.js'; import { viteID } from '../../util.js';
import { createModuleScriptElementWithSrc } from '../ssr-element.js'; import { createModuleScriptElementWithSrc } from '../ssr-element.js';
import { crawlGraph } from './vite.js'; import { crawlGraph } from './vite.js';
import { fileURLToPath } from 'url';
export async function getScriptsForURL( export async function getScriptsForURL(
filePath: URL, filePath: URL,
astroConfig: AstroConfig, astroConfig: AstroConfig,
viteServer: vite.ViteDevServer, viteServer: vite.ViteDevServer
): Promise<Set<SSRElement>> { ): Promise<Set<SSRElement>> {
const elements = new Set<SSRElement>(); const elements = new Set<SSRElement>();
const rootID = viteID(filePath); const rootID = viteID(filePath);
@ -29,7 +29,11 @@ export async function getScriptsForURL(
return elements; return elements;
} }
function addHoistedScripts(set: Set<SSRElement>, info: ModuleInfo | null, rootProjectFolder: string) { function addHoistedScripts(
set: Set<SSRElement>,
info: ModuleInfo | null,
rootProjectFolder: string
) {
if (!info?.meta?.astro) { if (!info?.meta?.astro) {
return; return;
} }

2
packages/astro/src/core/render/dev/vite.ts
View file

@ -1,5 +1,5 @@
import vite from 'vite';
import npath from 'path'; import npath from 'path';
import vite from 'vite';
import { unwrapId } from '../../util.js'; import { unwrapId } from '../../util.js';
/** /**

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

@ -135,10 +135,12 @@ describe('Scripts (hoisted and not)', () => {
let found = 0; let found = 0;
let moduleScripts = $('[type=module]'); let moduleScripts = $('[type=module]');
moduleScripts.each((i, el) => { moduleScripts.each((i, el) => {
if($(el).attr('src').includes('Glob/GlobComponent.astro?astro&type=script&index=0&lang.ts')) { if (
$(el).attr('src').includes('Glob/GlobComponent.astro?astro&type=script&index=0&lang.ts')
) {
found++; found++;
} }
}) });
expect(found).to.equal(1); expect(found).to.equal(1);
}); });
}); });