Skip to content

Commit

Permalink
Merge pull request #16 from tuatmcc/feat/prettier
Browse files Browse the repository at this point in the history
feat/prettier
  • Loading branch information
OJII3 authored Sep 2, 2024
2 parents f479e95 + f1b8b7b commit 93c37d9
Show file tree
Hide file tree
Showing 25 changed files with 399 additions and 272 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ pnpm-debug.log*

# direnv
.envrc
.direnv/
11 changes: 11 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/dist
/.astro
/public
/assets
/content

*.nix
/.github

/.vscode
/.direnv
14 changes: 14 additions & 0 deletions .prettierrc.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// .prettierrc.mjs
/** @type {import("prettier").Config} */
export default {
plugins: ["prettier-plugin-astro"],
useTabs: true,
overrides: [
{
files: "*.astro",
options: {
parser: "astro",
},
},
],
};
84 changes: 36 additions & 48 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,56 @@
# Astro Starter Kit: Blog
# ホームページ with Astro

```sh
npm create astro@latest -- --template blog
```
## 技術スタック

[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/blog)
[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/blog)
[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/blog/devcontainer.json)
- Astro
- TypeScript
- Tailwind CSS
- Kibela GraphQL API

> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
## 必要なもの

![blog](https://github.com/withastro/astro/assets/2244813/ff10799f-a816-4703-b967-c78997e8323d)
- Bun

Features:
## セットアップ

- ✅ Minimal styling (make it your own!)
- ✅ 100/100 Lighthouse performance
- ✅ SEO-friendly with canonical URLs and OpenGraph data
- ✅ Sitemap support
- ✅ RSS Feed support
- ✅ Markdown & MDX support
1. このリポジトリをクローン
2. `bun install` を実行

## 🚀 Project Structure
## 開発

Inside of your Astro project, you'll see the following folders and files:
### 開発サーバー

```text
├── public/
├── src/
│   ├── components/
│   ├── content/
│   ├── layouts/
│   └── pages/
├── astro.config.mjs
├── README.md
├── package.json
└── tsconfig.json
```sh
bun dev
```
実行すると `http://localhost:4321` に開発サーバーが立ち上がります. ファイルを編集すると自動的にブラウザに反映されます.

Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
### ビルド

There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.

The `src/content/` directory contains "collections" of related Markdown and MDX documents. Use `getCollection()` to retrieve posts from `src/content/blog/`, and type-check your frontmatter using an optional schema. See [Astro's Content Collections docs](https://docs.astro.build/en/guides/content-collections/) to learn more.
```sh
bun run --bun build
```
実行後、`build/` ディレクトリにビルドされたファイルが出力されます. これを本番環境でデプロイします.

Any static assets, like images, can be placed in the `public/` directory.
### プレビュー

## 🧞 Commands
```sh
bun preview
```
ビルドしたファイルをローカルサーバーでプレビューします.

All commands are run from the root of the project, from a terminal:
### リンタ

| Command | Action |
| :------------------------ | :----------------------------------------------- |
| `npm install` | Installs dependencies |
| `npm run dev` | Starts local dev server at `localhost:4321` |
| `npm run build` | Build your production site to `./dist/` |
| `npm run preview` | Preview your build locally, before deploying |
| `npm run astro ...` | Run CLI commands like `astro add`, `astro check` |
| `npm run astro -- --help` | Get help using the Astro CLI |
```sh
bun lint
```

## 👀 Want to learn more?
Biome を用いてコードをチェックします. Prettier によるフォーマットのチェックも行われます.

Check out [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).
### フォーマット

## Credit
```sh
bun fmt
```

This theme is based off of the lovely [Bear Blog](https://github.com/HermanMartinus/bearblog/).
Prettier を用いてコードをフォーマットします. Biome によるコードの修正も行われます
Binary file modified bun.lockb
Binary file not shown.
68 changes: 36 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
{
"name": "tuatmcc-com-mk3",
"type": "module",
"version": "0.0.1",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro check && astro build",
"preview": "astro preview",
"astro": "astro",
"lint": "biome check .",
"fmt": "biome check . --write"
},
"dependencies": {
"@astrojs/check": "^0.9.2",
"@astrojs/mdx": "^3.1.3",
"@astrojs/react": "^3.6.2",
"@astrojs/rss": "^4.0.7",
"@astrojs/sitemap": "^3.1.6",
"@astrojs/tailwind": "^5.1.0",
"@biomejs/biome": "^1.8.3",
"@fontsource-variable/jetbrains-mono": "^5.0.21",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/three": "^0.167.1",
"astro": "^4.13.1",
"pagefind": "^1.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.7",
"three": "^0.167.1",
"typescript": "^5.5.4"
}
"name": "tuatmcc-com-mk3",
"type": "module",
"version": "0.0.1",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro check && astro build",
"preview": "astro preview",
"astro": "astro",
"lint": "biome check . && prettier --check './**/*.{js,jsx,ts,tsx,astro}'",
"fmt": "prettier --write './**/*.{js,jsx,ts,tsx,astro}' && biome check . --write"
},
"dependencies": {
"@astrojs/check": "^0.9.2",
"@astrojs/mdx": "^3.1.3",
"@astrojs/react": "^3.6.2",
"@astrojs/rss": "^4.0.7",
"@astrojs/sitemap": "^3.1.6",
"@astrojs/tailwind": "^5.1.0",
"@fontsource-variable/jetbrains-mono": "^5.0.21",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/three": "^0.167.1",
"astro": "^4.13.1",
"pagefind": "^1.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.7",
"three": "^0.167.1",
"typescript": "^5.5.4"
},
"devDependencies": {
"@biomejs/biome": "^1.8.3",
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1"
}
}
16 changes: 14 additions & 2 deletions src/components/BaseHead.astro
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,20 @@ const image = og.image ?? new URL("/images/og-image.jpg", Astro.url);
<meta name="generator" content={Astro.generator} />

<!-- Font preloads -->
<link rel="preload" href="/fonts/atkinson-regular.woff" as="font" type="font/woff" crossorigin />
<link rel="preload" href="/fonts/atkinson-bold.woff" as="font" type="font/woff" crossorigin />
<link
rel="preload"
href="/fonts/atkinson-regular.woff"
as="font"
type="font/woff"
crossorigin
/>
<link
rel="preload"
href="/fonts/atkinson-bold.woff"
as="font"
type="font/woff"
crossorigin
/>

<!-- Canonical URL -->
<link rel="canonical" href={canonicalURL} />
Expand Down
28 changes: 14 additions & 14 deletions src/components/Card.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ const { class: className, ...props } = Astro.props;
---

<div class:list={[className, "card"]}>
<slot />
<slot />
</div>
<style>
.card {
clip-path: polygon(
20px 0,
calc(100% - 20px) 0,
100% 20px,
100% calc(100% - 20px),
calc(100% - 20px) 100%,
20px 100%,
0 calc(100% - 20px),
0 20px
);
margin-left: 20px;
}
.card {
clip-path: polygon(
20px 0,
calc(100% - 20px) 0,
100% 20px,
100% calc(100% - 20px),
calc(100% - 20px) 100%,
20px 100%,
0 calc(100% - 20px),
0 20px
);
margin-left: 20px;
}
</style>
14 changes: 12 additions & 2 deletions src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ const today = new Date();
</a>
<a href="https://twitter.com/astrodotbuild" target="_blank">
<span class="sr-only">Follow Astro on Twitter</span>
<svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32" astro-icon="social/twitter"
<svg
viewBox="0 0 16 16"
aria-hidden="true"
width="32"
height="32"
astro-icon="social/twitter"
><path
fill="currentColor"
d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"
Expand All @@ -30,7 +35,12 @@ const today = new Date();
</a>
<a href="https://github.com/withastro/astro" target="_blank">
<span class="sr-only">Go to Astro's GitHub repo</span>
<svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32" astro-icon="social/github"
<svg
viewBox="0 0 16 16"
aria-hidden="true"
width="32"
height="32"
astro-icon="social/github"
><path
fill="currentColor"
d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"
Expand Down
8 changes: 4 additions & 4 deletions src/components/FormattedDate.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ const { date } = Astro.props;

<time datetime={date.toISOString()}>
{
date.toLocaleDateString('en-us', {
year: 'numeric',
month: 'short',
day: 'numeric',
date.toLocaleDateString("en-us", {
year: "numeric",
month: "short",
day: "numeric",
})
}
</time>
Loading

0 comments on commit 93c37d9

Please sign in to comment.