Move createBasicEnvironment as test-util

withastro · Jul 4, 2023 · c9ded7e · c9ded7e
1 parent 7419bb6
commit c9ded7e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 34 deletions.
diff --git a/packages/astro/src/core/render/environment.ts b/packages/astro/src/core/render/environment.ts
@@ -1,8 +1,7 @@
 import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
 import type { RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
-import { getDefaultClientDirectives } from '../client-directive/default.js';
 import type { LogOptions } from '../logger/core.js';
-import { RouteCache } from './route-cache.js';
+import type { RouteCache } from './route-cache.js';
 
 /**
  * An environment represents the static parts of rendering that do not change
@@ -42,27 +41,3 @@ export type CreateEnvironmentArgs = Environment;
 export function createEnvironment(options: CreateEnvironmentArgs): Environment {
 	return options;
 }
-
-export type CreateBasicEnvironmentArgs = Partial<Environment> & {
-	logging: CreateEnvironmentArgs['logging'];
-};
-
-/**
- * Only used in tests
- */
-export function createBasicEnvironment(options: CreateBasicEnvironmentArgs): Environment {
-	const mode = options.mode ?? 'development';
-	return createEnvironment({
-		...options,
-		markdown: {
-			...(options.markdown ?? {}),
-		},
-		mode,
-		renderers: options.renderers ?? [],
-		clientDirectives: getDefaultClientDirectives(),
-		resolve: options.resolve ?? ((s: string) => Promise.resolve(s)),
-		routeCache: new RouteCache(options.logging, mode),
-		ssr: options.ssr ?? true,
-		streaming: options.streaming ?? true,
-	});
-}
diff --git a/packages/astro/src/core/render/index.ts b/packages/astro/src/core/render/index.ts
@@ -2,6 +2,6 @@ export { createRenderContext } from './context.js';
 export type { RenderContext } from './context.js';
 export { renderPage } from './core.js';
 export type { Environment } from './environment';
-export { createBasicEnvironment, createEnvironment } from './environment.js';
+export { createEnvironment } from './environment.js';
 export { getParamsAndProps } from './params-and-props.js';
 export { loadRenderer, loadRenderers } from './renderer.js';
diff --git a/packages/astro/test/units/render/head.test.js b/packages/astro/test/units/render/head.test.js
@@ -9,12 +9,9 @@ import {
 	renderHead,
 	Fragment,
 } from '../../../dist/runtime/server/index.js';
-import {
-	createBasicEnvironment,
-	createRenderContext,
-	renderPage,
-} from '../../../dist/core/render/index.js';
+import { createRenderContext, renderPage } from '../../../dist/core/render/index.js';
 import { defaultLogging as logging } from '../../test-utils.js';
+import { createBasicEnvironment } from '../test-utils.js';
 import * as cheerio from 'cheerio';
 
 const createAstroModule = (AstroComponent) => ({ default: AstroComponent });

diff --git a/packages/astro/test/units/render/jsx.test.js b/packages/astro/test/units/render/jsx.test.js
@@ -14,6 +14,7 @@ import {
 } from '../../../dist/core/render/index.js';
 import { createAstroJSXComponent, renderer as jsxRenderer } from '../../../dist/jsx/index.js';
 import { defaultLogging as logging } from '../../test-utils.js';
+import { createBasicEnvironment } from '../test-utils.js';
 
 const createAstroModule = (AstroComponent) => ({ default: AstroComponent });
 const loadJSXRenderer = () => loadRenderer(jsxRenderer, { import: (s) => import(s) });

diff --git a/packages/astro/test/units/test-utils.js b/packages/astro/test/units/test-utils.js
@@ -5,6 +5,9 @@ import realFS from 'node:fs';
 import npath from 'path';
 import { fileURLToPath } from 'url';
 import { unixify } from './correct-path.js';
+import { getDefaultClientDirectives } from '../../dist/core/client-directive/index.js';
+import { createEnvironment } from '../../dist/core/render/index.js';
+import { RouteCache } from '../../dist/core/render/route-cache.js';
 
 class VirtualVolume extends Volume {
 	#root = '';
@@ -151,3 +154,24 @@ export function buffersToString(buffers) {
 
 // A convenience method for creating an astro module from a component
 export const createAstroModule = (AstroComponent) => ({ default: AstroComponent });
+
+/**
+ * @param {Partial<import('../../src/core/render/environment.js').CreateEnvironmentArgs>} options
+ * @returns {import('../../src/core/render/environment.js').Environment}
+ */
+export function createBasicEnvironment(options) {
+	const mode = options.mode ?? 'development';
+	return createEnvironment({
+		...options,
+		markdown: {
+			...(options.markdown ?? {}),
+		},
+		mode,
+		renderers: options.renderers ?? [],
+		clientDirectives: getDefaultClientDirectives(),
+		resolve: options.resolve ?? ((s) => Promise.resolve(s)),
+		routeCache: new RouteCache(options.logging, mode),
+		ssr: options.ssr ?? true,
+		streaming: options.streaming ?? true,
+	});
+}
diff --git a/packages/astro/test/units/vite-plugin-astro-server/request.test.js b/packages/astro/test/units/vite-plugin-astro-server/request.test.js
@@ -2,12 +2,16 @@ import { expect } from 'chai';
 
 import { createDefaultDevSettings } from '../../../dist/core/config/index.js';
 import { createLoader } from '../../../dist/core/module-loader/index.js';
-import { createBasicEnvironment } from '../../../dist/core/render/index.js';
 import { createRouteManifest } from '../../../dist/core/routing/index.js';
 import { createComponent, render } from '../../../dist/runtime/server/index.js';
 import { createController, handleRequest } from '../../../dist/vite-plugin-astro-server/index.js';
 import { defaultLogging as logging } from '../../test-utils.js';
-import { createAstroModule, createFs, createRequestAndResponse } from '../test-utils.js';
+import {
+	createAstroModule,
+	createBasicEnvironment,
+	createFs,
+	createRequestAndResponse,
+} from '../test-utils.js';
 
 async function createDevEnvironment(overrides = {}) {
 	const env = createBasicEnvironment({