From 033a2c7d9052e6917edb8350276557cf3ad9f2d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 15 Sep 2022 13:53:33 +0000 Subject: [PATCH] [ci] release --- .changeset/swift-trees-double.md | 5 -- .changeset/tricky-cats-drop.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 4 +- examples/docs/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/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/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 | 4 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 6 +++ packages/astro/package.json | 2 +- packages/astro/src/core/config.ts | 10 ++-- .../src/vite-plugin-config-alias/index.ts | 1 - packages/astro/src/vite-plugin-jsx/index.ts | 4 +- packages/integrations/tailwind/CHANGELOG.md | 6 +++ packages/integrations/tailwind/package.json | 2 +- pnpm-lock.yaml | 48 +++++++++---------- 33 files changed, 69 insertions(+), 70 deletions(-) delete mode 100644 .changeset/swift-trees-double.md delete mode 100644 .changeset/tricky-cats-drop.md diff --git a/.changeset/swift-trees-double.md b/.changeset/swift-trees-double.md deleted file mode 100644 index 2b7c2d0cac15f..0000000000000 --- a/.changeset/swift-trees-double.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@astrojs/tailwind": patch ---- - -Update Tailwind manual install guide for v2 diff --git a/.changeset/tricky-cats-drop.md b/.changeset/tricky-cats-drop.md deleted file mode 100644 index 53ea749bf16ba..0000000000000 --- a/.changeset/tricky-cats-drop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Read jsxImportSource from tsconfig diff --git a/examples/basics/package.json b/examples/basics/package.json index e9000c7e56587..d982b240ccfcd 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4" + "astro": "^1.2.5" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index f44a4f62e22b1..a05eb1ea42fa2 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "@astrojs/mdx": "^0.11.1", "@astrojs/rss": "^1.0.1", "@astrojs/sitemap": "^1.0.0" diff --git a/examples/component/package.json b/examples/component/package.json index 32e44f004b3a2..8cf5cc7c0e816 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,9 +15,9 @@ ], "scripts": {}, "devDependencies": { - "astro": "^1.2.4" + "astro": "^1.2.5" }, "peerDependencies": { - "astro": "^1.2.4" + "astro": "^1.2.5" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index b5cb16933bcc3..418dd9a015793 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -12,7 +12,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "preact": "^10.7.3", "react": "^18.1.0", "react-dom": "^18.1.0", diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 96de85770383d..42316b145bfa7 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "alpinejs": "^3.10.2", "@astrojs/alpinejs": "^0.1.2", "@types/alpinejs": "^3.7.0" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 1f133c8c2e841..513b1b3975321 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "lit": "^2.2.5", "@astrojs/lit": "^1.0.0", "@webcomponents/template-shadowroot": "^0.1.0" diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 52e47ac2ecf27..288cf377ceef4 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "preact": "^10.7.3", "react": "^18.1.0", "react-dom": "^18.1.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 7bcadf3a36765..af6dbfceadabb 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "preact": "^10.7.3", "@astrojs/preact": "^1.1.0" } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 528ae383fa272..31bbd5e8a1946 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "react": "^18.1.0", "react-dom": "^18.1.0", "@astrojs/react": "^1.1.3", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 396264d9df3ad..62281cd43b7a4 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "solid-js": "^1.4.3", "@astrojs/solid-js": "^1.1.0" } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 14cbd42f07807..95401a4bfb8e1 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -13,6 +13,6 @@ "dependencies": { "svelte": "^3.48.0", "@astrojs/svelte": "^1.0.0", - "astro": "^1.2.4" + "astro": "^1.2.5" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 406ce3121b3df..15bb4f822b759 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "vue": "^3.2.37", "@astrojs/vue": "^1.0.2" } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 9c884617a1d93..68441c29c7e6f 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4" + "astro": "^1.2.5" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 88b057ebd5f05..fab94d73158fb 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4" + "astro": "^1.2.5" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 14498cf02f1f0..f013318d3ddab 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4" + "astro": "^1.2.5" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 62c8467a7675d..b58e134922e51 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ }, "devDependencies": {}, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "svelte": "^3.48.0", "@astrojs/svelte": "^1.0.0", "@astrojs/node": "^1.0.1", diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 1031905a5a1fc..426a21c96637d 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "@astrojs/markdown-remark": "^1.1.0", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 7e1d01e7e67f3..a788e7dcb11dc 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4" + "astro": "^1.2.5" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index d79ce183ad637..9704e03767b7c 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "preact": "^10.6.5", "@astrojs/preact": "^1.1.0", "@astrojs/mdx": "^0.11.1" diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 2b1d2f8bbeb4e..7ed02ccdaa20c 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "preact": "^10.7.3", "@astrojs/preact": "^1.1.0", "nanostores": "^0.5.12", diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index e651b28f4abf5..32744222deb6e 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", - "@astrojs/tailwind": "^2.0.0", + "astro": "^1.2.5", + "@astrojs/tailwind": "^2.0.1", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index a0ae0fe3489f0..30df3ccc9d7fb 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index c8f1e7a2aa37e..e3785f386e1b4 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^1.2.4", + "astro": "^1.2.5", "vitest": "^0.20.3" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 8294bbcf256b6..51cf62c0d049c 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 1.2.5 + +### Patch Changes + +- [#4759](https://github.com/withastro/astro/pull/4759) [`fc885eaea`](https://github.com/withastro/astro/commit/fc885eaea1f08429599c0ab4697ab6382f3d7fa4) Thanks [@matthewp](https://github.com/matthewp)! - Read jsxImportSource from tsconfig + ## 1.2.4 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 7d2299012105c..696bbecd636a9 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.2.4", + "version": "1.2.5", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/astro/src/core/config.ts b/packages/astro/src/core/config.ts index 3aa820835a6cc..58650613ead6c 100644 --- a/packages/astro/src/core/config.ts +++ b/packages/astro/src/core/config.ts @@ -554,16 +554,14 @@ async function tryLoadConfig( } } -function loadTSConfig( - cwd: string | undefined -): tsr.TsConfigResult | undefined { - for(const searchName of ['tsconfig.json', 'jsconfig.json']) { +function loadTSConfig(cwd: string | undefined): tsr.TsConfigResult | undefined { + for (const searchName of ['tsconfig.json', 'jsconfig.json']) { const config = tsr.tsconfigResolverSync({ cwd, searchName }); - if(config.exists) { + if (config.exists) { return config; } } - return undefined + return undefined; } /** diff --git a/packages/astro/src/vite-plugin-config-alias/index.ts b/packages/astro/src/vite-plugin-config-alias/index.ts index 62f5abd989b1f..4a9923edaa530 100644 --- a/packages/astro/src/vite-plugin-config-alias/index.ts +++ b/packages/astro/src/vite-plugin-config-alias/index.ts @@ -12,7 +12,6 @@ export declare interface Alias { /** Returns a path with its slashes replaced with posix slashes. */ const normalize = (pathname: string) => String(pathname).split(path.sep).join(path.posix.sep); - /** Returns a list of compiled aliases. */ const getConfigAlias = (astroConfig: AstroConfig): Alias[] | null => { /** Closest tsconfig.json or jsconfig.json */ diff --git a/packages/astro/src/vite-plugin-jsx/index.ts b/packages/astro/src/vite-plugin-jsx/index.ts index 9f42b0fa90800..de9eb3d947495 100644 --- a/packages/astro/src/vite-plugin-jsx/index.ts +++ b/packages/astro/src/vite-plugin-jsx/index.ts @@ -16,7 +16,7 @@ import tagExportsPlugin from './tag.js'; type FixedCompilerOptions = TsConfigJson.CompilerOptions & { jsxImportSource?: string; -} +}; const JSX_EXTENSIONS = new Set(['.jsx', '.tsx', '.mdx']); const IMPORT_STATEMENTS: Record = { @@ -229,7 +229,7 @@ export default function jsx({ config, logging }: AstroPluginJSXOptions): Plugin } // Check the tsconfig - if(!importSource) { + if (!importSource) { const compilerOptions = config._ctx.tsConfig?.compilerOptions; importSource = (compilerOptions as FixedCompilerOptions | undefined)?.jsxImportSource; } diff --git a/packages/integrations/tailwind/CHANGELOG.md b/packages/integrations/tailwind/CHANGELOG.md index c1b453a3be9d5..03136dfcc03c7 100644 --- a/packages/integrations/tailwind/CHANGELOG.md +++ b/packages/integrations/tailwind/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/tailwind +## 2.0.1 + +### Patch Changes + +- [#4758](https://github.com/withastro/astro/pull/4758) [`0398efa39`](https://github.com/withastro/astro/commit/0398efa39f14f40e77dc8e87f08e9f100a0fef34) Thanks [@delucis](https://github.com/delucis)! - Update Tailwind manual install guide for v2 + ## 2.0.0 ### Migration to v2 diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index d6851e0415aad..7ed14a1e3399b 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/tailwind", "description": "Tailwind + Astro Integrations", - "version": "2.0.0", + "version": "2.0.1", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f011242cbff09..2dbb75633ce42 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,7 +56,7 @@ importers: examples/basics: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 dependencies: astro: link:../../packages/astro @@ -65,7 +65,7 @@ importers: '@astrojs/mdx': ^0.11.1 '@astrojs/rss': ^1.0.1 '@astrojs/sitemap': ^1.0.0 - astro: ^1.2.4 + astro: ^1.2.5 dependencies: '@astrojs/mdx': link:../../packages/integrations/mdx '@astrojs/rss': link:../../packages/astro-rss @@ -74,7 +74,7 @@ importers: examples/component: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 devDependencies: astro: link:../../packages/astro @@ -88,7 +88,7 @@ importers: '@types/node': ^18.0.0 '@types/react': ^17.0.45 '@types/react-dom': ^18.0.0 - astro: ^1.2.4 + astro: ^1.2.5 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -111,7 +111,7 @@ importers: '@astrojs/alpinejs': ^0.1.2 '@types/alpinejs': ^3.7.0 alpinejs: ^3.10.2 - astro: ^1.2.4 + astro: ^1.2.5 dependencies: '@astrojs/alpinejs': link:../../packages/integrations/alpinejs '@types/alpinejs': 3.7.0 @@ -122,7 +122,7 @@ importers: specifiers: '@astrojs/lit': ^1.0.0 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.2.4 + astro: ^1.2.5 lit: ^2.2.5 dependencies: '@astrojs/lit': link:../../packages/integrations/lit @@ -137,7 +137,7 @@ importers: '@astrojs/solid-js': ^1.1.0 '@astrojs/svelte': ^1.0.0 '@astrojs/vue': ^1.0.2 - astro: ^1.2.4 + astro: ^1.2.5 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -161,7 +161,7 @@ importers: examples/framework-preact: specifiers: '@astrojs/preact': ^1.1.0 - astro: ^1.2.4 + astro: ^1.2.5 preact: ^10.7.3 dependencies: '@astrojs/preact': link:../../packages/integrations/preact @@ -173,7 +173,7 @@ importers: '@astrojs/react': ^1.1.3 '@types/react': ^18.0.10 '@types/react-dom': ^18.0.5 - astro: ^1.2.4 + astro: ^1.2.5 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -187,7 +187,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^1.1.0 - astro: ^1.2.4 + astro: ^1.2.5 solid-js: ^1.4.3 dependencies: '@astrojs/solid-js': link:../../packages/integrations/solid @@ -197,7 +197,7 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^1.0.0 - astro: ^1.2.4 + astro: ^1.2.5 svelte: ^3.48.0 dependencies: '@astrojs/svelte': link:../../packages/integrations/svelte @@ -207,7 +207,7 @@ importers: examples/framework-vue: specifiers: '@astrojs/vue': ^1.0.2 - astro: ^1.2.4 + astro: ^1.2.5 vue: ^3.2.37 dependencies: '@astrojs/vue': link:../../packages/integrations/vue @@ -216,19 +216,19 @@ importers: examples/minimal: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 dependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 dependencies: astro: link:../../packages/astro examples/portfolio: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 dependencies: astro: link:../../packages/astro @@ -236,7 +236,7 @@ importers: specifiers: '@astrojs/node': ^1.0.1 '@astrojs/svelte': ^1.0.0 - astro: ^1.2.4 + astro: ^1.2.5 concurrently: ^7.2.1 lightcookie: ^1.0.25 svelte: ^3.48.0 @@ -255,7 +255,7 @@ importers: examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^1.1.0 - astro: ^1.2.4 + astro: ^1.2.5 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -272,7 +272,7 @@ importers: examples/with-markdown-shiki: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 dependencies: astro: link:../../packages/astro @@ -280,7 +280,7 @@ importers: specifiers: '@astrojs/mdx': ^0.11.1 '@astrojs/preact': ^1.1.0 - astro: ^1.2.4 + astro: ^1.2.5 preact: ^10.6.5 dependencies: '@astrojs/mdx': link:../../packages/integrations/mdx @@ -292,7 +292,7 @@ importers: specifiers: '@astrojs/preact': ^1.1.0 '@nanostores/preact': ^0.1.3 - astro: ^1.2.4 + astro: ^1.2.5 nanostores: ^0.5.12 preact: ^10.7.3 dependencies: @@ -304,8 +304,8 @@ importers: examples/with-tailwindcss: specifiers: - '@astrojs/tailwind': ^2.0.0 - astro: ^1.2.4 + '@astrojs/tailwind': ^2.0.1 + astro: ^1.2.5 autoprefixer: ^10.4.7 canvas-confetti: ^1.5.1 postcss: ^8.4.14 @@ -320,7 +320,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 dependencies: @@ -330,7 +330,7 @@ importers: examples/with-vitest: specifiers: - astro: ^1.2.4 + astro: ^1.2.5 vitest: ^0.20.3 dependencies: astro: link:../../packages/astro