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

Fix code generation quotes handling (#5678)

Browse source
This commit is contained in:
Bjorn Lu 2022-12-28 00:12:03 +08:00 committed by GitHub
parent 376f67011d
commit f8f5768294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/purple-hounds-decide.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix code generation quotes handling

4
packages/astro/src/core/build/vite-plugin-pages.ts
View file

@ -27,8 +27,8 @@ export function vitePluginPages(opts: StaticBuildOptions, internals: BuildIntern
let i = 0; let i = 0;
for (const pageData of eachPageData(internals)) { for (const pageData of eachPageData(internals)) {
const variable = `_page${i}`; const variable = `_page${i}`;
imports.push(`import * as ${variable} from '${pageData.moduleSpecifier}';`); imports.push(`import * as ${variable} from ${JSON.stringify(pageData.moduleSpecifier)};`);
importMap += `['${pageData.component}', ${variable}],`; importMap += `[${JSON.stringify(pageData.component)}, ${variable}],`;
i++; i++;
} }

4
packages/astro/src/core/create-vite.ts
View file

@ -133,7 +133,9 @@ export async function createVite(
root: fileURLToPath(settings.config.root), root: fileURLToPath(settings.config.root),
envPrefix: 'PUBLIC_', envPrefix: 'PUBLIC_',
define: { define: {
'import.meta.env.SITE': settings.config.site ? `'${settings.config.site}'` : 'undefined', 'import.meta.env.SITE': settings.config.site
? JSON.stringify(settings.config.site)
: 'undefined',
}, },
server: { server: {
hmr: hmr:

2
packages/astro/src/core/dev/container.ts
View file

@ -82,7 +82,7 @@ export async function createContainer(params: CreateContainerParams = {}): Promi
}, },
define: { define: {
'import.meta.env.BASE_URL': settings.config.base 'import.meta.env.BASE_URL': settings.config.base
? `'${settings.config.base}'` ? JSON.stringify(settings.config.base)
: 'undefined', : 'undefined',
}, },
}, },

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

@ -37,9 +37,9 @@ function getPrivateEnv(
} }
} }
} }
privateEnv.SITE = astroConfig.site ? `'${astroConfig.site}'` : 'undefined'; privateEnv.SITE = astroConfig.site ? JSON.stringify(astroConfig.site) : 'undefined';
privateEnv.SSR = JSON.stringify(true); privateEnv.SSR = JSON.stringify(true);
privateEnv.BASE_URL = astroConfig.base ? `'${astroConfig.base}'` : 'undefined'; privateEnv.BASE_URL = astroConfig.base ? JSON.stringify(astroConfig.base) : 'undefined';
return privateEnv; return privateEnv;
} }

6
packages/astro/src/vite-plugin-markdown-legacy/index.ts
View file

@ -174,8 +174,8 @@ export default function markdown({ settings }: AstroPluginOptions): Plugin {
const prelude = `--- const prelude = `---
import Slugger from 'github-slugger'; import Slugger from 'github-slugger';
${layout ? `import Layout from '${layout}';` : ''} ${layout ? `import Layout from ${JSON.stringify(layout)};` : ''}
${components ? `import * from '${components}';` : ''} ${components ? `import * from ${JSON.stringify(components)};` : ''}
${setup} ${setup}
const slugger = new Slugger(); const slugger = new Slugger();
@ -193,7 +193,7 @@ Object.defineProperty($$content.astro, 'headers', {
}); });
---`; ---`;
const imports = `${layout ? `import Layout from '${layout}';` : ''} const imports = `${layout ? `import Layout from ${JSON.stringify(layout)};` : ''}
${setup}`.trim(); ${setup}`.trim();
// If the user imported "Layout", wrap the content in a Layout // If the user imported "Layout", wrap the content in a Layout

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

@ -95,7 +95,7 @@ export default function markdown({ settings, logging }: AstroPluginOptions): Plu
} }
const code = escapeViteEnvReferences(` const code = escapeViteEnvReferences(`
import { Fragment, jsx as h } from '${astroJsxRuntimeModulePath}'; import { Fragment, jsx as h } from ${JSON.stringify(astroJsxRuntimeModulePath)};
${layout ? `import Layout from ${JSON.stringify(layout)};` : ''} ${layout ? `import Layout from ${JSON.stringify(layout)};` : ''}
const html = ${JSON.stringify(html)}; const html = ${JSON.stringify(html)};

7
packages/astro/test/astro-pages.test.js
View file

@ -21,6 +21,13 @@ describe('Pages', () => {
expect($('h1').text()).to.equal('Name with index'); expect($('h1').text()).to.equal('Name with index');
}); });
it('Can find page with quotes in file name', async () => {
const html = await fixture.readFile("/quotes'-work-too/index.html");
const $ = cheerio.load(html);
expect($('h1').text()).to.equal("Quotes work too");
});
}); });
if (isWindows) return; if (isWindows) return;

1
packages/astro/test/fixtures/astro pages/src/pages/quotes'-work-too.md vendored Normal file
View file

@ -0,0 +1 @@
# Quotes work too