Skip to content

Commit

Permalink
Merge pull request #72 from cieloazul310/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
cieloazul310 authored Dec 11, 2024
2 parents 9fad815 + ba0f5ff commit 12acb8f
Show file tree
Hide file tree
Showing 43 changed files with 943 additions and 652 deletions.
12 changes: 12 additions & 0 deletions .changeset/spicy-parrots-itch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@repo/typescript-config": patch
"@repo/eslint-config": patch
"@cieloazul310/panda-preset-sarkara-base": patch
"@cieloazul310/astro-sarkara-components": patch
"@cieloazul310/astro-sarkara-layout": patch
"@cieloazul310/astro-sarkara-utils": patch
"@cieloazul310/astro-sarkara": patch
"astro-app": patch
---

Components: fix invalid a11y property
10 changes: 0 additions & 10 deletions .eslintrc.cjs

This file was deleted.

47 changes: 0 additions & 47 deletions app/astro/.eslintrc.cjs

This file was deleted.

23 changes: 23 additions & 0 deletions app/astro/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import config from "@repo/eslint-config";

/** @type {import("eslint").Linter.Config[]} */
export default [
/**
* reference:
* https://zenn.dev/suree/articles/71591ec903463d#google-analytics-%E3%81%AE%E3%82%B3%E3%83%BC%E3%83%89%E3%81%AB%E5%AF%BE%E5%BF%9C%E3%81%99%E3%82%8B
*/
{
languageOptions: {
globals: {
dataLayer: false,
},
},
},
...config,
{
files: ["postcss.config.ts"],
rules: {
"@typescript-eslint/no-require-imports": "off",
},
},
];
10 changes: 8 additions & 2 deletions app/astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"astro": "astro",
"panda": "panda",
"check": "astro check",
"eslint": "eslint src --ext .js,.ts,.astro --fix"
"eslint": "eslint src --fix"
},
"dependencies": {
"@astrojs/check": "^0.9.4",
Expand All @@ -27,6 +27,12 @@
"@astrojs/partytown": "^2.1.2",
"@pandacss/dev": "^0.48.0",
"@repo/eslint-config": "^1.1.0",
"eslint": "^8.57.0"
"eslint": "^9.16.0"
},
"lint-staged": {
"**/*.{js,cjs,mjs,ts,astro}": [
"eslint --fix",
"prettier --write"
]
}
}
2 changes: 1 addition & 1 deletion app/astro/panda.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const config = defineSarkaraConfig({
palette: { primary: "teal", secondary: "yellow" },
include: [
"./src/**/*.{js,ts,astro,mdx}",
"../../node_modules/@cieloazul310/**/*.{js,ts,astro,mdx}",
"../../packages/**/src/**/*.{js,ts,astro}",
],
theme: {
extend: {
Expand Down
2 changes: 1 addition & 1 deletion app/astro/src/content.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint import/prefer-default-export: off */
/* eslint-disable-next-line import/no-unresolved */
import { z, defineCollection } from "astro:content";
import { glob } from "astro/loaders";

Expand Down
2 changes: 1 addition & 1 deletion app/astro/src/layout/default.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { siteMetadata, menu } from "@/data";
import "@/index.css";
interface Props extends Omit<SarkaraLayoutProps, "siteMetadata"> {}
type Props = Omit<SarkaraLayoutProps, "siteMetadata">;
const { ...props } = Astro.props;
---

Expand Down
3 changes: 2 additions & 1 deletion app/astro/src/utils/slugify.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable-next-line import/no-unresolved */
import { type CollectionEntry } from "astro:content";
import type { MicrocmsBlogs } from "../types";

Expand All @@ -9,7 +10,7 @@ export function pubDateToYYMM(publishedAt: string) {
}

function isMicrocmsBlogs(
obj: any,
obj: unknown,
type: "microcms" | "tutorial",
): obj is Pick<MicrocmsBlogs, "id" | "publishedAt"> {
return type === "microcms";
Expand Down
2 changes: 1 addition & 1 deletion app/astro/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"include": [
"src",
"astro.config.ts",
"eslint.config.mjs",
"panda.config.ts",
"postcss.config.cjs",
".eslintrc.cjs",
".astro/types.d.ts"
]
}
4 changes: 4 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import config from "@repo/eslint-config";

/** @type {import("eslint").Linter.Config[]} */
export default [...config];
Loading

0 comments on commit 12acb8f

Please sign in to comment.