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

Merge branch 'main' into test/e2e-hydration

Browse source
This commit is contained in:
Tony Sullivan 2022-05-19 14:50:07 -05:00
commit 2d833cecaa
40 changed files with 2414 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/good-humans-sniff.md
View file

@ -1,5 +0,0 @@
---
'astro': patch
---
Include server CSS in the SSR manifest assets

5
.changeset/quiet-pumpkins-hunt.md
View file

@ -1,5 +0,0 @@
---
'astro': patch
---
Expose `file` and `url` properties when fetching `.astro` files with `Astro.glob()`

2
examples/basics/package.json
View file

@ -9,6 +9,6 @@
"preview": "astro preview" "preview": "astro preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/blog-multiple-authors/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/preact": "^0.1.2", "@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"sass": "^1.51.0" "sass": "^1.51.0"
}, },
"dependencies": { "dependencies": {

2
examples/blog/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/preact": "^0.1.2", "@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"preact": "^10.7.2" "preact": "^10.7.2"

2
examples/component/demo/package.json
View file

@ -10,6 +10,6 @@
}, },
"devDependencies": { "devDependencies": {
"@example/my-component": "workspace:*", "@example/my-component": "workspace:*",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/component/package.json
View file

@ -8,6 +8,6 @@
"serve": "astro --root demo preview" "serve": "astro --root demo preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/docs/package.json
View file

@ -20,6 +20,6 @@
"devDependencies": { "devDependencies": {
"@astrojs/preact": "^0.1.2", "@astrojs/preact": "^0.1.2",
"@astrojs/react": "^0.1.2", "@astrojs/react": "^0.1.2",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/env-vars/package.json
View file

@ -9,6 +9,6 @@
"preview": "astro preview" "preview": "astro preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/framework-alpine/package.json
View file

@ -9,7 +9,7 @@
"preview": "astro preview" "preview": "astro preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"alpinejs": "^3.10.2" "alpinejs": "^3.10.2"

2
examples/framework-lit/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/lit": "^0.1.3", "@astrojs/lit": "^0.1.3",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"@webcomponents/template-shadowroot": "^0.1.0", "@webcomponents/template-shadowroot": "^0.1.0",

2
examples/framework-multiple/package.json
View file

@ -15,7 +15,7 @@
"@astrojs/solid-js": "^0.1.2", "@astrojs/solid-js": "^0.1.2",
"@astrojs/svelte": "^0.1.3", "@astrojs/svelte": "^0.1.3",
"@astrojs/vue": "^0.1.4", "@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"@webcomponents/template-shadowroot": "^0.1.0", "@webcomponents/template-shadowroot": "^0.1.0",

2
examples/framework-preact/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/preact": "^0.1.2", "@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"preact": "^10.7.2" "preact": "^10.7.2"

2
examples/framework-react/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/react": "^0.1.2", "@astrojs/react": "^0.1.2",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"@types/react": "^18.0.9", "@types/react": "^18.0.9",

2
examples/framework-solid/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/solid-js": "^0.1.2", "@astrojs/solid-js": "^0.1.2",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"solid-js": "^1.4.2" "solid-js": "^1.4.2"

2
examples/framework-svelte/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/svelte": "^0.1.3", "@astrojs/svelte": "^0.1.3",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"svelte": "^3.48.0" "svelte": "^3.48.0"

2
examples/framework-vue/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/vue": "^0.1.4", "@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"vue": "^3.2.34" "vue": "^3.2.34"

2
examples/integrations-playground/package.json
View file

@ -16,7 +16,7 @@
"@astrojs/solid-js": "0.1.2", "@astrojs/solid-js": "0.1.2",
"@astrojs/tailwind": "^0.2.1", "@astrojs/tailwind": "^0.2.1",
"@astrojs/turbolinks": "^0.1.3", "@astrojs/turbolinks": "^0.1.3",
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"solid-js": "^1.4.2" "solid-js": "^1.4.2"
}, },
"dependencies": { "dependencies": {

2
examples/minimal/package.json
View file

@ -9,6 +9,6 @@
"preview": "astro preview" "preview": "astro preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/non-html-pages/package.json
View file

@ -9,6 +9,6 @@
"preview": "astro preview" "preview": "astro preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/portfolio/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/preact": "^0.1.2", "@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"sass": "^1.51.0" "sass": "^1.51.0"
}, },
"dependencies": { "dependencies": {

2
examples/ssr/package.json
View file

@ -11,7 +11,7 @@
"devDependencies": { "devDependencies": {
"@astrojs/node": "^0.1.1", "@astrojs/node": "^0.1.1",
"@astrojs/svelte": "^0.1.3", "@astrojs/svelte": "^0.1.3",
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"concurrently": "^7.2.0", "concurrently": "^7.2.0",
"lightcookie": "^1.0.25", "lightcookie": "^1.0.25",
"unocss": "^0.15.6", "unocss": "^0.15.6",

2
examples/starter/package.json
View file

@ -9,6 +9,6 @@
"preview": "astro preview" "preview": "astro preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/subpath/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/react": "^0.1.2", "@astrojs/react": "^0.1.2",
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"sass": "^1.51.0" "sass": "^1.51.0"
}, },
"dependencies": { "dependencies": {

2
examples/with-markdown-plugins/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/markdown-remark": "^0.9.4", "@astrojs/markdown-remark": "^0.9.4",
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"hast-util-select": "5.0.1", "hast-util-select": "5.0.1",
"rehype-autolink-headings": "^6.1.1", "rehype-autolink-headings": "^6.1.1",
"rehype-slug": "^5.0.1", "rehype-slug": "^5.0.1",

2
examples/with-markdown-shiki/package.json
View file

@ -10,6 +10,6 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/markdown-remark": "^0.9.4", "@astrojs/markdown-remark": "^0.9.4",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/with-markdown/package.json
View file

@ -14,7 +14,7 @@
"@astrojs/react": "^0.1.2", "@astrojs/react": "^0.1.2",
"@astrojs/svelte": "^0.1.3", "@astrojs/svelte": "^0.1.3",
"@astrojs/vue": "^0.1.4", "@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
}, },
"dependencies": { "dependencies": {
"preact": "^10.7.2", "preact": "^10.7.2",

2
examples/with-nanostores/package.json
View file

@ -25,6 +25,6 @@
"@astrojs/solid-js": "^0.1.2", "@astrojs/solid-js": "^0.1.2",
"@astrojs/svelte": "^0.1.3", "@astrojs/svelte": "^0.1.3",
"@astrojs/vue": "^0.1.4", "@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.30" "astro": "^1.0.0-beta.31"
} }
} }

2
examples/with-tailwindcss/package.json
View file

@ -10,7 +10,7 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/tailwind": "^0.2.1", "@astrojs/tailwind": "^0.2.1",
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"autoprefixer": "^10.4.7", "autoprefixer": "^10.4.7",
"canvas-confetti": "^1.5.1", "canvas-confetti": "^1.5.1",
"postcss": "^8.4.14", "postcss": "^8.4.14",

2
examples/with-vite-plugin-pwa/package.json
View file

@ -9,7 +9,7 @@
"preview": "astro preview" "preview": "astro preview"
}, },
"devDependencies": { "devDependencies": {
"astro": "^1.0.0-beta.30", "astro": "^1.0.0-beta.31",
"vite-plugin-pwa": "0.11.11", "vite-plugin-pwa": "0.11.11",
"workbox-window": "^6.5.3" "workbox-window": "^6.5.3"
} }

10
packages/astro/CHANGELOG.md
View file

@ -1,5 +1,15 @@
# astro # astro
## 1.0.0-beta.31
### Patch Changes
- [#3402](https://github.com/withastro/astro/pull/3402) [`0c9f770e`](https://github.com/withastro/astro/commit/0c9f770e8ab361f11549f1e24114e557fdcca65d) Thanks [@matthewp](https://github.com/matthewp)! - Include server CSS in the SSR manifest assets
* [#3406](https://github.com/withastro/astro/pull/3406) [`4007aebc`](https://github.com/withastro/astro/commit/4007aebc6aba8d732abed7c001f59e61678ea3f2) Thanks [@matthewp](https://github.com/matthewp)! - Provides a better error message when using @adobe/react-spectrum
- [#3385](https://github.com/withastro/astro/pull/3385) [`d34859d7`](https://github.com/withastro/astro/commit/d34859d75008812fcd101e197ce835bcc1ee2017) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Expose `file` and `url` properties when fetching `.astro` files with `Astro.glob()`
## 1.0.0-beta.30 ## 1.0.0-beta.30
### Patch Changes ### Patch Changes

2
packages/astro/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "astro", "name": "astro",
"version": "1.0.0-beta.30", "version": "1.0.0-beta.31",
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
"type": "module", "type": "module",
"author": "withastro", "author": "withastro",

11
packages/astro/src/core/errors.ts
View file

@ -41,9 +41,20 @@ export function fixViteErrorMessage(_err: unknown, server: ViteDevServer) {
return err; return err;
} }
const incompatiblePackages = {
'react-spectrum': `@adobe/react-spectrum is not compatible with Vite's server-side rendering mode at the moment. You can still use React Spectrum from the client. Create an island React component and use the client:only directive. From there you can use React Spectrum.`,
};
const incompatPackageExp = new RegExp(`(${Object.keys(incompatiblePackages).join('|')})`);
function generateHint(err: ErrorWithMetadata): string | undefined { function generateHint(err: ErrorWithMetadata): string | undefined {
if (/Unknown file extension \"\.(jsx|vue|svelte|astro)\" for /.test(err.message)) { if (/Unknown file extension \"\.(jsx|vue|svelte|astro)\" for /.test(err.message)) {
return 'You likely need to add this package to `vite.ssr.noExternal` in your astro config file.'; return 'You likely need to add this package to `vite.ssr.noExternal` in your astro config file.';
} else {
const res = incompatPackageExp.exec(err.stack);
if (res) {
const key = res[0] as keyof typeof incompatiblePackages;
return incompatiblePackages[key];
}
} }
return undefined; return undefined;
} }

4
packages/astro/src/template/5xx.ts
View file

@ -71,9 +71,9 @@ export default function template({
statusCode ? `<span class="statusCode">${statusCode}: </span> ` : '' statusCode ? `<span class="statusCode">${statusCode}: </span> ` : ''
}<span class="statusMessage">${title}</span></h1> }<span class="statusMessage">${title}</span></h1>
</header> </header>
<pre>${encode(error)}</pre> <pre class="error-message">${encode(error)}</pre>
${url ? `<a target="_blank" href="${url}">${url}</a>` : ''} ${url ? `<a target="_blank" href="${url}">${url}</a>` : ''}
<pre>${encode(stack)}</pre> <pre class="error-stack">${encode(stack)}</pre>
</main> </main>
</body> </body>
</html>`; </html>`;

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

@ -37,6 +37,14 @@ function removeViteHttpMiddleware(server: vite.Connect.Server) {
} }
} }
function truncateString(str: string, n: number) {
if (str.length > n) {
return str.substring(0, n) + '&#8230;';
} else {
return str;
}
}
function writeHtmlResponse(res: http.ServerResponse, statusCode: number, html: string) { function writeHtmlResponse(res: http.ServerResponse, statusCode: number, html: string) {
res.writeHead(statusCode, { res.writeHead(statusCode, {
'Content-Type': 'text/html; charset=utf-8', 'Content-Type': 'text/html; charset=utf-8',
@ -157,9 +165,9 @@ async function handle500Response(
statusCode: 500, statusCode: 500,
title: 'Internal Error', title: 'Internal Error',
tabTitle: '500: Error', tabTitle: '500: Error',
message: stripAnsi(err.message), message: stripAnsi(err.hint ?? err.message),
url: err.url || undefined, url: err.url || undefined,
stack: stripAnsi(err.stack), stack: truncateString(stripAnsi(err.stack), 500),
}); });
const transformedHtml = await viteServer.transformIndexHtml(pathname, html); const transformedHtml = await viteServer.transformIndexHtml(pathname, html);
writeHtmlResponse(res, 500, transformedHtml); writeHtmlResponse(res, 500, transformedHtml);

29
packages/astro/test/error-react-spectrum.test.js Normal file
View file

@ -0,0 +1,29 @@
import { isWindows, loadFixture } from './test-utils.js';
import { expect } from 'chai';
import * as cheerio from 'cheerio';
describe('Error packages: react-spectrum', () => {
if (isWindows) return;
/** @type {import('./test-utils').Fixture} */
let fixture;
/** @type {import('./test-utils').DevServer} */
let devServer;
before(async () => {
fixture = await loadFixture({
root: './fixtures/error-react-spectrum',
});
});
after(async () => {
devServer && devServer.stop();
});
it('properly detect syntax errors in template', async () => {
devServer = await fixture.startDevServer();
let html = await fixture.fetch('/').then((res) => res.text());
let $ = cheerio.load(html);
const msg = $('.error-message').text();
expect(msg).to.match(/@adobe\/react-spectrum is not compatible/);
});
});

7
packages/astro/test/fixtures/error-react-spectrum/astro.config.mjs vendored Normal file
View file

@ -0,0 +1,7 @@
import { defineConfig } from 'astro/config';
import react from '@astrojs/react';
// https://astro.build/config
export default defineConfig({
integrations: [react()],
});

15
packages/astro/test/fixtures/error-react-spectrum/package.json vendored Normal file
View file

@ -0,0 +1,15 @@
{
"name": "@test/error-react-spectrum",
"version": "0.0.0",
"private": true,
"dependencies": {
"astro": "workspace:*",
"@astrojs/react": "workspace:*",
"@adobe/react-spectrum": "^3.17.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
}
}

19
packages/astro/test/fixtures/error-react-spectrum/src/pages/index.astro vendored Normal file
View file

@ -0,0 +1,19 @@
---
// Just importing causes a failure
import '@adobe/react-spectrum';
---
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<style>
</style>
</head>
<body>
<main>
testing
</main>
</body>
</html>

2312
pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff