Skip to content

Commit

Permalink
chore: update dependencies and repo structure
Browse files Browse the repository at this point in the history
  • Loading branch information
Lehoczky committed Dec 6, 2024
1 parent 012fcf7 commit aa52239
Show file tree
Hide file tree
Showing 13 changed files with 1,070 additions and 1,109 deletions.
5 changes: 4 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Enforce Unix newlines
* text=auto eol=lf
* text=auto eol=lf

# Fix syntax highlighting on GitHub to allow comments
.vscode/*.json linguist-language=JSON-with-Comments
19 changes: 8 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
pull_request:
branches:
- master
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand All @@ -23,13 +22,14 @@ jobs:
with:
fetch-depth: 0

- name: Enable Corepack
run: corepack enable
- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Set up Node.js 💿
uses: actions/setup-node@v4
with:
node-version: 20
node-version-file: ".node-version"
registry-url: "https://registry.npmjs.org"
cache: pnpm

- name: Install dependencies 💤
Expand All @@ -41,12 +41,9 @@ jobs:
with:
main-branch-name: master

- name: Check for Affected Projects
uses: 2coo/action-nx-affected@v2
id: affected-packages
with:
base: ${{steps.nx-sha.outputs.base}}
head: ${{steps.nx-sha.outputs.head}}
- name: "Get affected projects"
id: affected-projects
run: echo "affected='$(npx nx show projects --affected --sep=' ')'" >> "$GITHUB_OUTPUT"

- name: Check formatting 🎨
run: npx nx format:check
Expand All @@ -59,7 +56,7 @@ jobs:
run: pnpm -F @lehoczky/postcss-fluid publish

- name: Deploy demo page 🚀
if: github.ref == 'refs/heads/master' && contains(steps.affected-packages.outputs.affected, 'demo')
if: github.ref == 'refs/heads/master' && contains(steps.affected-projects.outputs.affected, 'demo')
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ coverage/

.nx/cache
.nx/workspace-data

demo.old
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
4 changes: 0 additions & 4 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
coverage
dist
node_modules
pnpm-lock.yaml
/.nx/workspace-data
26 changes: 7 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
{
"name": "@lehoczky/postcss-fluid-monorepo",
"private": true,
"scripts": {
"lint": "npm run eslint:fix && npm run format:write",
"eslint:fix": "eslint --max-warnings=0 --fix",
"format:write": "prettier \"./**\" --write --ignore-unknown"
},
"scripts": {},
"devDependencies": {
"@lehoczky/eslint-config-vitest": "^1.0.4",
"@lehoczky/eslint-config-vue": "^2.0.3",
"@lehoczky/prettier-config": "^2.0.0",
"@types/node": "catalog:",
"eslint": "^9.13.0",
"eslint-plugin-astro": "^1.3.0",
"nx": "20.0.7",
"postcss": "^8.4.47",
"postcss-html": "^1.7.0",
"prettier": "^3.3.3",
"@lehoczky/prettier-config": "^2.0.1",
"nx": "20.1.4",
"prettier": "^3.4.2",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-tailwindcss": "^0.6.8",
"typescript": "catalog:"
"prettier-plugin-tailwindcss": "^0.6.9",
"typescript": "^5.7.2"
},
"nx": {},
"packageManager": "[email protected]"
"packageManager": "[email protected]"
}
14 changes: 14 additions & 0 deletions packages/demo/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @ts-check
import { configLehoczkyVue } from "@lehoczky/eslint-config-vue"
import eslintPluginAstro from "eslint-plugin-astro"

/** @type {import("eslint").Linter.Config[]} */
export default [
...configLehoczkyVue({
parserOptionsForTypeChecking: {
projectService: true,
tsconfigRootDir: import.meta.dirname,
},
}),
...eslintPluginAstro.configs["flat/recommended"],
]
19 changes: 12 additions & 7 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,24 @@
"start": "astro dev",
"build": "astro check && astro build",
"preview": "astro preview",
"astro": "astro"
"astro": "astro",
"lint": "eslint --max-warnings=0",
"lint:fix": "eslint --max-warnings=0 --fix"
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/tailwind": "^5.1.2",
"@astrojs/tailwind": "^5.1.3",
"@lehoczky/eslint-config-vue": "^2.0.4",
"@lehoczky/postcss-fluid": "workspace:*",
"@types/node": "catalog:",
"astro": "^4.16.8",
"@types/node": "^20.17.9",
"astro": "^4.16.17",
"clsx": "^2.1.1",
"eslint": "^9.16.0",
"eslint-plugin-astro": "^1.3.1",
"perfect-debounce": "^1.0.0",
"tailwind-merge": "^2.5.4",
"tailwindcss": "^3.4.14",
"typescript": "catalog:"
"tailwind-merge": "^2.5.5",
"tailwindcss": "^3.4.16",
"typescript": "^5.7.2"
},
"devDependencies": {
"@tailwindcss/container-queries": "^0.1.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
},
"devDependencies": {
"@lehoczky/postcss-fluid": "workspace:*",
"@types/node": "catalog:",
"postcss": "^8.4.47",
"@types/node": "^20.17.9",
"postcss": "^8.4.49",
"postcss-cli": "^11.0.0",
"typescript": "catalog:"
"typescript": "^5.7.2"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
// @ts-check
import { configLehoczkyTypescript } from "@lehoczky/eslint-config-typescript"
import { configLehoczkyVitest } from "@lehoczky/eslint-config-vitest"
import { configLehoczkyVue } from "@lehoczky/eslint-config-vue"
import eslintPluginAstro from "eslint-plugin-astro"

/** @type {import("eslint").Linter.Config[]} */
export default [
...configLehoczkyVue({
...configLehoczkyTypescript({
parserOptionsForTypeChecking: {
projectService: true,
tsconfigRootDir: import.meta.dirname,
Expand All @@ -27,5 +26,4 @@ export default [
],
},
},
...eslintPluginAstro.configs["flat/recommended"],
]
17 changes: 11 additions & 6 deletions packages/postcss-fluid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"clean-dist": "node -e \"fs.rmSync('dist', { force: true, recursive: true })\"",
"build": "npm run clean-dist && tsc -p tsconfig.build.json",
"test": "vitest run",
"test:coverage": "vitest run --coverage"
"test:coverage": "vitest run --coverage",
"lint": "eslint --max-warnings=0",
"lint:fix": "eslint --max-warnings=0 --fix"
},
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand All @@ -26,11 +28,14 @@
"postcss-value-parser": "^4.2.0"
},
"devDependencies": {
"@types/node": "catalog:",
"@vitest/coverage-v8": "^2.1.4",
"postcss": "^8.4.47",
"typescript": "catalog:",
"vitest": "^2.1.4"
"@lehoczky/eslint-config-typescript": "^2.0.4",
"@lehoczky/eslint-config-vitest": "^1.0.5",
"@types/node": "^20.17.9",
"@vitest/coverage-v8": "^2.1.8",
"eslint": "^9.16.0",
"postcss": "^8.4.49",
"typescript": "^5.7.2",
"vitest": "^2.1.8"
},
"keywords": [
"postcss",
Expand Down
Loading

0 comments on commit aa52239

Please sign in to comment.