Merge branch 'main' into calc-istty

withastro · Oct 23, 2023 · b039565 · b039565
2 parents 8a334fe + 99b683a
commit b039565
Show file tree

Hide file tree

Showing 104 changed files with 916 additions and 239 deletions.
diff --git a/.changeset/fresh-lizards-whisper.md b/.changeset/fresh-lizards-whisper.md
diff --git a/.changeset/funny-deers-report.md b/.changeset/funny-deers-report.md
diff --git a/.changeset/heavy-lies-cover.md b/.changeset/heavy-lies-cover.md
diff --git a/.changeset/lazy-actors-enjoy.md b/.changeset/lazy-actors-enjoy.md
@@ -0,0 +1,14 @@
+---
+'@astrojs/vercel': minor
+---
+
+You can now configure how long your functions can run before timing out.
+
+```diff
+export default defineConfig({
+    output: "server",
+    adapter: vercel({
++       maxDuration: 60
+    }),
+});
+```
diff --git a/.changeset/ninety-onions-bow.md b/.changeset/ninety-onions-bow.md
@@ -0,0 +1,5 @@
+---
+'create-astro': minor
+---
+
+Automatically installs the required dependencies to run the astro check command when the user indicates they plan to write TypeScript.
diff --git a/.changeset/silent-goats-invent.md b/.changeset/silent-goats-invent.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes CSS modules ordering by rendering styles before links
diff --git a/.changeset/small-beers-laugh.md b/.changeset/small-beers-laugh.md
diff --git a/.changeset/thin-flies-notice.md b/.changeset/thin-flies-notice.md
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -16,7 +16,7 @@ module.exports = {
     // These off/configured-differently-by-default rules fit well for us
     '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
     '@typescript-eslint/no-unused-vars': [
-      'error',
+      'warn',
       { argsIgnorePattern: '^_', ignoreRestSiblings: true },
     ],
     'no-only-tests/no-only-tests': 'error',

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -35,3 +35,9 @@
 
 'pkg: vue':
 - packages/integrations/vue/**
+
+'docs pr':
+- README.md
+- packages/astro/src/@types/astro.ts
+- packages/astro/src/core/errors/errors-data.ts
+- .changeset/*.md
diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml
@@ -12,12 +12,12 @@ defaults:
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-  FORCE_COLOR: true
+  FORCE_COLOR: 1
 
 jobs:
   snapshot-release:
     name: Create a snapshot release of a pull request
-    if: ${{ github.repository_owner == 'withastro' && github.event.issue.pull_request && startsWith(github.event.comment.body, '!preview') }}
+    if: ${{ github.repository_owner == 'withastro' && github.event.issue.pull_request && (contains(github.event.comment.body, '!preview') || contains(github.event.comment.body, '/preview') || contains(github.event.comment.body, '!snapshot') || contains(github.event.comment.body, '/snapshot')) }}
     runs-on: ubuntu-latest
     permissions: 
       contents: read 
@@ -37,14 +37,19 @@ jobs:
         uses: actions/github-script@v6
         with:
           script: |
-            const splitComment = context.payload.comment.body.split(' ');
-            splitComment.length !== 2 && (github.rest.issues.createComment({
+            const { body } = context.payload.comment;
+            const PREVIEW_RE = /^[!\/](?:preview|snapshot)\s+(\S*)\s*$/gim;
+            const [_, name] = PREVIEW_RE.exec(body) ?? [];
+            if (name) return name;
+
+            const error = 'Invalid command. Expected: "/preview <snapshot-name>"'
+            github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: 'Invalid comment format. Expected: "!preview <one-word-snapshot-name>"',
-            }) || core.setFailed('Invalid comment format. Expected: "!preview <one-word-snapshot-name>"'));
-            return splitComment[1].trim();
+              body: error,
+            })
+            core.setFailed(error)
           result-encoding: string
 
       - name: resolve pr refs
@@ -56,6 +61,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ steps.refs.outputs.head_ref }}
+          fetch-depth: 0
+
+      - run: git fetch origin main:main
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
@@ -76,34 +84,78 @@ jobs:
       - name: Bump Package Versions
         id: changesets
         run: |
-          pnpm exec changeset version --snapshot ${{ steps.getSnapshotName.outputs.result }} > changesets.output.txt 2>&1
-          echo ::set-output name=result::`cat changesets.output.txt`
+          pnpm exec changeset status --output status.output.json 2>&1
+          pnpm exec changeset version --snapshot ${{ steps.getSnapshotName.outputs.result }}
+
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "status<<$EOF" >> $GITHUB_OUTPUT
+          echo "$(cat status.output.json)" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
         env:
           # Needs access to run the script
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Disable color
+          FORCE_COLOR: 0
+          NO_COLOR: 1
 
       - name: Publish Release
         id: publish
         run: |
-          pnpm run release --tag next--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1
-          echo "Release complete"
+          GITHUB_ACTIONS=0 pnpm run build > build.output.txt 2>&1
+          pnpm exec changeset publish --tag experimental--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1
+
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+
+          echo "build<<$EOF" >> $GITHUB_OUTPUT
+          echo "$(cat build.output.txt)" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
+          cat build.output.txt
+
+          echo "publish<<$EOF" >> $GITHUB_OUTPUT
+          echo "$(cat publish.output.txt)" >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
           cat publish.output.txt
-          echo ::set-output name=result::`cat publish.output.txt`
         env:
           # Needs access to publish to npm
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          # Disable color
+          FORCE_COLOR: 0
+          NO_COLOR: 1
 
       - name: Pull Request Notification
         uses: actions/github-script@v6
         env:
-          MESSAGE: ${{ steps.publish.outputs.result }}
+          TAG: ${{ steps.getSnapshotName.outputs.result }}
+          STATUS_DATA: ${{ steps.changesets.outputs.status }}
+          BUILD_LOG: ${{ steps.publish.outputs.build }}
+          PUBLISH_LOG: ${{ steps.publish.outputs.publish }}
         with:
           script: |
-            console.log(process.env.MESSAGE);
+            let changeset = { releases: [] };
+            try {
+              changeset = JSON.parse(process.env.STATUS_DATA);
+            } catch (e) {}
+            let message = 'Snapshots have been released for the following packages:'
+            for (const release of changeset.releases) {
+              if (release.type === 'none') continue;
+              message += `\n- \`${release.name}@experimental--${process.env.TAG}\``;
+            }
+
+            function details(title, body) {
+              message += '\n';
+              message += `<details><summary><strong>${title}</strong></summary>`
+              message += '\n\n```\n';
+              message += body;
+              message += '\n```\n\n</details>';
+            }
+
+            details('Publish Log', process.env.PUBLISH_LOG);
+            details('Build Log', process.env.BUILD_LOG);
+
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: '```\n' + process.env.MESSAGE + '\n```',
+              body: message,
             })
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^1.1.2",
     "@astrojs/rss": "^3.0.0",
-    "@astrojs/sitemap": "^3.0.1",
-    "astro": "^3.3.1"
+    "@astrojs/sitemap": "^3.0.2",
+    "astro": "^3.3.3"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.7.2",
     "alpinejs": "^3.12.3",
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.2",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.3.1",
+    "astro": "^3.3.3",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -15,8 +15,8 @@
     "@astrojs/react": "^3.0.3",
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^4.0.3",
-    "@astrojs/vue": "^3.0.1",
-    "astro": "^3.3.1",
+    "@astrojs/vue": "^3.0.2",
+    "astro": "^3.3.3",
     "preact": "^10.17.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.3.1",
+    "astro": "^3.3.3",
     "preact": "^10.17.1"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.3",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "astro": "^3.3.1",
+    "astro": "^3.3.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^3.3.1",
+    "astro": "^3.3.3",
     "solid-js": "^1.7.11"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^4.0.3",
-    "astro": "^3.3.1",
+    "astro": "^3.3.3",
     "svelte": "^4.2.0"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^3.0.1",
-    "astro": "^3.3.1",
+    "@astrojs/vue": "^3.0.2",
+    "astro": "^3.3.3",
     "vue": "^3.3.4"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

diff --git a/examples/middleware/package.json b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.3.1",
+    "astro": "^3.3.3",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.1"
+    "astro": "^3.3.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": "^3.3.1"
+    "astro": "^3.3.3"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^6.0.3",
     "@astrojs/svelte": "^4.0.3",
-    "astro": "^3.3.1",
+    "astro": "^3.3.3",
     "svelte": "^4.2.0"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.2",
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.6.0",
-    "astro": "^3.3.1"
+    "astro": "^3.3.3"
   }
 }