Merge branch 'main' into feat/rename-rn-new

roninoss · Oct 27, 2024 · 87d2bcc · 87d2bcc
2 parents 4d71b77 + 6faacce
commit 87d2bcc
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # rn-new
 
+## 2.11.25
+
+### Patch Changes
+
+- [#421](https://github.com/roninoss/create-expo-stack/pull/421) [`8f9d35dead9b7e2ba6a1220043fee5a2c7a6e4ea`](https://github.com/roninoss/create-expo-stack/commit/8f9d35dead9b7e2ba6a1220043fee5a2c7a6e4ea) Thanks [@Viraj-10](https://github.com/Viraj-10)! - fix: nativewind version and dependencies
+
 ## 2.11.24
 
 ### Patch Changes

diff --git a/cli/README.md b/cli/README.md
@@ -59,7 +59,7 @@ Each project is generated based on the results of the CLI, on a per-file basis.
 
 | Library            | Category            | Version | Description                                    |
 | ------------------ | ------------------- | ------- | ---------------------------------------------- |
-| React Native       | Mobile Framework    | v0.73   | The best cross-platform mobile framework       |
+| React Native       | Mobile Framework    | v0.74   | The best cross-platform mobile framework       |
 | React              | UI Framework        | v18     | The most popular UI framework in the world     |
 | TypeScript         | Language            | v5      | Static typechecking                            |
 | React Navigation   | Navigation          | v6      | Performant and consistent navigation framework |
@@ -296,6 +296,13 @@ Thanks go to these wonderful people:
             <sub><b>YOUNESS HASSOUNE</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/Viraj-10">
+            <img src="https://avatars.githubusercontent.com/u/66306233?v=4" width="100;" alt="Viraj-10"/>
+            <br />
+            <sub><b>Viraj Joshi</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/Hacksore">
             <img src="https://avatars.githubusercontent.com/u/996134?v=4" width="100;" alt="Hacksore"/>
@@ -309,15 +316,15 @@ Thanks go to these wonderful people:
             <br />
             <sub><b>Salloom</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/ralacerda">
             <img src="https://avatars.githubusercontent.com/u/19380403?v=4" width="100;" alt="ralacerda"/>
             <br />
             <sub><b>Renato Lacerda</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/imranbarbhuiya">
             <img src="https://avatars.githubusercontent.com/u/74945038?v=4" width="100;" alt="imranbarbhuiya"/>
@@ -352,15 +359,15 @@ Thanks go to these wonderful people:
             <br />
             <sub><b>Jeff Boek</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/gwenoleR">
             <img src="https://avatars.githubusercontent.com/u/10418241?v=4" width="100;" alt="gwenoleR"/>
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/claudesortwell">
             <img src="https://avatars.githubusercontent.com/u/41422239?v=4" width="100;" alt="claudesortwell"/>

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rn-new",
-  "version": "2.11.24",
+  "version": "2.11.25",
   "description": "CLI tool to initialize a React Native application with Expo",
   "repository": {
     "type": "git",

diff --git a/cli/src/templates/base/package.json.ejs b/cli/src/templates/base/package.json.ejs
@@ -29,7 +29,15 @@
   },
   "dependencies": {
     <% if (props.stylingPackage?.name === "nativewind" || props.stylingPackage?.name === "nativewindui") { %>
-      "nativewind": "next",
+      "nativewind": "latest",
+      <%# This will already be installed if using expo-router (see below) %>
+      <% if (props.navigationPackage?.name !== "expo-router") { %>
+        "react-native-reanimated": "~3.10.1",
+      <% } %>
+      <%# This will already be installed if using navigation (see below) %>
+      <% if (props.navigationPackage?.type !== "navigation") { %>
+        "react-native-safe-area-context": "4.10.5",
+      <% } %>
     <% } %>
     <% if (props.stylingPackage?.name === "nativewindui") { %>
       "@roninoss/icons": "^0.0.4",