From aada3e0e609387e9693f42107f689f640a0f8275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Sodi=C4=87?= Date: Thu, 18 Sep 2025 10:14:38 +0200 Subject: [PATCH 01/10] Trigger CI From ea4ab587444b6cb2f77b0d2e22acc3d06d7c6e28 Mon Sep 17 00:00:00 2001 From: Franjo Mindek Date: Thu, 18 Sep 2025 11:41:37 +0200 Subject: [PATCH 02/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 03/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 04/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 05/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 06/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 07/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 08/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 09/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 From 18711b7f869411b5ceecc5d96096ff5c485994c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C5=A0o=C5=A1i=C4=87?= Date: Fri, 19 Sep 2025 10:37:44 +0200 Subject: [PATCH 10/10] Fix OpenSaas GitHub URL in opensaas-sh app (#510) --- opensaas-sh/app_diff/src/shared/common.ts.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensaas-sh/app_diff/src/shared/common.ts.diff b/opensaas-sh/app_diff/src/shared/common.ts.diff index 486e6319..4f5fcb8d 100644 --- a/opensaas-sh/app_diff/src/shared/common.ts.diff +++ b/opensaas-sh/app_diff/src/shared/common.ts.diff @@ -3,5 +3,5 @@ @@ -1,2 +1,4 @@ export const DocsUrl = 'https://docs.opensaas.sh'; export const BlogUrl = 'https://docs.opensaas.sh/blog'; -+export const GithubUrl = 'https://github.com/wasp-lang/opensaas'; ++export const GithubUrl = 'https://github.com/wasp-lang/open-saas'; +export const WaspUrl = 'https://wasp.sh';