Skip to content

Commit b6fdaba

Browse files
natemoo-renatemoo-re
authored
Merge branch 'main' into feat/slots
2 parents 41344a4 + 19cd962 commit b6fdaba

File tree

54 files changed

+754
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+754
-140
lines changed

‎.changeset/neat-seas-peel.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.changeset/spotty-rockets-grow.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/basics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"astro": "^1.0.0-beta.52"
12+
"astro": "^1.0.0-beta.53"
1313
}
1414
}

‎examples/blog-multiple-authors/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/preact": "^0.1.3",
13-
"astro": "^1.0.0-beta.52",
13+
"astro": "^1.0.0-beta.53",
1414
"sass": "^1.52.2"
1515
},
1616
"dependencies": {

‎examples/blog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/preact": "^0.1.3",
13-
"astro": "^1.0.0-beta.52"
13+
"astro": "^1.0.0-beta.53"
1414
},
1515
"dependencies": {
1616
"preact": "^10.7.3"

‎examples/component/demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
},
1111
"devDependencies": {
1212
"@example/my-component": "workspace:*",
13-
"astro": "^1.0.0-beta.52"
13+
"astro": "^1.0.0-beta.53"
1414
}
1515
}

‎examples/component/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"serve": "astro --root demo preview"
99
},
1010
"devDependencies": {
11-
"astro": "^1.0.0-beta.52"
11+
"astro": "^1.0.0-beta.53"
1212
}
1313
}

‎examples/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"devDependencies": {
2121
"@astrojs/preact": "^0.1.3",
2222
"@astrojs/react": "^0.1.3",
23-
"astro": "^1.0.0-beta.52"
23+
"astro": "^1.0.0-beta.53"
2424
}
2525
}

‎examples/env-vars/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"astro": "^1.0.0-beta.52"
12+
"astro": "^1.0.0-beta.53"
1313
}
1414
}

‎examples/framework-alpine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"astro": "^1.0.0-beta.52"
12+
"astro": "^1.0.0-beta.53"
1313
},
1414
"dependencies": {
1515
"alpinejs": "^3.10.2"

‎examples/framework-lit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/lit": "^0.2.0",
13-
"astro": "^1.0.0-beta.52"
13+
"astro": "^1.0.0-beta.53"
1414
},
1515
"dependencies": {
1616
"@webcomponents/template-shadowroot": "^0.1.0",

‎examples/framework-multiple/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"@astrojs/preact": "^0.1.3",
1414
"@astrojs/react": "^0.1.3",
1515
"@astrojs/solid-js": "^0.1.4",
16-
"@astrojs/svelte": "^0.1.4",
16+
"@astrojs/svelte": "^0.1.5",
1717
"@astrojs/vue": "^0.1.5",
18-
"astro": "^1.0.0-beta.52"
18+
"astro": "^1.0.0-beta.53"
1919
},
2020
"dependencies": {
2121
"@webcomponents/template-shadowroot": "^0.1.0",

‎examples/framework-preact/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/preact": "^0.1.3",
13-
"astro": "^1.0.0-beta.52"
13+
"astro": "^1.0.0-beta.53"
1414
},
1515
"dependencies": {
1616
"preact": "^10.7.3"

‎examples/framework-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@astrojs/react": "^0.1.3",
1313
"@types/react": "^18.0.10",
1414
"@types/react-dom": "^18.0.5",
15-
"astro": "^1.0.0-beta.52"
15+
"astro": "^1.0.0-beta.53"
1616
},
1717
"dependencies": {
1818
"react": "^18.1.0",

‎examples/framework-solid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/solid-js": "^0.1.4",
13-
"astro": "^1.0.0-beta.52"
13+
"astro": "^1.0.0-beta.53"
1414
},
1515
"dependencies": {
1616
"solid-js": "^1.4.3"

‎examples/framework-svelte/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"@astrojs/svelte": "^0.1.4",
13-
"astro": "^1.0.0-beta.52"
12+
"@astrojs/svelte": "^0.1.5",
13+
"astro": "^1.0.0-beta.53"
1414
},
1515
"dependencies": {
1616
"svelte": "^3.48.0"

‎examples/framework-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/vue": "^0.1.5",
13-
"astro": "^1.0.0-beta.52"
13+
"astro": "^1.0.0-beta.53"
1414
},
1515
"dependencies": {
1616
"vue": "^3.2.36"

‎examples/integrations-playground/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/lit": "^0.2.0",
13-
"@astrojs/partytown": "^0.1.4",
13+
"@astrojs/partytown": "^0.1.5",
1414
"@astrojs/react": "^0.1.3",
1515
"@astrojs/sitemap": "^0.2.1",
1616
"@astrojs/solid-js": "0.1.4",
1717
"@astrojs/tailwind": "^0.2.1",
1818
"@astrojs/turbolinks": "^0.1.3",
19-
"astro": "^1.0.0-beta.52",
19+
"astro": "^1.0.0-beta.53",
2020
"solid-js": "^1.4.3"
2121
},
2222
"dependencies": {

‎examples/minimal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"astro": "^1.0.0-beta.52"
12+
"astro": "^1.0.0-beta.53"
1313
}
1414
}

‎examples/non-html-pages/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"astro": "^1.0.0-beta.52"
12+
"astro": "^1.0.0-beta.53"
1313
}
1414
}

‎examples/portfolio/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/preact": "^0.1.3",
13-
"astro": "^1.0.0-beta.52",
13+
"astro": "^1.0.0-beta.53",
1414
"sass": "^1.52.2"
1515
},
1616
"dependencies": {

‎examples/ssr/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/node": "^0.1.2",
13-
"@astrojs/svelte": "^0.1.4",
14-
"astro": "^1.0.0-beta.52",
13+
"@astrojs/svelte": "^0.1.5",
14+
"astro": "^1.0.0-beta.53",
1515
"concurrently": "^7.2.1",
1616
"lightcookie": "^1.0.25",
1717
"unocss": "^0.15.6",

‎examples/starter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"astro": "^1.0.0-beta.52"
12+
"astro": "^1.0.0-beta.53"
1313
}
1414
}

‎examples/subpath/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/react": "^0.1.3",
13-
"astro": "^1.0.0-beta.52",
13+
"astro": "^1.0.0-beta.53",
1414
"sass": "^1.52.2"
1515
},
1616
"dependencies": {

‎examples/with-markdown-plugins/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/markdown-remark": "^0.11.3",
13-
"astro": "^1.0.0-beta.52",
13+
"astro": "^1.0.0-beta.53",
1414
"hast-util-select": "5.0.1",
1515
"rehype-autolink-headings": "^6.1.1",
1616
"rehype-slug": "^5.0.1",

‎examples/with-markdown-shiki/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/markdown-remark": "^0.11.3",
13-
"astro": "^1.0.0-beta.52"
13+
"astro": "^1.0.0-beta.53"
1414
}
1515
}

‎examples/with-markdown/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"@astrojs/markdown-remark": "^0.11.3",
1313
"@astrojs/preact": "^0.1.3",
1414
"@astrojs/react": "^0.1.3",
15-
"@astrojs/svelte": "^0.1.4",
15+
"@astrojs/svelte": "^0.1.5",
1616
"@astrojs/vue": "^0.1.5",
17-
"astro": "^1.0.0-beta.52"
17+
"astro": "^1.0.0-beta.53"
1818
},
1919
"dependencies": {
2020
"preact": "^10.7.3",

‎examples/with-nanostores/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"@astrojs/preact": "^0.1.3",
2424
"@astrojs/react": "^0.1.3",
2525
"@astrojs/solid-js": "^0.1.4",
26-
"@astrojs/svelte": "^0.1.4",
26+
"@astrojs/svelte": "^0.1.5",
2727
"@astrojs/vue": "^0.1.5",
28-
"astro": "^1.0.0-beta.52"
28+
"astro": "^1.0.0-beta.53"
2929
}
3030
}

‎examples/with-tailwindcss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@astrojs/tailwind": "^0.2.1",
13-
"astro": "^1.0.0-beta.52",
13+
"astro": "^1.0.0-beta.53",
1414
"autoprefixer": "^10.4.7",
1515
"canvas-confetti": "^1.5.1",
1616
"postcss": "^8.4.14",

‎examples/with-vite-plugin-pwa/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"preview": "astro preview"
1010
},
1111
"devDependencies": {
12-
"astro": "^1.0.0-beta.52",
12+
"astro": "^1.0.0-beta.53",
1313
"vite-plugin-pwa": "0.11.11",
1414
"workbox-window": "^6.5.3"
1515
}

‎packages/astro/CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# astro
22

3+
## 1.0.0-beta.53
4+
5+
### Patch Changes
6+
7+
- [#3685](https://github.com/withastro/astro/pull/3685) [`3d554fdb`](https://github.com/withastro/astro/commit/3d554fdbfb49d85d2945b7775825f7d9ace959ce) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix PostCSS config not applied to Svelte component by default
8+
9+
* [#3665](https://github.com/withastro/astro/pull/3665) [`9a813268`](https://github.com/withastro/astro/commit/9a813268db2e3a7ed5644739b7a12e83e5d239b2) Thanks [@matthewp](https://github.com/matthewp)! - Allow TypeScript inside script tags
10+
11+
This makes it so that you can use TypeScript inside of script tags like so:
12+
13+
```html
14+
<script>
15+
interface Person {
16+
name: string;
17+
}
18+
19+
const person: Person = {
20+
name: 'Astro',
21+
};
22+
23+
console.log(person);
24+
</script>
25+
```
26+
27+
Note that the the VSCode extension does not currently support this, however.
28+
29+
- [#3633](https://github.com/withastro/astro/pull/3633) [`921d9a27`](https://github.com/withastro/astro/commit/921d9a27e243c27e40e429a0a5c7d562d7b9633f) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Fix a bug with `astro add react` adding a too-complex semver to your package.json
30+
31+
* [#3676](https://github.com/withastro/astro/pull/3676) [`85c33751`](https://github.com/withastro/astro/commit/85c33751c20002e29bd646325a6e39f83cbb1f4d) Thanks [@matthewp](https://github.com/matthewp)! - Allow specifying entryFileNames for client JS
32+
333
## 1.0.0-beta.52
434

535
### Patch Changes

‎packages/astro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "astro",
3-
"version": "1.0.0-beta.52",
3+
"version": "1.0.0-beta.53",
44
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
55
"type": "module",
66
"author": "withastro",

‎packages/astro/src/core/add/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,9 @@ async function getInstallIntegrationsCommand({
407407
.map<[string, string | null][]>((i) => [[i.packageName, null], ...i.dependencies])
408408
.flat(1)
409409
.filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i)
410-
.map(([name, version]) => (version === null ? name : `${name}@${version}`))
410+
.map(([name, version]) =>
411+
version === null ? name : `${name}@${version.split(/\s*\|\|\s*/).pop()}`
412+
)
411413
.sort();
412414

413415
switch (pm.name) {

‎packages/astro/test/fixtures/postcss/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
"astro": "workspace:*",
1010
"autoprefixer": "^10.4.7",
1111
"postcss": "^8.4.14"
12+
},
13+
"devDependencies": {
14+
"postcss-preset-env": "^7.7.1"
1215
}
1316
}

‎packages/astro/test/fixtures/postcss/postcss.config.cjs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
const postcssPresetEnv = require('postcss-preset-env')
2+
const autoPrefixer = require('autoprefixer')
3+
14
module.exports = {
2-
plugins: {
3-
autoprefixer: {
5+
plugins: [
6+
// included to ensure public/ CSS resources are NOT transformed
7+
autoPrefixer({
48
overrideBrowserslist: ['> 0.1%', 'IE 11'] // enforce `appearance: none;` is prefixed with -webkit and -moz
5-
}
6-
}
7-
};
9+
}),
10+
postcssPresetEnv({ features: { 'nesting-rules': true } }),
11+
]
12+
}

‎packages/astro/test/fixtures/postcss/src/components/Astro.astro

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<style>
22
.astro-component {
3-
appearance: none;
3+
&.nested {
4+
color: red;
5+
}
46
}
57
</style>
68

7-
<div class="astro-component">
8-
Astro
9+
<div class="astro-component nested">
10+
Astro
911
</div>

‎packages/astro/test/fixtures/postcss/src/components/Solid.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.solid {
2-
appearance: none;
2+
&.nested {
3+
color: red;
4+
}
35
}

0 commit comments

Comments
 (0)