create-apppaaaul 2.0.14 → 2.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/templates/nextjs-ts-clean/project/package.json +16 -14
- package/dist/templates/nextjs-ts-clean/project/src/scripts/dev-rebase.js +32 -0
- package/dist/templates/nextjs-ts-landing-drizzle/project/package.json +21 -19
- package/dist/templates/nextjs-ts-landing-drizzle/project/src/scripts/dev-rebase.js +32 -0
- package/dist/templates/nextjs-ts-landing-prisma/project/package.json +21 -19
- package/dist/templates/nextjs-ts-landing-prisma/project/src/scripts/dev-rebase.js +32 -0
- package/package.json +1 -1
|
@@ -7,33 +7,34 @@
|
|
|
7
7
|
"build": "next build",
|
|
8
8
|
"start": "next start",
|
|
9
9
|
"lint": "next lint",
|
|
10
|
-
"prod": "pnpm build && git checkout main && git pull origin main && git merge dev && pnpm version patch && git push origin main && git
|
|
11
|
-
|
|
10
|
+
"prod": "pnpm test && pnpm lint && pnpm build && git checkout main && git pull origin main && git merge dev && pnpm version patch && git push origin main && git checkout dev && echo ✅ Deploy completado",
|
|
11
|
+
"dev-rebase": "node src/scripts/dev-rebase.js"
|
|
12
|
+
},
|
|
12
13
|
"dependencies": {
|
|
13
14
|
"@radix-ui/react-slot": "^1.2.3",
|
|
14
|
-
"@tailwindcss/postcss": "^4.1.
|
|
15
|
+
"@tailwindcss/postcss": "^4.1.13",
|
|
15
16
|
"autoprefixer": "^10.4.21",
|
|
16
17
|
"class-variance-authority": "^0.7.1",
|
|
17
18
|
"clsx": "^2.1.1",
|
|
18
|
-
"lucide-react": "^0.
|
|
19
|
-
"next": "^15.
|
|
19
|
+
"lucide-react": "^0.544.0",
|
|
20
|
+
"next": "^15.5.3",
|
|
20
21
|
"postcss": "^8.5.6",
|
|
21
22
|
"react": "19.1.1",
|
|
22
23
|
"react-dom": "19.1.1",
|
|
23
24
|
"tailwind-merge": "^3.3.1",
|
|
24
|
-
"tailwindcss": "^4.1.
|
|
25
|
+
"tailwindcss": "^4.1.13",
|
|
25
26
|
"tailwindcss-animate": "^1.0.7"
|
|
26
27
|
},
|
|
27
28
|
"devDependencies": {
|
|
28
29
|
"@eslint/compat": "^1.3.2",
|
|
29
|
-
"@next/eslint-plugin-next": "15.
|
|
30
|
-
"@types/node": "^24.
|
|
31
|
-
"@types/react": "^19.1.
|
|
32
|
-
"@types/react-dom": "^19.1.
|
|
30
|
+
"@next/eslint-plugin-next": "15.5.3",
|
|
31
|
+
"@types/node": "^24.3.1",
|
|
32
|
+
"@types/react": "^19.1.12",
|
|
33
|
+
"@types/react-dom": "^19.1.9",
|
|
33
34
|
"@vercel/style-guide": "^6.0.0",
|
|
34
35
|
"babel-plugin-react-compiler": "19.0.0-beta-e1e972c-20250221",
|
|
35
|
-
"eslint": "^9.
|
|
36
|
-
"eslint-config-next": "^15.
|
|
36
|
+
"eslint": "^9.35.0",
|
|
37
|
+
"eslint-config-next": "^15.5.3",
|
|
37
38
|
"eslint-config-prettier": "^10.1.8",
|
|
38
39
|
"eslint-plugin-import": "^2.32.0",
|
|
39
40
|
"eslint-plugin-jsx-a11y": "^6.10.2",
|
|
@@ -41,10 +42,11 @@
|
|
|
41
42
|
"eslint-plugin-react": "^7.37.5",
|
|
42
43
|
"eslint-plugin-react-compiler": "0.0.0-experimental-c8b3f72-20240517",
|
|
43
44
|
"eslint-plugin-react-hooks": "^5.2.0",
|
|
44
|
-
"globals": "^16.
|
|
45
|
+
"globals": "^16.4.0",
|
|
45
46
|
"prettier": "^3.6.2",
|
|
46
47
|
"prettier-plugin-tailwindcss": "^0.6.14",
|
|
48
|
+
"tsx": "^4.20.5",
|
|
47
49
|
"typescript": "^5.9.2",
|
|
48
|
-
"typescript-eslint": "^8.
|
|
50
|
+
"typescript-eslint": "^8.43.0"
|
|
49
51
|
}
|
|
50
52
|
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { execSync } from "child_process";
|
|
2
|
+
|
|
3
|
+
function run(cmd) {
|
|
4
|
+
execSync(cmd, { stdio: "inherit" });
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
try {
|
|
8
|
+
const branch = execSync("git rev-parse --abbrev-ref HEAD").toString().trim();
|
|
9
|
+
|
|
10
|
+
run("git fetch origin");
|
|
11
|
+
run("git checkout dev");
|
|
12
|
+
run("git pull origin dev");
|
|
13
|
+
run(`git checkout ${branch}`);
|
|
14
|
+
run("git rebase dev");
|
|
15
|
+
run("git checkout dev");
|
|
16
|
+
run(`git merge ${branch}`);
|
|
17
|
+
|
|
18
|
+
// Verificar si la rama ya está mergeada en dev
|
|
19
|
+
const isMerged = execSync(`git branch --merged dev`).toString().includes(branch);
|
|
20
|
+
|
|
21
|
+
if (isMerged) {
|
|
22
|
+
run(`git branch -d ${branch}`);
|
|
23
|
+
console.log(`✅ Rama ${branch} rebaseada, mergeada en dev y eliminada`);
|
|
24
|
+
} else {
|
|
25
|
+
console.log(
|
|
26
|
+
`⚠️ La rama ${branch} todavía no está completamente mergeada en dev, no se elimina.`,
|
|
27
|
+
);
|
|
28
|
+
}
|
|
29
|
+
} catch (err) {
|
|
30
|
+
console.error("❌ Error en el proceso:", err.message);
|
|
31
|
+
process.exit(1);
|
|
32
|
+
}
|
|
@@ -9,51 +9,53 @@
|
|
|
9
9
|
"lint": "next lint",
|
|
10
10
|
"db:push": "drizzle-kit push",
|
|
11
11
|
"db:studio": "pnpm drizzle-kit studio",
|
|
12
|
-
"prod": "pnpm build && git checkout main && git pull origin main && git merge dev && pnpm version patch && git push origin main && git
|
|
13
|
-
|
|
12
|
+
"prod": "pnpm test && pnpm lint && pnpm build && git checkout main && git pull origin main && git merge dev && pnpm version patch && git push origin main && git checkout dev && echo ✅ Deploy completado",
|
|
13
|
+
"dev-rebase": "node src/scripts/dev-rebase.js"
|
|
14
|
+
},
|
|
14
15
|
"dependencies": {
|
|
15
16
|
"@auth/drizzle-adapter": "^1.10.0",
|
|
16
17
|
"@radix-ui/react-slot": "^1.2.3",
|
|
17
|
-
"@tailwindcss/postcss": "^4.1.
|
|
18
|
+
"@tailwindcss/postcss": "^4.1.13",
|
|
18
19
|
"autoprefixer": "^10.4.21",
|
|
19
20
|
"bcryptjs": "^3.0.2",
|
|
20
21
|
"class-variance-authority": "^0.7.1",
|
|
21
22
|
"clsx": "^2.1.1",
|
|
22
|
-
"dotenv": "^17.2.
|
|
23
|
-
"drizzle-orm": "^0.44.
|
|
24
|
-
"lucide-react": "^0.
|
|
25
|
-
"next": "^15.
|
|
26
|
-
"next-auth": "
|
|
23
|
+
"dotenv": "^17.2.2",
|
|
24
|
+
"drizzle-orm": "^0.44.5",
|
|
25
|
+
"lucide-react": "^0.544.0",
|
|
26
|
+
"next": "^15.5.3",
|
|
27
|
+
"next-auth": "5.0.0-beta.29",
|
|
27
28
|
"postcss": "^8.5.6",
|
|
28
29
|
"postgres": "^3.4.7",
|
|
29
30
|
"react": "^19.1.1",
|
|
30
31
|
"react-dom": "^19.1.1",
|
|
31
32
|
"sonner": "^2.0.7",
|
|
32
33
|
"tailwind-merge": "^3.3.1",
|
|
33
|
-
"tailwindcss": "^4.1.
|
|
34
|
+
"tailwindcss": "^4.1.13",
|
|
34
35
|
"tailwindcss-animate": "^1.0.7",
|
|
35
|
-
"tsx": "^4.20.
|
|
36
|
-
"zod": "^4.
|
|
36
|
+
"tsx": "^4.20.5",
|
|
37
|
+
"zod": "^4.1.7"
|
|
37
38
|
},
|
|
38
39
|
"devDependencies": {
|
|
39
40
|
"@eslint/compat": "^1.3.2",
|
|
40
|
-
"@next/eslint-plugin-next": "15.
|
|
41
|
-
"@types/node": "^24.
|
|
42
|
-
"@types/react": "^19.1.
|
|
43
|
-
"@types/react-dom": "^19.1.
|
|
41
|
+
"@next/eslint-plugin-next": "15.5.3",
|
|
42
|
+
"@types/node": "^24.3.1",
|
|
43
|
+
"@types/react": "^19.1.12",
|
|
44
|
+
"@types/react-dom": "^19.1.9",
|
|
44
45
|
"babel-plugin-react-compiler": "19.0.0-beta-e1e972c-20250221",
|
|
45
46
|
"drizzle-kit": "^0.31.4",
|
|
46
|
-
"eslint": "^9.
|
|
47
|
-
"eslint-config-next": "15.
|
|
47
|
+
"eslint": "^9.35.0",
|
|
48
|
+
"eslint-config-next": "15.5.3",
|
|
48
49
|
"eslint-config-prettier": "^10.1.8",
|
|
49
50
|
"eslint-plugin-import": "^2.32.0",
|
|
50
51
|
"eslint-plugin-jsx-a11y": "^6.10.2",
|
|
51
52
|
"eslint-plugin-prettier": "^5.5.4",
|
|
52
53
|
"eslint-plugin-react-compiler": "0.0.0-experimental-c8b3f72-20240517",
|
|
53
|
-
"globals": "^16.
|
|
54
|
+
"globals": "^16.4.0",
|
|
54
55
|
"prettier": "^3.6.2",
|
|
55
56
|
"prettier-plugin-tailwindcss": "^0.6.14",
|
|
57
|
+
"tsx": "^4.20.5",
|
|
56
58
|
"typescript": "^5.9.2",
|
|
57
|
-
"typescript-eslint": "^8.
|
|
59
|
+
"typescript-eslint": "^8.43.0"
|
|
58
60
|
}
|
|
59
61
|
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { execSync } from "child_process";
|
|
2
|
+
|
|
3
|
+
function run(cmd) {
|
|
4
|
+
execSync(cmd, { stdio: "inherit" });
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
try {
|
|
8
|
+
const branch = execSync("git rev-parse --abbrev-ref HEAD").toString().trim();
|
|
9
|
+
|
|
10
|
+
run("git fetch origin");
|
|
11
|
+
run("git checkout dev");
|
|
12
|
+
run("git pull origin dev");
|
|
13
|
+
run(`git checkout ${branch}`);
|
|
14
|
+
run("git rebase dev");
|
|
15
|
+
run("git checkout dev");
|
|
16
|
+
run(`git merge ${branch}`);
|
|
17
|
+
|
|
18
|
+
// Verificar si la rama ya está mergeada en dev
|
|
19
|
+
const isMerged = execSync(`git branch --merged dev`).toString().includes(branch);
|
|
20
|
+
|
|
21
|
+
if (isMerged) {
|
|
22
|
+
run(`git branch -d ${branch}`);
|
|
23
|
+
console.log(`✅ Rama ${branch} rebaseada, mergeada en dev y eliminada`);
|
|
24
|
+
} else {
|
|
25
|
+
console.log(
|
|
26
|
+
`⚠️ La rama ${branch} todavía no está completamente mergeada en dev, no se elimina.`,
|
|
27
|
+
);
|
|
28
|
+
}
|
|
29
|
+
} catch (err) {
|
|
30
|
+
console.error("❌ Error en el proceso:", err.message);
|
|
31
|
+
process.exit(1);
|
|
32
|
+
}
|
|
@@ -8,40 +8,41 @@
|
|
|
8
8
|
"start": "next start",
|
|
9
9
|
"lint": "next lint",
|
|
10
10
|
"db:push": "npx prisma generate &&npx prisma db push",
|
|
11
|
-
"prod": "pnpm build && git checkout main && git pull origin main && git merge dev && pnpm version patch && git push origin main && git
|
|
12
|
-
|
|
11
|
+
"prod": "pnpm test && pnpm lint && pnpm build && git checkout main && git pull origin main && git merge dev && pnpm version patch && git push origin main && git checkout dev && echo ✅ Deploy completado",
|
|
12
|
+
"dev-rebase": "node src/scripts/dev-rebase.js"
|
|
13
|
+
},
|
|
13
14
|
"dependencies": {
|
|
14
15
|
"@auth/prisma-adapter": "^2.10.0",
|
|
15
|
-
"@prisma/client": "^6.
|
|
16
|
+
"@prisma/client": "^6.16.0",
|
|
16
17
|
"@radix-ui/react-slot": "^1.2.3",
|
|
17
|
-
"@tailwindcss/postcss": "^4.1.
|
|
18
|
+
"@tailwindcss/postcss": "^4.1.13",
|
|
18
19
|
"autoprefixer": "^10.4.21",
|
|
19
20
|
"bcryptjs": "^3.0.2",
|
|
20
21
|
"class-variance-authority": "^0.7.1",
|
|
21
22
|
"clsx": "^2.1.1",
|
|
22
|
-
"dotenv": "^17.2.
|
|
23
|
-
"lucide-react": "^0.
|
|
24
|
-
"next": "^15.
|
|
25
|
-
"next-auth": "
|
|
23
|
+
"dotenv": "^17.2.2",
|
|
24
|
+
"lucide-react": "^0.544.0",
|
|
25
|
+
"next": "^15.5.3",
|
|
26
|
+
"next-auth": "5.0.0-beta.29",
|
|
26
27
|
"postcss": "^8.5.6",
|
|
27
28
|
"postgres": "^3.4.7",
|
|
28
29
|
"react": "^19.1.1",
|
|
29
30
|
"react-dom": "^19.1.1",
|
|
30
31
|
"sonner": "^2.0.7",
|
|
31
32
|
"tailwind-merge": "^3.3.1",
|
|
32
|
-
"tailwindcss": "^4.1.
|
|
33
|
+
"tailwindcss": "^4.1.13",
|
|
33
34
|
"tailwindcss-animate": "^1.0.7",
|
|
34
|
-
"zod": "^4.
|
|
35
|
+
"zod": "^4.1.7"
|
|
35
36
|
},
|
|
36
37
|
"devDependencies": {
|
|
37
38
|
"@eslint/compat": "^1.3.2",
|
|
38
|
-
"@next/eslint-plugin-next": "15.3
|
|
39
|
-
"@types/node": "^24.
|
|
40
|
-
"@types/react": "^19.1.
|
|
41
|
-
"@types/react-dom": "^19.1.
|
|
39
|
+
"@next/eslint-plugin-next": "15.5.3",
|
|
40
|
+
"@types/node": "^24.3.1",
|
|
41
|
+
"@types/react": "^19.1.12",
|
|
42
|
+
"@types/react-dom": "^19.1.9",
|
|
42
43
|
"babel-plugin-react-compiler": "19.0.0-beta-e1e972c-20250221",
|
|
43
|
-
"eslint": "^9.
|
|
44
|
-
"eslint-config-next": "^15.
|
|
44
|
+
"eslint": "^9.35.0",
|
|
45
|
+
"eslint-config-next": "^15.5.3",
|
|
45
46
|
"eslint-config-prettier": "^10.1.8",
|
|
46
47
|
"eslint-plugin-import": "^2.32.0",
|
|
47
48
|
"eslint-plugin-jsx-a11y": "^6.10.2",
|
|
@@ -49,11 +50,12 @@
|
|
|
49
50
|
"eslint-plugin-react": "^7.37.5",
|
|
50
51
|
"eslint-plugin-react-compiler": "0.0.0-experimental-c8b3f72-20240517",
|
|
51
52
|
"eslint-plugin-react-hooks": "^5.2.0",
|
|
52
|
-
"globals": "^16.
|
|
53
|
+
"globals": "^16.4.0",
|
|
53
54
|
"prettier": "^3.6.2",
|
|
54
55
|
"prettier-plugin-tailwindcss": "^0.6.14",
|
|
55
|
-
"prisma": "^6.
|
|
56
|
+
"prisma": "^6.16.0",
|
|
57
|
+
"tsx": "^4.20.5",
|
|
56
58
|
"typescript": "^5.9.2",
|
|
57
|
-
"typescript-eslint": "^8.
|
|
59
|
+
"typescript-eslint": "^8.43.0"
|
|
58
60
|
}
|
|
59
61
|
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { execSync } from "child_process";
|
|
2
|
+
|
|
3
|
+
function run(cmd) {
|
|
4
|
+
execSync(cmd, { stdio: "inherit" });
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
try {
|
|
8
|
+
const branch = execSync("git rev-parse --abbrev-ref HEAD").toString().trim();
|
|
9
|
+
|
|
10
|
+
run("git fetch origin");
|
|
11
|
+
run("git checkout dev");
|
|
12
|
+
run("git pull origin dev");
|
|
13
|
+
run(`git checkout ${branch}`);
|
|
14
|
+
run("git rebase dev");
|
|
15
|
+
run("git checkout dev");
|
|
16
|
+
run(`git merge ${branch}`);
|
|
17
|
+
|
|
18
|
+
// Verificar si la rama ya está mergeada en dev
|
|
19
|
+
const isMerged = execSync(`git branch --merged dev`).toString().includes(branch);
|
|
20
|
+
|
|
21
|
+
if (isMerged) {
|
|
22
|
+
run(`git branch -d ${branch}`);
|
|
23
|
+
console.log(`✅ Rama ${branch} rebaseada, mergeada en dev y eliminada`);
|
|
24
|
+
} else {
|
|
25
|
+
console.log(
|
|
26
|
+
`⚠️ La rama ${branch} todavía no está completamente mergeada en dev, no se elimina.`,
|
|
27
|
+
);
|
|
28
|
+
}
|
|
29
|
+
} catch (err) {
|
|
30
|
+
console.error("❌ Error en el proceso:", err.message);
|
|
31
|
+
process.exit(1);
|
|
32
|
+
}
|