From 23c01e1ec8e6ae93bcaf74ed25d5c0f73edf1161 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 09:04:20 +0200 Subject: [PATCH 01/10] add prettier --- .editorconfig | 9 ++ .gitignore | 11 +- .prettierignore | 9 ++ .prettierrc | 15 +-- package-lock.json | 221 +++++++++++++++++++++++++++++++++++++++ package.json | 15 +++ template/app/.gitignore | 2 +- template/blog/.gitignore | 30 +++--- 8 files changed, 283 insertions(+), 29 deletions(-) create mode 100644 .editorconfig create mode 100644 .prettierignore create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..37a67009 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +charset = utf-8 +indent_style = space +indent_size = 2 +tab_width = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.gitignore b/.gitignore index 43e17d23..fd8dcf18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ -/template/app/migrations -/template/app/package-lock.json +# Dependencies +node_modules/ + +# MacOS-specific files. .DS_Store -# Local Netlify folder -.netlify +# We want to keep the template clean from the usual build artifacts. +template/app/migrations +template/app/package-lock.json diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..31d08dee --- /dev/null +++ b/.prettierignore @@ -0,0 +1,9 @@ +# Build outputs +.wasp/ +dist/ + +# OpenSaaS app diff folder. +app_diff/ + +# Ignore minified JS files in the public folder +**/public/**/*.js diff --git a/.prettierrc b/.prettierrc index e9c509bb..1f6141c0 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,9 +1,12 @@ { - "trailingComma": "es5", + "plugins": [ + "prettier-plugin-organize-imports", + "prettier-plugin-pkg", + "prettier-plugin-sh", + "prettier-plugin-tailwindcss" + ], "semi": true, - "singleQuote": true, - "endOfLine": "lf", - "tabWidth": 2, - "jsxSingleQuote": true, - "printWidth": 110 + "singleQuote": false, + "jsxSingleQuote": false, + "trailingComma": "all" } diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..a03bc7be --- /dev/null +++ b/package-lock.json @@ -0,0 +1,221 @@ +{ + "name": "wasp-repo", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "wasp-repo", + "devDependencies": { + "prettier": "3.5.3", + "prettier-plugin-organize-imports": "4.1.0", + "prettier-plugin-pkg": "0.19.1", + "prettier-plugin-sh": "0.17.4", + "prettier-plugin-tailwindcss": "^0.6.13", + "typescript": "~5.8.3" + } + }, + "node_modules/@reteps/dockerfmt": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@reteps/dockerfmt/-/dockerfmt-0.3.6.tgz", + "integrity": "sha512-Tb5wIMvBf/nLejTQ61krK644/CEMB/cpiaIFXqGApfGqO3GwcR3qnI0DbmkFVCl2OyEp8LnLX3EkucoL0+tbFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^v12.20.0 || ^14.13.0 || >=16.0.0" + } + }, + "node_modules/prettier": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", + "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-organize-imports": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-4.1.0.tgz", + "integrity": "sha512-5aWRdCgv645xaa58X8lOxzZoiHAldAPChljr/MT0crXVOWTZ+Svl4hIWlz+niYSlO6ikE5UXkN1JrRvIP2ut0A==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "prettier": ">=2.0", + "typescript": ">=2.9", + "vue-tsc": "^2.1.0" + }, + "peerDependenciesMeta": { + "vue-tsc": { + "optional": true + } + } + }, + "node_modules/prettier-plugin-pkg": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-pkg/-/prettier-plugin-pkg-0.19.1.tgz", + "integrity": "sha512-9x2USWidQHxzd6a1+ikVqIm1K9qNs3f+XoUvq9EChaSdkkFUxUnWU/4+2EGttFLDT9DK4d9CwCKGSNZC/EE98g==", + "dev": true, + "license": "MPL-2.0", + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + }, + "peerDependencies": { + "prettier": "^3.0.3" + } + }, + "node_modules/prettier-plugin-sh": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/prettier-plugin-sh/-/prettier-plugin-sh-0.17.4.tgz", + "integrity": "sha512-aAVKXZ7GTEMZdZsIPSwMwddwPvt2ibMbRGd4OJAP0G7QoeYZV+mPNg2Oln3R53sZ4PVjeAA7Xzi/PuI0QlHHfQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@reteps/dockerfmt": "^0.3.5", + "sh-syntax": "^0.5.6" + }, + "engines": { + "node": ">=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + }, + "peerDependencies": { + "prettier": "^3.0.3" + } + }, + "node_modules/prettier-plugin-tailwindcss": { + "version": "0.6.14", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.14.tgz", + "integrity": "sha512-pi2e/+ZygeIqntN+vC573BcW5Cve8zUB0SSAGxqpB4f96boZF4M3phPVoOFCeypwkpRYdi7+jQ5YJJUwrkGUAg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.21.3" + }, + "peerDependencies": { + "@ianvs/prettier-plugin-sort-imports": "*", + "@prettier/plugin-hermes": "*", + "@prettier/plugin-oxc": "*", + "@prettier/plugin-pug": "*", + "@shopify/prettier-plugin-liquid": "*", + "@trivago/prettier-plugin-sort-imports": "*", + "@zackad/prettier-plugin-twig": "*", + "prettier": "^3.0", + "prettier-plugin-astro": "*", + "prettier-plugin-css-order": "*", + "prettier-plugin-import-sort": "*", + "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", + "prettier-plugin-multiline-arrays": "*", + "prettier-plugin-organize-attributes": "*", + "prettier-plugin-organize-imports": "*", + "prettier-plugin-sort-imports": "*", + "prettier-plugin-style-order": "*", + "prettier-plugin-svelte": "*" + }, + "peerDependenciesMeta": { + "@ianvs/prettier-plugin-sort-imports": { + "optional": true + }, + "@prettier/plugin-hermes": { + "optional": true + }, + "@prettier/plugin-oxc": { + "optional": true + }, + "@prettier/plugin-pug": { + "optional": true + }, + "@shopify/prettier-plugin-liquid": { + "optional": true + }, + "@trivago/prettier-plugin-sort-imports": { + "optional": true + }, + "@zackad/prettier-plugin-twig": { + "optional": true + }, + "prettier-plugin-astro": { + "optional": true + }, + "prettier-plugin-css-order": { + "optional": true + }, + "prettier-plugin-import-sort": { + "optional": true + }, + "prettier-plugin-jsdoc": { + "optional": true + }, + "prettier-plugin-marko": { + "optional": true + }, + "prettier-plugin-multiline-arrays": { + "optional": true + }, + "prettier-plugin-organize-attributes": { + "optional": true + }, + "prettier-plugin-organize-imports": { + "optional": true + }, + "prettier-plugin-sort-imports": { + "optional": true + }, + "prettier-plugin-style-order": { + "optional": true + }, + "prettier-plugin-svelte": { + "optional": true + } + } + }, + "node_modules/sh-syntax": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/sh-syntax/-/sh-syntax-0.5.8.tgz", + "integrity": "sha512-JfVoxf4FxQI5qpsPbkHhZo+n6N9YMJobyl4oGEUBb/31oQYlgTjkXQD8PBiafS2UbWoxrTO0Z5PJUBXEPAG1Zw==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.8.1" + }, + "engines": { + "node": ">=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/sh-syntax" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD" + }, + "node_modules/typescript": { + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..cf63c6ca --- /dev/null +++ b/package.json @@ -0,0 +1,15 @@ +{ + "name": "wasp-repo", + "scripts": { + "prettier:check": "prettier --ignore-unknown --check --config .prettierrc .", + "prettier:format": "prettier --ignore-unknown --write --config .prettierrc ." + }, + "devDependencies": { + "prettier": "3.5.3", + "prettier-plugin-organize-imports": "4.1.0", + "prettier-plugin-pkg": "0.19.1", + "prettier-plugin-sh": "0.17.4", + "prettier-plugin-tailwindcss": "^0.6.13", + "typescript": "~5.8.3" + } +} diff --git a/template/app/.gitignore b/template/app/.gitignore index fd453426..b135f3f2 100644 --- a/template/app/.gitignore +++ b/template/app/.gitignore @@ -1,5 +1,5 @@ -.wasp/ node_modules/ +.wasp/ # Ignore all dotenv files by default to prevent accidentally committing any secrets. # To include specific dotenv files, use the `!` operator or adjust these rules. diff --git a/template/blog/.gitignore b/template/blog/.gitignore index 772efb8d..03a9986a 100644 --- a/template/blog/.gitignore +++ b/template/blog/.gitignore @@ -1,24 +1,18 @@ -# build output -dist/ -# generated types -.astro/ - -# deployment -.netlify/ - -# dependencies +# Dependencies node_modules/ -# logs -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* +# Build outputs +.astro/ +dist/ +# Deployment +.netlify/ -# environment variables +# Ignore all dotenv files by default to prevent accidentally committing any secrets. +# To include specific dotenv files, use the `!` operator or adjust these rules. .env -.env.production +.env.* -# macOS-specific files -.DS_Store +# Don't ignore example dotenv files. +!.env.example +!.env.*.example From 3bebe418bc1de7cc13736266a090c9e99e478d91 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 09:07:53 +0200 Subject: [PATCH 02/10] dots --- .prettierignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.prettierignore b/.prettierignore index 31d08dee..8867bf01 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,9 +1,9 @@ -# Build outputs +# Build outputs. .wasp/ dist/ # OpenSaaS app diff folder. app_diff/ -# Ignore minified JS files in the public folder +# Ignore minified JS files in the public folder. **/public/**/*.js From ea4ab587444b6cb2f77b0d2e22acc3d06d7c6e28 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 11:41:37 +0200 Subject: [PATCH 03/10] dont format md and mdx --- .prettierignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.prettierignore b/.prettierignore index 8867bf01..e678cbe5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,5 +5,9 @@ dist/ # OpenSaaS app diff folder. app_diff/ +# Formatting `.md` and `.mdx` can introduce logical changes. +**/blog/**/*.md +**/blog/**/*.mdx + # Ignore minified JS files in the public folder. **/public/**/*.js From 41cd4120bfdda01b4224a6d14581100de802ec5b Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 11:48:51 +0200 Subject: [PATCH 04/10] gitignore changes --- .gitignore | 1 + template/.gitignore | 11 +++++++++++ template/app/.gitignore | 9 --------- template/blog/.gitignore | 15 --------------- template/e2e-tests/.gitignore | 10 +++++----- 5 files changed, 17 insertions(+), 29 deletions(-) create mode 100644 template/.gitignore diff --git a/.gitignore b/.gitignore index fd8dcf18..5e63fcf7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ node_modules/ .DS_Store # We want to keep the template clean from the usual build artifacts. +# We also don't want to ship this ignores to the users. template/app/migrations template/app/package-lock.json diff --git a/template/.gitignore b/template/.gitignore new file mode 100644 index 00000000..a532fe55 --- /dev/null +++ b/template/.gitignore @@ -0,0 +1,11 @@ +# MacOS-specific files. +.DS_Store + +# Ignore all dotenv files by default to prevent accidentally committing any secrets. +# To include specific dotenv files, use the `!` operator or adjust these rules. +.env +.env.* + +# Don't ignore example dotenv files. +!.env.example +!.env.*.example diff --git a/template/app/.gitignore b/template/app/.gitignore index b135f3f2..060a26c6 100644 --- a/template/app/.gitignore +++ b/template/app/.gitignore @@ -1,11 +1,2 @@ node_modules/ .wasp/ - -# Ignore all dotenv files by default to prevent accidentally committing any secrets. -# To include specific dotenv files, use the `!` operator or adjust these rules. -.env -.env.* - -# Don't ignore example dotenv files. -!.env.example -!.env.*.example diff --git a/template/blog/.gitignore b/template/blog/.gitignore index 03a9986a..dab5dd66 100644 --- a/template/blog/.gitignore +++ b/template/blog/.gitignore @@ -1,18 +1,3 @@ -# Dependencies node_modules/ - -# Build outputs .astro/ dist/ - -# Deployment -.netlify/ - -# Ignore all dotenv files by default to prevent accidentally committing any secrets. -# To include specific dotenv files, use the `!` operator or adjust these rules. -.env -.env.* - -# Don't ignore example dotenv files. -!.env.example -!.env.*.example diff --git a/template/e2e-tests/.gitignore b/template/e2e-tests/.gitignore index 94976ceb..e65ed724 100644 --- a/template/e2e-tests/.gitignore +++ b/template/e2e-tests/.gitignore @@ -1,5 +1,5 @@ -/reports/ -/test-results/ -/.cache/ -/node_modules/ -prisma/ \ No newline at end of file +reports/ +test-results/ +.cache/ +node_modules/ +prisma/ From c0a6776f8beac7d7b850916055f1b03fed035dc5 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 11:49:38 +0200 Subject: [PATCH 05/10] wording --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5e63fcf7..38525f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,6 @@ node_modules/ .DS_Store # We want to keep the template clean from the usual build artifacts. -# We also don't want to ship this ignores to the users. +# We also don't want to ship these ignore rules to the users. template/app/migrations template/app/package-lock.json From eb1772a2d71568c8b186455fef8b6da00116e251 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 11:50:17 +0200 Subject: [PATCH 06/10] wording 2 --- .prettierignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index e678cbe5..771fe2dc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,7 +5,7 @@ dist/ # OpenSaaS app diff folder. app_diff/ -# Formatting `.md` and `.mdx` can introduce logical changes. +# Formatting `.md` and `.mdx` files can introduce logical changes. **/blog/**/*.md **/blog/**/*.mdx From b4383af4290f648eab1a0060138be76bfac6652e Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 16:51:56 +0200 Subject: [PATCH 07/10] fix version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf63c6ca..b245b26c 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "prettier-plugin-organize-imports": "4.1.0", "prettier-plugin-pkg": "0.19.1", "prettier-plugin-sh": "0.17.4", - "prettier-plugin-tailwindcss": "^0.6.13", + "prettier-plugin-tailwindcss": "0.6.13", "typescript": "~5.8.3" } } From 6e2d6ca99e8cc066eb4eb4b83b768ec2a3549262 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 16:52:08 +0200 Subject: [PATCH 08/10] package lock too --- package-lock.json | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index a03bc7be..9e9be059 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "prettier-plugin-organize-imports": "4.1.0", "prettier-plugin-pkg": "0.19.1", "prettier-plugin-sh": "0.17.4", - "prettier-plugin-tailwindcss": "^0.6.13", + "prettier-plugin-tailwindcss": "0.6.13", "typescript": "~5.8.3" } }, @@ -94,9 +94,9 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.14.tgz", - "integrity": "sha512-pi2e/+ZygeIqntN+vC573BcW5Cve8zUB0SSAGxqpB4f96boZF4M3phPVoOFCeypwkpRYdi7+jQ5YJJUwrkGUAg==", + "version": "0.6.13", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.13.tgz", + "integrity": "sha512-uQ0asli1+ic8xrrSmIOaElDu0FacR4x69GynTh2oZjFY10JUt6EEumTQl5tB4fMeD6I1naKd+4rXQQ7esT2i1g==", "dev": true, "license": "MIT", "engines": { @@ -104,8 +104,6 @@ }, "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", - "@prettier/plugin-hermes": "*", - "@prettier/plugin-oxc": "*", "@prettier/plugin-pug": "*", "@shopify/prettier-plugin-liquid": "*", "@trivago/prettier-plugin-sort-imports": "*", @@ -127,12 +125,6 @@ "@ianvs/prettier-plugin-sort-imports": { "optional": true }, - "@prettier/plugin-hermes": { - "optional": true - }, - "@prettier/plugin-oxc": { - "optional": true - }, "@prettier/plugin-pug": { "optional": true }, From d69cc909d5cc73e7e55f9cb9dec9303fe5de09de Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 16:52:45 +0200 Subject: [PATCH 09/10] whitespace --- .prettierignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index 771fe2dc..d3409cb1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,7 +7,7 @@ app_diff/ # Formatting `.md` and `.mdx` files can introduce logical changes. **/blog/**/*.md -**/blog/**/*.mdx +**/blog/**/*.mdx # Ignore minified JS files in the public folder. **/public/**/*.js From daea2be9d5558f08fc691b40485c5e5cf1992667 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 17:00:21 +0200 Subject: [PATCH 10/10] diff --- opensaas-sh/app_diff/.gitignore.diff | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/opensaas-sh/app_diff/.gitignore.diff b/opensaas-sh/app_diff/.gitignore.diff index ca7c5763..a85eae29 100644 --- a/opensaas-sh/app_diff/.gitignore.diff +++ b/opensaas-sh/app_diff/.gitignore.diff @@ -1,17 +1,20 @@ --- template/app/.gitignore +++ opensaas-sh/app/.gitignore -@@ -6,6 +6,17 @@ - .env - .env.* - +@@ -1,2 +1,20 @@ + node_modules/ + .wasp/ ++ ++.env ++.env.* ++ +# These two we added only because dotenv-vault keeps adding them if it doesn't find them, +# even though we don't need them. Remove them once dotenv-vault stops doing that. +.env* +.flaskenv* + - # Don't ignore example dotenv files. - !.env.example - !.env.*.example ++# Don't ignore example dotenv files. ++!.env.example ++!.env.*.example + +# We don't want to ignore .env.client as it doesn't have any secrets. +!.env.client