diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index ed07597b..75cf4485 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -1,4 +1,4 @@
-name: integration
+name: Integration
on:
pull_request:
@@ -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
@@ -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
diff --git a/.npmrc b/.npmrc
index e69de29b..b6f27f13 100644
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1 @@
+engine-strict=true
diff --git a/apps/api/package.json b/apps/api/package.json
index 151903ed..6d6dcca9 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -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",
diff --git a/apps/web/index.html b/apps/web/index.html
index cf264281..b0e913d4 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -1,20 +1,53 @@
-
-
-
-
-
-
-
-
-
-
-
- Lucky Parking
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Lucky Parking
+
+
+
+
+
diff --git a/apps/web/package.json b/apps/web/package.json
index 0cd547b5..844f90be 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -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",
diff --git a/apps/web/prettier.config.ts b/apps/web/prettier.config.mjs
similarity index 100%
rename from apps/web/prettier.config.ts
rename to apps/web/prettier.config.mjs
diff --git a/apps/web/public/manifest.json b/apps/web/public/manifest.json
index 627f61b3..54853288 100755
--- a/apps/web/public/manifest.json
+++ b/apps/web/public/manifest.json
@@ -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": "/"
}
diff --git a/package.json b/package.json
index f694bb7c..4f094d2d 100644
--- a/package.json
+++ b/package.json
@@ -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"
@@ -31,6 +32,6 @@
},
"packageManager": "pnpm@9.0.0",
"engines": {
- "node": ">=18"
+ "node": ">=24 <25"
}
}
diff --git a/packages/configs/package.json b/packages/configs/package.json
index cf5dbe39..267b4a2e 100644
--- a/packages/configs/package.json
+++ b/packages/configs/package.json
@@ -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",
diff --git a/packages/configs/prettier.config.ts b/packages/configs/prettier.config.mjs
similarity index 88%
rename from packages/configs/prettier.config.ts
rename to packages/configs/prettier.config.mjs
index 2b51fc75..640a7166 100644
--- a/packages/configs/prettier.config.ts
+++ b/packages/configs/prettier.config.mjs
@@ -1 +1 @@
-export { config as default } from "./src/prettier/prettier.config.ts";
+export { config as default } from "./src/prettier/prettier.config.mjs";
diff --git a/packages/configs/src/prettier/prettier.config.ts b/packages/configs/src/prettier/prettier.config.mjs
similarity index 95%
rename from packages/configs/src/prettier/prettier.config.ts
rename to packages/configs/src/prettier/prettier.config.mjs
index f8ff993b..a6065f1b 100644
--- a/packages/configs/src/prettier/prettier.config.ts
+++ b/packages/configs/src/prettier/prettier.config.mjs
@@ -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
diff --git a/packages/design/package.json b/packages/design/package.json
index 9d672149..30af7fb8 100644
--- a/packages/design/package.json
+++ b/packages/design/package.json
@@ -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",
diff --git a/packages/design/prettier.config.d.ts b/packages/design/prettier.config.d.ts
deleted file mode 100644
index fe688360..00000000
--- a/packages/design/prettier.config.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { config as default } from "@lucky-parking/configs/prettier";
-//# sourceMappingURL=prettier.config.d.ts.map
diff --git a/packages/design/prettier.config.d.ts.map b/packages/design/prettier.config.d.ts.map
deleted file mode 100644
index c2fdeda1..00000000
--- a/packages/design/prettier.config.d.ts.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"prettier.config.d.ts","sourceRoot":"","sources":["prettier.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,iCAAiC,CAAC"}
\ No newline at end of file
diff --git a/packages/design/prettier.config.js b/packages/design/prettier.config.mjs
similarity index 100%
rename from packages/design/prettier.config.js
rename to packages/design/prettier.config.mjs
diff --git a/packages/design/prettier.config.ts b/packages/design/prettier.config.ts
deleted file mode 100644
index ed74b30d..00000000
--- a/packages/design/prettier.config.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { config as default } from "@lucky-parking/configs/prettier";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f44209b5..173e6a2a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -209,8 +209,8 @@ importers:
packages/configs:
dependencies:
'@homer0/prettier-plugin-jsdoc':
- specifier: ^11.0.1
- version: 11.0.1(prettier@3.8.0)
+ specifier: ^11.0.2
+ version: 11.0.2(prettier@3.8.0)
'@trivago/prettier-plugin-sort-imports':
specifier: ^6.0.2
version: 6.0.2(prettier@3.8.0)
@@ -650,6 +650,12 @@ packages:
peerDependencies:
prettier: ^3.5.3
+ '@homer0/prettier-plugin-jsdoc@11.0.2':
+ resolution: {integrity: sha512-+BzWB8z61dExvX1Z5EjBHeregU8M51MyTJvxOQdalO0LhGAXoBesSZqU1HWe1DnxAZvY69ItwXfTtCyj2f+4gQ==}
+ engines: {node: '>=20'}
+ peerDependencies:
+ prettier: ^3.5.3
+
'@humanfs/core@0.19.1':
resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
engines: {node: '>=18.18.0'}
@@ -2630,6 +2636,10 @@ packages:
resolution: {integrity: sha512-0D6qSQ5IkeRrGJFHRClzaMOenMeT0gErz3zIw3AprKMqhRN6LNU2jQOdkPG/FZ+8bCgXE1VidrgSzlBBDZRr8A==}
engines: {node: '>= 12.0.0'}
+ comment-parser@1.4.5:
+ resolution: {integrity: sha512-aRDkn3uyIlCFfk5NUA+VdwMmMsh8JGhc4hapfV4yxymHGQ3BVskMQfoXGpCo5IoBuQ9tS5iiVKhCpTcB4pW4qw==}
+ engines: {node: '>= 12.0.0'}
+
concat-map@0.0.1:
resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
@@ -5367,6 +5377,12 @@ snapshots:
prettier: 3.8.0
ramda: 0.32.0
+ '@homer0/prettier-plugin-jsdoc@11.0.2(prettier@3.8.0)':
+ dependencies:
+ comment-parser: 1.4.5
+ prettier: 3.8.0
+ ramda: 0.32.0
+
'@humanfs/core@0.19.1': {}
'@humanfs/node@0.16.6':
@@ -8006,6 +8022,8 @@ snapshots:
comment-parser@1.4.4: {}
+ comment-parser@1.4.5: {}
+
concat-map@0.0.1: {}
concat-stream@1.5.2:
diff --git a/turbo.json b/turbo.json
index fe694f28..30442c1d 100644
--- a/turbo.json
+++ b/turbo.json
@@ -7,9 +7,6 @@
"inputs": ["$TURBO_DEFAULT$", ".env*"],
"outputs": [".next/**", "!.next/cache/**", "dist/**", "storybook-static/**"]
},
- "lint": {
- "dependsOn": ["^lint"]
- },
"check-types": {
"dependsOn": ["^check-types"]
},
@@ -17,6 +14,13 @@
"cache": false,
"persistent": true
},
+ "format": {
+ "cache": true,
+ "persistent": true
+ },
+ "lint": {
+ "dependsOn": ["^lint"]
+ },
"test": {}
}
}