[router]: fix _layoutfile with platform extensions registering as a r…

…oute
expo · May 9, 2024 · 12a3f5a · 12a3f5a
1 parent be289b3
commit 12a3f5a
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 5 deletions.
diff --git a/packages/expo-router/CHANGELOG.md b/packages/expo-router/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### 🐛 Bug fixes
 
 - Fix Typed Routes generating incorrect routes and crashing when moving files ([#28665](https://github.com/expo/expo/pull/28665) by [@marklawlor](https://github.com/marklawlor))
+- Fix _layout files with platform extensions incorrectly registering as a route
 
 ### 💡 Others
 

diff --git a/packages/expo-router/build/getRoutes.js b/packages/expo-router/build/getRoutes.js
diff --git a/packages/expo-router/build/getRoutes.js.map b/packages/expo-router/build/getRoutes.js.map
diff --git a/packages/expo-router/src/__tests__/platform-routes.test.android.tsx b/packages/expo-router/src/__tests__/platform-routes.test.android.tsx
@@ -71,3 +71,45 @@ it(`should only load android and native routes`, () => {
     type: 'layout',
   });
 });
+
+it(`should work with layout routes`, () => {
+  expect(
+    getRoutes(
+      inMemoryContext({
+        './(app)/index.tsx': () => null,
+        './(app)/_layout.tsx': () => null,
+        './(app)/_layout.android.tsx': () => null,
+      }),
+      { internal_stripLoadRoute: true, platform: Platform.OS, skipGenerated: true }
+    )
+  ).toEqual({
+    children: [
+      {
+        children: [
+          {
+            children: [],
+            contextKey: './(app)/index.tsx',
+            dynamic: null,
+            entryPoints: [
+              'expo-router/build/views/Navigator.js',
+              './(app)/_layout.android.tsx',
+              './(app)/index.tsx',
+            ],
+            route: 'index',
+            type: 'route',
+          },
+        ],
+        contextKey: './(app)/_layout.android.tsx',
+        dynamic: null,
+        initialRouteName: undefined,
+        route: '(app)',
+        type: 'layout',
+      },
+    ],
+    contextKey: 'expo-router/build/views/Navigator.js',
+    dynamic: null,
+    generated: true,
+    route: '',
+    type: 'layout',
+  });
+});
diff --git a/packages/expo-router/src/__tests__/platform-routes.test.ios.tsx b/packages/expo-router/src/__tests__/platform-routes.test.ios.tsx
@@ -71,3 +71,45 @@ it(`should only load android and native routes`, () => {
     type: 'layout',
   });
 });
+
+it(`should work with layout routes`, () => {
+  expect(
+    getRoutes(
+      inMemoryContext({
+        './(app)/index.tsx': () => null,
+        './(app)/_layout.tsx': () => null,
+        './(app)/_layout.ios.tsx': () => null,
+      }),
+      { internal_stripLoadRoute: true, platform: Platform.OS, skipGenerated: true }
+    )
+  ).toEqual({
+    children: [
+      {
+        children: [
+          {
+            children: [],
+            contextKey: './(app)/index.tsx',
+            dynamic: null,
+            entryPoints: [
+              'expo-router/build/views/Navigator.js',
+              './(app)/_layout.ios.tsx',
+              './(app)/index.tsx',
+            ],
+            route: 'index',
+            type: 'route',
+          },
+        ],
+        contextKey: './(app)/_layout.ios.tsx',
+        dynamic: null,
+        initialRouteName: undefined,
+        route: '(app)',
+        type: 'layout',
+      },
+    ],
+    contextKey: 'expo-router/build/views/Navigator.js',
+    dynamic: null,
+    generated: true,
+    route: '',
+    type: 'layout',
+  });
+});
diff --git a/packages/expo-router/src/__tests__/platform-routes.test.web.ts b/packages/expo-router/src/__tests__/platform-routes.test.web.ts
@@ -209,3 +209,45 @@ it(`can display platform routes`, () => {
     type: 'layout',
   });
 });
+
+it(`should work with layout routes`, () => {
+  expect(
+    getRoutes(
+      inMemoryContext({
+        './(app)/index.tsx': () => null,
+        './(app)/_layout.tsx': () => null,
+        './(app)/_layout.web.tsx': () => null,
+      }),
+      { internal_stripLoadRoute: true, platform: Platform.OS, skipGenerated: true }
+    )
+  ).toEqual({
+    children: [
+      {
+        children: [
+          {
+            children: [],
+            contextKey: './(app)/index.tsx',
+            dynamic: null,
+            entryPoints: [
+              'expo-router/build/views/Navigator.js',
+              './(app)/_layout.web.tsx',
+              './(app)/index.tsx',
+            ],
+            route: 'index',
+            type: 'route',
+          },
+        ],
+        contextKey: './(app)/_layout.web.tsx',
+        dynamic: null,
+        initialRouteName: undefined,
+        route: '(app)',
+        type: 'layout',
+      },
+    ],
+    contextKey: 'expo-router/build/views/Navigator.js',
+    dynamic: null,
+    generated: true,
+    route: '',
+    type: 'layout',
+  });
+});
diff --git a/packages/expo-router/src/getRoutes.ts b/packages/expo-router/src/getRoutes.ts
@@ -335,7 +335,8 @@ function getFileMeta(key: string, options: Options) {
   const parts = key.split('/');
   let route = removeSupportedExtensions(key);
   const filename = parts[parts.length - 1];
-  const filenameWithoutExtensions = removeSupportedExtensions(filename);
+  const [filenameWithoutExtensions, platformExtension] =
+    removeSupportedExtensions(filename).split('.');
   const isLayout = filenameWithoutExtensions === '_layout';
   const isApi = filename.match(/\+api\.(\w+\.)?[jt]sx?$/);
 
@@ -352,7 +353,6 @@ function getFileMeta(key: string, options: Options) {
   }
   let specificity = 0;
 
-  const platformExtension = filenameWithoutExtensions.split('.')[1];
   const hasPlatformExtension = validPlatforms.has(platformExtension);
   const usePlatformRoutes = options.platformRoutes ?? true;