Skip to content

Commit

Permalink
Merge pull request #47 from yunu7067/develop
Browse files Browse the repository at this point in the history
v1.0.12
  • Loading branch information
yunu7067 authored Nov 13, 2022
2 parents bf1d3ac + 5549c9c commit 865086a
Show file tree
Hide file tree
Showing 57 changed files with 862 additions and 521 deletions.
15 changes: 3 additions & 12 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,9 @@
"rangeStart": 0,
"requirePragma": false,
"insertPragma": false,
"plugins": ["prettier-plugin-astro"],
"overrides": [
{
"files": [".*", "*.json", "*.md", "*.toml", "*.yml"],
"options": {
"useTabs": false
}
},
{
"files": ["**/*.astro"],
"options": {
"parser": "astro"
}
}
{"files": [".*", "*.json", "*.md", "*.toml", "*.yml"], "options": {"useTabs": false}},
{"files": ["**/*.astro"], "options": {"parser": "astro"}}
]
}
7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
"editor.tabSize": 2
},
"[astro]": {
"editor.defaultFormatter": "astro-build.astro-vscode",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 2,
"editor.detectIndentation": false
}
},
"prettier.documentSelectors": [
"**/*.astro"
]
}
16 changes: 15 additions & 1 deletion astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
rehypeFigure,
rehypeAutolinkHeading,
} from './plugins';
import AutoImport from 'astro-auto-import';

// https://astro.build/config
export default defineConfig({
Expand All @@ -29,5 +30,18 @@ export default defineConfig({
wrap: true,
},
},
integrations: [mdx({}), solid(), tailwind(), image({logLevel: 'error'}), sitemap()],
integrations: [
AutoImport({
imports: [
{
'/src/components/MarkdownImage.astro': [['default', 'Image']],
},
],
}),
mdx({}),
solid(),
tailwind(),
image({logLevel: 'error'}),
sitemap(),
],
});
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "astro-blog",
"version": "1.0.0",
"name": "blogwalk-with-astro",
"version": "1.0.12",
"type": "module",
"author": {
"email": "[email protected]",
Expand All @@ -21,29 +21,32 @@
"astro": "astro"
},
"devDependencies": {
"@astrojs/image": "0.10.0",
"@astrojs/mdx": "^0.11.4",
"@astrojs/rss": "^1.0.2",
"@astrojs/image": "0.11.4",
"@astrojs/mdx": "^0.11.6",
"@astrojs/rss": "^1.0.3",
"@astrojs/sitemap": "1.0.0",
"@astrojs/solid-js": "1.2.0",
"@astrojs/tailwind": "2.1.0",
"@astrojs/solid-js": "1.2.2",
"@astrojs/tailwind": "2.1.2",
"@tailwindcss/line-clamp": "0.4.2",
"@types/eslint": "^8.4.6",
"@types/flexsearch": "^0.7.3",
"@types/node": "^18.8.1",
"@types/node": "^18.11.9",
"@types/prettier": "^2.7.1",
"astro": "1.5.0",
"astro": "1.6.7",
"astro-auto-import": "^0.2.0",
"flexsearch": "^0.7.21",
"hastscript": "^7.0.2",
"mdast-util-to-string": "^3.1.0",
"node-html-parser": "6.1.1",
"prettier": "^2.7.1",
"prettier-plugin-astro": "^0.7.0",
"reading-time": "1.5.0",
"rehype-autolink-headings": "^6.1.1",
"rehype-katex": "^6.0.2",
"remark-math": "^5.1.1",
"sass": "1.55.0",
"solid-js": "1.5.6",
"tailwindcss": "^3.1.8",
"tailwindcss": "^3.2.4",
"unist-util-visit": "^4.1.1"
}
}
Loading

0 comments on commit 865086a

Please sign in to comment.