From 9482fadeb88b8e1562ab67ffe244ec9c042f178d Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Tue, 24 Aug 2021 13:38:07 -0400 Subject: [PATCH] Fix resolution of Astro.resolve in nested components (#1213) * Fix resolution of Astro.resolve in nested components Components were previously tested, however nested folders were not. * Adds a changeset --- .changeset/violet-crabs-deny.md | 5 +++++ packages/astro/src/compiler/index.ts | 5 ----- packages/astro/test/astro-global.test.js | 1 + .../astro-global/src/components/nested/InnerChild.astro | 6 ++++++ .../test/fixtures/astro-global/src/pages/resolve.astro | 2 ++ 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 .changeset/violet-crabs-deny.md create mode 100644 packages/astro/test/fixtures/astro-global/src/components/nested/InnerChild.astro diff --git a/.changeset/violet-crabs-deny.md b/.changeset/violet-crabs-deny.md new file mode 100644 index 0000000000..9a830e445c --- /dev/null +++ b/.changeset/violet-crabs-deny.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Makes sure Astro.resolve works in nested component folders diff --git a/packages/astro/src/compiler/index.ts b/packages/astro/src/compiler/index.ts index a84abf97fb..ede2a62f21 100644 --- a/packages/astro/src/compiler/index.ts +++ b/packages/astro/src/compiler/index.ts @@ -169,10 +169,6 @@ async function __render(props, ...children) { value: (props[__astroInternal] && props[__astroInternal].isPage) || false, enumerable: true }, - resolve: { - value: (props[__astroContext] && props[__astroContext].resolve) || {}, - enumerable: true - }, request: { value: (props[__astroContext] && props[__astroContext].request) || {}, enumerable: true @@ -201,7 +197,6 @@ export async function __renderPage({request, children, props, css}) { value: { pageCSS: css, request, - resolve: __TopLevelAstro.resolve, createAstroRootUID(seed) { return seed + astroRootUIDCounter++; }, }, writable: false, diff --git a/packages/astro/test/astro-global.test.js b/packages/astro/test/astro-global.test.js index 5dbac151b3..558e0157ff 100644 --- a/packages/astro/test/astro-global.test.js +++ b/packages/astro/test/astro-global.test.js @@ -48,6 +48,7 @@ Global('Astro.resolve in development', async (context) => { const html = result.contents; const $ = doc(html); assert.equal($('img').attr('src'), '/_astro/src/images/penguin.png'); + assert.equal($('#inner-child img').attr('src'), '/_astro/src/components/nested/images/penguin.png'); }); Global.run(); diff --git a/packages/astro/test/fixtures/astro-global/src/components/nested/InnerChild.astro b/packages/astro/test/fixtures/astro-global/src/components/nested/InnerChild.astro new file mode 100644 index 0000000000..9b1e5f40ef --- /dev/null +++ b/packages/astro/test/fixtures/astro-global/src/components/nested/InnerChild.astro @@ -0,0 +1,6 @@ +--- +const penguinUrl = Astro.resolve('./images/penguin.png'); +--- +
+ +
\ No newline at end of file diff --git a/packages/astro/test/fixtures/astro-global/src/pages/resolve.astro b/packages/astro/test/fixtures/astro-global/src/pages/resolve.astro index df2b5f5cb3..b545b184c7 100644 --- a/packages/astro/test/fixtures/astro-global/src/pages/resolve.astro +++ b/packages/astro/test/fixtures/astro-global/src/pages/resolve.astro @@ -1,5 +1,6 @@ --- import Child from '../components/ChildResolve.astro'; +import InnerChild from '../components/nested/InnerChild.astro'; --- @@ -8,5 +9,6 @@ import Child from '../components/ChildResolve.astro'; + \ No newline at end of file