Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/tar-6.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
alexnguyennz authored Jun 21, 2024
2 parents 61a27e8 + 90c246f commit af1894a
Show file tree
Hide file tree
Showing 34 changed files with 6,174 additions and 4,707 deletions.
20 changes: 0 additions & 20 deletions .eslintrc.cjs

This file was deleted.

1 change: 1 addition & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ export default defineConfig({
fixturesFolder: false,
screenshotOnRunFailure: false,
video: false,
defaultCommandTimeout: 10000,
},
});
24 changes: 24 additions & 0 deletions eslint.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
const eslintPluginAstro = require("eslint-plugin-astro");
const eslintTypeScriptParser = require("@typescript-eslint/parser");
const eslintConfigPrettier = require("eslint-config-prettier");
const jsxA11y = require("eslint-plugin-jsx-a11y");

/** @type {import("eslint").Linter.Config} */
module.exports = [
...eslintPluginAstro.configs["flat/recommended"],
eslintConfigPrettier,
{
languageOptions: {
parser: eslintTypeScriptParser,
},
files: ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"],
plugins: {
"jsx-a11y": jsxA11y,
},
rules: {
"astro/no-conflict-set-directives": "error",
"astro/no-unused-define-vars-in-style": "error",
"jsx-a11y/control-has-associated-label": "error",
},
},
];
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,44 +10,44 @@
"preview": "astro preview",
"check": "astro check",
"astro": "astro",
"lint": "eslint --ext .js,.jsx,.ts,.tsx,.astro .",
"lint": "eslint src/pages/* src/components/* src/lib/*",
"test:unit": "vitest",
"test:e2e": "cypress run"
},
"dependencies": {
"@astrojs/check": "0.5.6",
"@astrojs/rss": "4.0.5",
"@astrojs/sitemap": "3.1.1",
"@astrojs/check": "0.7.0",
"@astrojs/rss": "4.0.6",
"@astrojs/sitemap": "3.1.6",
"@astrojs/tailwind": "5.1.0",
"@orama/plugin-astro": "2.0.9",
"astro": "4.4.15",
"astro-expressive-code": "0.33.4",
"@orama/plugin-astro": "2.0.20",
"astro": "4.11.0",
"astro-expressive-code": "0.35.3",
"astro-icon": "1.1.0",
"astro-seo": "0.8.3",
"clsx": "2.1.0",
"dayjs": "1.11.10",
"elevenlabs-node": "2.0.3",
"astro-seo": "0.8.4",
"clsx": "2.1.1",
"dayjs": "1.11.11",
"mdast-util-to-string": "4.0.0",
"reading-time": "1.5.0",
"sharp": "0.33.0",
"tailwind-merge": "2.2.1",
"tailwindcss": "3.4.1",
"typescript": "5.4.2"
"sharp": "0.33.4",
"tailwind-merge": "2.3.0",
"tailwindcss": "3.4.4",
"typescript": "5.5.2"
},
"devDependencies": {
"@iconify-json/lucide": "1.1.172",
"@tailwindcss/typography": "0.5.10",
"@types/node": "20.11.25",
"@types/react": "18.2.64",
"@typescript-eslint/parser": "7.1.1",
"cypress": "13.6.6",
"eslint": "8.57.0",
"@iconify-json/lucide": "1.1.194",
"@tailwindcss/typography": "0.5.13",
"@types/node": "20.14.7",
"@types/react": "18.3.3",
"@typescript-eslint/parser": "7.13.1",
"cypress": "13.12.0",
"eslint": "9.5.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-astro": "0.31.4",
"eslint-plugin-jsx-a11y": "6.8.0",
"prettier": "3.2.5",
"prettier-plugin-astro": "0.13.0",
"prettier-plugin-tailwindcss": "0.5.12",
"vitest": "1.3.1"
"eslint-plugin-astro": "1.2.2",
"eslint-plugin-jsx-a11y": "6.9.0",
"prettier": "3.3.2",
"prettier-plugin-astro": "0.14.0",
"prettier-plugin-tailwindcss": "0.6.5",
"vite": "5.3.1",
"vitest": "1.6.0"
}
}
Loading

0 comments on commit af1894a

Please sign in to comment.