Merge remote-tracking branch 'origin/main' into franjo/run-prettier

# Conflicts:
#	.prettierignore
#	template/e2e-tests/.gitignore

.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 these ignore rules to the users.
 template/app/migrations
 template/app/package-lock.json

.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
 

opensaas-sh/app_diff/.gitignore.diff

@@ -1,17 +1,20 @@
 --- template/app/.gitignore
 +++ opensaas-sh/app/.gitignore
-@@ -6,6 +6,17 @@
+@@ -1,2 +1,20 @@
- .env
+ node_modules/
- .env.*
+ .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.
++# Don't ignore example dotenv files.
- !.env.example
++!.env.example
- !.env.*.example
++!.env.*.example
 +
 +# We don't want to ignore .env.client as it doesn't have any secrets.
 +!.env.client

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';

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",
+      "version": "0.6.13",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.14.tgz",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.13.tgz",
-      "integrity": "sha512-pi2e/+ZygeIqntN+vC573BcW5Cve8zUB0SSAGxqpB4f96boZF4M3phPVoOFCeypwkpRYdi7+jQ5YJJUwrkGUAg==",
+      "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
         },

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"
   }
 }

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

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

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

template/e2e-tests/.gitignore

@@ -1,5 +1,5 @@
-/reports/
+reports/
-/test-results/
+test-results/
-/.cache/
+.cache/
-/node_modules/
+node_modules/
 prisma/