Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewp authored Oct 18, 2022
2 parents 8c55b29 + 66e8ae3 commit 79bb937
Show file tree
Hide file tree
Showing 7 changed files with 509 additions and 483 deletions.
5 changes: 5 additions & 0 deletions .changeset/short-lemons-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/node': patch
---

fix port in standalone mode
3 changes: 2 additions & 1 deletion examples/with-tailwindcss/astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { defineConfig } from 'astro/config';
import mdx from '@astrojs/mdx';
import tailwind from '@astrojs/tailwind';

// https://astro.build/config
export default defineConfig({
integrations: [tailwind()],
integrations: [mdx(), tailwind()],
});
1 change: 1 addition & 0 deletions examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/mdx": "^0.11.4",
"@astrojs/tailwind": "^2.1.0",
"@types/canvas-confetti": "^1.4.3",
"astro": "^1.5.0",
Expand Down
11 changes: 0 additions & 11 deletions examples/with-tailwindcss/src/pages/markdown-page.md

This file was deleted.

13 changes: 13 additions & 0 deletions examples/with-tailwindcss/src/pages/markdown-page.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
title: 'Markdown + Tailwind'
layout: ../layouts/main.astro
---

import Button from '../components/Button.astro';

<div class="grid place-items-center h-screen content-center">
<Button>Tailwind Button in Markdown!</Button>
<a href="/" class="p-4 underline">
Go home...
</a>
</div>
2 changes: 1 addition & 1 deletion packages/integrations/node/src/standalone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function getResolvedHostForHttpServer(host: string | boolean) {
}

export default function startServer(app: NodeApp, options: Options) {
const port = process.env.PORT ? Number(process.env.port) : options.port ?? 8080;
const port = process.env.PORT ? Number(process.env.PORT) : options.port ?? 8080;
const { client } = resolvePaths(options);
const handler = middleware(app);

Expand Down
Loading

0 comments on commit 79bb937

Please sign in to comment.