Merge branch 'next' into 404-page

withastro · Mar 4, 2022 · 873a5bd · 873a5bd
2 parents 1e08471 + 04558ea
commit 873a5bd
Show file tree

Hide file tree

Showing 35 changed files with 72 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -223,7 +223,7 @@ jobs:
   # We download all `dist/` artifacts from GitHub to skip the build process.
   changelog:
     name: Changelog PR or Release
-    if: ${{ github.ref_name == 'main' && github.repository_owner == 'withastro' }}
+    if: ${{ (github.ref_name == 'main' || github.ref_name == 'next') && github.repository_owner == 'withastro' }}
     needs: [build]
     runs-on: ubuntu-latest
     steps:

diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5",
+    "astro": "^0.23.7",
     "sass": "^1.49.8"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -12,6 +12,6 @@
     "serve": "astro --project-root demo preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -12,6 +12,6 @@
     "@docsearch/react": "^1.0.0-alpha.28"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/fast-build/package.json b/examples/fast-build/package.json
@@ -10,7 +10,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5",
+    "astro": "^0.23.7",
     "preact": "~10.6.5",
     "unocss": "^0.15.5",
     "vite-imagetools": "^4.0.1"

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-lit": "^0.4.0",
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.4.0",
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.4.0",
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
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": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/portfolio-svelte/package.json b/examples/portfolio-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -11,7 +11,7 @@
     "server": "node server/server.mjs"
   },
   "devDependencies": {
-    "astro": "^0.23.5",
+    "astro": "^0.23.7",
     "unocss": "^0.15.5",
     "vite-imagetools": "^4.0.1"
   },

diff --git a/examples/starter/package.json b/examples/starter/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/subpath/package.json b/examples/subpath/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5",
+    "astro": "^0.23.7",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.0",
     "rehype-slug": "^5.0.0",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.4.0",
-    "astro": "^0.23.5"
+    "astro": "^0.23.7"
   }
 }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.23.5",
+    "astro": "^0.23.7",
     "autoprefixer": "^10.4.0",
     "tailwindcss": "^3.0.5"
   }

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": "^0.23.5",
+    "astro": "^0.23.7",
     "vite-plugin-pwa": "0.11.5"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,19 @@
 # astro
 
+## 0.23.7
+
+### Patch Changes
+
+- Updated dependencies [[`0d37f8e0`](https://github.com/withastro/astro/commit/0d37f8e0a51ac7bcf9e108151828b733bbba6e94)]:
+  - @astrojs/renderer-svelte@0.5.1
+
+## 0.23.6
+
+### Patch Changes
+
+- Updated dependencies [[`5f91e007`](https://github.com/withastro/astro/commit/5f91e007cbbb3a5ff7322964d811844b0921db61)]:
+  - @astrojs/renderer-svelte@0.5.0
+
 ## 0.23.5
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "0.23.5",
+  "version": "0.23.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -64,7 +64,7 @@
     "@astrojs/prism": "0.4.0",
     "@astrojs/renderer-preact": "^0.5.0",
     "@astrojs/renderer-react": "0.5.0",
-    "@astrojs/renderer-svelte": "0.4.0",
+    "@astrojs/renderer-svelte": "0.5.1",
     "@astrojs/renderer-vue": "0.4.0",
     "@astropub/webapi": "^0.10.1",
     "@babel/core": "^7.15.8",

diff --git a/packages/renderers/renderer-svelte/CHANGELOG.md b/packages/renderers/renderer-svelte/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @astrojs/renderer-svelte
 
+## 0.5.1
+
+### Patch Changes
+
+- [#2722](https://github.com/withastro/astro/pull/2722) [`0d37f8e0`](https://github.com/withastro/astro/commit/0d37f8e0a51ac7bcf9e108151828b733bbba6e94) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Temporarily revert [#2715](https://github.com/withastro/astro/pull/2715) to fix `.svelte` files breaking in the static build.
+
+## 0.5.0
+
+### Minor Changes
+
+- [#2715](https://github.com/withastro/astro/pull/2715) [`5f91e007`](https://github.com/withastro/astro/commit/5f91e007cbbb3a5ff7322964d811844b0921db61) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Internally, we'll now use Vite to preprocess assets rather than pulling in `svelte-preprocess`.
+
+  > This removes the default warnings about missing `postcss-load-config`
+
 ## 0.4.0
 
 ### Minor Changes

diff --git a/packages/renderers/renderer-svelte/package.json b/packages/renderers/renderer-svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/renderer-svelte",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Use Svelte components within Astro",
   "type": "module",
   "author": "withastro",
@@ -20,10 +20,9 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.37",
-    "postcss-load-config": "^3.1.1",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.39",
     "svelte": "^3.46.4",
-    "svelte-preprocess": "^4.10.2"
+    "svelte-preprocess": "^4.9.8"
   },
   "engines": {
     "node": "^14.15.0 || >=16.0.0"

diff --git a/scripts/stats/stats.csv b/scripts/stats/stats.csv
@@ -1,4 +1,5 @@
 Date,Commits (24hr),Issues (24hr),Issues:BUG (24hr),Issues:RFC (24hr),Issues:DOC (24hr),PRs (24hr),Open PRs,Open Issues,Bugs: Needs Triage,Bugs: Accepted,RFC: In Progress,RFC: Accepted,Date (ISO)
+"Friday, March 4, 2022",6,1,0,0,0,9,13,99,21,70,0,0,"2022-03-04T12:02:11.658Z"
 "Thursday, March 3, 2022",9,2,2,0,0,5,12,99,21,71,0,0,"2022-03-03T12:07:54.171Z"
 "Wednesday, March 2, 2022",4,0,0,0,0,9,16,98,20,71,0,0,"2022-03-02T12:07:02.784Z"
 "Tuesday, March 1, 2022",12,3,3,0,0,10,13,99,21,71,0,0,"2022-03-01T12:06:43.489Z"

diff --git a/yarn.lock b/yarn.lock
@@ -1673,10 +1673,10 @@
     magic-string "^0.25.0"
     string.prototype.matchall "^4.0.6"
 
-"@sveltejs/vite-plugin-svelte@^1.0.0-next.37":
-  version "1.0.0-next.38"
-  resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.38.tgz#5fb7e911a27e866de5c24d5e5541afefd5ced4bc"
-  integrity sha512-epYAVZvfpiDZwB4Whe5AALk3zF5odKFf8Vx4q2tth+QuXmr0GLZ13ri02zINS6pHRCx+GjtOqCEEwMaPAfPcgQ==
+"@sveltejs/vite-plugin-svelte@^1.0.0-next.39":
+  version "1.0.0-next.39"
+  resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.39.tgz#b9437de18d13a475f76cf603511174cdf905b8d4"
+  integrity sha512-gnvvcAW2LK+KnUn8lKb2ypcXKwSp2K57mem5C4VNKfjxdRpM6+XwNavWwVf6otnDhz3qPYl/TKKW6/dRr6eeAw==
   dependencies:
     "@rollup/pluginutils" "^4.1.2"
     debug "^4.3.3"
@@ -6387,7 +6387,7 @@ postcss-js@^4.0.0:
   dependencies:
     camelcase-css "^2.0.1"
 
-postcss-load-config@^3.1.0, postcss-load-config@^3.1.1:
+postcss-load-config@^3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.3.tgz#21935b2c43b9a86e6581a576ca7ee1bde2bd1d23"
   integrity sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw==
@@ -7562,11 +7562,11 @@ supports-preserve-symlinks-flag@^1.0.0:
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 svelte-hmr@^0.14.9:
-  version "0.14.9"
-  resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.9.tgz#35f277efc789e1a6230185717347cddb2f8e9833"
-  integrity sha512-bKE9+4qb4sAnA+TKHiYurUl970rjA0XmlP9TEP7K/ncyWz3m81kA4HOgmlZK/7irGK7gzZlaPDI3cmf8fp/+tg==
+  version "0.14.10"
+  resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.10.tgz#eb383c7e8791e81ccc64958847908eb88a6aee08"
+  integrity sha512-VffsN0fT4cTJ7b4apf9VDIrgsbLFaJzPypcAuy4NcHx2PKKayfwLwabaYPWdHK5lJ/uQ/HBrkEsWHzo64NU6mQ==
 
-svelte-preprocess@^4.10.2:
+svelte-preprocess@^4.9.8:
   version "4.10.4"
   resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-4.10.4.tgz#308a410266bfc55b4e608da8d552b63580141260"
   integrity sha512-fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A==