Skip to content

Commit

Permalink
Modified compileAstro to reflect the settings in viteConfig.esbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
koyopro committed Dec 7, 2024
1 parent e21c7e6 commit 3d58791
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .changeset/seven-feet-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Modified compileAstro to reflect the settings in viteConfig.esbuild
2 changes: 1 addition & 1 deletion packages/astro/src/vite-plugin-astro/compile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export async function compileAstro({
// Compile all TypeScript to JavaScript.
// Also, catches invalid JS/TS in the compiled output before returning.
esbuildResult = await transformWithEsbuild(transformResult.code, compileProps.filename, {
...compileProps.viteConfig.esbuild,
loader: 'ts',
target: 'esnext',
sourcemap: 'external',
tsconfigRaw: {
compilerOptions: {
Expand Down
31 changes: 28 additions & 3 deletions packages/astro/test/units/vite-plugin-astro/compile.test.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import * as assert from 'node:assert/strict';
import { describe, it } from 'node:test';
import { describe, it, before } from 'node:test';
import { pathToFileURL } from 'node:url';
import { init, parse } from 'es-module-lexer';
import { resolveConfig } from 'vite';
import { compileAstro } from '../../../dist/vite-plugin-astro/compile.js';

const viteConfig = await resolveConfig({ configFile: false }, 'serve');

let inlineConfig;
/**
* @param {string} source
* @param {string} id
*/
async function compile(source, id) {
const viteConfig = await resolveConfig({ configFile: false, ...inlineConfig }, 'serve');
return await compileAstro({
compileProps: {
astroConfig: { root: pathToFileURL('/'), base: '/', experimental: {} },
Expand All @@ -24,6 +24,10 @@ async function compile(source, id) {
}

describe('astro full compile', () => {
before(() => {
inlineConfig = {};
})

it('should compile a single file', async () => {
const result = await compile(`<h1>Hello World</h1>`, '/src/components/index.astro');
assert.ok(result.code);
Expand Down Expand Up @@ -69,4 +73,25 @@ const name = 'world
assert.equal(names.includes('file'), true);
assert.equal(names.includes('url'), true);
});

describe('when the code contains syntax that is transformed by esbuild', () => {
let code = `\
---
using x = {}
---`;

it('should not transform the syntax by default', async () => {
const result = await compile(code, '/src/components/index.astro');
assert.equal(result.code.includes('using x = {}'), true);
});

it('should transform the syntax by esbuild.target', async () => {
inlineConfig = {
esbuild: { target: 'es2018' },
}
const result = await compile(code, '/src/components/index.astro');
assert.equal(result.code.includes('using x = {}'), false);
});
});

});

0 comments on commit 3d58791

Please sign in to comment.