michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: Relative imports inside of hosited script on windows (#3423)

Browse source 
* Failing test

* Add some debugging

* Normalize filename to remove @fs prefix

* Adds a changeset

* Break it again

* Fix it

* Update assertion
This commit is contained in:
Matthew Phillips 2022-05-24 11:34:08 -04:00 committed by GitHub
parent af179c0d89
commit 463a1c2147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/friendly-ways-collect.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix relative inline scripts on Windows

5
packages/astro/src/vite-plugin-astro/index.ts
View file

@ -62,8 +62,9 @@ export default function astro({ config, logging }: AstroPluginOptions): vite.Plu
// If resolving from an astro subresource such as a hoisted script, // If resolving from an astro subresource such as a hoisted script,
// we need to resolve relative paths ourselves. // we need to resolve relative paths ourselves.
if (from) { if (from) {
const { query: fromQuery, filename } = parseAstroRequest(from); const parsedFrom = parseAstroRequest(from);
if (fromQuery.astro && isRelativePath(id) && fromQuery.type === 'script') { if (parsedFrom.query.astro && isRelativePath(id) && parsedFrom.query.type === 'script') {
const filename = normalizeFilename(parsedFrom.filename);
const resolvedURL = new URL(id, `file://${filename}`); const resolvedURL = new URL(id, `file://${filename}`);
const resolved = resolvedURL.pathname; const resolved = resolvedURL.pathname;
if (isBrowserPath(resolved)) { if (isBrowserPath(resolved)) {

4
packages/astro/test/astro-scripts.test.js
View file

@ -1,6 +1,5 @@
import { expect } from 'chai'; import { expect } from 'chai';
import * as cheerio from 'cheerio'; import * as cheerio from 'cheerio';
import path from 'path';
import { loadFixture } from './test-utils.js'; import { loadFixture } from './test-utils.js';
describe('Scripts (hoisted and not)', () => { describe('Scripts (hoisted and not)', () => {
@ -50,6 +49,9 @@ describe('Scripts (hoisted and not)', () => {
// test 3: the JS exists // test 3: the JS exists
expect(inlineEntryJS).to.be.ok; expect(inlineEntryJS).to.be.ok;
// test 4: Inline imported JS is included
expect(inlineEntryJS).to.contain("I AM IMPORTED INLINE", "The inline imported JS is included in the bundle");
}); });
it('External page builds the hoisted scripts to a single bundle', async () => { it('External page builds the hoisted scripts to a single bundle', async () => {

6
packages/astro/test/fixtures/astro-scripts/src/pages/inline.astro vendored
View file

@ -12,5 +12,9 @@ import Inline from '../components/Inline.astro';
<Inline /> <Inline />
<Inline /> <Inline />
<Inline /> <Inline />
<script>
// This must be relative for the test
import '../scripts/hoist_external_imported_inline.js';
</script>
</body> </body>
</html> </html>

1
packages/astro/test/fixtures/astro-scripts/src/scripts/hoist_external_imported_inline.js vendored Normal file
View file

@ -0,0 +1 @@
console.log("I AM IMPORTED INLINE");