diff --git a/.gitignore b/.gitignore index fd8dcf18..38525f5f 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 these ignore rules to the users. template/app/migrations template/app/package-lock.json diff --git a/.prettierignore b/.prettierignore index e7a84b38..d3409cb1 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 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 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'; 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 }, 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" } } 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 581576b8..e65ed724 100644 --- a/template/e2e-tests/.gitignore +++ b/template/e2e-tests/.gitignore @@ -1,5 +1,5 @@ -/reports/ -/test-results/ -/.cache/ -/node_modules/ +reports/ +test-results/ +.cache/ +node_modules/ prisma/