fix: cleanup

withastro · Oct 23, 2023 · 69fcb81 · 69fcb81
1 parent c9935cd
commit 69fcb81
Show file tree

Hide file tree

Showing 22 changed files with 91 additions and 235 deletions.
diff --git a/examples/dev-overlay/.codesandbox/Dockerfile b/examples/dev-overlay/.codesandbox/Dockerfile
diff --git a/examples/dev-overlay/.gitignore b/examples/dev-overlay/.gitignore
diff --git a/examples/dev-overlay/.vscode/extensions.json b/examples/dev-overlay/.vscode/extensions.json
diff --git a/examples/dev-overlay/.vscode/launch.json b/examples/dev-overlay/.vscode/launch.json
diff --git a/examples/dev-overlay/README.md b/examples/dev-overlay/README.md
diff --git a/examples/dev-overlay/astro-devtools-plugin.js b/examples/dev-overlay/astro-devtools-plugin.js
diff --git a/examples/dev-overlay/astro.config.mjs b/examples/dev-overlay/astro.config.mjs
diff --git a/examples/dev-overlay/components/Component.tsx b/examples/dev-overlay/components/Component.tsx
diff --git a/examples/dev-overlay/package.json b/examples/dev-overlay/package.json
diff --git a/examples/dev-overlay/public/astro-logo.png b/examples/dev-overlay/public/astro-logo.png
diff --git a/examples/dev-overlay/public/favicon.svg b/examples/dev-overlay/public/favicon.svg
diff --git a/examples/dev-overlay/src/pages/index.astro b/examples/dev-overlay/src/pages/index.astro
diff --git a/examples/dev-overlay/tsconfig.json b/examples/dev-overlay/tsconfig.json
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
@@ -1084,10 +1084,6 @@ export interface AstroUserConfig {
 		remotePatterns?: Partial<RemotePattern>[];
 	};
 
-	devOverlay?: {
-		plugins: string[];
-	};
-
 	/**
 	 * @docs
 	 * @kind heading
@@ -1526,6 +1522,7 @@ export interface AstroSettings {
 	 * Map of directive name (e.g. `load`) to the directive script code
 	 */
 	clientDirectives: Map<string, string>;
+	devOverlayPlugins: string[];
 	tsConfig: TSConfig | undefined;
 	tsConfigPath: string | undefined;
 	watchFiles: string[];
@@ -2051,6 +2048,7 @@ export interface AstroIntegration {
 			injectScript: (stage: InjectedScriptStage, content: string) => void;
 			injectRoute: (injectRoute: InjectedRoute) => void;
 			addClientDirective: (directive: ClientDirectiveConfig) => void;
+			addDevOverlayPlugin: (entrypoint: string) => void;
 			logger: AstroIntegrationLogger;
 			// TODO: Add support for `injectElement()` for full HTML element injection, not just scripts.
 			// This may require some refactoring of `scripts`, `styles`, and `links` into something

diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
@@ -39,9 +39,6 @@ const ASTRO_CONFIG_DEFAULTS = {
 	image: {
 		service: { entrypoint: 'astro/assets/services/sharp', config: {} },
 	},
-	devOverlay: {
-		plugins: [],
-	},
 	compressHTML: true,
 	server: {
 		host: false,
@@ -231,9 +228,6 @@ export const AstroConfigSchema = z.object({
 				.default([]),
 		})
 		.default(ASTRO_CONFIG_DEFAULTS.image),
-	devOverlay: z
-		.object({ plugins: z.array(z.string()).default([]) })
-		.default(ASTRO_CONFIG_DEFAULTS.devOverlay),
 	markdown: z
 		.object({
 			drafts: z.boolean().default(false),

diff --git a/packages/astro/src/core/config/settings.ts b/packages/astro/src/core/config/settings.ts
@@ -98,6 +98,7 @@ export function createBaseSettings(config: AstroConfig): AstroSettings {
 		scripts: [],
 		clientDirectives: getDefaultClientDirectives(),
 		watchFiles: [],
+		devOverlayPlugins: [],
 		timer: new AstroTimer(),
 	};
 }

diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
@@ -16,7 +16,7 @@ import astroPostprocessVitePlugin from '../vite-plugin-astro-postprocess/index.j
 import { vitePluginAstroServer } from '../vite-plugin-astro-server/index.js';
 import astroVitePlugin from '../vite-plugin-astro/index.js';
 import configAliasVitePlugin from '../vite-plugin-config-alias/index.js';
-import astroDevTools from '../vite-plugin-dev-tools/vite-plugin-dev-tools.js';
+import astroDevOverlay from '../vite-plugin-dev-tools/vite-plugin-dev-overlay.js';
 import envVitePlugin from '../vite-plugin-env/index.js';
 import astroHeadPlugin from '../vite-plugin-head/index.js';
 import htmlVitePlugin from '../vite-plugin-html/index.js';
@@ -133,7 +133,7 @@ export async function createVite(
 			vitePluginSSRManifest(),
 			astroAssetsPlugin({ settings, logger, mode }),
 			astroTransitions(),
-			astroDevTools({ settings, logger }),
+			astroDevOverlay({ settings, logger }),
 		],
 		publicDir: fileURLToPath(settings.config.publicDir),
 		root: fileURLToPath(settings.config.root),

diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts
@@ -125,6 +125,9 @@ export async function runHookConfigSetup({
 				addWatchFile: (path) => {
 					updatedSettings.watchFiles.push(path instanceof URL ? fileURLToPath(path) : path);
 				},
+				addDevOverlayPlugin: (entrypoint) => {
+					updatedSettings.devOverlayPlugins.push(entrypoint);
+				},
 				addClientDirective: ({ name, entrypoint }) => {
 					if (updatedSettings.clientDirectives.has(name) || addedClientDirectives.has(name)) {
 						throw new Error(