Skip to content

Commit

Permalink
chore: remove plugin-middleware
Browse files Browse the repository at this point in the history
  • Loading branch information
ematipico committed May 24, 2023
1 parent eabc987 commit be8e50a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 85 deletions.
9 changes: 0 additions & 9 deletions packages/astro/src/core/build/plugins/README.md
Expand Up @@ -2,15 +2,6 @@

This file serves as developer documentation to explain how the internal plugins work


## `plugin-middleware`

This plugin is responsible to retrieve the `src/middleware.{ts.js}` file and emit an entry point during the SSR build.

The final file is emitted only if the user has the middleware file. The final name of the file is `middleware.mjs`.

The file emitted has this content, more or less:

```js
import { onRequest } from "@astro-middleware";
export { onRequest }
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/src/core/build/plugins/index.ts
Expand Up @@ -7,7 +7,6 @@ import { pluginComponentEntry } from './plugin-component-entry.js';
import { pluginCSS } from './plugin-css.js';
import { pluginHoistedScripts } from './plugin-hoisted-scripts.js';
import { pluginInternals } from './plugin-internals.js';
import { pluginMiddleware } from './plugin-middleware.js';
import { pluginPages } from './plugin-pages.js';
import { pluginPrerender } from './plugin-prerender.js';
import { pluginRenderers } from './plugin-renderers.js';
Expand All @@ -19,7 +18,6 @@ export function registerAllPlugins({ internals, options, register }: AstroBuildP
register(pluginAnalyzer(internals));
register(pluginInternals(internals));
register(pluginRenderers(options, internals));
register(pluginMiddleware(options, internals));
register(pluginPages(options, internals));
register(pluginCSS(options, internals));
register(astroHeadBuildPlugin(options, internals));
Expand Down
62 changes: 0 additions & 62 deletions packages/astro/src/core/build/plugins/plugin-middleware.ts

This file was deleted.

11 changes: 8 additions & 3 deletions packages/astro/src/core/build/plugins/plugin-pages.ts
Expand Up @@ -3,9 +3,9 @@ import { addRollupInput } from '../add-rollup-input.js';
import { type BuildInternals } from '../internal.js';
import type { AstroBuildPlugin } from '../plugin';
import type { StaticBuildOptions } from '../types';
import { MIDDLEWARE_MODULE_ID } from './plugin-middleware.js';
import { RENDERERS_MODULE_ID } from './plugin-renderers.js';
import { extname } from 'node:path';
import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js';

export const ASTRO_PAGE_MODULE_ID = '@astro-page:';
export const ASTRO_PAGE_RESOLVED_MODULE_ID = '\0@astro-page:';
Expand Down Expand Up @@ -64,8 +64,13 @@ function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): V
exports.push(`export { renderers };`);

if (opts.settings.config.experimental.middleware) {
imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}";`);
exports.push(`export const middleware = _middleware;`);
const middlewareId = await this.resolve(
`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
);
if (middlewareId) {
imports.push(`import * as _middleware from "${middlewareId.id}";`);
exports.push(`export const middleware = _middleware;`);
}
}

return `${imports.join('\n')}${exports.join('\n')}`;
Expand Down
14 changes: 9 additions & 5 deletions packages/astro/src/core/build/plugins/plugin-ssr.ts
Expand Up @@ -13,10 +13,10 @@ import { serializeRouteData } from '../../routing/index.js';
import { addRollupInput } from '../add-rollup-input.js';
import { getOutFile, getOutFolder } from '../common.js';
import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js';
import { MIDDLEWARE_MODULE_ID } from './plugin-middleware.js';
import { extname } from 'node:path';
import { RENDERERS_MODULE_ID } from './plugin-renderers.js';
import { ASTRO_PAGE_EXTENSION_POST_PATTERN, ASTRO_PAGE_MODULE_ID } from './plugin-pages.js';
import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js';

export const virtualModuleId = '@astrojs-ssr-virtual-entry';
const resolvedVirtualModuleId = '\0' + virtualModuleId;
Expand Down Expand Up @@ -50,8 +50,13 @@ function vitePluginSSR(
const exports: string[] = [];
let middleware;
if (config.experimental?.middleware === true) {
imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}"`);
middleware = 'middleware: _middleware';
const middlewareId = await this.resolve(
`${config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
);
if (middlewareId) {
imports.push(`import * as _middleware from "${middlewareId.id}"`);
middleware = 'middleware: _middleware';
}
}
let i = 0;
const pageMap: string[] = [];
Expand Down Expand Up @@ -110,8 +115,7 @@ const _start = 'start';
if(_start in adapter) {
adapter[_start](_manifest, _args);
}`;
const result = [imports.join('\n'), contents.join('\n'), content, exports.join('\n')];
return result.join('\n');
return `${imports.join('\n')}\n${contents.join('\n')}\n${content}\n${exports.join('\n')}`;
}
return void 0;
},
Expand Down
3 changes: 0 additions & 3 deletions packages/astro/src/core/build/static-build.ts
Expand Up @@ -24,7 +24,6 @@ import { generatePages } from './generate.js';
import { trackPageData } from './internal.js';
import { createPluginContainer, type AstroBuildPluginContainer } from './plugin.js';
import { registerAllPlugins } from './plugins/index.js';
import { RESOLVED_MIDDLEWARE_MODULE_ID } from './plugins/plugin-middleware.js';
import { RESOLVED_RENDERERS_MODULE_ID } from './plugins/plugin-renderers.js';
import type { PageBuildData, StaticBuildOptions } from './types';
import { getTimeStat } from './util.js';
Expand Down Expand Up @@ -184,8 +183,6 @@ async function ssrBuild(
.replaceAll('.', '_')
// this must be last
.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.')}.mjs`;
} else if (chunkInfo.facadeModuleId === RESOLVED_MIDDLEWARE_MODULE_ID) {
return 'middleware.mjs';
} else if (chunkInfo.facadeModuleId === RESOLVED_RENDERERS_MODULE_ID) {
return 'renderers.mjs';
} else {
Expand Down
1 change: 0 additions & 1 deletion packages/integrations/mdx/src/index.ts
Expand Up @@ -12,7 +12,6 @@ import { VFile } from 'vfile';
import type { Plugin as VitePlugin } from 'vite';
import { getRehypePlugins, getRemarkPlugins, recmaInjectImportMetaEnvPlugin } from './plugins.js';
import { getFileInfo, ignoreStringPlugins, parseFrontmatter } from './utils.js';
import { extname } from 'node:path';

export type MdxOptions = Omit<typeof markdownConfigDefaults, 'remarkPlugins' | 'rehypePlugins'> & {
extendMarkdownConfig: boolean;
Expand Down

0 comments on commit be8e50a

Please sign in to comment.