Merge branch 'main' into feat/directory-mode

.changeset/strong-plants-tell.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix client build sourcemap generation

.changeset/thick-ducks-sparkle.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fix custom 404 pages when using `astro preview` (#4113)

.github/workflows/ci.yml

@@ -24,6 +24,7 @@ env:
   FORCE_COLOR: true
   ASTRO_TELEMETRY_DISABLED: true
 
+
 jobs:
   lint:
     name: Lint
@@ -79,8 +80,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        node_version: [14]
+        OS: [ubuntu-latest]
+        NODE_VERSION: [14]
       fail-fast: true
     steps:
       - name: Checkout
@@ -89,10 +90,10 @@ jobs:
       - name: Setup PNPM
         uses: pnpm/action-setup@v2.2.1
 
-      - name: Setup node@${{ matrix.node_version }}
+      - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: ${{ matrix.NODE_VERSION }}
           cache: 'pnpm'
 
       - name: Install dependencies
@@ -102,30 +103,31 @@ jobs:
         run: pnpm run build
 
   test:
-    name: 'Test: ${{ matrix.os }} (node@${{ matrix.node_version }})'
+    name: 'Test: ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})'
     runs-on: ${{ matrix.os }}
     needs: build
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        node_version: [14, 16]
+        OS: [ubuntu-latest, windows-latest]
+        # TODO: Enable node@18!
+        NODE_VERSION: [14, 16]
         include:
-          - os: windows-latest
-            node_version: 14
           - os: macos-latest
-            node_version: 14
+            NODE_VERSION: 14
       fail-fast: false
+    env:
+      NODE_VERSION: ${{ matrix.NODE_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2.2.1
 
-      - name: Setup node@${{ matrix.node_version }}
+      - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: ${{ matrix.NODE_VERSION }}
           cache: 'pnpm'
 
       - name: Use Deno
@@ -143,26 +145,28 @@ jobs:
         run: pnpm run test
 
   e2e:
-    name: 'Test (E2E): ${{ matrix.os }} (node@${{ matrix.node_version }})'
+    name: 'Test (E2E): ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})'
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     needs: build
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        node_version: [14]
+        OS: [ubuntu-latest, windows-latest]
+        NODE_VERSION: [14]
       fail-fast: false
+    env:
+      NODE_VERSION: ${{ matrix.NODE_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2.2.1
 
-      - name: Setup node@${{ matrix.node_version }}
+      - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: ${{ matrix.NODE_VERSION }}
           cache: 'pnpm'
 
       - name: Install dependencies
@@ -175,24 +179,26 @@ jobs:
         run: pnpm run test:e2e
 
   smoke:
-    name: 'Test (Smoke): ${{ matrix.os }} (node@${{ matrix.node_version }})'
+    name: 'Test (Smoke): ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})'
     runs-on: ${{ matrix.os }}
     needs: build
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        node_version: [14]
+        OS: [ubuntu-latest]
+        NODE_VERSION: [14]
+    env:
+      NODE_VERSION: ${{ matrix.NODE_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2.2.1
 
-      - name: Setup node@${{ matrix.node_version }}
+      - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version: ${{ matrix.NODE_VERSION }}
           cache: 'pnpm'
 
       - name: Checkout docs

.gitpod.Dockerfile

@@ -1,7 +1,7 @@
 FROM gitpod/workspace-node
 
 # Install latest pnpm
-RUN pnpm i -g pnpm
+RUN curl -fsSL https://get.pnpm.io/install.sh | SHELL=`which bash` bash -
 
 # Install deno in gitpod
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh

.gitpod/gitpod-setup.sh

@@ -15,7 +15,7 @@ else
 fi
 
 # Wait for VSCode to be ready (port 23000)
-gp await-port 23000 > /dev/null 2>&1
+gp ports await 23000 > /dev/null 2>&1
 
 echo "Loading example project:" $EXAMPLE_PROJECT
 

.prettierignore

@@ -1,6 +1,10 @@
-# To be removed with ".astro" parsing is ready
-# Also, be sure to remove "pluginSearchDirs" from config
-**/*.astro
+# Ignoring these files for now due to https://github.com/withastro/compiler/issues/318
+examples/basics/src/layouts
+examples/blog/src/layouts
+examples/with-nanostores/src/layouts
+
+# Ignoring this file for now due to https://github.com/withastro/compiler/issues/485
+packages/markdown/component/Markdown.astro
 
 # Deep Directories
 **/dist

.prettierrc.json

@@ -5,13 +5,19 @@
   "tabWidth": 2,
   "trailingComma": "es5",
   "useTabs": true,
+  "plugins": ["./node_modules/prettier-plugin-astro"],
   "overrides": [
     {
       "files": [".*", "*.json", "*.md", "*.toml", "*.yml"],
       "options": {
         "useTabs": false
       }
+    },
+    {
+      "files": ["**/*.astro"],
+      "options": {
+        "parser": "astro"
+      }
     }
-  ],
-  "pluginSearchDirs": ["./assets"]
+  ]
 }

examples/README.md

@@ -1,6 +1,5 @@
 # Astro Examples Library
 
-
 The easiest way to check out one of these examples on your machine is by running this command in an empty directory:
 
 ```

examples/basics/README.md

@@ -30,12 +30,14 @@ Any static assets, like images, can be placed in the `public/` directory.
 
 All commands are run from the root of the project, from a terminal:
 
-| Command           | Action                                       |
-| :---------------- | :------------------------------------------- |
-| `npm install`     | Installs dependencies                        |
-| `npm run dev`     | Starts local dev server at `localhost:3000`  |
-| `npm run build`   | Build your production site to `./dist/`      |
-| `npm run preview` | Preview your build locally, before deploying |
+| Command                | Action                                             |
+| :--------------------- | :------------------------------------------------- |
+| `npm install`          | Installs dependencies                              |
+| `npm run dev`          | Starts local dev server at `localhost:3000`        |
+| `npm run build`        | Build your production site to `./dist/`            |
+| `npm run preview`      | Preview your build locally, before deploying       |
+| `npm run astro ...`    | Run CLI commands like `astro add`, `astro preview` |
+| `npm run astro --help` | Get help using the Astro CLI                       |
 
 ## 👀 Want to learn more?
 

examples/basics/package.json

@@ -6,9 +6,10 @@
     "dev": "astro dev",
     "start": "astro dev",
     "build": "astro build",
-    "preview": "astro preview"
+    "preview": "astro preview",
+    "astro": "astro"
   },
   "devDependencies": {
-    "astro": "^1.0.0-rc.1"
+    "astro": "^1.0.0-rc.7"
   }
 }

examples/basics/src/components/Card.astro

@@ -4,7 +4,8 @@ export interface Props {
 	body: string;
 	href: string;
 }
-const { href, title, body } = Astro.props;
+
+const { href, title, body } = Astro.props as Props;
 ---
 
 <li class="link-card">
@@ -69,6 +70,7 @@ const { href, title, body } = Astro.props;
 	}
 
 	.link-card:is(:hover, :focus-within) h2 span {
+		will-change: transform;
 		transform: translateX(2px);
 	}
 </style>

examples/basics/src/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="astro/client" />

examples/basics/src/pages/index.astro

@@ -1,6 +1,6 @@
 ---
-import Layout from "../layouts/Layout.astro";
-import Card from "../components/Card.astro";
+import Layout from '../layouts/Layout.astro';
+import Card from '../components/Card.astro';
 ---
 
 <Layout title="Welcome to Astro.">
@@ -86,6 +86,7 @@ import Card from "../components/Card.astro";
 		border-radius: 4px;
 		padding: 0.15em 0.25em;
 	}
+
 	.link-card-grid {
 		display: grid;
 		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));

examples/basics/tsconfig.json

@@ -9,7 +9,7 @@
     "resolveJsonModule": true,
     // Enable stricter transpilation for better output.
     "isolatedModules": true,
-    // Add type definitions for our Astro runtime.
-    "types": ["astro/client"]
+    // Astro will directly run your TypeScript code, no transpilation needed.
+    "noEmit": true
   }
 }