From ea75f596e19682d9aa724592d0e32969a8df1c12 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen <30383579+Adammatthiesen@users.noreply.github.com> Date: Mon, 29 Jan 2024 02:50:26 -0800 Subject: [PATCH 01/10] Update README.md --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 92bc056f..a57e5e96 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,22 @@ In this Repo you will also find the Following: - `astro-ghostcms-theme-default`: The Default theme in integration mode. - `tsconfig`: *LOCAL* Development package for `@ts-ghost/core-api`. +## Contributing + +This is a `pnpm` workspace and requires `pnpm` to function properly + +To setup this workspace clone this repo and run the following command: + +```sh +pnpm install +``` + +Then you can run the playground: + +```sh +pnpm playground:dev +``` + ### Notices *Ghost is a trademark of [The Ghost Foundation](https://ghost.org/trademark/). This project is not directly related to or provided by The Ghost Foundation and is intended to help create a easier method to utilize their provided JavaScript tools to link a Headless GhostCMS install in to your Astro project.* -- 2.40.1 From c456b39e6090ed3001df29549f31798b78d3d795 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Mon, 29 Jan 2024 03:01:27 -0800 Subject: [PATCH 02/10] fix - dont remove .env from playground --- playground/.env | 2 ++ playground/.gitignore | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 playground/.env diff --git a/playground/.env b/playground/.env new file mode 100644 index 00000000..e1699c0e --- /dev/null +++ b/playground/.env @@ -0,0 +1,2 @@ +CONTENT_API_KEY=a33da3965a3a9fb2c6b3f63b48 +CONTENT_API_URL=https://ghostdemo.matthiesen.xyz \ No newline at end of file diff --git a/playground/.gitignore b/playground/.gitignore index 6d4c0aa0..71d83bbc 100644 --- a/playground/.gitignore +++ b/playground/.gitignore @@ -13,9 +13,6 @@ yarn-debug.log* yarn-error.log* pnpm-debug.log* -# environment variables -.env -.env.production # macOS-specific files .DS_Store -- 2.40.1 From 6aaf6dbe64e74a3ccf0209bdc443bc5d2b541cf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:39:08 +0000 Subject: [PATCH 03/10] Bump @astrojs/rss from 4.0.3 to 4.0.4 Bumps [@astrojs/rss](https://github.com/withastro/astro/tree/HEAD/packages/astro-rss) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/withastro/astro/releases) - [Changelog](https://github.com/withastro/astro/blob/main/packages/astro-rss/CHANGELOG.md) - [Commits](https://github.com/withastro/astro/commits/@astrojs/rss@4.0.4/packages/astro-rss) --- updated-dependencies: - dependency-name: "@astrojs/rss" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/astro-ghostcms/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/astro-ghostcms/package.json b/packages/astro-ghostcms/package.json index 087457f6..e90a2dca 100644 --- a/packages/astro-ghostcms/package.json +++ b/packages/astro-ghostcms/package.json @@ -83,7 +83,7 @@ }, "dependencies": { "@matthiesenxyz/astro-ghostcms-theme-default": "^0.1.3", - "@astrojs/rss": "^4.0.2", + "@astrojs/rss": "^4.0.4", "@astrojs/sitemap": "^3.0.5", "@ts-ghost/core-api": "^5.1.2", "astro-robots-txt": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85ef8931..9d30d6dc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,8 +43,8 @@ importers: packages/astro-ghostcms: dependencies: '@astrojs/rss': - specifier: ^4.0.2 - version: 4.0.3 + specifier: ^4.0.4 + version: 4.0.4 '@astrojs/sitemap': specifier: ^3.0.5 version: 3.0.5 @@ -377,8 +377,8 @@ packages: prismjs: 1.29.0 dev: false - /@astrojs/rss@4.0.3: - resolution: {integrity: sha512-l9g2oISdfHb+0NM2GkyRhbQMJzmIkviApXMOKrz64F9NoboTR/F4zaqOAKPuK4nB48hOqQAw1B+EfyftEDbeeg==} + /@astrojs/rss@4.0.4: + resolution: {integrity: sha512-VmHmRoC62j9iR0ez2Qumpn4LTQ9/4txOmGwGBmCSI+PzSFJI5M/qdao656oT9Logjh7CDwcPrCGQEEEi3HF75A==} dependencies: fast-xml-parser: 4.3.3 kleur: 4.1.5 @@ -7640,7 +7640,7 @@ packages: vitest: '>=0.16.0' dependencies: cross-fetch: 3.1.8 - vitest: 1.2.1(@types/node@18.19.10) + vitest: 1.2.1(@types/node@20.11.6) transitivePeerDependencies: - encoding dev: true -- 2.40.1 From 5e639fd2fcc9fb2b30f82d3012e78b6a7ff242d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:41:48 +0000 Subject: [PATCH 04/10] Bump astro from 4.2.4 to 4.2.6 Bumps [astro](https://github.com/withastro/astro/tree/HEAD/packages/astro) from 4.2.4 to 4.2.6. - [Release notes](https://github.com/withastro/astro/releases) - [Changelog](https://github.com/withastro/astro/blob/main/packages/astro/CHANGELOG.md) - [Commits](https://github.com/withastro/astro/commits/astro@4.2.6/packages/astro) --- updated-dependencies: - dependency-name: astro dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- demo/package.json | 2 +- playground/package.json | 2 +- pnpm-lock.yaml | 42 +++++++++++++++++++++-------------------- www/package.json | 2 +- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/demo/package.json b/demo/package.json index 41d307e7..5e992c84 100644 --- a/demo/package.json +++ b/demo/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.2.4", + "astro": "^4.2.6", "@matthiesenxyz/astro-ghostcms": "3.1.5", "@matthiesenxyz/astro-ghostcms-theme-default": "0.1.5" }, diff --git a/playground/package.json b/playground/package.json index 3c26323d..69fa4a97 100644 --- a/playground/package.json +++ b/playground/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^4.2.4", + "astro": "^4.2.6", "@matthiesenxyz/astro-ghostcms-theme-default": "*", "@matthiesenxyz/astro-ghostcms": "workspace:*" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85ef8931..dda34f4c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: 0.1.5 version: link:../packages/astro-ghostcms-theme-default astro: - specifier: ^4.2.4 - version: 4.2.4(typescript@5.3.3) + specifier: ^4.2.6 + version: 4.2.6(typescript@5.3.3) devDependencies: '@astrojs/check': specifier: ^0.4.1 @@ -213,8 +213,8 @@ importers: specifier: '*' version: link:../packages/astro-ghostcms-theme-default astro: - specifier: ^4.2.4 - version: 4.2.4(typescript@5.3.3) + specifier: ^4.2.6 + version: 4.2.6(typescript@5.3.3) devDependencies: '@astrojs/check': specifier: ^0.4.1 @@ -230,10 +230,10 @@ importers: version: 0.4.1(prettier-plugin-astro@0.13.0)(prettier@3.2.4)(typescript@5.3.3) '@astrojs/starlight': specifier: ^0.17.0 - version: 0.17.0(astro@4.2.4) + version: 0.17.0(astro@4.2.6) astro: - specifier: ^4.2.4 - version: 4.2.4(sass@1.70.0)(typescript@5.3.3) + specifier: ^4.2.6 + version: 4.2.6(sass@1.70.0)(typescript@5.3.3) astro-font: specifier: ^0.0.77 version: 0.0.77 @@ -344,7 +344,7 @@ packages: - supports-color dev: false - /@astrojs/mdx@2.0.6(astro@4.2.4): + /@astrojs/mdx@2.0.6(astro@4.2.6): resolution: {integrity: sha512-PY6FYN5TN8dsRFSzcPIt5ofJ/w+v+5GtUUyDYbznu8zmFWlL9TkTLJ9U1zaQ3s2Qh6r1cAeLdEYjW/hW+vZzlw==} engines: {node: '>=18.14.1'} peerDependencies: @@ -353,7 +353,7 @@ packages: '@astrojs/markdown-remark': 4.2.0 '@mdx-js/mdx': 3.0.0 acorn: 8.11.3 - astro: 4.2.4(sass@1.70.0)(typescript@5.3.3) + astro: 4.2.6(sass@1.70.0)(typescript@5.3.3) es-module-lexer: 1.4.1 estree-util-visit: 2.0.0 github-slugger: 2.0.0 @@ -391,18 +391,18 @@ packages: zod: 3.22.4 dev: false - /@astrojs/starlight@0.17.0(astro@4.2.4): + /@astrojs/starlight@0.17.0(astro@4.2.6): resolution: {integrity: sha512-a2s+x/5r0v7S5jERC91IuEqV+PXDUlFNVDJPrcbpjx0xaqvg4TezL1K3gWCptfHO1mUE9ikQ8vaArbNbgFVb/g==} peerDependencies: astro: ^4.0.0 dependencies: - '@astrojs/mdx': 2.0.6(astro@4.2.4) + '@astrojs/mdx': 2.0.6(astro@4.2.6) '@astrojs/sitemap': 3.0.5 '@pagefind/default-ui': 1.0.4 '@types/hast': 3.0.3 '@types/mdast': 4.0.3 - astro: 4.2.4(sass@1.70.0)(typescript@5.3.3) - astro-expressive-code: 0.32.2(astro@4.2.4) + astro: 4.2.6(sass@1.70.0)(typescript@5.3.3) + astro-expressive-code: 0.32.2(astro@4.2.6) bcp-47: 2.1.0 hast-util-select: 6.0.2 hastscript: 8.0.0 @@ -2318,12 +2318,12 @@ packages: - supports-color dev: true - /astro-expressive-code@0.32.2(astro@4.2.4): + /astro-expressive-code@0.32.2(astro@4.2.6): resolution: {integrity: sha512-uJbgSCl9F9NGjdfTmBHci5Ws0/zMUNk9dWfOl6rvYaOL6NZha+NNjnmB3Aza7GnxP+NvQt3RV8M2vpcZnaudSw==} peerDependencies: astro: ^3.3.0 || ^4.0.0-beta dependencies: - astro: 4.2.4(sass@1.70.0)(typescript@5.3.3) + astro: 4.2.6(sass@1.70.0)(typescript@5.3.3) hast-util-to-html: 8.0.4 remark-expressive-code: 0.32.2 dev: false @@ -2503,8 +2503,8 @@ packages: - typescript dev: false - /astro@4.2.4(sass@1.70.0)(typescript@5.3.3): - resolution: {integrity: sha512-z1f52lXkHf71M5HSLKrd5G1PH5/Zfq4kMp0iUT7Na5VHcPDma/NYFPFPewDxqV6UPmyxupj3xuooFaN3j8zaow==} + /astro@4.2.6(sass@1.70.0)(typescript@5.3.3): + resolution: {integrity: sha512-k5i8pEI2r45JTkoE0I4JyhOH/dZFpjUA4AONbRd9Gr1LtnGOhKHDftiYOrRLUGx91q7BzoW3DOk+h4yZM4yC3g==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true dependencies: @@ -2528,6 +2528,7 @@ packages: clsx: 2.1.0 common-ancestor-path: 1.0.1 cookie: 0.6.0 + cssesc: 3.0.0 debug: 4.3.4 deterministic-object-hash: 2.0.2 devalue: 4.3.2 @@ -2585,8 +2586,8 @@ packages: - typescript dev: false - /astro@4.2.4(typescript@5.3.3): - resolution: {integrity: sha512-z1f52lXkHf71M5HSLKrd5G1PH5/Zfq4kMp0iUT7Na5VHcPDma/NYFPFPewDxqV6UPmyxupj3xuooFaN3j8zaow==} + /astro@4.2.6(typescript@5.3.3): + resolution: {integrity: sha512-k5i8pEI2r45JTkoE0I4JyhOH/dZFpjUA4AONbRd9Gr1LtnGOhKHDftiYOrRLUGx91q7BzoW3DOk+h4yZM4yC3g==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true dependencies: @@ -2610,6 +2611,7 @@ packages: clsx: 2.1.0 common-ancestor-path: 1.0.1 cookie: 0.6.0 + cssesc: 3.0.0 debug: 4.3.4 deterministic-object-hash: 2.0.2 devalue: 4.3.2 @@ -7640,7 +7642,7 @@ packages: vitest: '>=0.16.0' dependencies: cross-fetch: 3.1.8 - vitest: 1.2.1(@types/node@18.19.10) + vitest: 1.2.1(@types/node@20.11.6) transitivePeerDependencies: - encoding dev: true diff --git a/www/package.json b/www/package.json index 96f4870c..7b10ec8f 100644 --- a/www/package.json +++ b/www/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/check": "^0.4.1", "@astrojs/starlight": "^0.17.0", - "astro": "^4.2.4", + "astro": "^4.2.6", "astro-font": "^0.0.77", "sass": "^1.69.5", "sharp": "^0.33.2", -- 2.40.1 From 2309eb6f248615d70a790809095f78788e70d03f Mon Sep 17 00:00:00 2001 From: Adam Matthiesen <30383579+Adammatthiesen@users.noreply.github.com> Date: Mon, 29 Jan 2024 03:42:24 -0800 Subject: [PATCH 05/10] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a57e5e96..35bf3f33 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ # Welcome to Astro-GhostCMS +Want to Chat? Join our [Discord](https://discord.gg/u7NZqUyeAR) + ## Quick Start ```sh -- 2.40.1 From c0571599c24635b04464801648099f61a729c0ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:21:36 +0000 Subject: [PATCH 06/10] Bump prettier from 2.8.8 to 3.2.4 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.2.4. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.2.4) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/create-astro-ghostcms/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-astro-ghostcms/package.json b/packages/create-astro-ghostcms/package.json index 917d62fb..2332951e 100644 --- a/packages/create-astro-ghostcms/package.json +++ b/packages/create-astro-ghostcms/package.json @@ -55,7 +55,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.3", - "prettier": "^2.8.4", + "prettier": "^3.2.4", "typescript": "^5.3.3", "vitest": "^1.1.0", "vite": "^5.0.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e6a0906..6526e4dd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -187,8 +187,8 @@ importers: specifier: ^3.5.3 version: 3.6.1(@typescript-eslint/parser@6.19.1)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) prettier: - specifier: ^2.8.4 - version: 2.8.8 + specifier: ^3.2.4 + version: 3.2.4 typescript: specifier: ^5.3.3 version: 5.3.3 -- 2.40.1 From 9db6384b32db1bc67c4446e990a0f4a35b0f65ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:23:21 +0000 Subject: [PATCH 07/10] Bump @types/node from 18.19.10 to 20.11.10 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.10 to 20.11.10. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/astro-ghostcms/package.json | 2 +- packages/create-astro-ghostcms/package.json | 2 +- pnpm-lock.yaml | 203 ++++---------------- 3 files changed, 40 insertions(+), 167 deletions(-) diff --git a/packages/astro-ghostcms/package.json b/packages/astro-ghostcms/package.json index e90a2dca..d1156057 100644 --- a/packages/astro-ghostcms/package.json +++ b/packages/astro-ghostcms/package.json @@ -69,7 +69,7 @@ "@ts-ghost/core-api": "*", "@ts-ghost/tsconfig": "*", "@matthiesenxyz/astro-ghostcms-theme-default": "*", - "@types/node": "^20.11.6", + "@types/node": "^20.11.10", "@typescript-eslint/eslint-plugin": "^6.19.0", "@typescript-eslint/parser": "^6.19.0", "eslint": "^8.56.0", diff --git a/packages/create-astro-ghostcms/package.json b/packages/create-astro-ghostcms/package.json index 917d62fb..680794ef 100644 --- a/packages/create-astro-ghostcms/package.json +++ b/packages/create-astro-ghostcms/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@types/fs-extra": "^11.0.1", "@types/gunzip-maybe": "^1.4.0", - "@types/node": "^18.14.1", + "@types/node": "^20.11.10", "@types/tar-fs": "^2.0.1", "@typescript-eslint/eslint-plugin": "^6.19.0", "@typescript-eslint/parser": "^6.19.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e6a0906..270fcc40 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: version: 2.27.1 vitest: specifier: ^1.1.0 - version: 1.2.1(@types/node@18.19.10) + version: 1.2.1 vitest-fetch-mock: specifier: ^0.2.2 version: 0.2.2(vitest@1.2.1) @@ -31,7 +31,7 @@ importers: version: link:../packages/astro-ghostcms-theme-default astro: specifier: ^4.2.6 - version: 4.2.6(typescript@5.3.3) + version: 4.2.6(sass@1.70.0)(typescript@5.3.3) devDependencies: '@astrojs/check': specifier: ^0.4.1 @@ -56,13 +56,13 @@ importers: version: 5.1.2 astro: specifier: ^4.2.3 - version: 4.2.4(@types/node@20.11.6)(typescript@5.3.3) + version: 4.2.4(@types/node@20.11.10)(typescript@5.3.3) astro-robots-txt: specifier: ^1.0.0 version: 1.0.0 vite: specifier: ^5.0.12 - version: 5.0.12(@types/node@20.11.6) + version: 5.0.12(@types/node@20.11.10) vite-tsconfig-paths: specifier: ^4.2.2 version: 4.3.1(typescript@5.3.3)(vite@5.0.12) @@ -80,8 +80,8 @@ importers: specifier: '*' version: link:../tsconfig '@types/node': - specifier: ^20.11.6 - version: 20.11.6 + specifier: ^20.11.10 + version: 20.11.10 '@typescript-eslint/eslint-plugin': specifier: ^6.19.0 version: 6.19.1(@typescript-eslint/parser@6.19.1)(eslint@8.56.0)(typescript@5.3.3) @@ -108,7 +108,7 @@ importers: version: 5.3.3 vitest: specifier: ^1.1.0 - version: 1.2.1(@types/node@20.11.6) + version: 1.2.1(@types/node@20.11.10) vitest-fetch-mock: specifier: ^0.2.2 version: 0.2.2(vitest@1.2.1) @@ -163,8 +163,8 @@ importers: specifier: ^1.4.0 version: 1.4.2 '@types/node': - specifier: ^18.14.1 - version: 18.19.10 + specifier: ^20.11.10 + version: 20.11.10 '@types/tar-fs': specifier: ^2.0.1 version: 2.0.4 @@ -194,13 +194,13 @@ importers: version: 5.3.3 vite: specifier: ^5.0.12 - version: 5.0.12(@types/node@18.19.10) + version: 5.0.12(@types/node@20.11.10) vite-tsconfig-paths: specifier: ^4.2.2 version: 4.3.1(typescript@5.3.3)(vite@5.0.12) vitest: specifier: ^1.1.0 - version: 1.2.1(@types/node@18.19.10) + version: 1.2.1(@types/node@20.11.10) packages/tsconfig: {} @@ -214,7 +214,7 @@ importers: version: link:../packages/astro-ghostcms-theme-default astro: specifier: ^4.2.6 - version: 4.2.6(typescript@5.3.3) + version: 4.2.6(sass@1.70.0)(typescript@5.3.3) devDependencies: '@astrojs/check': specifier: ^0.4.1 @@ -1748,13 +1748,13 @@ packages: resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 18.19.10 + '@types/node': 20.11.10 dev: true /@types/gunzip-maybe@1.4.2: resolution: {integrity: sha512-2uqXZg1jTCKE1Pjbab8qb74+f2+i9h/jz8rQ+jRR+zaNJF75zWwrpbX8/TjF4m56m3KFOg9umHdCJ074KwiVxg==} dependencies: - '@types/node': 18.19.10 + '@types/node': 20.11.10 dev: true /@types/hast@2.3.9: @@ -1780,7 +1780,7 @@ packages: /@types/jsonfile@6.1.4: resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==} dependencies: - '@types/node': 20.11.6 + '@types/node': 20.11.10 dev: true /@types/mdast@4.0.3: @@ -1815,13 +1815,8 @@ packages: resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} dev: false - /@types/node@18.19.10: - resolution: {integrity: sha512-IZD8kAM02AW1HRDTPOlz3npFava678pr8Ie9Vp8uRhBROXAv8MXT2pCnGZZAKYdromsNQLHQcfWQ6EOatVLtqA==} - dependencies: - undici-types: 5.26.5 - - /@types/node@20.11.6: - resolution: {integrity: sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==} + /@types/node@20.11.10: + resolution: {integrity: sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==} dependencies: undici-types: 5.26.5 @@ -1835,7 +1830,7 @@ packages: /@types/sax@1.2.7: resolution: {integrity: sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==} dependencies: - '@types/node': 20.11.6 + '@types/node': 20.11.10 dev: false /@types/semver@7.5.6: @@ -1845,14 +1840,14 @@ packages: /@types/tar-fs@2.0.4: resolution: {integrity: sha512-ipPec0CjTmVDWE+QKr9cTmIIoTl7dFG/yARCM5MqK8i6CNLIG1P8x4kwDsOQY1ChZOZjH0wO9nvfgBvWl4R3kA==} dependencies: - '@types/node': 18.19.10 + '@types/node': 20.11.10 '@types/tar-stream': 3.1.3 dev: true /@types/tar-stream@3.1.3: resolution: {integrity: sha512-Zbnx4wpkWBMBSu5CytMbrT5ZpMiF55qgM+EpHzR4yIDu7mv52cej8hTkOc6K+LzpkOAbxwn/m7j3iO+/l42YkQ==} dependencies: - '@types/node': 20.11.6 + '@types/node': 20.11.10 dev: true /@types/unist@2.0.10: @@ -2421,7 +2416,7 @@ packages: - typescript dev: false - /astro@4.2.4(@types/node@20.11.6)(typescript@5.3.3): + /astro@4.2.4(@types/node@20.11.10)(typescript@5.3.3): resolution: {integrity: sha512-z1f52lXkHf71M5HSLKrd5G1PH5/Zfq4kMp0iUT7Na5VHcPDma/NYFPFPewDxqV6UPmyxupj3xuooFaN3j8zaow==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true @@ -2484,7 +2479,7 @@ packages: tsconfck: 3.0.1(typescript@5.3.3) unist-util-visit: 5.0.0 vfile: 6.0.1 - vite: 5.0.12(@types/node@20.11.6) + vite: 5.0.12(@types/node@20.11.10) vitefu: 0.2.5(vite@5.0.12) which-pm: 2.1.1 yargs-parser: 21.1.1 @@ -2586,89 +2581,6 @@ packages: - typescript dev: false - /astro@4.2.6(typescript@5.3.3): - resolution: {integrity: sha512-k5i8pEI2r45JTkoE0I4JyhOH/dZFpjUA4AONbRd9Gr1LtnGOhKHDftiYOrRLUGx91q7BzoW3DOk+h4yZM4yC3g==} - engines: {node: '>=18.14.1', npm: '>=6.14.0'} - hasBin: true - dependencies: - '@astrojs/compiler': 2.5.0 - '@astrojs/internal-helpers': 0.2.1 - '@astrojs/markdown-remark': 4.2.0 - '@astrojs/telemetry': 3.0.4 - '@babel/core': 7.23.7 - '@babel/generator': 7.23.6 - '@babel/parser': 7.23.6 - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.7) - '@babel/traverse': 7.23.7 - '@babel/types': 7.23.6 - '@types/babel__core': 7.20.5 - acorn: 8.11.3 - aria-query: 5.3.0 - axobject-query: 4.0.0 - boxen: 7.1.1 - chokidar: 3.5.3 - ci-info: 4.0.0 - clsx: 2.1.0 - common-ancestor-path: 1.0.1 - cookie: 0.6.0 - cssesc: 3.0.0 - debug: 4.3.4 - deterministic-object-hash: 2.0.2 - devalue: 4.3.2 - diff: 5.1.0 - dlv: 1.1.3 - dset: 3.1.3 - es-module-lexer: 1.4.1 - esbuild: 0.19.12 - estree-walker: 3.0.3 - execa: 8.0.1 - fast-glob: 3.3.2 - flattie: 1.1.0 - github-slugger: 2.0.0 - gray-matter: 4.0.3 - html-escaper: 3.0.3 - http-cache-semantics: 4.1.1 - js-yaml: 4.1.0 - kleur: 4.1.5 - magic-string: 0.30.5 - mdast-util-to-hast: 13.0.2 - mime: 3.0.0 - ora: 7.0.1 - p-limit: 5.0.0 - p-queue: 8.0.1 - path-to-regexp: 6.2.1 - preferred-pm: 3.1.2 - probe-image-size: 7.2.3 - prompts: 2.4.2 - rehype: 13.0.1 - resolve: 1.22.8 - semver: 7.5.4 - server-destroy: 1.0.1 - shikiji: 0.9.19 - string-width: 7.1.0 - strip-ansi: 7.1.0 - tsconfck: 3.0.1(typescript@5.3.3) - unist-util-visit: 5.0.0 - vfile: 6.0.1 - vite: 5.0.12(@types/node@18.19.10) - vitefu: 0.2.5(vite@5.0.12) - which-pm: 2.1.1 - yargs-parser: 21.1.1 - zod: 3.22.4 - optionalDependencies: - sharp: 0.32.6 - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - - typescript - dev: false - /astrojs-compiler-sync@0.3.5(@astrojs/compiler@2.5.0): resolution: {integrity: sha512-y420rhIIJ2HHDkYeqKArBHSdJNIIGMztLH90KGIX3zjcJyt/cr9Z2wYA8CP5J1w6KE7xqMh0DAkhfjhNDpQb2Q==} engines: {node: ^14.18.0 || >=16.0.0} @@ -4469,7 +4381,6 @@ packages: /immutable@4.3.4: resolution: {integrity: sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==} - dev: false /import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} @@ -6514,7 +6425,6 @@ packages: chokidar: 3.5.3 immutable: 4.3.4 source-map-js: 1.0.2 - dev: false /sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} @@ -7460,7 +7370,7 @@ packages: vfile-message: 4.0.2 dev: false - /vite-node@1.2.1(@types/node@18.19.10): + /vite-node@1.2.1: resolution: {integrity: sha512-fNzHmQUSOY+y30naohBvSW7pPn/xn3Ib/uqm+5wAJQJiqQsU0NBR78XdRJb04l4bOFKjpTWld0XAfkKlrDbySg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -7469,7 +7379,7 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.0.12(@types/node@18.19.10) + vite: 5.0.12(sass@1.70.0) transitivePeerDependencies: - '@types/node' - less @@ -7481,7 +7391,7 @@ packages: - terser dev: true - /vite-node@1.2.1(@types/node@20.11.6): + /vite-node@1.2.1(@types/node@20.11.10): resolution: {integrity: sha512-fNzHmQUSOY+y30naohBvSW7pPn/xn3Ib/uqm+5wAJQJiqQsU0NBR78XdRJb04l4bOFKjpTWld0XAfkKlrDbySg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -7490,7 +7400,7 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.0.12(@types/node@20.11.6) + vite: 5.0.12(@types/node@20.11.10) transitivePeerDependencies: - '@types/node' - less @@ -7513,12 +7423,12 @@ packages: debug: 4.3.4 globrex: 0.1.2 tsconfck: 3.0.1(typescript@5.3.3) - vite: 5.0.12(@types/node@20.11.6) + vite: 5.0.12(@types/node@20.11.10) transitivePeerDependencies: - supports-color - typescript - /vite@5.0.12(@types/node@18.19.10): + /vite@5.0.12(@types/node@20.11.10): resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -7546,42 +7456,7 @@ packages: terser: optional: true dependencies: - '@types/node': 18.19.10 - esbuild: 0.19.12 - postcss: 8.4.33 - rollup: 4.9.6 - optionalDependencies: - fsevents: 2.3.3 - - /vite@5.0.12(@types/node@20.11.6): - resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.11.6 + '@types/node': 20.11.10 esbuild: 0.19.12 postcss: 8.4.33 rollup: 4.9.6 @@ -7622,7 +7497,6 @@ packages: sass: 1.70.0 optionalDependencies: fsevents: 2.3.3 - dev: false /vitefu@0.2.5(vite@5.0.12): resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==} @@ -7632,7 +7506,7 @@ packages: vite: optional: true dependencies: - vite: 5.0.12(@types/node@18.19.10) + vite: 5.0.12(sass@1.70.0) dev: false /vitest-fetch-mock@0.2.2(vitest@1.2.1): @@ -7642,12 +7516,12 @@ packages: vitest: '>=0.16.0' dependencies: cross-fetch: 3.1.8 - vitest: 1.2.1(@types/node@20.11.6) + vitest: 1.2.1(@types/node@20.11.10) transitivePeerDependencies: - encoding dev: true - /vitest@1.2.1(@types/node@18.19.10): + /vitest@1.2.1: resolution: {integrity: sha512-TRph8N8rnSDa5M2wKWJCMnztCZS9cDcgVTQ6tsTFTG/odHJ4l5yNVqvbeDJYJRZ6is3uxaEpFs8LL6QM+YFSdA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -7672,7 +7546,6 @@ packages: jsdom: optional: true dependencies: - '@types/node': 18.19.10 '@vitest/expect': 1.2.1 '@vitest/runner': 1.2.1 '@vitest/snapshot': 1.2.1 @@ -7691,8 +7564,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.0.12(@types/node@18.19.10) - vite-node: 1.2.1(@types/node@18.19.10) + vite: 5.0.12(sass@1.70.0) + vite-node: 1.2.1 why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -7704,7 +7577,7 @@ packages: - terser dev: true - /vitest@1.2.1(@types/node@20.11.6): + /vitest@1.2.1(@types/node@20.11.10): resolution: {integrity: sha512-TRph8N8rnSDa5M2wKWJCMnztCZS9cDcgVTQ6tsTFTG/odHJ4l5yNVqvbeDJYJRZ6is3uxaEpFs8LL6QM+YFSdA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -7729,7 +7602,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.6 + '@types/node': 20.11.10 '@vitest/expect': 1.2.1 '@vitest/runner': 1.2.1 '@vitest/snapshot': 1.2.1 @@ -7748,8 +7621,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.0.12(@types/node@20.11.6) - vite-node: 1.2.1(@types/node@20.11.6) + vite: 5.0.12(@types/node@20.11.10) + vite-node: 1.2.1(@types/node@20.11.10) why-is-node-running: 2.2.2 transitivePeerDependencies: - less -- 2.40.1 From c5e49c9ef9058e234c44ccf50c9f3da1bffdae5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:36:23 +0000 Subject: [PATCH 08/10] Bump execa from 7.2.0 to 8.0.1 Bumps [execa](https://github.com/sindresorhus/execa) from 7.2.0 to 8.0.1. - [Release notes](https://github.com/sindresorhus/execa/releases) - [Commits](https://github.com/sindresorhus/execa/compare/v7.2.0...v8.0.1) --- updated-dependencies: - dependency-name: execa dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/create-astro-ghostcms/package.json | 2 +- pnpm-lock.yaml | 29 ++------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/packages/create-astro-ghostcms/package.json b/packages/create-astro-ghostcms/package.json index 680794ef..fa275716 100644 --- a/packages/create-astro-ghostcms/package.json +++ b/packages/create-astro-ghostcms/package.json @@ -40,7 +40,7 @@ "@clack/prompts": "^0.7.0", "picocolors": "^1.0.0", "arg": "^5.0.2", - "execa": "^7.0.0", + "execa": "^8.0.1", "fs-extra": "^11.1.0", "read-pkg": "^5.2.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 270fcc40..cace2c95 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -144,8 +144,8 @@ importers: specifier: ^5.0.2 version: 5.0.2 execa: - specifier: ^7.0.0 - version: 7.2.0 + specifier: ^8.0.1 + version: 8.0.1 fs-extra: specifier: ^11.1.0 version: 11.2.0 @@ -3662,21 +3662,6 @@ packages: resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==} dev: false - /execa@7.2.0: - resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==} - engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 4.3.1 - is-stream: 3.0.0 - merge-stream: 2.0.0 - npm-run-path: 5.2.0 - onetime: 6.0.0 - signal-exit: 3.0.7 - strip-final-newline: 3.0.0 - dev: false - /execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} @@ -3921,11 +3906,6 @@ packages: hasown: 2.0.0 dev: true - /get-stream@6.0.1: - resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} - engines: {node: '>=10'} - dev: false - /get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} @@ -4355,11 +4335,6 @@ packages: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} dev: true - /human-signals@4.3.1: - resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} - engines: {node: '>=14.18.0'} - dev: false - /human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} -- 2.40.1 From 839ffd48a6b7e47bea20016e6abc96bd0eefccc9 Mon Sep 17 00:00:00 2001 From: Adam Matthiesen Date: Mon, 29 Jan 2024 04:41:00 -0800 Subject: [PATCH 09/10] up version for new deps --- packages/create-astro-ghostcms/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-astro-ghostcms/package.json b/packages/create-astro-ghostcms/package.json index 657294a9..d219eb07 100644 --- a/packages/create-astro-ghostcms/package.json +++ b/packages/create-astro-ghostcms/package.json @@ -1,6 +1,6 @@ { "name": "@matthiesenxyz/create-astro-ghostcms", - "version": "0.0.5", + "version": "0.0.6", "description": "Utility to quickly get started with our Integration and astro", "type": "module", "main": "./create-astro-ghostcms.mjs", -- 2.40.1 From 1bd0066bb4860d0ceb863b7e129b8f2c81a84ad5 Mon Sep 17 00:00:00 2001 From: Udit <23015406+udit-001@users.noreply.github.com> Date: Mon, 29 Jan 2024 19:42:08 +0530 Subject: [PATCH 10/10] update author details section on author page --- .../src/components/AuthorDetailCard.astro | 97 +++++++++++++++++++ .../src/routes/author/[slug].astro | 80 +-------------- 2 files changed, 100 insertions(+), 77 deletions(-) create mode 100644 packages/astro-ghostcms-theme-default/src/components/AuthorDetailCard.astro diff --git a/packages/astro-ghostcms-theme-default/src/components/AuthorDetailCard.astro b/packages/astro-ghostcms-theme-default/src/components/AuthorDetailCard.astro new file mode 100644 index 00000000..e4808957 --- /dev/null +++ b/packages/astro-ghostcms-theme-default/src/components/AuthorDetailCard.astro @@ -0,0 +1,97 @@ +--- +export type Props = { + name: string, + image?: string | null, + count: number, + bio: string | null, + location: string | null, + website: string | null, + twitter: string | null, + facebook: string | null +}; + +const { + name, image, bio, location, website, twitter, facebook, count +} = Astro.props as Props; +--- + +
+ { image ? Author Image : ( + + + + + + + + )} +
+
{name}
+
+ {bio ? bio : count > 0? count + " Posts" : "No Posts"} +
+ + {location && ( +
+ 📍 {location} +
+ )} + +
+ {website && (Website)} + {twitter && (Twitter)} + {facebook && (Facebook)} +
+
+
+ + diff --git a/packages/astro-ghostcms-theme-default/src/routes/author/[slug].astro b/packages/astro-ghostcms-theme-default/src/routes/author/[slug].astro index 9231a1f4..9eb79ee5 100644 --- a/packages/astro-ghostcms-theme-default/src/routes/author/[slug].astro +++ b/packages/astro-ghostcms-theme-default/src/routes/author/[slug].astro @@ -2,6 +2,7 @@ import type { InferGetStaticParamsType, InferGetStaticPropsType } from 'astro'; import DefaultPageLayout from "../../layouts/default.astro"; import PostPreviewList from "../../components/PostPreviewList.astro"; +import AuthorDetailCard from '../../components/AuthorDetailCard.astro'; import { getAllPosts, getAllAuthors, getSettings, twitter, facebook, invariant } from "@matthiesenxyz/astro-ghostcms/api"; export async function getStaticPaths() { @@ -39,82 +40,7 @@ const description = `All of the articles we've posted and linked so far under th settings={settings} >
-
-
-
- {author.profile_image ? ( - {author.name} - ) : ( - - - - - - - - )} -

{author.name}

-

- {author.bio - ? author.bio - : author.count?.posts || 0 > 0 - ? `${author.count?.posts} Posts` - : "No posts"} -

- -
- {author.location && ( -
📍 {author.location}
- )} - - {author.website && ( - - - {author.website} - - - )} - {author.twitter && ( - - - {author.twitter} - - - )} - {author.facebook && ( - - - {author.facebook} - - - )} -
-
-
- - -
+ +
-- 2.40.1