Skip to content

Commit

Permalink
Merge branch 'dev' into rec
Browse files Browse the repository at this point in the history
  • Loading branch information
rharkor committed Dec 10, 2023
2 parents 91d981d + 80b8874 commit 6f30e90
Show file tree
Hide file tree
Showing 12 changed files with 527 additions and 193 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ jobs:
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npx multi-semantic-release
run: npx semantic-release
615 changes: 464 additions & 151 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@
"packages/landing"
],
"dependencies": {
"concurrently": "^8.2.2",
"concurrently": "^8.2.2"
},
"devDependencies": {
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^11.0.0",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^9.0.4",
"@semantic-release/npm": "^11.0.0",
"@semantic-release/release-notes-generator": "^12.0.0"
"@semantic-release/release-notes-generator": "^12.0.0",
"semantic-release": "^22.0.10"
}
}
3 changes: 2 additions & 1 deletion .releaserc → packages/app/.releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
"@semantic-release/commit-analyzer",
"@semantic-release/git",
"@semantic-release/changelog"
]
],
"tagFormat": "@next-boilerplate/app@v${version}"
}
15 changes: 0 additions & 15 deletions packages/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@next-boilerplate/app",
"version": "3.0.0",
"private": true,
"scripts": {
"dev": "npm run is-initialized && npx prisma migrate dev && cross-env FORCE_COLOR=1 next dev",
"build": "next build",
Expand Down Expand Up @@ -78,7 +77,6 @@
"zod": "^3.21.4"
},
"devDependencies": {
"@anolilab/multi-semantic-release": "^1.0.3",
"@babel/core": "^7.22.17",
"@jest/globals": "^29.7.0",
"@testing-library/jest-dom": "^6.1.3",
Expand All @@ -99,7 +97,6 @@
"prettier": "^3.1.0",
"prettier-plugin-tailwindcss": "^0.5.7",
"prisma": "^5.6.0",
"semantic-release": "^22.0.9",
"tailwindcss": "^3.3.3",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
Expand Down
26 changes: 26 additions & 0 deletions packages/docs/.releaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"branches": [
{
"name": "rec",
"channel": "beta",
"prerelease": true
},
{
"name": "main"
}
],
"plugins": [
[
"@semantic-release/npm",
{
"npmPublish": false
}
],
"@semantic-release/release-notes-generator",
"@semantic-release/github",
"@semantic-release/commit-analyzer",
"@semantic-release/git",
"@semantic-release/changelog"
],
"tagFormat": "@next-boilerplate/docs@v${version}"
}
1 change: 0 additions & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@next-boilerplate/docs",
"version": "3.0.0",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
"start": "docusaurus start",
Expand Down
26 changes: 26 additions & 0 deletions packages/landing/.releaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"branches": [
{
"name": "rec",
"channel": "beta",
"prerelease": true
},
{
"name": "main"
}
],
"plugins": [
[
"@semantic-release/npm",
{
"npmPublish": false
}
],
"@semantic-release/release-notes-generator",
"@semantic-release/github",
"@semantic-release/commit-analyzer",
"@semantic-release/git",
"@semantic-release/changelog"
],
"tagFormat": "@next-boilerplate/landing@v${version}"
}
1 change: 0 additions & 1 deletion packages/landing/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@next-boilerplate/landing",
"version": "3.0.0",
"private": true,
"scripts": {
"dev": "next dev -p 3002",
"build": "next build",
Expand Down
6 changes: 3 additions & 3 deletions packages/landing/src/app/[lang]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ export default async function Home({

return (
<main className="flex min-h-screen flex-col items-center justify-center p-6 md:p-24">
<div className="absolute left-0 top-0 h-full w-full overflow-hidden">
<div className="pointer-events-none absolute left-0 top-0 h-full w-full overflow-hidden">
<Blob />
</div>
<h1 className="animate-fade-in-scale relative z-10 rounded-lg p-5 text-center text-4xl font-bold text-white/80 md:text-6xl lg:text-8xl">
<h1 className="animate-fade-in-scale relative rounded-lg p-5 text-center text-4xl font-bold text-white/80 md:text-6xl lg:text-8xl">
{dictionary.home.title}
</h1>
<a href={env.NEXT_PUBLIC_APP_URL} className="mt-10">
<a href={env.NEXT_PUBLIC_APP_URL} className="animate-fade-in-scale mt-10 hover:text-blue-500">
{dictionary.home.link}
</a>
</main>
Expand Down
15 changes: 0 additions & 15 deletions packages/scripts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6f30e90

Please sign in to comment.