From 6a3ce6c738123e098e6ded27e8d41c85857b9077 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Sat, 16 Sep 2023 09:21:40 +0100 Subject: [PATCH] chore: revert JSON changes with new options --- .changeset/config.json | 20 +- .devcontainer/basics/devcontainer.json | 50 ++--- .devcontainer/blog/devcontainer.json | 50 ++--- .devcontainer/component/devcontainer.json | 30 +-- .devcontainer/deno/devcontainer.json | 50 ++--- .devcontainer/devcontainer.json | 40 ++-- .devcontainer/docs/devcontainer.json | 50 ++--- .../framework-alpine/devcontainer.json | 50 ++--- .devcontainer/framework-lit/devcontainer.json | 50 ++--- .../framework-multiple/devcontainer.json | 50 ++--- .../framework-preact/devcontainer.json | 50 ++--- .../framework-react/devcontainer.json | 50 ++--- .../framework-solid/devcontainer.json | 50 ++--- .../framework-svelte/devcontainer.json | 50 ++--- .devcontainer/framework-vue/devcontainer.json | 50 ++--- .devcontainer/hackernews/devcontainer.json | 50 ++--- .devcontainer/integration/devcontainer.json | 30 +-- .devcontainer/minimal/devcontainer.json | 50 ++--- .../non-html-pages/devcontainer.json | 50 ++--- .devcontainer/portfolio/devcontainer.json | 50 ++--- .devcontainer/ssr/devcontainer.json | 50 ++--- .../with-markdown-plugins/devcontainer.json | 50 ++--- .../with-markdown-shiki/devcontainer.json | 50 ++--- .devcontainer/with-mdx/devcontainer.json | 50 ++--- .../with-nanostores/devcontainer.json | 50 ++--- .../with-tailwindcss/devcontainer.json | 50 ++--- .../with-vite-plugin-pwa/devcontainer.json | 50 ++--- .devcontainer/with-vitest/devcontainer.json | 50 ++--- .eslintrc.cjs | 184 +++++++++--------- .prettierignore | 1 + .vscode/extensions.json | 14 +- .vscode/launch.json | 52 ++--- .vscode/tasks.json | 24 +-- biome.json | 75 +++---- examples/basics/.vscode/extensions.json | 4 +- examples/basics/.vscode/launch.json | 18 +- examples/blog/.vscode/extensions.json | 4 +- examples/blog/.vscode/launch.json | 18 +- examples/deno/.vscode/extensions.json | 4 +- examples/deno/.vscode/launch.json | 18 +- .../framework-alpine/.vscode/extensions.json | 4 +- examples/framework-alpine/.vscode/launch.json | 18 +- .../framework-lit/.vscode/extensions.json | 4 +- examples/framework-lit/.vscode/launch.json | 18 +- .../.vscode/extensions.json | 4 +- .../framework-multiple/.vscode/launch.json | 18 +- .../framework-preact/.vscode/extensions.json | 4 +- examples/framework-preact/.vscode/launch.json | 18 +- .../framework-react/.vscode/extensions.json | 4 +- examples/framework-react/.vscode/launch.json | 18 +- .../framework-solid/.vscode/extensions.json | 4 +- examples/framework-solid/.vscode/launch.json | 18 +- .../framework-svelte/.vscode/extensions.json | 4 +- examples/framework-svelte/.vscode/launch.json | 18 +- .../framework-vue/.vscode/extensions.json | 4 +- examples/framework-vue/.vscode/launch.json | 18 +- examples/hackernews/.vscode/extensions.json | 4 +- examples/hackernews/.vscode/launch.json | 18 +- examples/minimal/.vscode/extensions.json | 4 +- examples/minimal/.vscode/launch.json | 18 +- .../non-html-pages/.vscode/extensions.json | 4 +- examples/non-html-pages/.vscode/launch.json | 18 +- examples/portfolio/.vscode/extensions.json | 4 +- examples/portfolio/.vscode/launch.json | 18 +- examples/ssr/.vscode/extensions.json | 4 +- examples/ssr/.vscode/launch.json | 18 +- examples/ssr/src/models/db.json | 52 ++--- examples/with-markdoc/.vscode/extensions.json | 4 +- examples/with-markdoc/.vscode/launch.json | 18 +- examples/with-mdx/.vscode/extensions.json | 4 +- examples/with-mdx/.vscode/launch.json | 18 +- package.json | 4 +- packages/astro/src/@types/astro.ts | 16 +- packages/astro/src/core/app/common.ts | 2 +- packages/astro/src/core/app/node.ts | 2 +- packages/astro/src/core/app/types.ts | 2 +- .../src/core/build/plugins/plugin-manifest.ts | 4 +- packages/astro/src/core/compile/cache.ts | 2 +- packages/astro/src/core/config/settings.ts | 2 +- packages/astro/src/core/endpoint/dev/index.ts | 2 +- .../src/core/preview/static-preview-server.ts | 2 +- packages/astro/src/core/render/result.ts | 2 +- packages/astro/src/core/sync/index.ts | 4 +- .../src/runtime/server/render/component.ts | 10 +- .../astro/src/runtime/server/render/page.ts | 2 +- packages/astro/src/type-utils.ts | 5 +- .../astro/src/vite-plugin-astro/compile.ts | 4 +- .../src/vite-plugin-config-alias/index.ts | 2 +- .../astro/src/vite-plugin-markdown/index.ts | 12 +- packages/astro/src/vite-plugin-mdx/index.ts | 2 +- packages/astro/src/vite-plugin-utils/index.ts | 2 +- packages/astro/tsconfigs/base.json | 54 ++--- packages/astro/tsconfigs/strict.json | 12 +- packages/astro/tsconfigs/strictest.json | 48 ++--- packages/create-astro/src/actions/context.ts | 2 +- packages/create-astro/src/actions/verify.ts | 2 +- packages/create-astro/src/messages.ts | 6 +- packages/integrations/cloudflare/src/index.ts | 8 +- .../integrations/cloudflare/src/parser.ts | 4 +- packages/integrations/mdx/src/index.ts | 4 +- .../integrations/node/src/nodeMiddleware.ts | 2 +- packages/integrations/preact/src/index.ts | 4 +- packages/integrations/preact/src/server.ts | 2 +- .../vercel/src/serverless/adapter.ts | 16 +- .../integrations/vercel/src/static/adapter.ts | 8 +- .../vercel/test/speed-insights.test.js | 2 +- .../vercel/test/web-analytics.test.js | 2 +- .../markdown/remark/test/autolinking.test.js | 2 +- .../markdown/remark/test/entities.test.js | 2 +- packages/markdown/remark/test/plugins.test.js | 2 +- .../remark/test/remark-collect-images.test.js | 2 +- pnpm-lock.yaml | 154 +++++++-------- prettier.config.js | 2 +- tsconfig.eslint.json | 8 +- turbo.json | 90 ++++----- 115 files changed, 1316 insertions(+), 1323 deletions(-) diff --git a/.changeset/config.json b/.changeset/config.json index d2ea229c6..e8ba17558 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -1,12 +1,12 @@ { - "$schema": "https://unpkg.com/@changesets/config@1.7.0/schema.json", - "changelog": ["@changesets/changelog-github", { "repo": "withastro/astro" }], - "commit": false, - "linked": [], - "access": "public", - "baseBranch": "main", - "updateInternalDependencies": "patch", - "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": { - "onlyUpdatePeerDependentsWhenOutOfRange": true - } + "$schema": "https://unpkg.com/@changesets/config@1.7.0/schema.json", + "changelog": ["@changesets/changelog-github", { "repo": "withastro/astro" }], + "commit": false, + "linked": [], + "access": "public", + "baseBranch": "main", + "updateInternalDependencies": "patch", + "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": { + "onlyUpdatePeerDependentsWhenOutOfRange": true + } } diff --git a/.devcontainer/basics/devcontainer.json b/.devcontainer/basics/devcontainer.json index 755f87bee..bb1707ff0 100644 --- a/.devcontainer/basics/devcontainer.json +++ b/.devcontainer/basics/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Basics", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Basics", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/basics", + "workspaceFolder": "/workspaces/astro/examples/basics", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/blog/devcontainer.json b/.devcontainer/blog/devcontainer.json index 2a2773053..d587fead5 100644 --- a/.devcontainer/blog/devcontainer.json +++ b/.devcontainer/blog/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Blog", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Blog", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/blog", + "workspaceFolder": "/workspaces/astro/examples/blog", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/component/devcontainer.json b/.devcontainer/component/devcontainer.json index 71c56d28d..c2d3e50c3 100644 --- a/.devcontainer/component/devcontainer.json +++ b/.devcontainer/component/devcontainer.json @@ -1,21 +1,21 @@ { - "name": "Component Template", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Component Template", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/component", + "workspaceFolder": "/workspaces/astro/examples/component", - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "customizations": { - "codespaces": { - "openFiles": ["src/MyComponent.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/MyComponent.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/deno/devcontainer.json b/.devcontainer/deno/devcontainer.json index 041b143e7..05b733527 100644 --- a/.devcontainer/deno/devcontainer.json +++ b/.devcontainer/deno/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Deno", - "build": { - "dockerfile": "../examples.deno.Dockerfile" - }, + "name": "Deno", + "build": { + "dockerfile": "../examples.deno.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/deno", + "workspaceFolder": "/workspaces/astro/examples/deno", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 99bb2dfd2..6b8edf605 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,27 +1,27 @@ { - "name": "Contribute to Astro", - "build": { - "dockerfile": "Dockerfile" - }, + "name": "Contribute to Astro", + "build": { + "dockerfile": "Dockerfile" + }, - "features": { - "ghcr.io/devcontainers/features/desktop-lite:1": {} - }, + "features": { + "ghcr.io/devcontainers/features/desktop-lite:1": {} + }, - "postCreateCommand": "pnpm install && pnpm run build", + "postCreateCommand": "pnpm install && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Astro tests": "pnpm run test" - }, + "postAttachCommand": { + "Astro tests": "pnpm run test" + }, - "customizations": { - "codespaces": { - "openFiles": ["README.md", "CONTRIBUTING.md"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["README.md", "CONTRIBUTING.md"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/docs/devcontainer.json b/.devcontainer/docs/devcontainer.json index e38058d9f..a26ff9d8c 100644 --- a/.devcontainer/docs/devcontainer.json +++ b/.devcontainer/docs/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Docs Site", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Docs Site", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/docs", + "workspaceFolder": "/workspaces/astro/examples/docs", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-alpine/devcontainer.json b/.devcontainer/framework-alpine/devcontainer.json index d309dbf63..1b8f26503 100644 --- a/.devcontainer/framework-alpine/devcontainer.json +++ b/.devcontainer/framework-alpine/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Alpine", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Alpine", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-alpine", + "workspaceFolder": "/workspaces/astro/examples/framework-alpine", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-lit/devcontainer.json b/.devcontainer/framework-lit/devcontainer.json index 934fbff06..4eb1d5979 100644 --- a/.devcontainer/framework-lit/devcontainer.json +++ b/.devcontainer/framework-lit/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Lit", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Lit", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-lit", + "workspaceFolder": "/workspaces/astro/examples/framework-lit", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-multiple/devcontainer.json b/.devcontainer/framework-multiple/devcontainer.json index 59719cd95..660df3e32 100644 --- a/.devcontainer/framework-multiple/devcontainer.json +++ b/.devcontainer/framework-multiple/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Kitchen Sink (Multiple Frameworks)", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Kitchen Sink (Multiple Frameworks)", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-multiple", + "workspaceFolder": "/workspaces/astro/examples/framework-multiple", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-preact/devcontainer.json b/.devcontainer/framework-preact/devcontainer.json index 47214355c..5c71cb6f2 100644 --- a/.devcontainer/framework-preact/devcontainer.json +++ b/.devcontainer/framework-preact/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Preact", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Preact", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-preact", + "workspaceFolder": "/workspaces/astro/examples/framework-preact", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-react/devcontainer.json b/.devcontainer/framework-react/devcontainer.json index 56d89ac99..f130c26ff 100644 --- a/.devcontainer/framework-react/devcontainer.json +++ b/.devcontainer/framework-react/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "React", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "React", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-react", + "workspaceFolder": "/workspaces/astro/examples/framework-react", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-solid/devcontainer.json b/.devcontainer/framework-solid/devcontainer.json index 2df288194..4a3e65ec8 100644 --- a/.devcontainer/framework-solid/devcontainer.json +++ b/.devcontainer/framework-solid/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Solid", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Solid", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-solid", + "workspaceFolder": "/workspaces/astro/examples/framework-solid", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-svelte/devcontainer.json b/.devcontainer/framework-svelte/devcontainer.json index 7da6c8449..d8db14287 100644 --- a/.devcontainer/framework-svelte/devcontainer.json +++ b/.devcontainer/framework-svelte/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Svelte", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Svelte", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-svelte", + "workspaceFolder": "/workspaces/astro/examples/framework-svelte", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/framework-vue/devcontainer.json b/.devcontainer/framework-vue/devcontainer.json index 34bccf6a4..db9a62878 100644 --- a/.devcontainer/framework-vue/devcontainer.json +++ b/.devcontainer/framework-vue/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Vue", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Vue", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/framework-vue", + "workspaceFolder": "/workspaces/astro/examples/framework-vue", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/hackernews/devcontainer.json b/.devcontainer/hackernews/devcontainer.json index 5c24e4958..dc113624d 100644 --- a/.devcontainer/hackernews/devcontainer.json +++ b/.devcontainer/hackernews/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Hackernews", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Hackernews", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/hackernews", + "workspaceFolder": "/workspaces/astro/examples/hackernews", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/[...stories].astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/[...stories].astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/integration/devcontainer.json b/.devcontainer/integration/devcontainer.json index 10f45155f..8e6a4df8d 100644 --- a/.devcontainer/integration/devcontainer.json +++ b/.devcontainer/integration/devcontainer.json @@ -1,21 +1,21 @@ { - "name": "Integration Package", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Integration Package", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/integration", + "workspaceFolder": "/workspaces/astro/examples/integration", - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "customizations": { - "codespaces": { - "openFiles": ["index.ts"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["index.ts"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/minimal/devcontainer.json b/.devcontainer/minimal/devcontainer.json index de48a32a6..1756ffd8b 100644 --- a/.devcontainer/minimal/devcontainer.json +++ b/.devcontainer/minimal/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Minimal", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Minimal", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/minimal", + "workspaceFolder": "/workspaces/astro/examples/minimal", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/non-html-pages/devcontainer.json b/.devcontainer/non-html-pages/devcontainer.json index 0ff0c2ccc..b47fae4e9 100644 --- a/.devcontainer/non-html-pages/devcontainer.json +++ b/.devcontainer/non-html-pages/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Non-HTML Pages", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Non-HTML Pages", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/non-html-pages", + "workspaceFolder": "/workspaces/astro/examples/non-html-pages", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/portfolio/devcontainer.json b/.devcontainer/portfolio/devcontainer.json index 075ccbf67..39e283d83 100644 --- a/.devcontainer/portfolio/devcontainer.json +++ b/.devcontainer/portfolio/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Portfolio", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Portfolio", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/portfolio", + "workspaceFolder": "/workspaces/astro/examples/portfolio", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/ssr/devcontainer.json b/.devcontainer/ssr/devcontainer.json index 01ba4f264..2ace9a1dd 100644 --- a/.devcontainer/ssr/devcontainer.json +++ b/.devcontainer/ssr/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "SSR", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "SSR", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/ssr", + "workspaceFolder": "/workspaces/astro/examples/ssr", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/with-markdown-plugins/devcontainer.json b/.devcontainer/with-markdown-plugins/devcontainer.json index bbf70fd65..21894a77c 100644 --- a/.devcontainer/with-markdown-plugins/devcontainer.json +++ b/.devcontainer/with-markdown-plugins/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Markdown with Plugins", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Markdown with Plugins", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/with-markdown-plugins", + "workspaceFolder": "/workspaces/astro/examples/with-markdown-plugins", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.md"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.md"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/with-markdown-shiki/devcontainer.json b/.devcontainer/with-markdown-shiki/devcontainer.json index 19b2325a9..a3f51750a 100644 --- a/.devcontainer/with-markdown-shiki/devcontainer.json +++ b/.devcontainer/with-markdown-shiki/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Markdown with Shiki", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Markdown with Shiki", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/with-markdown-shiki", + "workspaceFolder": "/workspaces/astro/examples/with-markdown-shiki", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.md"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.md"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/with-mdx/devcontainer.json b/.devcontainer/with-mdx/devcontainer.json index 197a30f3c..13ff67464 100644 --- a/.devcontainer/with-mdx/devcontainer.json +++ b/.devcontainer/with-mdx/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "MDX", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "MDX", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/with-mdx", + "workspaceFolder": "/workspaces/astro/examples/with-mdx", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.mdx"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.mdx"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/with-nanostores/devcontainer.json b/.devcontainer/with-nanostores/devcontainer.json index 6a630600d..656776b2a 100644 --- a/.devcontainer/with-nanostores/devcontainer.json +++ b/.devcontainer/with-nanostores/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Nanostores", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Nanostores", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/with-nanostores", + "workspaceFolder": "/workspaces/astro/examples/with-nanostores", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/with-tailwindcss/devcontainer.json b/.devcontainer/with-tailwindcss/devcontainer.json index 737989d4b..6e7298a6f 100644 --- a/.devcontainer/with-tailwindcss/devcontainer.json +++ b/.devcontainer/with-tailwindcss/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Tailwind", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Tailwind", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/with-tailwindcss", + "workspaceFolder": "/workspaces/astro/examples/with-tailwindcss", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/with-vite-plugin-pwa/devcontainer.json b/.devcontainer/with-vite-plugin-pwa/devcontainer.json index cf2ef2b7b..d716cded0 100644 --- a/.devcontainer/with-vite-plugin-pwa/devcontainer.json +++ b/.devcontainer/with-vite-plugin-pwa/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Vite PWA", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Vite PWA", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/with-vite-plugin-pwa", + "workspaceFolder": "/workspaces/astro/examples/with-vite-plugin-pwa", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.devcontainer/with-vitest/devcontainer.json b/.devcontainer/with-vitest/devcontainer.json index 6879a0c25..793108939 100644 --- a/.devcontainer/with-vitest/devcontainer.json +++ b/.devcontainer/with-vitest/devcontainer.json @@ -1,34 +1,34 @@ { - "name": "Vitest", - "build": { - "dockerfile": "../examples.Dockerfile" - }, + "name": "Vitest", + "build": { + "dockerfile": "../examples.Dockerfile" + }, - "workspaceFolder": "/workspaces/astro/examples/with-vitest", + "workspaceFolder": "/workspaces/astro/examples/with-vitest", - "portsAttributes": { - "4321": { - "label": "Application", - "onAutoForward": "openPreview" - } - }, + "portsAttributes": { + "4321": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, - "forwardPorts": [4321], + "forwardPorts": [4321], - "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", + "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build", - "waitFor": "postCreateCommand", + "waitFor": "postCreateCommand", - "postAttachCommand": { - "Server": "pnpm start --host" - }, + "postAttachCommand": { + "Server": "pnpm start --host" + }, - "customizations": { - "codespaces": { - "openFiles": ["src/pages/index.astro"] - }, - "vscode": { - "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] - } - } + "customizations": { + "codespaces": { + "openFiles": ["src/pages/index.astro"] + }, + "vscode": { + "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"] + } + } } diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 750f56aba..2df463d35 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,98 +1,98 @@ const { builtinModules } = require('module'); module.exports = { - extends: [ - 'plugin:@typescript-eslint/recommended-type-checked', - 'plugin:@typescript-eslint/stylistic-type-checked', - 'prettier', - ], - parser: '@typescript-eslint/parser', - parserOptions: { - project: ['./packages/*/tsconfig.json', './tsconfig.eslint.json'], - tsconfigRootDir: __dirname, - }, - plugins: ['@typescript-eslint', 'prettier', 'no-only-tests'], - rules: { - // 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', - { argsIgnorePattern: '^_', ignoreRestSiblings: true }, - ], - 'no-only-tests/no-only-tests': 'error', - '@typescript-eslint/no-shadow': ['error'], - 'no-console': 'warn', + extends: [ + 'plugin:@typescript-eslint/recommended-type-checked', + 'plugin:@typescript-eslint/stylistic-type-checked', + 'prettier', + ], + parser: '@typescript-eslint/parser', + parserOptions: { + project: ['./packages/*/tsconfig.json', './tsconfig.eslint.json'], + tsconfigRootDir: __dirname, + }, + plugins: ['@typescript-eslint', 'prettier', 'no-only-tests'], + rules: { + // 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', + { argsIgnorePattern: '^_', ignoreRestSiblings: true }, + ], + 'no-only-tests/no-only-tests': 'error', + '@typescript-eslint/no-shadow': ['error'], + 'no-console': 'warn', - // Todo: do we want these? - '@typescript-eslint/array-type': 'off', - '@typescript-eslint/ban-ts-comment': 'off', - '@typescript-eslint/class-literal-property-style': 'off', - '@typescript-eslint/consistent-indexed-object-style': 'off', - '@typescript-eslint/consistent-type-definitions': 'off', - '@typescript-eslint/dot-notation': 'off', - '@typescript-eslint/no-base-to-string': 'off', - '@typescript-eslint/no-empty-function': 'off', - '@typescript-eslint/no-floating-promises': 'off', - '@typescript-eslint/no-misused-promises': 'off', - '@typescript-eslint/no-redundant-type-constituents': 'off', - '@typescript-eslint/no-this-alias': 'off', - '@typescript-eslint/no-unsafe-argument': 'off', - '@typescript-eslint/no-unsafe-assignment': 'off', - '@typescript-eslint/no-unsafe-call': 'off', - '@typescript-eslint/no-unsafe-member-access': 'off', - '@typescript-eslint/no-unsafe-return': 'off', - '@typescript-eslint/prefer-nullish-coalescing': 'off', - '@typescript-eslint/prefer-optional-chain': 'off', - '@typescript-eslint/prefer-string-starts-ends-with': 'off', - '@typescript-eslint/require-await': 'off', - '@typescript-eslint/restrict-plus-operands': 'off', - '@typescript-eslint/restrict-template-expressions': 'off', - '@typescript-eslint/sort-type-constituents': 'off', - '@typescript-eslint/unbound-method': 'off', - '@typescript-eslint/no-explicit-any': 'off', + // Todo: do we want these? + '@typescript-eslint/array-type': 'off', + '@typescript-eslint/ban-ts-comment': 'off', + '@typescript-eslint/class-literal-property-style': 'off', + '@typescript-eslint/consistent-indexed-object-style': 'off', + '@typescript-eslint/consistent-type-definitions': 'off', + '@typescript-eslint/dot-notation': 'off', + '@typescript-eslint/no-base-to-string': 'off', + '@typescript-eslint/no-empty-function': 'off', + '@typescript-eslint/no-floating-promises': 'off', + '@typescript-eslint/no-misused-promises': 'off', + '@typescript-eslint/no-redundant-type-constituents': 'off', + '@typescript-eslint/no-this-alias': 'off', + '@typescript-eslint/no-unsafe-argument': 'off', + '@typescript-eslint/no-unsafe-assignment': 'off', + '@typescript-eslint/no-unsafe-call': 'off', + '@typescript-eslint/no-unsafe-member-access': 'off', + '@typescript-eslint/no-unsafe-return': 'off', + '@typescript-eslint/prefer-nullish-coalescing': 'off', + '@typescript-eslint/prefer-optional-chain': 'off', + '@typescript-eslint/prefer-string-starts-ends-with': 'off', + '@typescript-eslint/require-await': 'off', + '@typescript-eslint/restrict-plus-operands': 'off', + '@typescript-eslint/restrict-template-expressions': 'off', + '@typescript-eslint/sort-type-constituents': 'off', + '@typescript-eslint/unbound-method': 'off', + '@typescript-eslint/no-explicit-any': 'off', - // These rules enabled by the preset configs don't work well for us - '@typescript-eslint/await-thenable': 'off', - 'prefer-const': 'off', - }, - overrides: [ - { - // Ensure Node builtins aren't included in Astro's server runtime - files: ['packages/astro/src/runtime/**/*.ts'], - rules: { - 'no-restricted-imports': [ - 'error', - { - paths: [...builtinModules], - patterns: ['node:*'], - }, - ], - }, - }, - { - files: ['packages/**/test/*.js', 'packages/**/*.js'], - env: { - mocha: true, - }, - globals: { - globalThis: false, // false means read-only - }, - rules: { - 'no-console': 'off', - }, - }, - { - files: ['packages/integrations/**/*.ts'], - rules: { - 'no-console': ['error', { allow: ['warn', 'error', 'info', 'debug'] }], - }, - }, - { - files: ['benchmark/**/*.js'], - rules: { - '@typescript-eslint/no-unused-vars': 'off', - 'no-console': 'off', - }, - }, - ], + // These rules enabled by the preset configs don't work well for us + '@typescript-eslint/await-thenable': 'off', + 'prefer-const': 'off', + }, + overrides: [ + { + // Ensure Node builtins aren't included in Astro's server runtime + files: ['packages/astro/src/runtime/**/*.ts'], + rules: { + 'no-restricted-imports': [ + 'error', + { + paths: [...builtinModules], + patterns: ['node:*'], + }, + ], + }, + }, + { + files: ['packages/**/test/*.js', 'packages/**/*.js'], + env: { + mocha: true, + }, + globals: { + globalThis: false, // false means read-only + }, + rules: { + 'no-console': 'off', + }, + }, + { + files: ['packages/integrations/**/*.ts'], + rules: { + 'no-console': ['error', { allow: ['warn', 'error', 'info', 'debug'] }], + }, + }, + { + files: ['benchmark/**/*.js'], + rules: { + '@typescript-eslint/no-unused-vars': 'off', + 'no-console': 'off', + }, + }, + ], }; diff --git a/.prettierignore b/.prettierignore index c822e0a50..f6888a480 100644 --- a/.prettierignore +++ b/.prettierignore @@ -21,3 +21,4 @@ pnpm-lock.yaml *.mjs *.cjs *.json +*.jsonc diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d10a1ead4..d8411afe0 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,9 +1,9 @@ { - "recommendations": [ - "astro-build.astro-vscode", - "esbenp.prettier-vscode", - "editorconfig.editorconfig", - "dbaeumer.vscode-eslint" - ], - "unwantedRecommendations": [] + "recommendations": [ + "astro-build.astro-vscode", + "esbenp.prettier-vscode", + "editorconfig.editorconfig", + "dbaeumer.vscode-eslint" + ], + "unwantedRecommendations": [] } diff --git a/.vscode/launch.json b/.vscode/launch.json index 44c94ef5a..b575d4b70 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,29 +1,29 @@ // A launch configuration that compiles the extension and then opens it inside a new window { - "version": "0.2.0", - "configurations": [ - { - "name": "Launch Client", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}/tools/vscode"], - "outFiles": ["${workspaceRoot}/tools/vscode/dist/**/*.js"] - }, - { - "type": "node", - "request": "attach", - "name": "Attach to Server", - "port": 6040, - "restart": true, - "outFiles": ["${workspaceRoot}/tools/languageserver/dist/**/*.js"], - "skipFiles": ["/**"] - } - ], - "compounds": [ - { - "name": "Launch Extension", - "configurations": ["Launch Client", "Attach to Server"] - } - ] + "version": "0.2.0", + "configurations": [ + { + "name": "Launch Client", + "type": "extensionHost", + "request": "launch", + "runtimeExecutable": "${execPath}", + "args": ["--extensionDevelopmentPath=${workspaceRoot}/tools/vscode"], + "outFiles": ["${workspaceRoot}/tools/vscode/dist/**/*.js"] + }, + { + "type": "node", + "request": "attach", + "name": "Attach to Server", + "port": 6040, + "restart": true, + "outFiles": ["${workspaceRoot}/tools/languageserver/dist/**/*.js"], + "skipFiles": ["/**"] + } + ], + "compounds": [ + { + "name": "Launch Extension", + "configurations": ["Launch Client", "Attach to Server"] + } + ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 068a3d4af..d81861501 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,14 +1,14 @@ { - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "build:vscode", - "group": "build", - "presentation": { - "panel": "dedicated", - "reveal": "never" - } - } - ] + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "build:vscode", + "group": "build", + "presentation": { + "panel": "dedicated", + "reveal": "never" + } + } + ] } diff --git a/biome.json b/biome.json index dc78e1ded..955e347b2 100644 --- a/biome.json +++ b/biome.json @@ -1,38 +1,41 @@ { - "$schema": "https://biomejs.dev/schemas/1.0.0/schema.json", - "organizeImports": { - "enabled": true - }, - "files": { - "ignoreUnknown": true, - "ignore": [ - "examples/basics/src/layouts/**", - "examples/with-nanostores/src/layouts/**", - "benchmark/projects/**", - "benchmark/results/**", - "**/dist", - "**/smoke", - "**/node_modules", - "**/fixtures", - "**/vendor", - "**/.vercel" - ] - }, - "linter": { - "enabled": false - }, - "formatter": { - "lineWidth": 100 - }, - "javascript": { - "formatter": { - "quoteStyle": "single", - "trailingComma": "es5" - } - }, - "json": { - "parser": { - "allowComments": true - } - } + "$schema": "https://biomejs.dev/schemas/1.2.1/schema.json", + "organizeImports": { + "enabled": true + }, + "files": { + "ignoreUnknown": true, + "ignore": [ + "examples/basics/src/layouts/**", + "examples/with-nanostores/src/layouts/**", + "benchmark/projects/**", + "benchmark/results/**", + "**/dist", + "**/smoke", + "**/node_modules", + "**/fixtures", + "**/vendor", + "**/.vercel" + ] + }, + "linter": { + "enabled": false + }, + "formatter": { + "lineWidth": 100 + }, + "javascript": { + "formatter": { + "quoteStyle": "single", + "trailingComma": "es5" + } + }, + "json": { + "parser": { + "allowComments": true + }, + "formatter": { + "indentStyle": "space" + } + } } diff --git a/examples/basics/.vscode/extensions.json b/examples/basics/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/basics/.vscode/extensions.json +++ b/examples/basics/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/basics/.vscode/launch.json b/examples/basics/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/basics/.vscode/launch.json +++ b/examples/basics/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/blog/.vscode/extensions.json b/examples/blog/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/blog/.vscode/extensions.json +++ b/examples/blog/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/blog/.vscode/launch.json b/examples/blog/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/blog/.vscode/launch.json +++ b/examples/blog/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/deno/.vscode/extensions.json b/examples/deno/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/deno/.vscode/extensions.json +++ b/examples/deno/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/deno/.vscode/launch.json b/examples/deno/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/deno/.vscode/launch.json +++ b/examples/deno/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-alpine/.vscode/extensions.json b/examples/framework-alpine/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-alpine/.vscode/extensions.json +++ b/examples/framework-alpine/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-alpine/.vscode/launch.json b/examples/framework-alpine/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-alpine/.vscode/launch.json +++ b/examples/framework-alpine/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-lit/.vscode/extensions.json b/examples/framework-lit/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-lit/.vscode/extensions.json +++ b/examples/framework-lit/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-lit/.vscode/launch.json b/examples/framework-lit/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-lit/.vscode/launch.json +++ b/examples/framework-lit/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-multiple/.vscode/extensions.json b/examples/framework-multiple/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-multiple/.vscode/extensions.json +++ b/examples/framework-multiple/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-multiple/.vscode/launch.json b/examples/framework-multiple/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-multiple/.vscode/launch.json +++ b/examples/framework-multiple/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-preact/.vscode/extensions.json b/examples/framework-preact/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-preact/.vscode/extensions.json +++ b/examples/framework-preact/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-preact/.vscode/launch.json b/examples/framework-preact/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-preact/.vscode/launch.json +++ b/examples/framework-preact/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-react/.vscode/extensions.json b/examples/framework-react/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-react/.vscode/extensions.json +++ b/examples/framework-react/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-react/.vscode/launch.json b/examples/framework-react/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-react/.vscode/launch.json +++ b/examples/framework-react/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-solid/.vscode/extensions.json b/examples/framework-solid/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-solid/.vscode/extensions.json +++ b/examples/framework-solid/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-solid/.vscode/launch.json b/examples/framework-solid/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-solid/.vscode/launch.json +++ b/examples/framework-solid/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-svelte/.vscode/extensions.json b/examples/framework-svelte/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-svelte/.vscode/extensions.json +++ b/examples/framework-svelte/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-svelte/.vscode/launch.json b/examples/framework-svelte/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-svelte/.vscode/launch.json +++ b/examples/framework-svelte/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/framework-vue/.vscode/extensions.json b/examples/framework-vue/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/framework-vue/.vscode/extensions.json +++ b/examples/framework-vue/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/framework-vue/.vscode/launch.json b/examples/framework-vue/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/framework-vue/.vscode/launch.json +++ b/examples/framework-vue/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/hackernews/.vscode/extensions.json b/examples/hackernews/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/hackernews/.vscode/extensions.json +++ b/examples/hackernews/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/hackernews/.vscode/launch.json b/examples/hackernews/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/hackernews/.vscode/launch.json +++ b/examples/hackernews/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/minimal/.vscode/extensions.json b/examples/minimal/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/minimal/.vscode/extensions.json +++ b/examples/minimal/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/minimal/.vscode/launch.json b/examples/minimal/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/minimal/.vscode/launch.json +++ b/examples/minimal/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/non-html-pages/.vscode/extensions.json b/examples/non-html-pages/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/non-html-pages/.vscode/extensions.json +++ b/examples/non-html-pages/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/non-html-pages/.vscode/launch.json b/examples/non-html-pages/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/non-html-pages/.vscode/launch.json +++ b/examples/non-html-pages/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/portfolio/.vscode/extensions.json b/examples/portfolio/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/portfolio/.vscode/extensions.json +++ b/examples/portfolio/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/portfolio/.vscode/launch.json b/examples/portfolio/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/portfolio/.vscode/launch.json +++ b/examples/portfolio/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/ssr/.vscode/extensions.json b/examples/ssr/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/ssr/.vscode/extensions.json +++ b/examples/ssr/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/ssr/.vscode/launch.json b/examples/ssr/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/ssr/.vscode/launch.json +++ b/examples/ssr/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/ssr/src/models/db.json b/examples/ssr/src/models/db.json index 6401b1803..76f9e4da3 100644 --- a/examples/ssr/src/models/db.json +++ b/examples/ssr/src/models/db.json @@ -1,28 +1,28 @@ { - "products": [ - { - "id": 1, - "name": "Cereal", - "price": 3.99, - "image": "/images/products/cereal.jpg" - }, - { - "id": 2, - "name": "Yogurt", - "price": 3.97, - "image": "/images/products/yogurt.jpg" - }, - { - "id": 3, - "name": "Rolled Oats", - "price": 2.89, - "image": "/images/products/oats.jpg" - }, - { - "id": 4, - "name": "Muffins", - "price": 4.39, - "image": "/images/products/muffins.jpg" - } - ] + "products": [ + { + "id": 1, + "name": "Cereal", + "price": 3.99, + "image": "/images/products/cereal.jpg" + }, + { + "id": 2, + "name": "Yogurt", + "price": 3.97, + "image": "/images/products/yogurt.jpg" + }, + { + "id": 3, + "name": "Rolled Oats", + "price": 2.89, + "image": "/images/products/oats.jpg" + }, + { + "id": 4, + "name": "Muffins", + "price": 4.39, + "image": "/images/products/muffins.jpg" + } + ] } diff --git a/examples/with-markdoc/.vscode/extensions.json b/examples/with-markdoc/.vscode/extensions.json index 3a1c9ecdb..22a15055d 100644 --- a/examples/with-markdoc/.vscode/extensions.json +++ b/examples/with-markdoc/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode"], + "unwantedRecommendations": [] } diff --git a/examples/with-markdoc/.vscode/launch.json b/examples/with-markdoc/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/with-markdoc/.vscode/launch.json +++ b/examples/with-markdoc/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/examples/with-mdx/.vscode/extensions.json b/examples/with-mdx/.vscode/extensions.json index 26d70b409..56f043d30 100644 --- a/examples/with-mdx/.vscode/extensions.json +++ b/examples/with-mdx/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["astro-build.astro-vscode", "unifiedjs.vscode-mdx"], - "unwantedRecommendations": [] + "recommendations": ["astro-build.astro-vscode", "unifiedjs.vscode-mdx"], + "unwantedRecommendations": [] } diff --git a/examples/with-mdx/.vscode/launch.json b/examples/with-mdx/.vscode/launch.json index 230708db4..d64220976 100644 --- a/examples/with-mdx/.vscode/launch.json +++ b/examples/with-mdx/.vscode/launch.json @@ -1,11 +1,11 @@ { - "version": "0.2.0", - "configurations": [ - { - "command": "./node_modules/.bin/astro dev", - "name": "Development server", - "request": "launch", - "type": "node-terminal" - } - ] + "version": "0.2.0", + "configurations": [ + { + "command": "./node_modules/.bin/astro dev", + "name": "Development server", + "request": "launch", + "type": "node-terminal" + } + ] } diff --git a/package.json b/package.json index 32beb8579..d5f437f24 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "dev": "turbo run dev --concurrency=40 --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", "format": "pnpm run format:code", "format:ci": "pnpm run format:imports && pnpm run format:code", - "format:code": "prettier -w \"**/*\" --ignore-unknown --cache", - "format:imports": "organize-imports-cli ./packages/*/tsconfig.json ./packages/*/*/tsconfig.json", + "format:code": "biome check --apply-unsafe ./ && prettier -w \"**/*\" --ignore-unknown --cache", "test": "turbo run test --concurrency=1 --filter=astro --filter=create-astro --filter=\"@astrojs/*\"", "test:match": "cd packages/astro && pnpm run test:match", "test:unit": "cd packages/astro && pnpm run test:unit", @@ -78,6 +77,7 @@ }, "devDependencies": { "@astrojs/check": "^0.1.0", + "@biomejs/biome": "1.2.1", "@changesets/changelog-github": "^0.4.8", "@changesets/cli": "^2.26.2", "@types/node": "^18.17.8", diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 10e15b6ff..26b7d271e 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -1,3 +1,5 @@ +import type { OutgoingHttpHeaders } from 'node:http'; +import type { AddressInfo } from 'node:net'; import type { MarkdownHeading, MarkdownMetadata, @@ -8,8 +10,6 @@ import type { ShikiConfig, } from '@astrojs/markdown-remark'; import type * as babel from '@babel/core'; -import type { OutgoingHttpHeaders } from 'node:http'; -import type { AddressInfo } from 'node:net'; import type * as rollup from 'rollup'; import type { TsConfigJson } from 'tsconfig-resolver'; import type * as vite from 'vite'; @@ -148,7 +148,7 @@ export interface CLIFlags { export interface AstroGlobal< Props extends Record = Record, Self = AstroComponentFactory, - Params extends Record = Record, + Params extends Record = Record > extends AstroGlobalPartial, AstroSharedContext { /** @@ -281,7 +281,7 @@ export interface AstroGlobal< } /** Union type of supported markdown file extensions */ -type MarkdowFileExtension = (typeof SUPPORTED_MARKDOWN_FILE_EXTENSIONS)[number]; +type MarkdowFileExtension = typeof SUPPORTED_MARKDOWN_FILE_EXTENSIONS[number]; export interface AstroGlobalPartial { /** @@ -1751,7 +1751,7 @@ export interface Page { export type PaginateFunction = < PaginateData, AdditionalPaginateProps extends Props, - AdditionalPaginateParams extends Params, + AdditionalPaginateParams extends Params >( data: PaginateData[], args?: PaginateOptions @@ -1825,7 +1825,7 @@ export type ValidRedirectStatus = 300 | 301 | 302 | 303 | 304 | 307 | 308; // Shared types between `Astro` global and API context object interface AstroSharedContext< Props extends Record = Record, - RouteParams extends Record = Record, + RouteParams extends Record = Record > { /** * The address (usually IP address) of the user. Used with SSR only. @@ -1864,7 +1864,7 @@ interface AstroSharedContext< export interface APIContext< Props extends Record = Record, - APIParams extends Record = Record, + APIParams extends Record = Record > extends AstroSharedContext { site: URL | undefined; generator: string; @@ -2009,7 +2009,7 @@ export interface SSRLoadedRenderer extends AstroRenderer { export type HookParameters< Hook extends keyof AstroIntegration['hooks'], - Fn = AstroIntegration['hooks'][Hook], + Fn = AstroIntegration['hooks'][Hook] > = Fn extends (...args: any) => any ? Parameters[0] : never; export interface AstroIntegration { diff --git a/packages/astro/src/core/app/common.ts b/packages/astro/src/core/app/common.ts index 5426d7721..fc3eaf800 100644 --- a/packages/astro/src/core/app/common.ts +++ b/packages/astro/src/core/app/common.ts @@ -1,5 +1,5 @@ import { deserializeRouteData } from '../routing/manifest/serialization.js'; -import type { RouteInfo, SerializedSSRManifest, SSRManifest } from './types.js'; +import type { RouteInfo, SSRManifest, SerializedSSRManifest } from './types.js'; export function deserializeManifest(serializedManifest: SerializedSSRManifest): SSRManifest { const routes: RouteInfo[] = []; diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts index 1df931eca..dbb512921 100644 --- a/packages/astro/src/core/app/node.ts +++ b/packages/astro/src/core/app/node.ts @@ -1,5 +1,5 @@ import type { RouteData } from '../../@types/astro.js'; -import type { SerializedSSRManifest, SSRManifest } from './types.js'; +import type { SSRManifest, SerializedSSRManifest } from './types.js'; import * as fs from 'node:fs'; import { IncomingMessage } from 'node:http'; diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts index 0050b5d7a..ea54fb11f 100644 --- a/packages/astro/src/core/app/types.ts +++ b/packages/astro/src/core/app/types.ts @@ -1,9 +1,9 @@ import type { RouteData, - SerializedRouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult, + SerializedRouteData, } from '../../@types/astro.js'; import type { SinglePageBuiltModule } from '../build/types.js'; diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts index 41ceb282c..d3ac5958b 100644 --- a/packages/astro/src/core/build/plugins/plugin-manifest.ts +++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts @@ -1,5 +1,5 @@ -import glob from 'fast-glob'; import { fileURLToPath } from 'node:url'; +import glob from 'fast-glob'; import type { OutputChunk } from 'rollup'; import { type Plugin as VitePlugin } from 'vite'; import { runHookBuildSsr } from '../../../integrations/index.js'; @@ -9,7 +9,7 @@ import { joinPaths, prependForwardSlash } from '../../path.js'; import { serializeRouteData } from '../../routing/index.js'; import { addRollupInput } from '../add-rollup-input.js'; import { getOutFile, getOutFolder } from '../common.js'; -import { cssOrder, mergeInlineCss, type BuildInternals } from '../internal.js'; +import { type BuildInternals, cssOrder, mergeInlineCss } from '../internal.js'; import type { AstroBuildPlugin } from '../plugin.js'; import type { StaticBuildOptions } from '../types.js'; diff --git a/packages/astro/src/core/compile/cache.ts b/packages/astro/src/core/compile/cache.ts index cdd9ddd55..f6d5555e6 100644 --- a/packages/astro/src/core/compile/cache.ts +++ b/packages/astro/src/core/compile/cache.ts @@ -1,5 +1,5 @@ import type { AstroConfig } from '../../@types/astro.js'; -import { compile, type CompileProps, type CompileResult } from './compile.js'; +import { type CompileProps, type CompileResult, compile } from './compile.js'; type CompilationCache = Map; diff --git a/packages/astro/src/core/config/settings.ts b/packages/astro/src/core/config/settings.ts index 8b70f6e96..3af5f6571 100644 --- a/packages/astro/src/core/config/settings.ts +++ b/packages/astro/src/core/config/settings.ts @@ -1,6 +1,6 @@ -import yaml from 'js-yaml'; import path from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; +import yaml from 'js-yaml'; import type { AstroConfig, AstroSettings } from '../../@types/astro.js'; import { getContentPaths } from '../../content/index.js'; import { markdownContentEntryType } from '../../vite-plugin-markdown/content-entry-type.js'; diff --git a/packages/astro/src/core/endpoint/dev/index.ts b/packages/astro/src/core/endpoint/dev/index.ts index 96fe5f3d7..3093d416e 100644 --- a/packages/astro/src/core/endpoint/dev/index.ts +++ b/packages/astro/src/core/endpoint/dev/index.ts @@ -1,5 +1,5 @@ import type { EndpointHandler } from '../../../@types/astro.js'; -import { createRenderContext, type SSROptions } from '../../render/index.js'; +import { type SSROptions, createRenderContext } from '../../render/index.js'; import { callEndpoint } from '../index.js'; export async function call(options: SSROptions) { diff --git a/packages/astro/src/core/preview/static-preview-server.ts b/packages/astro/src/core/preview/static-preview-server.ts index 3cb0e89e8..68fdd305a 100644 --- a/packages/astro/src/core/preview/static-preview-server.ts +++ b/packages/astro/src/core/preview/static-preview-server.ts @@ -2,7 +2,7 @@ import type http from 'node:http'; import { fileURLToPath } from 'node:url'; import { performance } from 'perf_hooks'; import enableDestroy from 'server-destroy'; -import { preview, type PreviewServer as VitePreviewServer } from 'vite'; +import { type PreviewServer as VitePreviewServer, preview } from 'vite'; import type { AstroSettings } from '../../@types/astro.js'; import type { Logger } from '../logger/core.js'; import * as msg from '../messages.js'; diff --git a/packages/astro/src/core/render/result.ts b/packages/astro/src/core/render/result.ts index abfcb5e3e..2102304ff 100644 --- a/packages/astro/src/core/render/result.ts +++ b/packages/astro/src/core/render/result.ts @@ -6,7 +6,7 @@ import type { SSRLoadedRenderer, SSRResult, } from '../../@types/astro.js'; -import { renderSlotToString, type ComponentSlots } from '../../runtime/server/index.js'; +import { type ComponentSlots, renderSlotToString } from '../../runtime/server/index.js'; import { renderJSX } from '../../runtime/server/jsx.js'; import { chunkToString } from '../../runtime/server/render/index.js'; import { AstroCookies } from '../cookies/index.js'; diff --git a/packages/astro/src/core/sync/index.ts b/packages/astro/src/core/sync/index.ts index 940ff0524..fed5a4374 100644 --- a/packages/astro/src/core/sync/index.ts +++ b/packages/astro/src/core/sync/index.ts @@ -1,8 +1,8 @@ -import { dim } from 'kleur/colors'; import fsMod from 'node:fs'; import { performance } from 'node:perf_hooks'; import { fileURLToPath } from 'node:url'; -import { createServer, type HMRPayload } from 'vite'; +import { dim } from 'kleur/colors'; +import { type HMRPayload, createServer } from 'vite'; import type { AstroInlineConfig, AstroSettings } from '../../@types/astro.js'; import { createContentTypesGenerator } from '../../content/index.js'; import { globalContentConfigObserver } from '../../content/utils.js'; diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts index bfb82ceda..0129a64e7 100644 --- a/packages/astro/src/runtime/server/render/component.ts +++ b/packages/astro/src/runtime/server/render/component.ts @@ -4,7 +4,7 @@ import type { SSRLoadedRenderer, SSRResult, } from '../../../@types/astro.js'; -import { createRenderInstruction, type RenderInstruction } from './instruction.js'; +import { type RenderInstruction, createRenderInstruction } from './instruction.js'; import { clsx } from 'clsx'; import { AstroError, AstroErrorData } from '../../../core/errors/index.js'; @@ -14,21 +14,21 @@ import { serializeProps } from '../serialize.js'; import { shorthash } from '../shorthash.js'; import { isPromise } from '../util.js'; import { + type AstroComponentFactory, createAstroComponentInstance, isAstroComponentFactory, renderTemplate, - type AstroComponentFactory, } from './astro/index.js'; import { Fragment, - Renderer, - chunkToString, type RenderDestination, type RenderInstance, + Renderer, + chunkToString, } from './common.js'; import { componentIsHTMLElement, renderHTMLElement } from './dom.js'; import { maybeRenderHead } from './head.js'; -import { renderSlotToString, renderSlots, type ComponentSlots } from './slot.js'; +import { type ComponentSlots, renderSlotToString, renderSlots } from './slot.js'; import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from './util.js'; const needsHeadRenderingSymbol = Symbol.for('astro.needsHeadRendering'); diff --git a/packages/astro/src/runtime/server/render/page.ts b/packages/astro/src/runtime/server/render/page.ts index 2f4e87f5f..098a1706c 100644 --- a/packages/astro/src/runtime/server/render/page.ts +++ b/packages/astro/src/runtime/server/render/page.ts @@ -1,5 +1,5 @@ import type { RouteData, SSRResult } from '../../../@types/astro.js'; -import { renderComponentToString, type NonAstroPageComponent } from './component.js'; +import { type NonAstroPageComponent, renderComponentToString } from './component.js'; import type { AstroComponentFactory } from './index.js'; import { isAstroComponentFactory } from './astro/index.js'; diff --git a/packages/astro/src/type-utils.ts b/packages/astro/src/type-utils.ts index 96970f7c4..f9097938a 100644 --- a/packages/astro/src/type-utils.ts +++ b/packages/astro/src/type-utils.ts @@ -12,9 +12,8 @@ export type WithRequired = T & { [P in K]-?: T[P] }; // Name is pretty self descriptive, but it removes the index signature of an object export type OmitIndexSignature = { - [KeyType in keyof ObjectType as {} extends Record - ? never - : KeyType]: ObjectType[KeyType]; + [KeyType in + keyof ObjectType as {} extends Record ? never : KeyType]: ObjectType[KeyType]; }; // Transform a string into its kebab case equivalent (camelCase -> kebab-case). Useful for CSS-in-JS to CSS. diff --git a/packages/astro/src/vite-plugin-astro/compile.ts b/packages/astro/src/vite-plugin-astro/compile.ts index 768d18d86..299598627 100644 --- a/packages/astro/src/vite-plugin-astro/compile.ts +++ b/packages/astro/src/vite-plugin-astro/compile.ts @@ -1,6 +1,6 @@ -import { transformWithEsbuild, type ESBuildTransformResult } from 'vite'; +import { type ESBuildTransformResult, transformWithEsbuild } from 'vite'; import type { AstroConfig } from '../@types/astro.js'; -import { cachedCompilation, type CompileProps, type CompileResult } from '../core/compile/index.js'; +import { type CompileProps, type CompileResult, cachedCompilation } from '../core/compile/index.js'; import type { Logger } from '../core/logger/core.js'; import { getFileInfo } from '../vite-plugin-utils/index.js'; diff --git a/packages/astro/src/vite-plugin-config-alias/index.ts b/packages/astro/src/vite-plugin-config-alias/index.ts index 8b8535af9..edbfca388 100644 --- a/packages/astro/src/vite-plugin-config-alias/index.ts +++ b/packages/astro/src/vite-plugin-config-alias/index.ts @@ -1,5 +1,5 @@ import path from 'node:path'; -import { normalizePath, type ResolvedConfig, type Plugin as VitePlugin } from 'vite'; +import { type Plugin as VitePlugin, type ResolvedConfig, normalizePath } from 'vite'; import type { AstroSettings } from '../@types/astro.js'; type Alias = { diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index 163baab0d..1ae341fc7 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -1,12 +1,12 @@ -import { - createMarkdownProcessor, - InvalidAstroDataError, - type MarkdownProcessor, -} from '@astrojs/markdown-remark'; -import matter from 'gray-matter'; import fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; +import { + InvalidAstroDataError, + type MarkdownProcessor, + createMarkdownProcessor, +} from '@astrojs/markdown-remark'; +import matter from 'gray-matter'; import type { Plugin } from 'vite'; import { normalizePath } from 'vite'; import type { AstroSettings } from '../@types/astro.js'; diff --git a/packages/astro/src/vite-plugin-mdx/index.ts b/packages/astro/src/vite-plugin-mdx/index.ts index 5e2ce2a98..94fef2783 100644 --- a/packages/astro/src/vite-plugin-mdx/index.ts +++ b/packages/astro/src/vite-plugin-mdx/index.ts @@ -1,5 +1,5 @@ import type { TransformResult } from 'rollup'; -import { transformWithEsbuild, type Plugin, type ResolvedConfig } from 'vite'; +import { type Plugin, type ResolvedConfig, transformWithEsbuild } from 'vite'; import type { AstroRenderer, AstroSettings } from '../@types/astro.js'; import type { Logger } from '../core/logger/core.js'; import type { PluginMetadata } from '../vite-plugin-astro/types.js'; diff --git a/packages/astro/src/vite-plugin-utils/index.ts b/packages/astro/src/vite-plugin-utils/index.ts index 51f0e6cc4..044ef684c 100644 --- a/packages/astro/src/vite-plugin-utils/index.ts +++ b/packages/astro/src/vite-plugin-utils/index.ts @@ -1,5 +1,5 @@ -import ancestor from 'common-ancestor-path'; import { fileURLToPath } from 'node:url'; +import ancestor from 'common-ancestor-path'; import type { AstroConfig } from '../@types/astro.js'; import { appendExtension, diff --git a/packages/astro/tsconfigs/base.json b/packages/astro/tsconfigs/base.json index fe579b972..578693195 100644 --- a/packages/astro/tsconfigs/base.json +++ b/packages/astro/tsconfigs/base.json @@ -1,29 +1,29 @@ { - "$schema": "https://json.schemastore.org/tsconfig", - "compilerOptions": { - // Enable top-level await, and other modern ESM features. - "target": "ESNext", - "module": "ESNext", - // Enable node-style module resolution, for things like npm package imports. - "moduleResolution": "Bundler", - // Allow importing TypeScript files using their native extension (.ts(x)). - "allowImportingTsExtensions": true, - // Enable JSON imports. - "resolveJsonModule": true, - // Enforce the usage of type-only imports when needed, which helps avoiding bundling issues. - "verbatimModuleSyntax": true, - // Ensure that each file can be transpiled without relying on other imports. - // This is redundant with the previous option, however it ensures that it's on even if someone disable `verbatimModuleSyntax` - "isolatedModules": true, - // Astro directly run TypeScript code, no transpilation needed. - "noEmit": true, - // Report an error when importing a file using a casing different from another import of the same file. - "forceConsistentCasingInFileNames": true, - // Properly support importing CJS modules in ESM - "esModuleInterop": true, - // Skip typechecking libraries and .d.ts files - "skipLibCheck": true, - // Allow JavaScript files to be imported - "allowJs": true - } + "$schema": "https://json.schemastore.org/tsconfig", + "compilerOptions": { + // Enable top-level await, and other modern ESM features. + "target": "ESNext", + "module": "ESNext", + // Enable node-style module resolution, for things like npm package imports. + "moduleResolution": "Bundler", + // Allow importing TypeScript files using their native extension (.ts(x)). + "allowImportingTsExtensions": true, + // Enable JSON imports. + "resolveJsonModule": true, + // Enforce the usage of type-only imports when needed, which helps avoiding bundling issues. + "verbatimModuleSyntax": true, + // Ensure that each file can be transpiled without relying on other imports. + // This is redundant with the previous option, however it ensures that it's on even if someone disable `verbatimModuleSyntax` + "isolatedModules": true, + // Astro directly run TypeScript code, no transpilation needed. + "noEmit": true, + // Report an error when importing a file using a casing different from another import of the same file. + "forceConsistentCasingInFileNames": true, + // Properly support importing CJS modules in ESM + "esModuleInterop": true, + // Skip typechecking libraries and .d.ts files + "skipLibCheck": true, + // Allow JavaScript files to be imported + "allowJs": true + } } diff --git a/packages/astro/tsconfigs/strict.json b/packages/astro/tsconfigs/strict.json index 03fba7703..3064440a5 100644 --- a/packages/astro/tsconfigs/strict.json +++ b/packages/astro/tsconfigs/strict.json @@ -1,8 +1,8 @@ { - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "./base.json", - "compilerOptions": { - // Enable strict mode. This enables a few options at a time, see https://www.typescriptlang.org/tsconfig#strict for a list. - "strict": true - } + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "./base.json", + "compilerOptions": { + // Enable strict mode. This enables a few options at a time, see https://www.typescriptlang.org/tsconfig#strict for a list. + "strict": true + } } diff --git a/packages/astro/tsconfigs/strictest.json b/packages/astro/tsconfigs/strictest.json index 846f41eae..36f11635e 100644 --- a/packages/astro/tsconfigs/strictest.json +++ b/packages/astro/tsconfigs/strictest.json @@ -1,26 +1,26 @@ { - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "./strict.json", - "compilerOptions": { - // Report errors for fallthrough cases in switch statements - "noFallthroughCasesInSwitch": true, - // Force functions designed to override their parent class to be specified as `override`. - "noImplicitOverride": true, - // Force functions to specify that they can return `undefined` if a possible code path does not return a value. - "noImplicitReturns": true, - // Report an error when a variable is declared but never used. - "noUnusedLocals": true, - // Report an error when a parameter is declared but never used. - "noUnusedParameters": true, - // Force the usage of the indexed syntax to access fields declared using an index signature. - "noUncheckedIndexedAccess": true, - // Report an error when the value `undefined` is given to an optional property that doesn't specify `undefined` as a valid value. - "exactOptionalPropertyTypes": true, - // Report an error for unreachable code instead of just a warning. - "allowUnreachableCode": false, - // Report an error for unused labels instead of just a warning. - "allowUnusedLabels": false, - // Disallow JavaScript files from being imported - "allowJs": false - } + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "./strict.json", + "compilerOptions": { + // Report errors for fallthrough cases in switch statements + "noFallthroughCasesInSwitch": true, + // Force functions designed to override their parent class to be specified as `override`. + "noImplicitOverride": true, + // Force functions to specify that they can return `undefined` if a possible code path does not return a value. + "noImplicitReturns": true, + // Report an error when a variable is declared but never used. + "noUnusedLocals": true, + // Report an error when a parameter is declared but never used. + "noUnusedParameters": true, + // Force the usage of the indexed syntax to access fields declared using an index signature. + "noUncheckedIndexedAccess": true, + // Report an error when the value `undefined` is given to an optional property that doesn't specify `undefined` as a valid value. + "exactOptionalPropertyTypes": true, + // Report an error for unreachable code instead of just a warning. + "allowUnreachableCode": false, + // Report an error for unused labels instead of just a warning. + "allowUnusedLabels": false, + // Disallow JavaScript files from being imported + "allowJs": false + } } diff --git a/packages/create-astro/src/actions/context.ts b/packages/create-astro/src/actions/context.ts index ae720a1b3..a3232ae01 100644 --- a/packages/create-astro/src/actions/context.ts +++ b/packages/create-astro/src/actions/context.ts @@ -1,7 +1,7 @@ +import os from 'node:os'; import { prompt } from '@astrojs/cli-kit'; import { random } from '@astrojs/cli-kit/utils'; import arg from 'arg'; -import os from 'node:os'; import { getName, getVersion } from '../messages.js'; diff --git a/packages/create-astro/src/actions/verify.ts b/packages/create-astro/src/actions/verify.ts index ac3eae484..d9e0f3a82 100644 --- a/packages/create-astro/src/actions/verify.ts +++ b/packages/create-astro/src/actions/verify.ts @@ -1,7 +1,7 @@ import type { Context } from './context.js'; -import { color } from '@astrojs/cli-kit'; import dns from 'node:dns/promises'; +import { color } from '@astrojs/cli-kit'; import { bannerAbort, error, info, log } from '../messages.js'; import { getTemplateTarget } from './template.js'; diff --git a/packages/create-astro/src/messages.ts b/packages/create-astro/src/messages.ts index 29c551883..335a30d66 100644 --- a/packages/create-astro/src/messages.ts +++ b/packages/create-astro/src/messages.ts @@ -1,7 +1,7 @@ -/* eslint no-console: 'off' */ -import { color, say as houston, label, spinner as load } from '@astrojs/cli-kit'; -import { align, sleep } from '@astrojs/cli-kit/utils'; import { exec } from 'node:child_process'; +/* eslint no-console: 'off' */ +import { color, label, say as houston, spinner as load } from '@astrojs/cli-kit'; +import { align, sleep } from '@astrojs/cli-kit/utils'; import stripAnsi from 'strip-ansi'; import { shell } from './shell.js'; diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index b64d986af..a1e85c17a 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -1,16 +1,16 @@ import type { IncomingRequestCfProperties } from '@cloudflare/workers-types/experimental'; import type { AstroAdapter, AstroConfig, AstroIntegration, RouteData } from 'astro'; +import * as fs from 'node:fs'; +import * as os from 'node:os'; +import { sep } from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects'; import { CacheStorage } from '@miniflare/cache'; import { NoOpLog } from '@miniflare/shared'; import { MemoryStorage } from '@miniflare/storage-memory'; import { AstroError } from 'astro/errors'; import esbuild from 'esbuild'; -import * as fs from 'node:fs'; -import * as os from 'node:os'; -import { sep } from 'node:path'; -import { fileURLToPath, pathToFileURL } from 'node:url'; import glob from 'tiny-glob'; import { getEnvVars } from './parser.js'; diff --git a/packages/integrations/cloudflare/src/parser.ts b/packages/integrations/cloudflare/src/parser.ts index e9a9cdd00..d5b91295c 100644 --- a/packages/integrations/cloudflare/src/parser.ts +++ b/packages/integrations/cloudflare/src/parser.ts @@ -7,11 +7,11 @@ * TODO: Tackle this file, once their is an decision on the upstream request */ +import * as fs from 'node:fs'; +import { dirname, resolve } from 'node:path'; import TOML from '@iarna/toml'; import dotenv from 'dotenv'; import { findUpSync } from 'find-up'; -import * as fs from 'node:fs'; -import { dirname, resolve } from 'node:path'; function findWranglerToml( referencePath: string = process.cwd(), diff --git a/packages/integrations/mdx/src/index.ts b/packages/integrations/mdx/src/index.ts index fd330625e..ddef19b84 100644 --- a/packages/integrations/mdx/src/index.ts +++ b/packages/integrations/mdx/src/index.ts @@ -1,10 +1,10 @@ +import fs from 'node:fs/promises'; +import { fileURLToPath } from 'node:url'; import { markdownConfigDefaults, setVfileFrontmatter } from '@astrojs/markdown-remark'; import type { PluggableList } from '@mdx-js/mdx/lib/core.js'; import type { AstroIntegration, ContentEntryType, HookParameters, SSRError } from 'astro'; import astroJSXRenderer from 'astro/jsx/renderer.js'; import { parse as parseESM } from 'es-module-lexer'; -import fs from 'node:fs/promises'; -import { fileURLToPath } from 'node:url'; import type { Options as RemarkRehypeOptions } from 'remark-rehype'; import { VFile } from 'vfile'; import type { Plugin as VitePlugin } from 'vite'; diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts index 32b8020dc..0523d3891 100644 --- a/packages/integrations/node/src/nodeMiddleware.ts +++ b/packages/integrations/node/src/nodeMiddleware.ts @@ -1,6 +1,6 @@ -import type { NodeApp } from 'astro/app/node'; import type { ServerResponse } from 'node:http'; import type { Readable } from 'stream'; +import type { NodeApp } from 'astro/app/node'; import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders.js'; import { responseIterator } from './response-iterator.js'; import type { ErrorHandlerParams, Options, RequestHandlerParams } from './types.js'; diff --git a/packages/integrations/preact/src/index.ts b/packages/integrations/preact/src/index.ts index 85f9bed0f..a2264a990 100644 --- a/packages/integrations/preact/src/index.ts +++ b/packages/integrations/preact/src/index.ts @@ -1,6 +1,6 @@ -import { preact, type PreactPluginOptions as VitePreactPluginOptions } from '@preact/preset-vite'; -import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro'; import { fileURLToPath } from 'node:url'; +import { type PreactPluginOptions as VitePreactPluginOptions, preact } from '@preact/preset-vite'; +import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro'; const babelCwd = new URL('../', import.meta.url); diff --git a/packages/integrations/preact/src/server.ts b/packages/integrations/preact/src/server.ts index a395433c9..5cc2e75dc 100644 --- a/packages/integrations/preact/src/server.ts +++ b/packages/integrations/preact/src/server.ts @@ -1,5 +1,5 @@ import type { AstroComponentMetadata } from 'astro'; -import { Component as BaseComponent, h, type VNode } from 'preact'; +import { Component as BaseComponent, type VNode, h } from 'preact'; import { render } from 'preact-render-to-string'; import { getContext } from './context.js'; import { restoreSignalsOnProps, serializeSignals } from './signals.js'; diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts index 88887fd3a..1323f3a4a 100644 --- a/packages/integrations/vercel/src/serverless/adapter.ts +++ b/packages/integrations/vercel/src/serverless/adapter.ts @@ -1,3 +1,5 @@ +import { basename } from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; import type { AstroAdapter, AstroConfig, @@ -7,24 +9,22 @@ import type { } from 'astro'; import { AstroError } from 'astro/errors'; import glob from 'fast-glob'; -import { basename } from 'node:path'; -import { fileURLToPath, pathToFileURL } from 'node:url'; import { - getAstroImageConfig, - getDefaultImageConfig, type DevImageService, type VercelImageConfig, + getAstroImageConfig, + getDefaultImageConfig, } from '../image/shared.js'; import { getVercelOutput, removeDir, writeJson } from '../lib/fs.js'; import { copyDependenciesToFunction } from '../lib/nft.js'; import { getRedirects } from '../lib/redirects.js'; import { - getSpeedInsightsViteConfig, type VercelSpeedInsightsConfig, + getSpeedInsightsViteConfig, } from '../lib/speed-insights.js'; import { - getInjectableWebAnalyticsContent, type VercelWebAnalyticsConfig, + getInjectableWebAnalyticsContent, } from '../lib/web-analytics.js'; import { generateEdgeMiddleware } from './middleware.js'; @@ -250,9 +250,7 @@ You can set functionPerRoute: false to prevent surpassing the limit.` const getRouteFuncName = (route: RouteData) => route.component.replace('src/pages/', ''); const getFallbackFuncName = (entryFile: URL) => - basename(entryFile.toString()) - .replace('entry.', '') - .replace(/\.mjs$/, ''); + basename(entryFile.toString()).replace('entry.', '').replace(/\.mjs$/, ''); for (const [route, entryFile] of _entryPoints) { const func = route.component.startsWith('src/pages/') diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts index df2995c37..a6ddcde0f 100644 --- a/packages/integrations/vercel/src/static/adapter.ts +++ b/packages/integrations/vercel/src/static/adapter.ts @@ -1,21 +1,21 @@ import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro'; import { - getAstroImageConfig, - getDefaultImageConfig, type DevImageService, type VercelImageConfig, + getAstroImageConfig, + getDefaultImageConfig, } from '../image/shared.js'; import { emptyDir, getVercelOutput, writeJson } from '../lib/fs.js'; import { isServerLikeOutput } from '../lib/prerender.js'; import { getRedirects } from '../lib/redirects.js'; import { - getSpeedInsightsViteConfig, type VercelSpeedInsightsConfig, + getSpeedInsightsViteConfig, } from '../lib/speed-insights.js'; import { - getInjectableWebAnalyticsContent, type VercelWebAnalyticsConfig, + getInjectableWebAnalyticsContent, } from '../lib/web-analytics.js'; const PACKAGE_NAME = '@astrojs/vercel/static'; diff --git a/packages/integrations/vercel/test/speed-insights.test.js b/packages/integrations/vercel/test/speed-insights.test.js index 7cf2ae778..9fb09585c 100644 --- a/packages/integrations/vercel/test/speed-insights.test.js +++ b/packages/integrations/vercel/test/speed-insights.test.js @@ -1,5 +1,5 @@ -import { loadFixture } from './test-utils.js'; import { expect } from 'chai'; +import { loadFixture } from './test-utils.js'; describe('Vercel Speed Insights', () => { describe('output: server', () => { diff --git a/packages/integrations/vercel/test/web-analytics.test.js b/packages/integrations/vercel/test/web-analytics.test.js index b728fae4c..11173f661 100644 --- a/packages/integrations/vercel/test/web-analytics.test.js +++ b/packages/integrations/vercel/test/web-analytics.test.js @@ -1,5 +1,5 @@ -import { loadFixture } from './test-utils.js'; import { expect } from 'chai'; +import { loadFixture } from './test-utils.js'; describe('Vercel Web Analytics', () => { describe('output: static', () => { diff --git a/packages/markdown/remark/test/autolinking.test.js b/packages/markdown/remark/test/autolinking.test.js index 79d3ea767..631180c99 100644 --- a/packages/markdown/remark/test/autolinking.test.js +++ b/packages/markdown/remark/test/autolinking.test.js @@ -1,5 +1,5 @@ -import { createMarkdownProcessor } from '../dist/index.js'; import chai from 'chai'; +import { createMarkdownProcessor } from '../dist/index.js'; describe('autolinking', () => { describe('plain md', async () => { diff --git a/packages/markdown/remark/test/entities.test.js b/packages/markdown/remark/test/entities.test.js index b2dacb79f..bb138cbf1 100644 --- a/packages/markdown/remark/test/entities.test.js +++ b/packages/markdown/remark/test/entities.test.js @@ -1,5 +1,5 @@ -import { createMarkdownProcessor } from '../dist/index.js'; import { expect } from 'chai'; +import { createMarkdownProcessor } from '../dist/index.js'; describe('entities', async () => { const processor = await createMarkdownProcessor(); diff --git a/packages/markdown/remark/test/plugins.test.js b/packages/markdown/remark/test/plugins.test.js index ce2401047..f26c1b45e 100644 --- a/packages/markdown/remark/test/plugins.test.js +++ b/packages/markdown/remark/test/plugins.test.js @@ -1,5 +1,5 @@ -import { createMarkdownProcessor } from '../dist/index.js'; import chai from 'chai'; +import { createMarkdownProcessor } from '../dist/index.js'; import { fileURLToPath } from 'node:url'; diff --git a/packages/markdown/remark/test/remark-collect-images.test.js b/packages/markdown/remark/test/remark-collect-images.test.js index a55336953..609250c7e 100644 --- a/packages/markdown/remark/test/remark-collect-images.test.js +++ b/packages/markdown/remark/test/remark-collect-images.test.js @@ -1,5 +1,5 @@ -import { createMarkdownProcessor } from '../dist/index.js'; import chai from 'chai'; +import { createMarkdownProcessor } from '../dist/index.js'; describe('collect images', async () => { const processor = await createMarkdownProcessor(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e49068992..cb9911d9c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,6 +21,9 @@ importers: '@astrojs/check': specifier: ^0.1.0 version: 0.1.0(prettier-plugin-astro@0.12.0)(prettier@3.0.3)(typescript@5.1.6) + '@biomejs/biome': + specifier: 1.2.1 + version: 1.2.1 '@changesets/changelog-github': specifier: ^0.4.8 version: 0.4.8 @@ -54,9 +57,6 @@ importers: only-allow: specifier: ^1.1.1 version: 1.1.1 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.0.3 version: 3.0.3 @@ -6782,6 +6782,74 @@ packages: '@babel/helper-validator-identifier': 7.22.5 to-fast-properties: 2.0.0 + /@biomejs/biome@1.2.1: + resolution: {integrity: sha512-olT0ldjncEQx+mtVLJ1LwJikrDtMYZakJ8dIMYXEoX9t10xjKpeY4OyKBa9Os8/EUHah9YmpYL64hQooza3WrA==} + engines: {node: '>=14.*'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@biomejs/cli-darwin-arm64': 1.2.1 + '@biomejs/cli-darwin-x64': 1.2.1 + '@biomejs/cli-linux-arm64': 1.2.1 + '@biomejs/cli-linux-x64': 1.2.1 + '@biomejs/cli-win32-arm64': 1.2.1 + '@biomejs/cli-win32-x64': 1.2.1 + dev: true + + /@biomejs/cli-darwin-arm64@1.2.1: + resolution: {integrity: sha512-lz/Hn/isGnnZqILhnPiwO3Hy4mhGr1APrjXkCBolONyYG67x1OT3l8T5yaNW62GsIEeblabWkwLl/MkoPJJXZQ==} + engines: {node: '>=14.*'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@biomejs/cli-darwin-x64@1.2.1: + resolution: {integrity: sha512-mWJE2+sPiHJk0kHkuHby9ssTm2WR/R7USwJbbNmy7PM07DZdcciF2XbyLofO2ZGh0QI0LEW59OcjMwYChQnZbA==} + engines: {node: '>=14.*'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@biomejs/cli-linux-arm64@1.2.1: + resolution: {integrity: sha512-M81if0mY66Feq3nsOoNRa+o57k6YecCeH4EX2EqkU/ObqYfVLmWnIvFsgqEZE/e/bguNmqBoAIJaIV26PvyyJg==} + engines: {node: '>=14.*'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@biomejs/cli-linux-x64@1.2.1: + resolution: {integrity: sha512-gzTpmpvBmSFu6oeUeFKP8C34WpV91rha4gS+3swAuw5G+C4PosOTpAVPKnElbgl9iS0+stfP73tXARQUXySDPA==} + engines: {node: '>=14.*'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@biomejs/cli-win32-arm64@1.2.1: + resolution: {integrity: sha512-SveEeHYjiXzRZhTE3HyURQ+CyZ3yLeKHUrggH4bSDQ1+b7rgDEF/XIEgMl+/3SWFlc+HdEpgbJWWZQCfSCqxww==} + engines: {node: '>=14.*'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@biomejs/cli-win32-x64@1.2.1: + resolution: {integrity: sha512-ooEjE+A6kbQhf0cPNvC8bXje1jk2uKWgJ8S3DgHZRBvr6DlBiUsU8C1ycURdhDiHZ5d6nOI98LFrj3WWR1ODzA==} + engines: {node: '>=14.*'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@builder.io/partytown@0.8.0: resolution: {integrity: sha512-M6H7nSMwW2dHd1/MQ+9J1Jqdw22uhl1nKv90kIiL9G7gjFVqqouQp4qSS1oZclmtW1XjAa4Q5UnbHB4iytmxZA==} hasBin: true @@ -8701,15 +8769,6 @@ packages: engines: {node: '>=10.13.0'} dev: false - /@ts-morph/common@0.20.0: - resolution: {integrity: sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==} - dependencies: - fast-glob: 3.3.1 - minimatch: 7.4.6 - mkdirp: 2.1.6 - path-browserify: 1.0.1 - dev: true - /@types/acorn@4.0.6: resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==} dependencies: @@ -9044,14 +9103,6 @@ packages: '@types/node': 18.17.8 dev: true - /@types/strip-bom@3.0.0: - resolution: {integrity: sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==} - dev: true - - /@types/strip-json-comments@0.0.30: - resolution: {integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==} - dev: true - /@types/trusted-types@2.0.3: resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==} @@ -10465,10 +10516,6 @@ packages: engines: {node: '>=6'} dev: false - /code-block-writer@12.0.0: - resolution: {integrity: sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==} - dev: true - /code-red@1.0.4: resolution: {integrity: sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==} dependencies: @@ -10535,6 +10582,7 @@ packages: /commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} + dev: false /commander@4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} @@ -11079,16 +11127,6 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: false - /editorconfig@0.15.3: - resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==} - hasBin: true - dependencies: - commander: 2.20.3 - lru-cache: 4.1.5 - semver: 5.7.2 - sigmund: 1.0.1 - dev: true - /ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -14230,13 +14268,6 @@ packages: brace-expansion: 2.0.1 dev: false - /minimatch@7.4.6: - resolution: {integrity: sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==} - engines: {node: '>=10'} - dependencies: - brace-expansion: 2.0.1 - dev: true - /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -14295,12 +14326,6 @@ packages: hasBin: true dev: false - /mkdirp@2.1.6: - resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==} - engines: {node: '>=10'} - hasBin: true - dev: true - /mlly@1.4.0: resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} dependencies: @@ -14710,16 +14735,6 @@ packages: strip-ansi: 7.1.0 dev: false - /organize-imports-cli@0.10.0: - resolution: {integrity: sha512-cVyNEeiDxX/zA6gdK1QS2rr3TK1VymIkT0LagnAk4f6eE0IC0bo3BeUkMzm3q3GnCJzYC+6lfuMpBE0Cequ7Vg==} - hasBin: true - dependencies: - chalk: 4.1.2 - editorconfig: 0.15.3 - ts-morph: 19.0.0 - tsconfig: 7.0.0 - dev: true - /os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -14881,10 +14896,6 @@ packages: tslib: 2.5.3 dev: false - /path-browserify@1.0.1: - resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} - dev: true - /path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -16360,10 +16371,6 @@ packages: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} dev: false - /sigmund@1.0.1: - resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==} - dev: true - /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -16734,6 +16741,7 @@ packages: /strip-json-comments@2.0.1: resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} engines: {node: '>=0.10.0'} + requiresBuild: true /strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} @@ -17124,13 +17132,6 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /ts-morph@19.0.0: - resolution: {integrity: sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==} - dependencies: - '@ts-morph/common': 0.20.0 - code-block-writer: 12.0.0 - dev: true - /tsconfig-resolver@3.0.1: resolution: {integrity: sha512-ZHqlstlQF449v8glscGRXzL6l2dZvASPCdXJRWG4gHEZlUVx2Jtmr+a2zeVG4LCsKhDXKRj5R3h0C/98UcVAQg==} dependencies: @@ -17141,15 +17142,6 @@ packages: strip-bom: 4.0.0 type-fest: 3.0.0 - /tsconfig@7.0.0: - resolution: {integrity: sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==} - dependencies: - '@types/strip-bom': 3.0.0 - '@types/strip-json-comments': 0.0.30 - strip-bom: 3.0.0 - strip-json-comments: 2.0.1 - dev: true - /tslib@2.1.0: resolution: {integrity: sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==} dev: true diff --git a/prettier.config.js b/prettier.config.js index b28486608..4c9969429 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -9,7 +9,7 @@ export default { plugins: ['prettier-plugin-astro'], overrides: [ { - files: ['.*', '*.json', '*.md', '*.toml', '*.yml'], + files: ['.*', '*.md', '*.toml', '*.yml'], options: { useTabs: false, }, diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index f2cdd4177..678a223c9 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -1,6 +1,6 @@ { - "compilerOptions": { - "allowJs": true - }, - "extends": "./tsconfig.base.json" + "compilerOptions": { + "allowJs": true + }, + "extends": "./tsconfig.base.json" } diff --git a/turbo.json b/turbo.json index b2a69769f..d95246aef 100644 --- a/turbo.json +++ b/turbo.json @@ -1,47 +1,47 @@ { - "$schema": "https://turborepo.org/schema.json", - "pipeline": { - "build": { - "dependsOn": ["^build"], - "inputs": [ - "**/*", - "!test/**/*", - "!e2e/**/*", - "!performance/**/*", - "!.astro/**/*", - "!.cache/**/*", - "!mod.js", - "!mod.js.map" - ], - "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"], - "outputMode": "new-only" - }, - "build:ci": { - "dependsOn": ["^build:ci"], - "inputs": [ - "**/*", - "!test/**/*", - "!e2e/**/*", - "!performance/**/*", - "!.astro/**/*", - "!.cache/**/*", - "!mod.js", - "!mod.js.map" - ], - "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"], - "outputMode": "new-only" - }, - "dev": { - "cache": false, - "persistent": true - }, - "test": { - "env": ["RUNNER_OS", "NODE_VERSION"], - "outputMode": "new-only" - }, - "test:hosted": { - "outputMode": "new-only", - "cache": false - } - } + "$schema": "https://turborepo.org/schema.json", + "pipeline": { + "build": { + "dependsOn": ["^build"], + "inputs": [ + "**/*", + "!test/**/*", + "!e2e/**/*", + "!performance/**/*", + "!.astro/**/*", + "!.cache/**/*", + "!mod.js", + "!mod.js.map" + ], + "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"], + "outputMode": "new-only" + }, + "build:ci": { + "dependsOn": ["^build:ci"], + "inputs": [ + "**/*", + "!test/**/*", + "!e2e/**/*", + "!performance/**/*", + "!.astro/**/*", + "!.cache/**/*", + "!mod.js", + "!mod.js.map" + ], + "outputs": ["dist/**/*", "!vendor/**", "mod.js", "mod.js.map"], + "outputMode": "new-only" + }, + "dev": { + "cache": false, + "persistent": true + }, + "test": { + "env": ["RUNNER_OS", "NODE_VERSION"], + "outputMode": "new-only" + }, + "test:hosted": { + "outputMode": "new-only", + "cache": false + } + } }