Skip to content

Fix integration workflow #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glenflorendo merged 9 commits into from
Mar 2, 2026
Merged

Fix integration workflow #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2f560a4
chore: sort tasks alphabetically
glenflorendo Mar 2, 2026
0946b44
fix: restore format command to workspace
glenflorendo Mar 2, 2026
75ba124
fix: remove format commands from api app
glenflorendo Mar 2, 2026
796c1a9
fix: remove config flag from projects to allow prettier config discovery
glenflorendo Mar 2, 2026
2765433
fix: use mjs for prettier config files
glenflorendo Mar 2, 2026
cfbdf82
chore: format
glenflorendo Mar 2, 2026
6359266
fix: fix typo
glenflorendo Mar 2, 2026
e27cb48
chore: update prettier dependencies
glenflorendo Mar 2, 2026
2496614
chore: upgrade to node@24
glenflorendo Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: integration
name: Integration

on:
pull_request:
Expand Down Expand Up @@ -32,7 +32,8 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version-file: package.json
check-latest: true
cache: pnpm

- name: Install dependencies
Expand All @@ -58,7 +59,8 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version-file: package.json
check-latest: true
cache: pnpm

- name: Install dependencies
Expand Down
1 change: 1 addition & 0 deletions .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
4 changes: 1 addition & 3 deletions apps/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"name": "@lucky-parking/api",
"scripts": {
"build": "tsup",
"dev": "tsx watch src/index.ts",
"format": "NODE_OPTIONS='--experimental-strip-types' prettier . --check --ignore-unknown --config ./prettier.config.ts",
"format:fix": "NODE_OPTIONS='--experimental-strip-types' prettier . --write --ignore-unknown --config ./prettier.config.ts"
"dev": "tsx watch src/index.ts"
},
"dependencies": {
"body-parser": "^1.20.3",
Expand Down
67 changes: 50 additions & 17 deletions apps/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,53 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="apple-touch-icon" type="image/png" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png" />
<link rel="icon" type="image/png" sizes="512x512" href="/android-chrome-512x512.png" />
<link rel="icon" type="image/x-icon" sizes="16x16" href="/favicon.ico" />
<link rel="manifest" href="/manifest.json" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Lucky Parking</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="src/main.tsx"></script>
</body>
<head>
<meta charset="UTF-8" />
<link
rel="icon"
type="image/svg+xml"
href="/vite.svg" />
<link
rel="apple-touch-icon"
type="image/png"
sizes="180x180"
href="/apple-touch-icon.png" />
<link
rel="icon"
type="image/png"
sizes="32x32"
href="/favicon-32x32.png" />
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/favicon-16x16.png" />
<link
rel="icon"
type="image/png"
sizes="192x192"
href="/android-chrome-192x192.png" />
<link
rel="icon"
type="image/png"
sizes="512x512"
href="/android-chrome-512x512.png" />
<link
rel="icon"
type="image/x-icon"
sizes="16x16"
href="/favicon.ico" />
<link
rel="manifest"
href="/manifest.json" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0" />
<title>Lucky Parking</title>
</head>
<body>
<div id="root"></div>
<script
type="module"
src="src/main.tsx"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions apps/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"dev": "next dev",
"clean": "rm -rf .next node_modules",
"build:docker": "pnpm -w build:docker:web",
"format": "NODE_OPTIONS='--experimental-strip-types' prettier . --check --ignore-unknown --config ./prettier.config.ts",
"format:fix": "NODE_OPTIONS='--experimental-strip-types' prettier . --write --ignore-unknown --config ./prettier.config.ts",
"format": "prettier . --check --ignore-unknown",
"format:fix": "prettier . --write --ignore-unknown",
"build": "next build",
"start": "next start",
"lint": "eslint . --fix-dry-run --config ./eslint.config.mjs",
Expand Down
0 apps/web/prettier.config.ts → apps/web/prettier.config.mjs
View file
Open in desktop
File renamed without changes.
76 changes: 38 additions & 38 deletions apps/web/public/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
{
"name": "Lucky Parking",
"short_name": "Lucky Parking",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
},
{
"src": "/apple-touch-icon.png",
"sizes": "180x180",
"type": "image/png"
},
{
"src": "/favicon-32x32.png",
"sizes": "32x32",
"type": "image/png"
},
{
"src": "/favicon-16x16.png",
"sizes": "16x16",
"type": "image/png"
},
{
"src": "/favicon.ico",
"sizes": "16x16",
"type": "image/x-icon"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone",
"start_url": "/"
"name": "Lucky Parking",
"short_name": "Lucky Parking",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
},
{
"src": "/apple-touch-icon.png",
"sizes": "180x180",
"type": "image/png"
},
{
"src": "/favicon-32x32.png",
"sizes": "32x32",
"type": "image/png"
},
{
"src": "/favicon-16x16.png",
"sizes": "16x16",
"type": "image/png"
},
{
"src": "/favicon.ico",
"sizes": "16x16",
"type": "image/x-icon"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone",
"start_url": "/"
}
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
"check-types": "turbo run check-types",
"clean": "rm -rf .turbo && turbo run clean",
"dev": "turbo run dev",
"format": "turbo run format",
"lint": "turbo run lint",
"prepare": "husky",
"test": "turbo run test"
},
"lint-staged": {
"**/*": [
"prettier --check --ignore-unknown --config ./packages/configs/src/prettier/prettier.config.ts"
"prettier --check --ignore-unknown --config ./packages/configs/src/prettier/prettier.config.mjs"
],
"**/*.{cjs,js,jsx,mjs,ts,tsx}": [
"eslint --fix-dry-run --config ./packages/configs/src/eslint/eslint.config.mjs"
Expand All @@ -31,6 +32,6 @@
},
"packageManager": "pnpm@9.0.0",
"engines": {
"node": ">=18"
"node": ">=24 <25"
}
}
8 changes: 4 additions & 4 deletions packages/configs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"exports": {
"./*": "./src/*",
"./eslint": "./src/eslint/eslint.config.mjs",
"./prettier": "./src/prettier/prettier.config.ts",
"./prettier": "./src/prettier/prettier.config.mjs",
"./tailwind/postcss": "./src/tailwind/postcss.config.js"
},
"scripts": {
"format": "NODE_OPTIONS='--experimental-strip-types' prettier . --check --ignore-unknown --config ./prettier.config.ts",
"format:fix": "NODE_OPTIONS='--experimental-strip-types' prettier . --write --ignore-unknown --config ./prettier.config.ts"
"format": "prettier . --check --ignore-unknown",
"format:fix": "prettier . --write --ignore-unknown"
},
"peerDependencies": {
"@homer0/prettier-plugin-jsdoc": "^11.0.1",
"@homer0/prettier-plugin-jsdoc": "^11.0.2",
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
"@xeonlink/prettier-plugin-organize-attributes": "^1.1.0",
"eslint": "^9.39.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/configs/prettier.config.ts → packages/configs/prettier.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { config as default } from "./src/prettier/prettier.config.ts";
export { config as default } from "./src/prettier/prettier.config.mjs";
5 changes: 2 additions & 3 deletions ...s/configs/src/prettier/prettier.config.ts → .../configs/src/prettier/prettier.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { type Config } from "prettier";

/**
* @type {import('prettier').Config}
* @see https://prettier.io/docs/configuration
*/
export const config: Config = {
export const config = {
/**
* Prettier options
* @see https://prettier.io/docs/options
Expand Down
4 changes: 2 additions & 2 deletions packages/design/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"clean": "rm -rf .turbo node_modules dist",
"dev:components": "tsc --watch",
"dev:styles": "tailwindcss -i ./src/styles.css -o ./dist/index.css --watch",
"format": "NODE_OPTIONS='--experimental-strip-types' prettier . --check --ignore-unknown --config ./prettier.config.ts",
"format:fix": "NODE_OPTIONS='--experimental-strip-types' prettier . --write --ignore-unknown --config ./prettier.config.ts"
"format": "prettier . --check --ignore-unknown",
"format:fix": "prettier . --write --ignore-unknown"
},
"dependencies": {
"@radix-ui/react-accordion": "^1.2.12",
Expand Down
2 changes: 0 additions & 2 deletions packages/design/prettier.config.d.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/design/prettier.config.d.ts.map
View file
Open in desktop

This file was deleted.

0 packages/design/prettier.config.js → packages/design/prettier.config.mjs
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion packages/design/prettier.config.ts
View file
Open in desktop

This file was deleted.

22 changes: 20 additions & 2 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,20 @@
"inputs": ["$TURBO_DEFAULT$", ".env*"],
"outputs": [".next/**", "!.next/cache/**", "dist/**", "storybook-static/**"]
},
"lint": {
"dependsOn": ["^lint"]
},
"check-types": {
"dependsOn": ["^check-types"]
},
"dev": {
"cache": false,
"persistent": true
},
"format": {
"cache": true,
"persistent": true
},
"lint": {
"dependsOn": ["^lint"]
},
"test": {}
}
}
Loading