Merge branch 'main' into add-dot-markdown-file-extension-support

withastro · Oct 26, 2022 · 85b625d · 85b625d
2 parents c73d62c + d151d9f
commit 85b625d
Show file tree

Hide file tree

Showing 47 changed files with 200 additions and 151 deletions.
diff --git a/.changeset/chilly-experts-add.md b/.changeset/chilly-experts-add.md
diff --git a/.changeset/clever-keys-hammer.md b/.changeset/clever-keys-hammer.md
diff --git a/.changeset/dry-dragons-greet.md b/.changeset/dry-dragons-greet.md
diff --git a/.changeset/gentle-insects-run.md b/.changeset/gentle-insects-run.md
diff --git a/.changeset/nine-roses-explain.md b/.changeset/nine-roses-explain.md
diff --git a/.changeset/poor-frogs-clean.md b/.changeset/poor-frogs-clean.md
@@ -0,0 +1,6 @@
+---
+'@astrojs/cloudflare': patch
+---
+
+enable access to cloudflare runtime [KV, R2, Durable Objects]
+- access native cloudflare runtime through `import { getRuntime } from "@astrojs/cloudflare/runtime"` now you can call `getRuntime(Astro.request)` and get access to the runtime environment
diff --git a/.changeset/smart-chicken-develop.md b/.changeset/smart-chicken-develop.md
diff --git a/.changeset/wicked-laws-heal.md b/.changeset/wicked-laws-heal.md
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
-    "@astrojs/mdx": "^0.11.4",
+    "astro": "^1.5.3",
+    "@astrojs/mdx": "^0.11.5",
     "@astrojs/rss": "^1.0.2",
     "@astrojs/sitemap": "^1.0.0"
   }

diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,9 +15,9 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   },
   "peerDependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/deno/package.json b/examples/deno/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   },
   "devDependencies": {
     "@astrojs/deno": "^1.2.0"

diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -12,7 +12,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "alpinejs": "^3.10.2",
     "@astrojs/alpinejs": "^0.1.2",
     "@types/alpinejs": "^3.7.0"

diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "lit": "^2.2.5",
     "@astrojs/lit": "^1.0.0",
     "@webcomponents/template-shadowroot": "^0.1.0"

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.2.0",
     "@preact/signals": "^1.1.0"

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "@astrojs/react": "^1.2.1",

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "solid-js": "^1.4.3",
     "@astrojs/solid-js": "^1.2.1"
   }

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -13,6 +13,6 @@
   "dependencies": {
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.2",
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "vue": "^3.2.37",
     "@astrojs/vue": "^1.2.1"
   }

diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,9 +15,9 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   },
   "peerDependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -12,7 +12,7 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.2",
     "@astrojs/node": "^2.0.1",

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "@astrojs/markdown-remark": "^1.1.3",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2"
+    "astro": "^1.5.3"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "preact": "^10.6.5",
     "@astrojs/preact": "^1.2.0",
-    "@astrojs/mdx": "^0.11.4"
+    "@astrojs/mdx": "^0.11.5"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.2.0",
     "nanostores": "^0.5.12",

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^0.11.4",
+    "@astrojs/mdx": "^0.11.5",
     "@astrojs/tailwind": "^2.1.1",
     "@types/canvas-confetti": "^1.4.3",
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "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
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.3"
   }

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^1.5.2",
+    "astro": "^1.5.3",
     "vitest": "^0.20.3"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,15 @@
 # astro
 
+## 1.5.3
+
+### Patch Changes
+
+- [#5133](https://github.com/withastro/astro/pull/5133) [`1c477dd8d`](https://github.com/withastro/astro/commit/1c477dd8d9026fcbd533b4e6d11908e167ce7247) Thanks [@bluwy](https://github.com/bluwy)! - Fix `.css?raw` usage
+
+- [#5133](https://github.com/withastro/astro/pull/5133) [`1c477dd8d`](https://github.com/withastro/astro/commit/1c477dd8d9026fcbd533b4e6d11908e167ce7247) Thanks [@bluwy](https://github.com/bluwy)! - Update `@astrojs/compiler` and use the new `resolvePath` option. This allows removing much of the runtime code, which should improve rendering performance for Astro and MDX pages.
+
+- [#5192](https://github.com/withastro/astro/pull/5192) [`8728ee0b9`](https://github.com/withastro/astro/commit/8728ee0b94ef28524900367a06b9fe806babd574) Thanks [@tony-sull](https://github.com/tony-sull)! - `astro add` no longer automatically installs optional peer dependencies
+
 ## 1.5.2
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "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/integrations/cloudflare/README.md b/packages/integrations/cloudflare/README.md
@@ -68,6 +68,18 @@ $ pnpm install wrangler --save-dev
 
 It's then possible to update the preview script in your `package.json` to `"preview": "wrangler pages dev ./dist"`.This will allow you run your entire application locally with [Wrangler](https://github.com/cloudflare/wrangler2), which supports secrets, environment variables, KV namespaces, Durable Objects and [all other supported Cloudflare bindings](https://developers.cloudflare.com/pages/platform/functions/#adding-bindings).
 
+## Access to the cloudflare runtime
+
+You have the posibility to access all the cloudflare bindings and environment variables from your astro pages and api routes through the adapter API
+
+```
+import { getRuntime } from "@astrojs/cloudflare/runtime";
+
+getRuntime(Astro.request);
+```
+
+Depending your adapter mode (advanced = worker, directory = pages) the runtime object will look a little different due to the difference in the cloudflare API.
+
 ## Streams
 
 Some integrations such as [React](https://github.com/withastro/astro/tree/main/packages/integrations/react) rely on web streams. Currently Cloudflare Pages Functions require enabling a flag to support Streams.

diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/cloudflare",
-  "description": "Deploy your site to cloudflare pages functions",
+  "description": "Deploy your site to cloudflare workers or cloudflare pages",
   "version": "3.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -19,6 +19,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/cloudflare/",
   "exports": {
     ".": "./dist/index.js",
+    "./runtime": "./dist/runtime.js",
     "./server.advanced.js": "./dist/server.advanced.js",
     "./server.directory.js": "./dist/server.directory.js",
     "./package.json": "./package.json"

diff --git a/packages/integrations/cloudflare/src/runtime.ts b/packages/integrations/cloudflare/src/runtime.ts
@@ -0,0 +1,28 @@
+export type WorkerRuntime<T = unknown> = {
+	name: 'cloudflare';
+	env: T;
+	waitUntil(promise: Promise<any>): void;
+	passThroughOnException(): void;
+};
+
+export type PagesRuntime<T = unknown, U = unknown> = {
+	name: 'cloudflare';
+	env: T;
+	functionPath: string;
+	params: Record<string, string>;
+	data: U;
+	waitUntil(promise: Promise<any>): void;
+	next(request: Request): void;
+};
+
+export function getRuntime<T = unknown, U = unknown>(
+	request: Request
+): WorkerRuntime<T> | PagesRuntime<T, U> {
+	if (!!request) {
+		return Reflect.get(request, Symbol.for('runtime'));
+	} else {
+		throw new Error(
+			'To retrieve the current cloudflare runtime you need to pass in the Astro request object'
+		);
+	}
+}