From aa423dff5f7e0e71e680aab194564ffe739c8248 Mon Sep 17 00:00:00 2001 From: Matt Kane Date: Mon, 8 Jul 2024 13:09:50 +0100 Subject: [PATCH] Debugging windows --- packages/astro/package.json | 4 ++-- packages/astro/src/content/loaders/glob.ts | 3 +++ .../astro/test/fixtures/content-layer/src/content/config.ts | 6 +++++- scripts/cmd/test.js | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/astro/package.json b/packages/astro/package.json index 32a9d68f5ec31..25b3955993cc1 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -121,7 +121,7 @@ "test:e2e:match": "playwright test -g", "test:e2e:chrome": "playwright test", "test:e2e:firefox": "playwright test --config playwright.firefox.config.js", - "test:node": "astro-scripts test \"test/**/*.test.js\"" + "test:node": "astro-scripts test \"test/content-layer.test.js\"" }, "dependencies": { "@astrojs/compiler": "^2.8.1", @@ -243,4 +243,4 @@ "publishConfig": { "provenance": true } -} +} \ No newline at end of file diff --git a/packages/astro/src/content/loaders/glob.ts b/packages/astro/src/content/loaders/glob.ts index cd20973480c9c..53fe7e0c45513 100644 --- a/packages/astro/src/content/loaders/glob.ts +++ b/packages/astro/src/content/loaders/glob.ts @@ -73,7 +73,9 @@ export function glob(globOptions: GlobOptions): Loader { logger.warn(`No entry type found for ${entry}`); return; } + console.log({ entry, base }); const fileUrl = new URL(entry, base); + console.log({ fileUrl }); const { body, data } = await entryType.getEntryInfo({ contents: await fs.readFile(fileUrl, 'utf-8'), fileUrl, @@ -82,6 +84,7 @@ export function glob(globOptions: GlobOptions): Loader { const id = generateId({ entry, base, data }); const filePath = fileURLToPath(fileUrl); + console.log({ filePath }); const parsedData = await parseData({ id, diff --git a/packages/astro/test/fixtures/content-layer/src/content/config.ts b/packages/astro/test/fixtures/content-layer/src/content/config.ts index 7b5bd16a9abfd..d0a5173c8f612 100644 --- a/packages/astro/test/fixtures/content-layer/src/content/config.ts +++ b/packages/astro/test/fixtures/content-layer/src/content/config.ts @@ -69,8 +69,12 @@ const cats = defineCollection({ }), }); +console.log('import.meta.url', import.meta.url); +console.log('url', new URL('../../content-outside-src', import.meta.url).href ); +console.log('fileURLToPath', fileURLToPath(new URL('../../content-outside-src', import.meta.url))); + // Absolute paths should also work -const absoluteRoot = fileURLToPath(new URL('../../content-outside-src', import.meta.url)) +const absoluteRoot = fileURLToPath(new URL('../../content-outside-src', import.meta.url)); const spacecraft = defineCollection({ type: 'experimental_data', diff --git a/scripts/cmd/test.js b/scripts/cmd/test.js index 04f02f73afc00..d0d64a883c60a 100644 --- a/scripts/cmd/test.js +++ b/scripts/cmd/test.js @@ -7,7 +7,7 @@ import arg from 'arg'; import glob from 'tiny-glob'; const isCI = !!process.env.CI; -const defaultTimeout = isCI ? 1400000 : 600000; +const defaultTimeout = 600000 //isCI ? 600000 : 600000; export default async function test() { const args = arg({