Merge branch 'master' of github.com:spotify/backstage into blam/gql

* 'master' of github.com:spotify/backstage:
  fix(techdocs-not-found): bug fix
  images have extension jpg or jpeg, not jpe (#1742)

packages/cli/config/jest.js

@@ -38,7 +38,7 @@ async function getConfig() {
     transform: {
       '\\.esm\\.js$': require.resolve('jest-esm-transformer'),
       '\\.(js|jsx|ts|tsx)': require.resolve('ts-jest'),
-      '\\.(bmp|gif|jpe|png|frag|xml|svg)': require.resolve(
+      '\\.(bmp|gif|jpg|jpeg|png|frag|xml|svg)': require.resolve(
         './jestFileTransform.js',
       ),
     },
@@ -49,7 +49,7 @@ async function getConfig() {
     // Default behaviour is to not apply transforms for node_modules, but we still want
     // to apply the esm-transformer to .esm.js files, since that's what we use in backstage packages.
     transformIgnorePatterns: [
-      '/node_modules/(?!.*\\.(?:esm\\.js|bmp|gif|jpe|png|frag|xml|svg)$)',
+      '/node_modules/(?!.*\\.(?:esm\\.js|bmp|gif|jpg|jpeg|png|frag|xml|svg)$)',
     ],
   };
 

plugins/techdocs/src/reader/components/Reader.tsx

@@ -91,6 +91,10 @@ export const Reader = () => {
       return; // Page isn't ready
     }
 
+    if (state.value instanceof Error) {
+      return; // Docs not found
+    }
+
     // Pre-render
     const transformedElement = transformer(state.value as string, [
       sanitizeDOM(),