Skip to content

Commit b5e35ad

Browse files
ematipicoematipico
committed
fix build
1 parent f1d7452 commit b5e35ad

4 files changed

Lines changed: 10 additions & 18 deletions

File tree

‎packages/astro/src/content/server-listeners.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { bold, cyan, underline } from 'kleur/colors';
55
import type { ViteDevServer } from 'vite';
66
import { loadTSConfig } from '../core/config/tsconfig.js';
77
import type { Logger } from '../core/logger/core.js';
8-
import { getRunnableEnvironment } from '../core/module-loader/index.js';
98
import { appendForwardSlash } from '../core/path.js';
109
import type { AstroSettings } from '../types/astro.js';
1110
import { createContentTypesGenerator } from './types-generator.js';
@@ -24,7 +23,6 @@ export async function attachContentServerListeners({
2423
logger,
2524
settings,
2625
}: ContentServerListenerParams) {
27-
const environment = getRunnableEnvironment(viteServer);
2826
const contentPaths = getContentPaths(settings.config, fs);
2927
if (!settings.config.legacy?.collections) {
3028
await attachListeners();
@@ -54,7 +52,7 @@ export async function attachContentServerListeners({
5452
fs,
5553
settings,
5654
logger,
57-
environment,
55+
viteServer,
5856
contentConfigObserver: globalContentConfigObserver,
5957
});
6058
await contentGenerator.init();

‎packages/astro/src/content/types-generator.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { zodToJsonSchema } from 'zod-to-json-schema';
99
import { AstroError } from '../core/errors/errors.js';
1010
import { AstroErrorData, AstroUserError } from '../core/errors/index.js';
1111
import type { Logger } from '../core/logger/core.js';
12+
import { getRunnableEnvironment } from '../core/module-loader/index.js';
1213
import { isRelativePath } from '../core/path.js';
1314
import type { AstroSettings } from '../types/astro.js';
1415
import type { ContentEntryType } from '../types/public/content.js';
@@ -34,7 +35,6 @@ import {
3435
getEntryType,
3536
reloadContentConfigObserver,
3637
} from './utils.js';
37-
import { getRunnableEnvironment } from '../core/module-loader/index.js';
3838

3939
type ChokidarEvent = 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir';
4040
type RawContentEvent = { name: ChokidarEvent; entry: string };
@@ -336,10 +336,11 @@ export async function createContentTypesGenerator({
336336
typeTemplateContent,
337337
contentConfig: observable.status === 'loaded' ? observable.config : undefined,
338338
contentEntryTypes: settings.contentEntryTypes,
339-
environment,
339+
viteServer,
340340
logger,
341341
settings,
342342
});
343+
const environment = getRunnableEnvironment(viteServer);
343344
invalidateVirtualMod(environment);
344345
}
345346
}
@@ -444,7 +445,7 @@ async function writeContentFiles({
444445
typeTemplateContent: string;
445446
contentEntryTypes: Pick<ContentEntryType, 'contentModuleTypes'>[];
446447
contentConfig?: ContentConfig;
447-
viteServer: Pick<ViteDevServer, 'hot'>;
448+
viteServer: ViteDevServer;
448449
logger: Logger;
449450
settings: AstroSettings;
450451
}) {

‎packages/astro/src/content/vite-plugin-content-virtual-mod.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
44
import { dataToEsm } from '@rollup/pluginutils';
55
import pLimit from 'p-limit';
66
import { glob } from 'tinyglobby';
7-
import { isRunnableDevEnvironment, normalizePath, type Plugin, type ViteDevServer } from 'vite';
7+
import { normalizePath, type Plugin, type ViteDevServer } from 'vite';
88
import { AstroError, AstroErrorData } from '../core/errors/index.js';
99
import { getRunnableEnvironment } from '../core/module-loader/index.js';
1010
import { rootRelativePath } from '../core/viteUtils.js';
@@ -80,10 +80,8 @@ export function astroContentVirtualModPlugin({
8080
if (devServer) {
8181
// We defer adding the data store file to the watcher until the server is ready
8282
devServer.watcher.add(fileURLToPath(dataStoreFile));
83-
}
84-
if (isRunnableDevEnvironment(this.environment)) {
8583
// Manually invalidate the data store to avoid a race condition in file watching
86-
invalidateDataStore(this.environment);
84+
invalidateDataStore(devServer);
8785
}
8886
},
8987
async resolveId(id, importer) {
@@ -201,16 +199,14 @@ export function astroContentVirtualModPlugin({
201199
// If the datastore file changes, invalidate the virtual module
202200

203201
server.watcher.on('add', (addedPath) => {
204-
const environment = getRunnableEnvironment(server);
205202
if (addedPath === dataStorePath) {
206-
invalidateDataStore(environment);
203+
invalidateDataStore(server);
207204
}
208205
});
209206

210207
server.watcher.on('change', (changedPath) => {
211208
if (changedPath === dataStorePath) {
212-
const environment = getRunnableEnvironment(server);
213-
invalidateDataStore(environment);
209+
invalidateDataStore(server);
214210
}
215211
});
216212
},

‎packages/astro/src/core/sync/index.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
isAstroError,
3333
} from '../errors/index.js';
3434
import type { Logger } from '../logger/core.js';
35-
import { getRunnableEnvironment } from '../module-loader/index.js';
3635
import { createRoutesList } from '../routing/index.js';
3736
import { ensureProcessNodeEnv } from '../util.js';
3837
import { normalizePath } from '../viteUtils.js';
@@ -255,8 +254,6 @@ async function syncContentCollections(
255254
),
256255
);
257256

258-
const environment = getRunnableEnvironment(tempViteServer);
259-
260257
// Patch `hot.send` to bubble up error events
261258
// `hot.on('error')` does not fire for some reason
262259
const hotSend = tempViteServer.environments.client.hot.send;
@@ -273,7 +270,7 @@ async function syncContentCollections(
273270
logger: logger,
274271
fs,
275272
settings,
276-
environment,
273+
viteServer: tempViteServer,
277274
});
278275
const typesResult = await contentTypesGenerator.init();
279276

0 commit comments

Comments
 (0)