Skip to content

Commit c600e3d

Browse files
committed
Merge main into feat/add-moonrepo-support
- Resolved package.json conflicts by keeping moonrepo additions and updating @types/node - Regenerated pnpm-lock.yaml to resolve lockfile conflicts
2 parents ba58ed3 + 6b0db8e commit c600e3d

File tree

7 files changed

+460
-260
lines changed

7 files changed

+460
-260
lines changed

apps/crew/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"crew-important-feature-7": "workspace:*",
2929
"crew-important-feature-8": "workspace:*",
3030
"crew-important-feature-9": "workspace:*",
31-
"next": "15.3.5",
31+
"next": "15.4.2",
3232
"react": "19.1.0",
3333
"react-dom": "19.1.0"
3434
},

apps/flight-simulator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"flight-simulator-important-feature-7": "workspace:*",
2929
"flight-simulator-important-feature-8": "workspace:*",
3030
"flight-simulator-important-feature-9": "workspace:*",
31-
"next": "15.3.5",
31+
"next": "15.4.2",
3232
"react": "19.1.0",
3333
"react-dom": "19.1.0"
3434
},

apps/navigation/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"navigation-important-feature-7": "workspace:*",
2929
"navigation-important-feature-8": "workspace:*",
3030
"navigation-important-feature-9": "workspace:*",
31-
"next": "15.3.5",
31+
"next": "15.4.2",
3232
"react": "19.1.0",
3333
"react-dom": "19.1.0"
3434
},

apps/ticket-booking/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"next": "15.3.5",
11+
"next": "15.4.2",
1212
"react": "19.1.0",
1313
"react-dom": "19.1.0",
1414
"ticket-booking-important-feature-0": "workspace:*",

apps/warp-drive-manager/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"next": "15.3.5",
11+
"next": "15.4.2",
1212
"react": "19.1.0",
1313
"react-dom": "19.1.0",
1414
"warp-drive-manager-important-feature-0": "workspace:*",

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"devDependencies": {
1919
"@moonrepo/cli": "^1.29.0",
2020
"@nx/next": "^21.2.2",
21-
"@types/node": "^24.0.10",
21+
"@types/node": "^24.0.15",
2222
"lage": "2.14.6",
2323
"lerna": "8.2.3",
24-
"nx": "21.2.2",
24+
"nx": "21.3.0",
2525
"tsx": "^4.20.3",
26-
"turbo": "2.5.4",
26+
"turbo": "2.5.5",
2727
"typescript": "^5.8.3"
2828
},
2929
"packageManager": "pnpm@10.10.0",

pnpm-lock.yaml

Lines changed: 452 additions & 252 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)