Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] release #3435

Merged
merged 1 commit into from
May 25, 2022
Merged

[ci] release #3435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/blue-bottles-explode.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fair-bananas-camp.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/friendly-ways-collect.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/orange-colts-march.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/red-tables-hang.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silly-ears-unite.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/wet-beds-act.md
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/wicked-adults-pull.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion examples/basics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/blog-multiple-authors/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.32",
"astro": "^1.0.0-beta.33",
"sass": "^1.52.1"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/blog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"preact": "^10.7.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/component/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
},
"devDependencies": {
"@example/my-component": "workspace:*",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"serve": "astro --root demo preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"devDependencies": {
"@astrojs/preact": "^0.1.2",
"@astrojs/react": "^0.1.2",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/env-vars/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"alpinejs": "^3.10.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-lit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/lit": "^0.1.3",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"@webcomponents/template-shadowroot": "^0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-multiple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@astrojs/solid-js": "^0.1.2",
"@astrojs/svelte": "^0.1.3",
"@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"@webcomponents/template-shadowroot": "^0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"preact": "^10.7.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/react": "^0.1.2",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"@types/react": "^18.0.9",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/solid-js": "^0.1.2",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"solid-js": "^1.4.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/svelte": "^0.1.3",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"svelte": "^3.48.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"vue": "^3.2.36"
Expand Down
4 changes: 2 additions & 2 deletions examples/integrations-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
},
"devDependencies": {
"@astrojs/lit": "^0.1.3",
"@astrojs/partytown": "^0.1.3",
"@astrojs/partytown": "^0.1.4",
"@astrojs/react": "^0.1.2",
"@astrojs/sitemap": "^0.1.0",
"@astrojs/solid-js": "0.1.2",
"@astrojs/tailwind": "^0.2.1",
"@astrojs/turbolinks": "^0.1.3",
"astro": "^1.0.0-beta.32",
"astro": "^1.0.0-beta.33",
"solid-js": "^1.4.2"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/non-html-pages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/preact": "^0.1.2",
"astro": "^1.0.0-beta.32",
"astro": "^1.0.0-beta.33",
"sass": "^1.52.1"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/ssr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"@astrojs/node": "^0.1.2",
"@astrojs/svelte": "^0.1.3",
"astro": "^1.0.0-beta.32",
"astro": "^1.0.0-beta.33",
"concurrently": "^7.2.1",
"lightcookie": "^1.0.25",
"unocss": "^0.15.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/starter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/subpath/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/react": "^0.1.2",
"astro": "^1.0.0-beta.32",
"astro": "^1.0.0-beta.33",
"sass": "^1.52.1"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/with-markdown-plugins/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/markdown-remark": "^0.9.4",
"astro": "^1.0.0-beta.32",
"@astrojs/markdown-remark": "^0.10.0",
"astro": "^1.0.0-beta.33",
"hast-util-select": "5.0.1",
"rehype-autolink-headings": "^6.1.1",
"rehype-slug": "^5.0.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/with-markdown-shiki/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/markdown-remark": "^0.9.4",
"astro": "^1.0.0-beta.32"
"@astrojs/markdown-remark": "^0.10.0",
"astro": "^1.0.0-beta.33"
}
}
4 changes: 2 additions & 2 deletions examples/with-markdown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"preview": "astro preview"
},
"devDependencies": {
"@astrojs/markdown-remark": "^0.9.4",
"@astrojs/markdown-remark": "^0.10.0",
"@astrojs/preact": "^0.1.2",
"@astrojs/react": "^0.1.2",
"@astrojs/svelte": "^0.1.3",
"@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
},
"dependencies": {
"preact": "^10.7.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"@astrojs/solid-js": "^0.1.2",
"@astrojs/svelte": "^0.1.3",
"@astrojs/vue": "^0.1.4",
"astro": "^1.0.0-beta.32"
"astro": "^1.0.0-beta.33"
}
}
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@astrojs/tailwind": "^0.2.1",
"astro": "^1.0.0-beta.32",
"astro": "^1.0.0-beta.33",
"autoprefixer": "^10.4.7",
"canvas-confetti": "^1.5.1",
"postcss": "^8.4.14",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-vite-plugin-pwa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "astro preview"
},
"devDependencies": {
"astro": "^1.0.0-beta.32",
"astro": "^1.0.0-beta.33",
"vite-plugin-pwa": "0.11.11",
"workbox-window": "^6.5.3"
}
Expand Down
21 changes: 21 additions & 0 deletions packages/astro/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# astro

## 1.0.0-beta.33

### Patch Changes

- [#3426](https://github.com/withastro/astro/pull/3426) [`946630a1`](https://github.com/withastro/astro/commit/946630a112dca39d6afc32ef02edceda94a604cb) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Logs: Add "ssr.noExternal" hint for CSS loaded from npm packages

* [#3434](https://github.com/withastro/astro/pull/3434) [`4e3b405e`](https://github.com/withastro/astro/commit/4e3b405e9eb03f7c286234a30ca45c26e3e17fcf) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Respect user's configured vite logLevel during build

- [#3423](https://github.com/withastro/astro/pull/3423) [`463a1c21`](https://github.com/withastro/astro/commit/463a1c214779e0558bcd99c30294e1a14a97232e) Thanks [@matthewp](https://github.com/matthewp)! - Fix relative inline scripts on Windows

* [#3384](https://github.com/withastro/astro/pull/3384) [`296fff2c`](https://github.com/withastro/astro/commit/296fff2cffd4632f2d2e891069f52f6859a5c076) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix long-standing bug where a `class` attribute inside of a spread prop will cause duplicate `class` attributes

- [#3433](https://github.com/withastro/astro/pull/3433) [`4ca60e93`](https://github.com/withastro/astro/commit/4ca60e9344f882ee1a216ec66fb409c88c740641) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix build issue where hoisted scripts would be duplicated per page

* [#3422](https://github.com/withastro/astro/pull/3422) [`0209d627`](https://github.com/withastro/astro/commit/0209d6276c6ed86914b6433e223628010b6a7dfd) Thanks [@tony-sull](https://github.com/tony-sull)! - Updates component hydration scripts to use absolute paths for script imports

- [#3410](https://github.com/withastro/astro/pull/3410) [`cfae9760`](https://github.com/withastro/astro/commit/cfae9760b252052b6189e96398b819a4337634a8) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Significantally more stable behavior for "Markdown + Components" usage, which now handles component serialization much more similarly to MDX. Also supports switching between Components and Markdown without extra newlines, removes wrapping `<p>` tags from standalone components, and improves JSX expression handling.

- Updated dependencies [[`cfae9760`](https://github.com/withastro/astro/commit/cfae9760b252052b6189e96398b819a4337634a8)]:
- @astrojs/markdown-remark@0.10.0

## 1.0.0-beta.32

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "astro",
"version": "1.0.0-beta.32",
"version": "1.0.0-beta.33",
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
"type": "module",
"author": "withastro",
Expand Down Expand Up @@ -79,7 +79,7 @@
"dependencies": {
"@astrojs/compiler": "^0.15.0",
"@astrojs/language-server": "^0.13.4",
"@astrojs/markdown-remark": "^0.9.4",
"@astrojs/markdown-remark": "^0.10.0",
"@astrojs/prism": "0.4.1",
"@astrojs/telemetry": "^0.1.2",
"@astrojs/webapi": "^0.12.0",
Expand Down
12 changes: 9 additions & 3 deletions packages/astro/src/vite-plugin-markdown/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,15 @@ export default function markdown({ config }: AstroPluginOptions): Plugin {
let { data: frontmatter, content: markdownContent } = matter(source);

// Turn HTML comments into JS comments
markdownContent = markdownContent.replace(/<\s*!--([^-->]*)(.*?)-->/gs, (whole) => `{/*${whole}*/}`)

let renderResult = await renderMarkdown(markdownContent, { ...renderOpts, fileURL: fileUrl } as any);
markdownContent = markdownContent.replace(
/<\s*!--([^-->]*)(.*?)-->/gs,
(whole) => `{/*${whole}*/}`
);

let renderResult = await renderMarkdown(markdownContent, {
...renderOpts,
fileURL: fileUrl,
} as any);
let { code: astroResult, metadata } = renderResult;
const { layout = '', components = '', setup = '', ...content } = frontmatter;
content.astro = metadata;
Expand Down
6 changes: 3 additions & 3 deletions packages/astro/test/astro-markdown.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ describe('Astro Markdown', () => {
const html = await fixture.readFile('/slug/index.html');
const $ = cheerio.load(html);

expect($('h1').attr("id")).to.equal('my-blog-post');
expect($('h1').attr('id')).to.equal('my-blog-post');
});

it('Can handle code elements without extra spacing', async () => {
const html = await fixture.readFile('/code-element/index.html');
const $ = cheerio.load(html);

$('code').each((_, el) => {
expect($(el).html()).to.equal($(el).html().trim())
expect($(el).html()).to.equal($(el).html().trim());
});
});

Expand Down Expand Up @@ -76,7 +76,7 @@ describe('Astro Markdown', () => {
it('Can handle scripts in markdown pages', async () => {
const html = await fixture.readFile('/script/index.html');
console.log(html);
expect(html).not.to.match(new RegExp("\/src\/scripts\/test\.js"));
expect(html).not.to.match(new RegExp('/src/scripts/test.js'));
});

it('Can load more complex jsxy stuff', async () => {
Expand Down
Loading