Merge branch 'next' into fix-regex-to-glob-conversion

addons/a11y/package.json

@@ -41,7 +41,7 @@
     "@storybook/components": "6.0.0-alpha.33",
     "@storybook/core-events": "6.0.0-alpha.33",
     "@storybook/theming": "6.0.0-alpha.33",
-    "axe-core": "^3.3.2",
+    "axe-core": "^3.5.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "lodash": "^4.17.15",

lib/api/src/modules/refs.ts

@@ -47,7 +47,11 @@ export type RefUrl = string;
 export const getSourceType = (source: string) => {
   const { origin, pathname } = location;
 
-  if (source === origin || source === `${origin + pathname}iframe.html`) {
+  if (
+    source === origin ||
+    source === `${origin + pathname}iframe.html` ||
+    source === `${origin + pathname.replace(/(?!.*\/).*\.html$/, '')}iframe.html`
+  ) {
     return 'local';
   }
   return 'external';

lib/api/src/tests/refs.test.js

@@ -0,0 +1,41 @@
+import { getSourceType } from '../modules/refs';
+
+jest.mock('global', () => {
+  const globalMock = {};
+  // Change global.location value to handle edge cases
+  // Add additional variations of global.location mock return values in this array.
+  // NOTE: The order must match the order that global.location is called in the unit tests.
+  const edgecaseLocations = [
+    { origin: 'https://storybook.js.org', pathname: '/storybook/index.html' },
+  ];
+  // global.location value after all edgecaseLocations are returned
+  const lastLocation = { origin: 'https://storybook.js.org', pathname: '/storybook/' };
+  Object.defineProperties(globalMock, {
+    location: {
+      get: edgecaseLocations
+        .reduce((mockFn, location) => mockFn.mockReturnValueOnce(location), jest.fn())
+        .mockReturnValue(lastLocation),
+    },
+  });
+  return globalMock;
+});
+
+describe('refs', () => {
+  describe('getSourceType(source)', () => {
+    // These tests must be run first and in correct order.
+    // The order matches the "edgecaseLocations" order in the 'global' mock function above.
+    describe('edge cases', () => {
+      it('returns "local" when source matches location with /index.html in path', () => {
+        // mockReturnValue(edgecaseLocations[0])
+        expect(getSourceType('https://storybook.js.org/storybook/iframe.html')).toBe('local');
+      });
+    });
+    // Other tests use "lastLocation" for the 'global' mock
+    it('returns "local" when source matches location', () => {
+      expect(getSourceType('https://storybook.js.org/storybook/iframe.html')).toBe('local');
+    });
+    it('returns "external" when source does not match location', () => {
+      expect(getSourceType('https://external.com/storybook/iframe.html')).toBe('external');
+    });
+  });
+});

lib/ui/src/index.tsx

@@ -13,6 +13,7 @@ import Provider from './provider';
 
 // @ts-ignore
 ThemeProvider.displayName = 'ThemeProvider';
+// @ts-ignore
 HelmetProvider.displayName = 'HelmetProvider';
 
 const getDocsMode = () => {