Skip to content

Commit

Permalink
[ci] format
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewp authored and astrobot-houston committed Nov 1, 2022
1 parent c77a6cb commit 63a3282
Show file tree
Hide file tree
Showing 29 changed files with 240 additions and 239 deletions.
38 changes: 19 additions & 19 deletions packages/astro/src/@types/typed-emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

export type EventMap = {
[key: string]: (...args: any[]) => void
}
[key: string]: (...args: any[]) => void;
};

/**
* Type-safe event emitter.
Expand All @@ -25,25 +25,25 @@ export type EventMap = {
* ```
*/
interface TypedEventEmitter<Events extends EventMap> {
addListener<E extends keyof Events> (event: E, listener: Events[E]): this
on<E extends keyof Events> (event: E, listener: Events[E]): this
once<E extends keyof Events> (event: E, listener: Events[E]): this
prependListener<E extends keyof Events> (event: E, listener: Events[E]): this
prependOnceListener<E extends keyof Events> (event: E, listener: Events[E]): this
addListener<E extends keyof Events>(event: E, listener: Events[E]): this;
on<E extends keyof Events>(event: E, listener: Events[E]): this;
once<E extends keyof Events>(event: E, listener: Events[E]): this;
prependListener<E extends keyof Events>(event: E, listener: Events[E]): this;
prependOnceListener<E extends keyof Events>(event: E, listener: Events[E]): this;

off<E extends keyof Events>(event: E, listener: Events[E]): this
removeAllListeners<E extends keyof Events> (event?: E): this
removeListener<E extends keyof Events> (event: E, listener: Events[E]): this
off<E extends keyof Events>(event: E, listener: Events[E]): this;
removeAllListeners<E extends keyof Events>(event?: E): this;
removeListener<E extends keyof Events>(event: E, listener: Events[E]): this;

emit<E extends keyof Events> (event: E, ...args: Parameters<Events[E]>): boolean
// The sloppy `eventNames()` return type is to mitigate type incompatibilities - see #5
eventNames (): (keyof Events | string | symbol)[]
rawListeners<E extends keyof Events> (event: E): Events[E][]
listeners<E extends keyof Events> (event: E): Events[E][]
listenerCount<E extends keyof Events> (event: E): number
emit<E extends keyof Events>(event: E, ...args: Parameters<Events[E]>): boolean;
// The sloppy `eventNames()` return type is to mitigate type incompatibilities - see #5
eventNames(): (keyof Events | string | symbol)[];
rawListeners<E extends keyof Events>(event: E): Events[E][];
listeners<E extends keyof Events>(event: E): Events[E][];
listenerCount<E extends keyof Events>(event: E): number;

getMaxListeners (): number
setMaxListeners (maxListeners: number): this
getMaxListeners(): number;
setMaxListeners(maxListeners: number): this;
}

export default TypedEventEmitter
export default TypedEventEmitter;
9 changes: 2 additions & 7 deletions packages/astro/src/core/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,7 @@ export async function openConfig(configOptions: LoadConfigOptions): Promise<Open
if (config) {
userConfig = config.value;
}
const astroConfig = await resolveConfig(
userConfig,
root,
flags,
configOptions.cmd
);
const astroConfig = await resolveConfig(userConfig, root, flags, configOptions.cmd);

return {
astroConfig,
Expand Down Expand Up @@ -318,7 +313,7 @@ export async function resolveConfig(

export function createDefaultDevConfig(
userConfig: AstroUserConfig = {},
root: string = process.cwd(),
root: string = process.cwd()
) {
return resolveConfig(userConfig, root, undefined, 'dev');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/core/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ export {
validateConfig,
} from './config.js';
export type { AstroConfigSchema } from './schema';
export { createSettings, createDefaultDevSettings } from './settings.js';
export { createDefaultDevSettings, createSettings } from './settings.js';
export { loadTSConfig, updateTSConfigForFramework } from './tsconfig.js';
5 changes: 2 additions & 3 deletions packages/astro/src/core/config/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type { AstroConfig, AstroSettings, AstroUserConfig } from '../../@types/a
import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../constants.js';

import { fileURLToPath } from 'url';
import { createDefaultDevConfig } from './config.js';
import jsxRenderer from '../../jsx/renderer.js';
import { createDefaultDevConfig } from './config.js';
import { loadTSConfig } from './tsconfig.js';

export function createBaseSettings(config: AstroConfig): AstroSettings {
Expand Down Expand Up @@ -34,10 +34,9 @@ export async function createDefaultDevSettings(
userConfig: AstroUserConfig = {},
root?: string | URL
): Promise<AstroSettings> {
if(root && typeof root !== 'string') {
if (root && typeof root !== 'string') {
root = fileURLToPath(root);
}
const config = await createDefaultDevConfig(userConfig, root);
return createBaseSettings(config);
}

4 changes: 2 additions & 2 deletions packages/astro/src/core/create-vite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import envVitePlugin from '../vite-plugin-env/index.js';
import htmlVitePlugin from '../vite-plugin-html/index.js';
import astroIntegrationsContainerPlugin from '../vite-plugin-integrations-container/index.js';
import jsxVitePlugin from '../vite-plugin-jsx/index.js';
import astroLoadFallbackPlugin from '../vite-plugin-load-fallback/index.js';
import legacyMarkdownVitePlugin from '../vite-plugin-markdown-legacy/index.js';
import markdownVitePlugin from '../vite-plugin-markdown/index.js';
import astroScriptsPlugin from '../vite-plugin-scripts/index.js';
import astroScriptsPageSSRPlugin from '../vite-plugin-scripts/page-ssr.js';
import { createCustomViteLogger } from './errors/dev/index.js';
import astroLoadFallbackPlugin from '../vite-plugin-load-fallback/index.js';
import { resolveDependency } from './util.js';

interface CreateViteOptions {
Expand Down Expand Up @@ -110,7 +110,7 @@ export async function createVite(
astroPostprocessVitePlugin({ settings }),
astroIntegrationsContainerPlugin({ settings, logging }),
astroScriptsPageSSRPlugin({ settings }),
astroLoadFallbackPlugin({ fs })
astroLoadFallbackPlugin({ fs }),
],
publicDir: fileURLToPath(settings.config.publicDir),
root: fileURLToPath(settings.config.root),
Expand Down
27 changes: 16 additions & 11 deletions packages/astro/src/core/dev/container.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@

import * as http from 'http';
import type { AddressInfo } from 'net';
import type { AstroSettings, AstroUserConfig } from '../../@types/astro';
import * as http from 'http';

import nodeFs from 'fs';
import * as vite from 'vite';
import {
runHookConfigDone,
runHookConfigSetup,
runHookServerSetup,
runHookServerStart,
} from '../../integrations/index.js';
import { createDefaultDevSettings } from '../config/index.js';
import { createVite } from '../create-vite.js';
import { LogOptions } from '../logger/core.js';
import { LogOptions } from '../logger/core.js';
import { nodeLogDestination } from '../logger/node.js';
import nodeFs from 'fs';
import * as vite from 'vite';
import { createDefaultDevSettings } from '../config/index.js';
import { apply as applyPolyfill } from '../polyfill.js';


const defaultLogging: LogOptions = {
dest: nodeLogDestination,
level: 'error',
Expand Down Expand Up @@ -47,7 +45,7 @@ export async function createContainer(params: CreateContainerParams = {}): Promi
isRestart = false,
logging = defaultLogging,
settings = await createDefaultDevSettings(params.userConfig, params.root),
fs = nodeFs
fs = nodeFs,
} = params;

// Initialize
Expand Down Expand Up @@ -97,11 +95,15 @@ export async function createContainer(params: CreateContainerParams = {}): Promi
},
close() {
return viteServer.close();
}
},
};
}

export async function startContainer({ settings, viteServer, logging }: Container): Promise<AddressInfo> {
export async function startContainer({
settings,
viteServer,
logging,
}: Container): Promise<AddressInfo> {
const { port } = settings.config.server;
await viteServer.listen(port);
const devServerAddressInfo = viteServer.httpServer!.address() as AddressInfo;
Expand All @@ -114,7 +116,10 @@ export async function startContainer({ settings, viteServer, logging }: Containe
return devServerAddressInfo;
}

export async function runInContainer(params: CreateContainerParams, callback: (container: Container) => Promise<void> | void) {
export async function runInContainer(
params: CreateContainerParams,
callback: (container: Container) => Promise<void> | void
) {
const container = await createContainer(params);
try {
await callback(container);
Expand Down
11 changes: 2 additions & 9 deletions packages/astro/src/core/dev/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
export {
createContainer,
startContainer,
runInContainer
} from './container.js';

export {
default
} from './dev.js';
export { createContainer, runInContainer, startContainer } from './container.js';
export { default } from './dev.js';
11 changes: 3 additions & 8 deletions packages/astro/src/core/errors/dev/vite.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import type { ModuleLoader } from '../../module-loader/index.js';
import * as fs from 'fs';
import { fileURLToPath } from 'url';
import {
createLogger,
type ErrorPayload,
type Logger,
type LogLevel,
} from 'vite';
import { createLogger, type ErrorPayload, type Logger, type LogLevel } from 'vite';
import type { ModuleLoader } from '../../module-loader/index.js';
import { AstroErrorCodes } from '../codes.js';
import { AstroError, type ErrorWithMetadata } from '../errors.js';
import { incompatPackageExp } from './utils.js';
Expand All @@ -30,7 +25,7 @@ export function createCustomViteLogger(logLevel: LogLevel): Logger {
export function enhanceViteSSRError(
error: Error,
filePath?: URL,
loader?: ModuleLoader,
loader?: ModuleLoader
): AstroError {
// Vite will give you better stacktraces, using sourcemaps.
if (loader) {
Expand Down
17 changes: 3 additions & 14 deletions packages/astro/src/core/module-loader/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
export type {
ModuleInfo,
ModuleLoader,
ModuleNode,
LoaderEvents
} from './loader.js';

export {
createLoader
} from './loader.js';

export {
createViteLoader
} from './vite.js';
export { createLoader } from './loader.js';
export type { LoaderEvents, ModuleInfo, ModuleLoader, ModuleNode } from './loader.js';
export { createViteLoader } from './vite.js';
38 changes: 26 additions & 12 deletions packages/astro/src/core/module-loader/loader.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type TypedEmitter from '../../@types/typed-emitter';
import type * as fs from 'fs';
import { EventEmitter } from 'events';
import type * as fs from 'fs';
import type TypedEmitter from '../../@types/typed-emitter';

// This is a generic interface for a module loader. In the astro cli this is
// fulfilled by Vite, see vite.ts
Expand All @@ -10,10 +10,10 @@ export type LoaderEvents = {
'file-change': (msg: [path: string, stats?: fs.Stats | undefined]) => void;
'file-unlink': (msg: [path: string, stats?: fs.Stats | undefined]) => void;
'hmr-error': (msg: {
type: 'error',
type: 'error';
err: {
message: string;
stack: string
stack: string;
};
}) => void;
};
Expand Down Expand Up @@ -53,19 +53,33 @@ export interface ModuleInfo {

export function createLoader(overrides: Partial<ModuleLoader>): ModuleLoader {
return {
import() { throw new Error(`Not implemented`); },
resolveId(id) { return Promise.resolve(id); },
getModuleById() {return undefined },
getModulesByFile() { return undefined },
getModuleInfo() { return null; },
eachModule() { throw new Error(`Not implemented`); },
import() {
throw new Error(`Not implemented`);
},
resolveId(id) {
return Promise.resolve(id);
},
getModuleById() {
return undefined;
},
getModulesByFile() {
return undefined;
},
getModuleInfo() {
return null;
},
eachModule() {
throw new Error(`Not implemented`);
},
invalidateModule() {},
fixStacktrace() {},
clientReload() {},
webSocketSend() {},
isHttps() { return true; },
isHttps() {
return true;
},
events: new EventEmitter() as ModuleLoaderEventEmitter,

...overrides
...overrides,
};
}
23 changes: 11 additions & 12 deletions packages/astro/src/core/module-loader/vite.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EventEmitter } from 'events';
import type * as vite from 'vite';
import type { ModuleLoader, ModuleLoaderEventEmitter } from './loader';
import { EventEmitter } from 'events';

export function createViteLoader(viteServer: vite.ViteDevServer): ModuleLoader {
const events = new EventEmitter() as ModuleLoaderEventEmitter;
Expand All @@ -9,8 +9,8 @@ export function createViteLoader(viteServer: vite.ViteDevServer): ModuleLoader {
viteServer.watcher.on('unlink', (...args) => events.emit('file-unlink', args));
viteServer.watcher.on('change', (...args) => events.emit('file-change', args));

wrapMethod(viteServer.ws, 'send', msg => {
if(msg?.type === 'error') {
wrapMethod(viteServer.ws, 'send', (msg) => {
if (msg?.type === 'error') {
events.emit('hmr-error', msg);
}
});
Expand All @@ -33,18 +33,18 @@ export function createViteLoader(viteServer: vite.ViteDevServer): ModuleLoader {
return viteServer.pluginContainer.getModuleInfo(id);
},
eachModule(cb) {
return viteServer.moduleGraph.idToModuleMap.forEach(cb);
},
invalidateModule(mod) {
viteServer.moduleGraph.invalidateModule(mod as vite.ModuleNode);
},
return viteServer.moduleGraph.idToModuleMap.forEach(cb);
},
invalidateModule(mod) {
viteServer.moduleGraph.invalidateModule(mod as vite.ModuleNode);
},
fixStacktrace(err) {
return viteServer.ssrFixStacktrace(err);
},
clientReload() {
viteServer.ws.send({
type: 'full-reload',
path: '*'
path: '*',
});
},
webSocketSend(msg) {
Expand All @@ -53,14 +53,13 @@ export function createViteLoader(viteServer: vite.ViteDevServer): ModuleLoader {
isHttps() {
return !!viteServer.config.server.https;
},
events
events,
};
}


function wrapMethod(object: any, method: string, newFn: (...args: any[]) => void) {
const orig = object[method];
object[method] = function(...args: any[]) {
object[method] = function (...args: any[]) {
newFn.apply(this, args);
return orig.apply(this, args);
};
Expand Down
3 changes: 1 addition & 2 deletions packages/astro/src/core/render/dev/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ export async function getStylesForURL(
const ext = path.extname(importedModule.url).toLowerCase();
if (STYLE_EXTENSIONS.has(ext)) {
// The SSR module is possibly not loaded. Load it if it's null.
const ssrModule =
importedModule.ssrModule ?? (await loader.import(importedModule.url));
const ssrModule = importedModule.ssrModule ?? (await loader.import(importedModule.url));
if (
mode === 'development' && // only inline in development
typeof ssrModule?.default === 'string' // ignore JS module styles
Expand Down
3 changes: 1 addition & 2 deletions packages/astro/src/core/render/dev/environment.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import type { ViteDevServer } from 'vite';
import type { AstroSettings, RuntimeMode } from '../../../@types/astro';
import type { LogOptions } from '../../logger/core.js';
import type { Environment } from '../index';
import type { ModuleLoader } from '../../module-loader/index';
import type { Environment } from '../index';

import { createEnvironment } from '../index.js';
import { RouteCache } from '../route-cache.js';
Expand Down
Loading

0 comments on commit 63a3282

Please sign in to comment.