Skip to content

Commit b37b0cb

Browse files
glenflorendoglenflorendo
authored
Fix integration workflow (#714)
* chore: sort tasks alphabetically * fix: restore format command to workspace * fix: remove format commands from api app * fix: remove config flag from projects to allow prettier config discovery * fix: use mjs for prettier config files * chore: format * fix: fix typo * chore: update prettier dependencies * chore: upgrade to node@24
1 parent 112ff60 commit b37b0cb

File tree

18 files changed

+136
-84
lines changed

18 files changed

+136
-84
lines changed

‎.github/workflows/integration.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: integration
1+
name: Integration
22

33
on:
44
pull_request:
@@ -32,7 +32,8 @@ jobs:
3232
- name: Install Node.js
3333
uses: actions/setup-node@v4
3434
with:
35-
node-version: 18
35+
node-version-file: package.json
36+
check-latest: true
3637
cache: pnpm
3738

3839
- name: Install dependencies
@@ -58,7 +59,8 @@ jobs:
5859
- name: Install Node.js
5960
uses: actions/setup-node@v4
6061
with:
61-
node-version: 18
62+
node-version-file: package.json
63+
check-latest: true
6264
cache: pnpm
6365

6466
- name: Install dependencies

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
engine-strict=true

‎apps/api/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
"name": "@lucky-parking/api",
33
"scripts": {
44
"build": "tsup",
5-
"dev": "tsx watch src/index.ts",
6-
"format": "NODE_OPTIONS='--experimental-strip-types' prettier . --check --ignore-unknown --config ./prettier.config.ts",
7-
"format:fix": "NODE_OPTIONS='--experimental-strip-types' prettier . --write --ignore-unknown --config ./prettier.config.ts"
5+
"dev": "tsx watch src/index.ts"
86
},
97
"dependencies": {
108
"body-parser": "^1.20.3",

‎apps/web/index.html‎

Lines changed: 50 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,53 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
6-
<link rel="apple-touch-icon" type="image/png" sizes="180x180" href="/apple-touch-icon.png" />
7-
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
8-
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
9-
<link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png" />
10-
<link rel="icon" type="image/png" sizes="512x512" href="/android-chrome-512x512.png" />
11-
<link rel="icon" type="image/x-icon" sizes="16x16" href="/favicon.ico" />
12-
<link rel="manifest" href="/manifest.json" />
13-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
14-
<title>Lucky Parking</title>
15-
</head>
16-
<body>
17-
<div id="root"></div>
18-
<script type="module" src="src/main.tsx"></script>
19-
</body>
3+
<head>
4+
<meta charset="UTF-8" />
5+
<link
6+
rel="icon"
7+
type="image/svg+xml"
8+
href="/vite.svg" />
9+
<link
10+
rel="apple-touch-icon"
11+
type="image/png"
12+
sizes="180x180"
13+
href="/apple-touch-icon.png" />
14+
<link
15+
rel="icon"
16+
type="image/png"
17+
sizes="32x32"
18+
href="/favicon-32x32.png" />
19+
<link
20+
rel="icon"
21+
type="image/png"
22+
sizes="16x16"
23+
href="/favicon-16x16.png" />
24+
<link
25+
rel="icon"
26+
type="image/png"
27+
sizes="192x192"
28+
href="/android-chrome-192x192.png" />
29+
<link
30+
rel="icon"
31+
type="image/png"
32+
sizes="512x512"
33+
href="/android-chrome-512x512.png" />
34+
<link
35+
rel="icon"
36+
type="image/x-icon"
37+
sizes="16x16"
38+
href="/favicon.ico" />
39+
<link
40+
rel="manifest"
41+
href="/manifest.json" />
42+
<meta
43+
name="viewport"
44+
content="width=device-width, initial-scale=1.0" />
45+
<title>Lucky Parking</title>
46+
</head>
47+
<body>
48+
<div id="root"></div>
49+
<script
50+
type="module"
51+
src="src/main.tsx"></script>
52+
</body>
2053
</html>

‎apps/web/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"dev": "next dev",
77
"clean": "rm -rf .next node_modules",
88
"build:docker": "pnpm -w build:docker:web",
9-
"format": "NODE_OPTIONS='--experimental-strip-types' prettier . --check --ignore-unknown --config ./prettier.config.ts",
10-
"format:fix": "NODE_OPTIONS='--experimental-strip-types' prettier . --write --ignore-unknown --config ./prettier.config.ts",
9+
"format": "prettier . --check --ignore-unknown",
10+
"format:fix": "prettier . --write --ignore-unknown",
1111
"build": "next build",
1212
"start": "next start",
1313
"lint": "eslint . --fix-dry-run --config ./eslint.config.mjs",

apps/web/prettier.config.ts renamed to apps/web/prettier.config.mjs

File renamed without changes.

‎apps/web/public/manifest.json‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
{
2-
"name": "Lucky Parking",
3-
"short_name": "Lucky Parking",
4-
"icons": [
5-
{
6-
"src": "/android-chrome-192x192.png",
7-
"sizes": "192x192",
8-
"type": "image/png"
9-
},
10-
{
11-
"src": "/android-chrome-512x512.png",
12-
"sizes": "512x512",
13-
"type": "image/png"
14-
},
15-
{
16-
"src": "/apple-touch-icon.png",
17-
"sizes": "180x180",
18-
"type": "image/png"
19-
},
20-
{
21-
"src": "/favicon-32x32.png",
22-
"sizes": "32x32",
23-
"type": "image/png"
24-
},
25-
{
26-
"src": "/favicon-16x16.png",
27-
"sizes": "16x16",
28-
"type": "image/png"
29-
},
30-
{
31-
"src": "/favicon.ico",
32-
"sizes": "16x16",
33-
"type": "image/x-icon"
34-
}
35-
],
36-
"theme_color": "#ffffff",
37-
"background_color": "#ffffff",
38-
"display": "standalone",
39-
"start_url": "/"
2+
"name": "Lucky Parking",
3+
"short_name": "Lucky Parking",
4+
"icons": [
5+
{
6+
"src": "/android-chrome-192x192.png",
7+
"sizes": "192x192",
8+
"type": "image/png"
9+
},
10+
{
11+
"src": "/android-chrome-512x512.png",
12+
"sizes": "512x512",
13+
"type": "image/png"
14+
},
15+
{
16+
"src": "/apple-touch-icon.png",
17+
"sizes": "180x180",
18+
"type": "image/png"
19+
},
20+
{
21+
"src": "/favicon-32x32.png",
22+
"sizes": "32x32",
23+
"type": "image/png"
24+
},
25+
{
26+
"src": "/favicon-16x16.png",
27+
"sizes": "16x16",
28+
"type": "image/png"
29+
},
30+
{
31+
"src": "/favicon.ico",
32+
"sizes": "16x16",
33+
"type": "image/x-icon"
34+
}
35+
],
36+
"theme_color": "#ffffff",
37+
"background_color": "#ffffff",
38+
"display": "standalone",
39+
"start_url": "/"
4040
}

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
"check-types": "turbo run check-types",
88
"clean": "rm -rf .turbo && turbo run clean",
99
"dev": "turbo run dev",
10+
"format": "turbo run format",
1011
"lint": "turbo run lint",
1112
"prepare": "husky",
1213
"test": "turbo run test"
1314
},
1415
"lint-staged": {
1516
"**/*": [
16-
"prettier --check --ignore-unknown --config ./packages/configs/src/prettier/prettier.config.ts"
17+
"prettier --check --ignore-unknown --config ./packages/configs/src/prettier/prettier.config.mjs"
1718
],
1819
"**/*.{cjs,js,jsx,mjs,ts,tsx}": [
1920
"eslint --fix-dry-run --config ./packages/configs/src/eslint/eslint.config.mjs"
@@ -31,6 +32,6 @@
3132
},
3233
"packageManager": "pnpm@9.0.0",
3334
"engines": {
34-
"node": ">=18"
35+
"node": ">=24 <25"
3536
}
3637
}

‎packages/configs/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"exports": {
55
"./*": "./src/*",
66
"./eslint": "./src/eslint/eslint.config.mjs",
7-
"./prettier": "./src/prettier/prettier.config.ts",
7+
"./prettier": "./src/prettier/prettier.config.mjs",
88
"./tailwind/postcss": "./src/tailwind/postcss.config.js"
99
},
1010
"scripts": {
11-
"format": "NODE_OPTIONS='--experimental-strip-types' prettier . --check --ignore-unknown --config ./prettier.config.ts",
12-
"format:fix": "NODE_OPTIONS='--experimental-strip-types' prettier . --write --ignore-unknown --config ./prettier.config.ts"
11+
"format": "prettier . --check --ignore-unknown",
12+
"format:fix": "prettier . --write --ignore-unknown"
1313
},
1414
"peerDependencies": {
15-
"@homer0/prettier-plugin-jsdoc": "^11.0.1",
15+
"@homer0/prettier-plugin-jsdoc": "^11.0.2",
1616
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
1717
"@xeonlink/prettier-plugin-organize-attributes": "^1.1.0",
1818
"eslint": "^9.39.2",

packages/configs/prettier.config.ts renamed to packages/configs/prettier.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { config as default } from "./src/prettier/prettier.config.ts";
1+
export { config as default } from "./src/prettier/prettier.config.mjs";

0 commit comments

Comments
 (0)