From d74b9ed7b68fd284305555906deca0b68ae62e4a Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Thu, 25 Apr 2024 10:14:05 +0100 Subject: [PATCH 1/3] chore: remove eslint plugins (#10874) --- eslint.config.js | 3 --- package.json | 2 -- pnpm-lock.yaml | 60 ------------------------------------------------ 3 files changed, 65 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 33177f3c37..47e2b501c6 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -6,7 +6,6 @@ import { FlatCompat } from '@eslint/eslintrc'; import tseslint from 'typescript-eslint'; // plugins -import prettierEslint from 'eslint-plugin-prettier'; import noOnlyTestsEslint from 'eslint-plugin-no-only-tests'; import regexpEslint from 'eslint-plugin-regexp'; const typescriptEslint = tseslint.plugin; @@ -45,7 +44,6 @@ export default [ ...tseslint.configs.recommendedTypeChecked, ...tseslint.configs.stylisticTypeChecked, // mimic ESLintRC-style extends - ...compat.extends('prettier'), ...compat.extends('plugin:regexp/recommended'), { languageOptions: { @@ -57,7 +55,6 @@ export default [ }, plugins: { '@typescript-eslint': typescriptEslint, - prettier: prettierEslint, 'no-only-tests': noOnlyTestsEslint, regexp: regexpEslint, }, diff --git a/package.json b/package.json index 9443b3e623..ac822b907f 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,7 @@ "@types/node": "^18.17.8", "esbuild": "^0.20.2", "eslint": "^9.1.0", - "eslint-config-prettier": "^9.1.0", "eslint-plugin-no-only-tests": "^3.1.0", - "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-regexp": "^2.5.0", "globby": "^14.0.1", "only-allow": "^1.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15d849e62e..285fe848db 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,15 +42,9 @@ importers: eslint: specifier: ^9.1.0 version: 9.1.0 - eslint-config-prettier: - specifier: ^9.1.0 - version: 9.1.0(eslint@9.1.0) eslint-plugin-no-only-tests: specifier: ^3.1.0 version: 3.1.0 - eslint-plugin-prettier: - specifier: ^5.1.3 - version: 5.1.3(eslint-config-prettier@9.1.0)(eslint@9.1.0)(prettier@3.2.5) eslint-plugin-regexp: specifier: ^2.5.0 version: 2.5.0(eslint@9.1.0) @@ -7689,11 +7683,6 @@ packages: requiresBuild: true optional: true - /@pkgr/core@0.1.1: - resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} - engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} - dev: true - /@playwright/test@1.43.1: resolution: {integrity: sha512-HgtQzFgNEEo4TE22K/X7sYTYNqEMMTZmFS8kTq6m8hXj+m1D8TgwgIbumHddJa9h4yl4GkKb8/bgAl2+g7eDgA==} engines: {node: '>=16'} @@ -10670,41 +10659,11 @@ packages: resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} engines: {node: '>=12'} - /eslint-config-prettier@9.1.0(eslint@9.1.0): - resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==} - hasBin: true - peerDependencies: - eslint: '>=7.0.0' - dependencies: - eslint: 9.1.0 - dev: true - /eslint-plugin-no-only-tests@3.1.0: resolution: {integrity: sha512-Lf4YW/bL6Un1R6A76pRZyE1dl1vr31G/ev8UzIc/geCgFWyrKil8hVjYqWVKGB/UIGmb6Slzs9T0wNezdSVegw==} engines: {node: '>=5.0.0'} dev: true - /eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0)(eslint@9.1.0)(prettier@3.2.5): - resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - '@types/eslint': '>=8.0.0' - eslint: '>=8.0.0' - eslint-config-prettier: '*' - prettier: '>=3.0.0' - peerDependenciesMeta: - '@types/eslint': - optional: true - eslint-config-prettier: - optional: true - dependencies: - eslint: 9.1.0 - eslint-config-prettier: 9.1.0(eslint@9.1.0) - prettier: 3.2.5 - prettier-linter-helpers: 1.0.0 - synckit: 0.8.8 - dev: true - /eslint-plugin-regexp@2.5.0(eslint@9.1.0): resolution: {integrity: sha512-I7vKcP0o75WS5SHiVNXN+Eshq49sbrweMQIuqSL3AId9AwDe9Dhbfug65vw64LxmOd4v+yf5l5Xt41y9puiq0g==} engines: {node: ^18 || >=20} @@ -10955,10 +10914,6 @@ packages: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true - /fast-diff@1.3.0: - resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} - dev: true - /fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} @@ -14384,13 +14339,6 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-linter-helpers@1.0.0: - resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} - engines: {node: '>=6.0.0'} - dependencies: - fast-diff: 1.3.0 - dev: true - /prettier-plugin-astro@0.13.0: resolution: {integrity: sha512-5HrJNnPmZqTUNoA97zn4gNQv9BgVhv+et03314WpQ9H9N8m2L9OSV798olwmG2YLXPl1iSstlJCR1zB3x5xG4g==} engines: {node: ^14.15.0 || >=16.0.0} @@ -15721,14 +15669,6 @@ packages: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} dev: true - /synckit@0.8.8: - resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==} - engines: {node: ^14.18.0 || >=16.0.0} - dependencies: - '@pkgr/core': 0.1.1 - tslib: 2.6.2 - dev: true - /tailwindcss@3.4.3: resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==} engines: {node: '>=14.0.0'} From 9876163406941e92fa5d10275090deec5ddb1a70 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Thu, 25 Apr 2024 02:28:32 -0700 Subject: [PATCH 2/3] [ci] release (#10865) Co-authored-by: github-actions[bot] --- .changeset/curvy-humans-judge.md | 5 -- .changeset/famous-mugs-grab.md | 5 -- .changeset/khaki-pianos-burn.md | 53 ---------------- .changeset/pink-rivers-knock.md | 7 --- .changeset/thirty-poems-chew.md | 7 --- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/starlog/package.json | 2 +- examples/toolbar-app/package.json | 2 +- examples/view-transitions/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 68 +++++++++++++++++++++ packages/astro/package.json | 2 +- pnpm-lock.yaml | 56 ++++++++--------- 36 files changed, 125 insertions(+), 134 deletions(-) delete mode 100644 .changeset/curvy-humans-judge.md delete mode 100644 .changeset/famous-mugs-grab.md delete mode 100644 .changeset/khaki-pianos-burn.md delete mode 100644 .changeset/pink-rivers-knock.md delete mode 100644 .changeset/thirty-poems-chew.md diff --git a/.changeset/curvy-humans-judge.md b/.changeset/curvy-humans-judge.md deleted file mode 100644 index a9768726ce..0000000000 --- a/.changeset/curvy-humans-judge.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Fixes an issue where `astro build` writes type declaration files to `outDir` when it's outside of root directory. diff --git a/.changeset/famous-mugs-grab.md b/.changeset/famous-mugs-grab.md deleted file mode 100644 index 02d97d16fd..0000000000 --- a/.changeset/famous-mugs-grab.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Update sharp to 0.33 to fix issue with Alpine Linux diff --git a/.changeset/khaki-pianos-burn.md b/.changeset/khaki-pianos-burn.md deleted file mode 100644 index d5a6aa85f3..0000000000 --- a/.changeset/khaki-pianos-burn.md +++ /dev/null @@ -1,53 +0,0 @@ ---- -"astro": minor ---- - -Adds new utilities to ease the creation of toolbar apps including `defineToolbarApp` to make it easier to define your toolbar app and `app` and `server` helpers for easier communication between the toolbar and the server. These new utilities abstract away some of the boilerplate code that is common in toolbar apps, and lower the barrier of entry for app authors. - -For example, instead of creating an event listener for the `app-toggled` event and manually typing the value in the callback, you can now use the `onAppToggled` method. Additionally, communicating with the server does not require knowing any of the Vite APIs anymore, as a new `server` object is passed to the `init` function that contains easy to use methods for communicating with the server. - -```diff -import { defineToolbarApp } from "astro/toolbar"; - -export default defineToolbarApp({ - init(canvas, app, server) { - -- app.addEventListener("app-toggled", (e) => { -- console.log(`App is now ${state ? "enabled" : "disabled"}`);. -- }); - -+ app.onToggled(({ state }) => { -+ console.log(`App is now ${state ? "enabled" : "disabled"}`); -+ }); - -- if (import.meta.hot) { -- import.meta.hot.send("my-app:my-client-event", { message: "world" }); -- } - -+ server.send("my-app:my-client-event", { message: "world" }) - -- if (import.meta.hot) { -- import.meta.hot.on("my-server-event", (data: {message: string}) => { -- console.log(data.message); -- }); -- } - -+ server.on<{ message: string }>("my-server-event", (data) => { -+ console.log(data.message); // data is typed using the type parameter -+ }); - }, -}) -``` - -Server helpers are also available on the server side, for use in your integrations, through the new `toolbar` object: - -```ts -"astro:server:setup": ({ toolbar }) => { - toolbar.on<{ message: string }>("my-app:my-client-event", (data) => { - console.log(data.message); - toolbar.send("my-server-event", { message: "hello" }); - }); -} -``` - -This is a backwards compatible change and your your existing dev toolbar apps will continue to function. However, we encourage you to build your apps with the new helpers, following the [updated Dev Toolbar API documentation](https://docs.astro.build/en/reference/dev-toolbar-app-reference/). diff --git a/.changeset/pink-rivers-knock.md b/.changeset/pink-rivers-knock.md deleted file mode 100644 index 7d2651447d..0000000000 --- a/.changeset/pink-rivers-knock.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"astro": minor ---- - -Astro will now automatically check for updates when you run the dev server. If a new version is available, a message will appear in the terminal with instructions on how to update. Updates will be checked once per 10 days, and the message will only appear if the project is multiple versions behind the latest release. - -This behavior can be disabled by running `astro preferences disable checkUpdates` or setting the `ASTRO_DISABLE_UPDATE_CHECK` environment variable to `false`. diff --git a/.changeset/thirty-poems-chew.md b/.changeset/thirty-poems-chew.md deleted file mode 100644 index 1072fc92d3..0000000000 --- a/.changeset/thirty-poems-chew.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"astro": minor ---- - -Enables type checking for JavaScript files when using the `strictest` TS config. This ensures consistency with Astro's other TS configs, and fixes type checking for integrations like Astro DB when using an `astro.config.mjs`. - -If you are currently using the `strictest` preset and would like to still disable `.js` files, set `allowJS: false` in your `tsconfig.json`. diff --git a/examples/basics/package.json b/examples/basics/package.json index 6939c16fdd..432fb69c4a 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 4e092776e5..2b291959f2 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^2.3.1", "@astrojs/rss": "^4.0.5", "@astrojs/sitemap": "^3.1.4", - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/component/package.json b/examples/component/package.json index e8dfba6f36..b48d3284f9 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.6.4" + "astro": "^4.7.0" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index a5c4aff455..079c9b37e4 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.4.0", "@types/alpinejs": "^3.13.5", "alpinejs": "^3.13.3", - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 987cbb8c8e..b545d307c1 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^4.0.1", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^4.6.4", + "astro": "^4.7.0", "lit": "^3.1.2" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 80113b6df4..96ebae4a39 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -18,7 +18,7 @@ "@astrojs/vue": "^4.1.0", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "astro": "^4.6.4", + "astro": "^4.7.0", "preact": "^10.19.2", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index b19748ff25..6f2b14f306 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.2.0", "@preact/signals": "^1.2.1", - "astro": "^4.6.4", + "astro": "^4.7.0", "preact": "^10.19.2" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index a291d12229..6f75d04903 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.3.1", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", - "astro": "^4.6.4", + "astro": "^4.7.0", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 6b6a13de57..7937d208ae 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^4.1.0", - "astro": "^4.6.4", + "astro": "^4.7.0", "solid-js": "^1.8.5" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 3eaaf67fb6..9889bd7d23 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^5.4.0", - "astro": "^4.6.4", + "astro": "^4.7.0", "svelte": "^4.2.5" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 5ff7026d1e..000cd53203 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^4.1.0", - "astro": "^4.6.4", + "astro": "^4.7.0", "vue": "^3.3.8" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 0abad55532..44c2cd938a 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^8.2.5", - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 295947d1ec..5ffce1c86a 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^4.6.4" + "astro": "^4.7.0" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 7c872f2b2d..fae6a84565 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^8.2.5", - "astro": "^4.6.4", + "astro": "^4.7.0", "html-minifier": "^4.0.0" }, "devDependencies": { diff --git a/examples/minimal/package.json b/examples/minimal/package.json index b350ff3efe..cb282c938f 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 34a84ff565..5c609d8dd7 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index e2facb8153..9fe9d5f11c 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index eb5e2ab4bc..37302f7c84 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^8.2.5", "@astrojs/svelte": "^5.4.0", - "astro": "^4.6.4", + "astro": "^4.7.0", "svelte": "^4.2.5" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index 2b7c282bd0..baba24ec94 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.4", + "astro": "^4.7.0", "sass": "^1.69.5", "sharp": "^0.33.3" } diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index acece4d501..ada6648fe5 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -15,6 +15,6 @@ "./app": "./dist/app.js" }, "devDependencies": { - "astro": "^4.6.1" + "astro": "^4.7.0" } } diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json index 116bcad529..1485fbf529 100644 --- a/examples/view-transitions/package.json +++ b/examples/view-transitions/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@astrojs/tailwind": "^5.1.0", "@astrojs/node": "^8.2.5", - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 1ac4e0761f..c592e4cd86 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.11.0", - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 34a17734dc..33827e16c9 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^5.1.0", - "astro": "^4.6.4", + "astro": "^4.7.0", "hast-util-select": "^6.0.2", "rehype-autolink-headings": "^7.1.0", "rehype-slug": "^6.0.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 257d3b09fa..bda2955f5b 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.6.4" + "astro": "^4.7.0" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 5725e958bd..3f6938c86d 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^2.3.1", "@astrojs/preact": "^3.2.0", - "astro": "^4.6.4", + "astro": "^4.7.0", "preact": "^10.19.2" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 328eb99711..fd2ca0add3 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.2.0", "@nanostores/preact": "^0.5.0", - "astro": "^4.6.4", + "astro": "^4.7.0", "nanostores": "^0.9.5", "preact": "^10.19.2" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index ba725f89c6..171e7d54dd 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^2.3.1", "@astrojs/tailwind": "^5.1.0", "@types/canvas-confetti": "^1.6.3", - "astro": "^4.6.4", + "astro": "^4.7.0", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.9.1", "postcss": "^8.4.28", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index a1d0ee1b95..432db1b04c 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^4.6.4", + "astro": "^4.7.0", "vitest": "^1.5.0" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 5561b785ff..33e47f6d2a 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,73 @@ # astro +## 4.7.0 + +### Minor Changes + +- [#10665](https://github.com/withastro/astro/pull/10665) [`7b4f284`](https://github.com/withastro/astro/commit/7b4f2840203fe220758934f1366485f788727f0d) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Adds new utilities to ease the creation of toolbar apps including `defineToolbarApp` to make it easier to define your toolbar app and `app` and `server` helpers for easier communication between the toolbar and the server. These new utilities abstract away some of the boilerplate code that is common in toolbar apps, and lower the barrier of entry for app authors. + + For example, instead of creating an event listener for the `app-toggled` event and manually typing the value in the callback, you can now use the `onAppToggled` method. Additionally, communicating with the server does not require knowing any of the Vite APIs anymore, as a new `server` object is passed to the `init` function that contains easy to use methods for communicating with the server. + + ```diff + import { defineToolbarApp } from "astro/toolbar"; + + export default defineToolbarApp({ + init(canvas, app, server) { + + - app.addEventListener("app-toggled", (e) => { + - console.log(`App is now ${state ? "enabled" : "disabled"}`);. + - }); + + + app.onToggled(({ state }) => { + + console.log(`App is now ${state ? "enabled" : "disabled"}`); + + }); + + - if (import.meta.hot) { + - import.meta.hot.send("my-app:my-client-event", { message: "world" }); + - } + + + server.send("my-app:my-client-event", { message: "world" }) + + - if (import.meta.hot) { + - import.meta.hot.on("my-server-event", (data: {message: string}) => { + - console.log(data.message); + - }); + - } + + + server.on<{ message: string }>("my-server-event", (data) => { + + console.log(data.message); // data is typed using the type parameter + + }); + }, + }) + ``` + + Server helpers are also available on the server side, for use in your integrations, through the new `toolbar` object: + + ```ts + "astro:server:setup": ({ toolbar }) => { + toolbar.on<{ message: string }>("my-app:my-client-event", (data) => { + console.log(data.message); + toolbar.send("my-server-event", { message: "hello" }); + }); + } + ``` + + This is a backwards compatible change and your your existing dev toolbar apps will continue to function. However, we encourage you to build your apps with the new helpers, following the [updated Dev Toolbar API documentation](https://docs.astro.build/en/reference/dev-toolbar-app-reference/). + +- [#10734](https://github.com/withastro/astro/pull/10734) [`6fc4c0e`](https://github.com/withastro/astro/commit/6fc4c0e420da7629b4cfc28ee7efce1d614447be) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Astro will now automatically check for updates when you run the dev server. If a new version is available, a message will appear in the terminal with instructions on how to update. Updates will be checked once per 10 days, and the message will only appear if the project is multiple versions behind the latest release. + + This behavior can be disabled by running `astro preferences disable checkUpdates` or setting the `ASTRO_DISABLE_UPDATE_CHECK` environment variable to `false`. + +- [#10762](https://github.com/withastro/astro/pull/10762) [`43ead8f`](https://github.com/withastro/astro/commit/43ead8fbd5112823118060175c7a4a22522cc325) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Enables type checking for JavaScript files when using the `strictest` TS config. This ensures consistency with Astro's other TS configs, and fixes type checking for integrations like Astro DB when using an `astro.config.mjs`. + + If you are currently using the `strictest` preset and would like to still disable `.js` files, set `allowJS: false` in your `tsconfig.json`. + +### Patch Changes + +- [#10861](https://github.com/withastro/astro/pull/10861) [`b673bc8`](https://github.com/withastro/astro/commit/b673bc850593d5af25793d0358c00797477fa373) Thanks [@mingjunlu](https://github.com/mingjunlu)! - Fixes an issue where `astro build` writes type declaration files to `outDir` when it's outside of root directory. + +- [#10684](https://github.com/withastro/astro/pull/10684) [`8b59d5d`](https://github.com/withastro/astro/commit/8b59d5d078ff40576b8cbee432279c6ad044a1a9) Thanks [@PeterDraex](https://github.com/PeterDraex)! - Update sharp to 0.33 to fix issue with Alpine Linux + ## 4.6.4 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 0c7adf23b4..47528cdc5c 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "4.6.4", + "version": "4.7.0", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 285fe848db..9a3de03afb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -128,7 +128,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/blog: @@ -143,13 +143,13 @@ importers: specifier: ^3.1.4 version: link:../../packages/integrations/sitemap astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/framework-alpine: @@ -164,7 +164,7 @@ importers: specifier: ^3.13.3 version: 3.13.8 astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/framework-lit: @@ -176,7 +176,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro lit: specifier: ^3.1.2 @@ -206,7 +206,7 @@ importers: specifier: ^18.2.15 version: 18.2.25 astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -236,7 +236,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.20.2) astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -254,7 +254,7 @@ importers: specifier: ^18.2.15 version: 18.2.25 astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -269,7 +269,7 @@ importers: specifier: ^4.1.0 version: link:../../packages/integrations/solid astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro solid-js: specifier: ^1.8.5 @@ -281,7 +281,7 @@ importers: specifier: ^5.4.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -293,7 +293,7 @@ importers: specifier: ^4.1.0 version: link:../../packages/integrations/vue astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro vue: specifier: ^3.3.8 @@ -305,13 +305,13 @@ importers: specifier: ^8.2.5 version: link:../../packages/integrations/node astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/middleware: @@ -320,7 +320,7 @@ importers: specifier: ^8.2.5 version: link:../../packages/integrations/node astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -333,19 +333,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/ssr: @@ -357,7 +357,7 @@ importers: specifier: ^5.4.0 version: link:../../packages/integrations/svelte astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro svelte: specifier: ^4.2.5 @@ -366,7 +366,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro sass: specifier: ^1.69.5 @@ -378,7 +378,7 @@ importers: examples/toolbar-app: devDependencies: astro: - specifier: ^4.6.1 + specifier: ^4.7.0 version: link:../../packages/astro examples/view-transitions: @@ -390,7 +390,7 @@ importers: specifier: ^5.1.0 version: link:../../packages/integrations/tailwind astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/with-markdoc: @@ -399,7 +399,7 @@ importers: specifier: ^0.11.0 version: link:../../packages/integrations/markdoc astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/with-markdown-plugins: @@ -408,7 +408,7 @@ importers: specifier: ^5.1.0 version: link:../../packages/markdown/remark astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro hast-util-select: specifier: ^6.0.2 @@ -429,7 +429,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro examples/with-mdx: @@ -441,7 +441,7 @@ importers: specifier: ^3.2.0 version: link:../../packages/integrations/preact astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro preact: specifier: ^10.19.2 @@ -456,7 +456,7 @@ importers: specifier: ^0.5.0 version: 0.5.1(nanostores@0.9.5)(preact@10.20.2) astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro nanostores: specifier: ^0.9.5 @@ -477,7 +477,7 @@ importers: specifier: ^1.6.3 version: 1.6.4 astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -495,7 +495,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^4.6.4 + specifier: ^4.7.0 version: link:../../packages/astro vitest: specifier: ^1.5.0 From a10ed2a4cfd3a7385c2455895303e1db11aa662b Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Thu, 25 Apr 2024 20:14:59 +0800 Subject: [PATCH 3/3] Optimize minor hot code (#10821) Co-authored-by: ematipico --- .../runtime/server/render/astro/instance.ts | 26 ++++++++++--------- .../astro/src/runtime/server/render/util.ts | 7 ++++- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/packages/astro/src/runtime/server/render/astro/instance.ts b/packages/astro/src/runtime/server/render/astro/instance.ts index 5f6b26c728..a7745c03bb 100644 --- a/packages/astro/src/runtime/server/render/astro/instance.ts +++ b/packages/astro/src/runtime/server/render/astro/instance.ts @@ -49,23 +49,25 @@ export class AstroComponentInstance { async init(result: SSRResult) { if (this.returnValue !== undefined) return this.returnValue; this.returnValue = this.factory(result, this.props, this.slotValues); + // Save the resolved value after promise is resolved for optimization + if (isPromise(this.returnValue)) { + this.returnValue + .then((resolved) => { + this.returnValue = resolved; + }) + .catch(() => { + // Ignore errors and appease unhandledrejection error + }); + } return this.returnValue; } async render(destination: RenderDestination) { - if (this.returnValue === undefined) { - await this.init(this.result); - } - - let value: Promise | AstroFactoryReturnValue | undefined = - this.returnValue; - if (isPromise(value)) { - value = await value; - } - if (isHeadAndContent(value)) { - await value.content.render(destination); + const returnValue = await this.init(this.result); + if (isHeadAndContent(returnValue)) { + await returnValue.content.render(destination); } else { - await renderChild(destination, value); + await renderChild(destination, returnValue); } } } diff --git a/packages/astro/src/runtime/server/render/util.ts b/packages/astro/src/runtime/server/render/util.ts index 39414591f5..469491de4e 100644 --- a/packages/astro/src/runtime/server/render/util.ts +++ b/packages/astro/src/runtime/server/render/util.ts @@ -12,6 +12,9 @@ const htmlEnumAttributes = /^(?:contenteditable|draggable|spellcheck|value)$/i; // Note: SVG is case-sensitive! const svgEnumAttributes = /^(?:autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i; +const AMPERSAND_REGEX = /&/g; +const DOUBLE_QUOTE_REGEX = /"/g; + const STATIC_DIRECTIVES = new Set(['set:html', 'set:text']); // converts (most) arbitrary strings to valid JS identifiers @@ -22,7 +25,9 @@ const toIdent = (k: string) => }); export const toAttributeString = (value: any, shouldEscape = true) => - shouldEscape ? String(value).replace(/&/g, '&').replace(/"/g, '"') : value; + shouldEscape + ? String(value).replace(AMPERSAND_REGEX, '&').replace(DOUBLE_QUOTE_REGEX, '"') + : value; const kebab = (k: string) => k.toLowerCase() === k ? k : k.replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);