Merge branch 'main' into feat/slots

withastro · Jun 23, 2022 · b6fdaba · b6fdaba
2 parents 41344a4 + 19cd962
commit b6fdaba
Show file tree

Hide file tree

Showing 54 changed files with 754 additions and 140 deletions.
diff --git a/.changeset/neat-seas-peel.md b/.changeset/neat-seas-peel.md
diff --git a/.changeset/spotty-rockets-grow.md b/.changeset/spotty-rockets-grow.md
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.1.3",
-    "astro": "^1.0.0-beta.52",
+    "astro": "^1.0.0-beta.53",
     "sass": "^1.52.2"
   },
   "dependencies": {

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.1.3",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "preact": "^10.7.3"

diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@example/my-component": "workspace:*",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -8,6 +8,6 @@
     "serve": "astro --root demo preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -20,6 +20,6 @@
   "devDependencies": {
     "@astrojs/preact": "^0.1.3",
     "@astrojs/react": "^0.1.3",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "alpinejs": "^3.10.2"

diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/lit": "^0.2.0",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -13,9 +13,9 @@
     "@astrojs/preact": "^0.1.3",
     "@astrojs/react": "^0.1.3",
     "@astrojs/solid-js": "^0.1.4",
-    "@astrojs/svelte": "^0.1.4",
+    "@astrojs/svelte": "^0.1.5",
     "@astrojs/vue": "^0.1.5",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.1.3",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "preact": "^10.7.3"

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -12,7 +12,7 @@
     "@astrojs/react": "^0.1.3",
     "@types/react": "^18.0.10",
     "@types/react-dom": "^18.0.5",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "react": "^18.1.0",

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/solid-js": "^0.1.4",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "solid-js": "^1.4.3"

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -9,8 +9,8 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "@astrojs/svelte": "^0.1.4",
-    "astro": "^1.0.0-beta.52"
+    "@astrojs/svelte": "^0.1.5",
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "svelte": "^3.48.0"

diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/vue": "^0.1.5",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "vue": "^3.2.36"

diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json
@@ -10,13 +10,13 @@
   },
   "devDependencies": {
     "@astrojs/lit": "^0.2.0",
-    "@astrojs/partytown": "^0.1.4",
+    "@astrojs/partytown": "^0.1.5",
     "@astrojs/react": "^0.1.3",
     "@astrojs/sitemap": "^0.2.1",
     "@astrojs/solid-js": "0.1.4",
     "@astrojs/tailwind": "^0.2.1",
     "@astrojs/turbolinks": "^0.1.3",
-    "astro": "^1.0.0-beta.52",
+    "astro": "^1.0.0-beta.53",
     "solid-js": "^1.4.3"
   },
   "dependencies": {

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.1.3",
-    "astro": "^1.0.0-beta.52",
+    "astro": "^1.0.0-beta.53",
     "sass": "^1.52.2"
   },
   "dependencies": {

diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -10,8 +10,8 @@
   },
   "devDependencies": {
     "@astrojs/node": "^0.1.2",
-    "@astrojs/svelte": "^0.1.4",
-    "astro": "^1.0.0-beta.52",
+    "@astrojs/svelte": "^0.1.5",
+    "astro": "^1.0.0-beta.53",
     "concurrently": "^7.2.1",
     "lightcookie": "^1.0.25",
     "unocss": "^0.15.6",

diff --git a/examples/starter/package.json b/examples/starter/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/subpath/package.json b/examples/subpath/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/react": "^0.1.3",
-    "astro": "^1.0.0-beta.52",
+    "astro": "^1.0.0-beta.53",
     "sass": "^1.52.2"
   },
   "dependencies": {

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "^0.11.3",
-    "astro": "^1.0.0-beta.52",
+    "astro": "^1.0.0-beta.53",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.0.1",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "^0.11.3",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json
@@ -12,9 +12,9 @@
     "@astrojs/markdown-remark": "^0.11.3",
     "@astrojs/preact": "^0.1.3",
     "@astrojs/react": "^0.1.3",
-    "@astrojs/svelte": "^0.1.4",
+    "@astrojs/svelte": "^0.1.5",
     "@astrojs/vue": "^0.1.5",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   },
   "dependencies": {
     "preact": "^10.7.3",

diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -23,8 +23,8 @@
     "@astrojs/preact": "^0.1.3",
     "@astrojs/react": "^0.1.3",
     "@astrojs/solid-js": "^0.1.4",
-    "@astrojs/svelte": "^0.1.4",
+    "@astrojs/svelte": "^0.1.5",
     "@astrojs/vue": "^0.1.5",
-    "astro": "^1.0.0-beta.52"
+    "astro": "^1.0.0-beta.53"
   }
 }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/tailwind": "^0.2.1",
-    "astro": "^1.0.0-beta.52",
+    "astro": "^1.0.0-beta.53",
     "autoprefixer": "^10.4.7",
     "canvas-confetti": "^1.5.1",
     "postcss": "^8.4.14",

diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.52",
+    "astro": "^1.0.0-beta.53",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.3"
   }

diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,35 @@
 # astro
 
+## 1.0.0-beta.53
+
+### Patch Changes
+
+- [#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
+
+* [#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
+
+  This makes it so that you can use TypeScript inside of script tags like so:
+
+  ```html
+  <script>
+    interface Person {
+      name: string;
+    }
+
+    const person: Person = {
+      name: 'Astro',
+    };
+
+    console.log(person);
+  </script>
+  ```
+
+  Note that the the VSCode extension does not currently support this, however.
+
+- [#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
+
+* [#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
+
 ## 1.0.0-beta.52
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.52",
+  "version": "1.0.0-beta.53",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

diff --git a/packages/astro/src/core/add/index.ts b/packages/astro/src/core/add/index.ts
@@ -407,7 +407,9 @@ async function getInstallIntegrationsCommand({
 		.map<[string, string | null][]>((i) => [[i.packageName, null], ...i.dependencies])
 		.flat(1)
 		.filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i)
-		.map(([name, version]) => (version === null ? name : `${name}@${version}`))
+		.map(([name, version]) =>
+			version === null ? name : `${name}@${version.split(/\s*\|\|\s*/).pop()}`
+		)
 		.sort();
 
 	switch (pm.name) {

diff --git a/packages/astro/test/fixtures/postcss/package.json b/packages/astro/test/fixtures/postcss/package.json
@@ -9,5 +9,8 @@
     "astro": "workspace:*",
     "autoprefixer": "^10.4.7",
     "postcss": "^8.4.14"
+  },
+  "devDependencies": {
+    "postcss-preset-env": "^7.7.1"
   }
 }
diff --git a/packages/astro/test/fixtures/postcss/postcss.config.cjs b/packages/astro/test/fixtures/postcss/postcss.config.cjs
@@ -1,7 +1,12 @@
+const postcssPresetEnv = require('postcss-preset-env')
+const autoPrefixer = require('autoprefixer')
+
 module.exports = {
-  plugins: {
-    autoprefixer: {
+  plugins: [
+		// included to ensure public/ CSS resources are NOT transformed
+		autoPrefixer({
       overrideBrowserslist: ['> 0.1%', 'IE 11'] // enforce `appearance: none;` is prefixed with -webkit and -moz
-    }
-  }
-};
+    }),
+    postcssPresetEnv({ features: { 'nesting-rules': true } }),
+  ]
+}
diff --git a/packages/astro/test/fixtures/postcss/src/components/Astro.astro b/packages/astro/test/fixtures/postcss/src/components/Astro.astro
@@ -1,9 +1,11 @@
 <style>
 .astro-component {
-  appearance: none;
+  &.nested {
+		color: red;
+	}
 }
 </style>
 
-<div class="astro-component">
-  Astro
+<div class="astro-component nested">
+	Astro
 </div>
diff --git a/packages/astro/test/fixtures/postcss/src/components/Solid.css b/packages/astro/test/fixtures/postcss/src/components/Solid.css
@@ -1,3 +1,5 @@
 .solid {
-  appearance: none;
+	&.nested {
+		color: red;
+	}
 }