Mapbox fix

jest.config.js

@@ -8,4 +8,7 @@ module.exports = {
     '!<rootDir>/**/__snapshots__/*',
     '!<rootDir>/src/**/index.ts',
   ],
+  moduleNameMapper: {
+    '\\.(css)$': '<rootDir>/test/__mocks__/styleMock.js',
+  },
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsml-ui",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "private": false,
   "license": "MIT",
   "scripts": {

public/tests/aasanjose.html

@@ -48,7 +48,9 @@
 
       var tsml_react_config = {
         feedback_emails: ['meetings@aasanjose.org'],
-        map: darkMode ? { style: 'mapbox://styles/mapbox/dark-v11' } : {},
+        map: darkMode
+          ? { style: 'mapbox://styles/mapbox/navigation-night-v1' }
+          : {},
       };
     </script>
     <script src="/app.js" async></script>

src/helpers/settings.ts

@@ -64,7 +64,7 @@ export const defaults: TSMLReactConfig = {
         width: 26,
       },
     },
-    style: 'mapbox://styles/mapbox/streets-v12',
+    style: 'mapbox://styles/mapbox/streets-v10',
   },
   now_offset: -10, //"now" includes meetings that started in the last 10 minutes
   params: ['search', 'mode', 'view', 'meeting'], //input other than filters

src/styles/map.ts

@@ -2,6 +2,8 @@ import { css } from '@emotion/react';
 
 import { color } from './variables';
 
+import 'mapbox-gl/dist/mapbox-gl.css';
+
 export const mapCss = css`
   background-color: ${color.medium};
   border-radius: var(--border-radius);

src/components/__fixtures__/meeting.ts → test/__fixtures__/meeting.ts

@@ -1,4 +1,4 @@
-import type { Meeting } from '../../types';
+import type { Meeting } from '../../src/types';
 
 export const mockMeeting: Meeting = {
   slug: 'foo',

src/components/__fixtures__/state.ts → test/__fixtures__/state.ts

@@ -1,4 +1,4 @@
-import type { State } from '../../types';
+import type { State } from '../../src/types';
 
 export const mockState: State = {
   capabilities: {

test/__mocks__/styleMock.js

@@ -0,0 +1 @@
+module.exports = {};

src/components/__tests__/Alert.spec.tsx → test/__tests__/Alert.spec.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
-import Alert from '../Alert';
-import { en } from '../../i18n';
+import Alert from '../../src/components/Alert';
+import { en } from '../../src/i18n';
 import { mockState } from '../__fixtures__';
 
 describe('<Alert />', () => {

src/components/__tests__/Button.spec.tsx → test/__tests__/Button.spec.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
-import Button from '../Button';
+import Button from '../../src/components/Button';
 
 describe('<Button />', () => {
   it('passes props correctly', () => {

src/components/__tests__/Controls.spec.tsx → test/__tests__/Controls.spec.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
-import Controls from '../Controls';
-import { mergeSettings, SettingsContext } from '../../helpers';
+import Controls from '../../src/components/Controls';
+import { mergeSettings, SettingsContext } from '../../src/helpers';
 import { mockMeeting, mockState } from '../__fixtures__';
 
 describe('<Controls />', () => {

src/components/__tests__/Dropdown.spec.tsx → test/__tests__/Dropdown.spec.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
-import Dropdown from '../Dropdown';
-import { SettingsContext, mergeSettings } from '../../helpers';
+import Dropdown from '../../src/components/Dropdown';
+import { SettingsContext, mergeSettings } from '../../src/helpers';
 import { mockState } from '../__fixtures__';
-import { State } from '../../types';
+import { State } from '../../src/types';
 
 describe('<Dropdown />', () => {
   const filter = 'type';

src/components/__tests__/Link.spec.tsx → test/__tests__/Link.spec.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { screen, render, fireEvent } from '@testing-library/react';
-import { Meeting } from '../../types';
-import Link from '../Link';
-import { SettingsContext, mergeSettings } from '../../helpers/settings';
+import { Meeting } from '../../src/types';
+import Link from '../../src/components/Link';
+import { SettingsContext, mergeSettings } from '../../src/helpers/settings';
 import { mockState } from '../__fixtures__';
 
 const mockMeeting: Meeting = {

src/components/__tests__/Loading.spec.tsx → test/__tests__/Loading.spec.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
-import Loading from '../Loading';
+import Loading from '../../src/components/Loading';
 
 test('<Loading />', () => {
   const tree = renderer.create(<Loading />).toJSON();

src/components/__tests__/Map.spec.tsx → test/__tests__/Map.spec.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import { DateTime } from 'luxon';
 
-import Map from '../Map';
+import Map from '../../src/components/Map';
 import { mockState } from '../__fixtures__';
 
 describe('<Map />', () => {

src/components/__tests__/Meeting.spec.tsx → test/__tests__/Meeting.spec.tsx

@@ -2,10 +2,10 @@ import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { DateTime } from 'luxon';
 
-import type { Meeting as MeetingType, State } from '../../types';
-import { SettingsContext, mergeSettings } from '../../helpers';
-import { en } from '../../i18n';
-import Meeting from '../Meeting';
+import type { Meeting as MeetingType, State } from '../../src/types';
+import { SettingsContext, mergeSettings } from '../../src/helpers';
+import { en } from '../../src/i18n';
+import Meeting from '../../src/components/Meeting';
 
 describe('<Meeting />', () => {
   beforeEach(() => {

src/components/__tests__/Table.spec.tsx → test/__tests__/Table.spec.tsx

@@ -5,8 +5,8 @@ import {
   SettingsContext,
   formatString as i18n,
   mergeSettings,
-} from '../../helpers';
-import Table from '../Table';
+} from '../../src/helpers';
+import Table from '../../src/components/Table';
 import { mockMeeting, mockState } from '../__fixtures__';
 
 describe('<Table />', () => {

src/components/__tests__/Title.spec.tsx → test/__tests__/Title.spec.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { screen, render } from '@testing-library/react';
-import Title from '../Title';
+import Title from '../../src/components/Title';
 import { mockState } from '../__fixtures__';
 
 function assertHeadingAndTitleHas(title: string) {

src/components/__tests__/__snapshots__/Loading.spec.tsx.snap → test/__tests__/__snapshots__/Loading.spec.tsx.snap

@@ -4,8 +4,8 @@ exports[`<Loading /> 1`] = `
 <div
   css={
     {
-      "map": "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxvYWRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUzZCIiwiZmlsZSI6ImxvYWRpbmcudHMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjc3MsIGtleWZyYW1lcyB9IGZyb20gJ0BlbW90aW9uL3JlYWN0JztcblxuaW1wb3J0IHsgY29sb3IsIHNpemUgfSBmcm9tICcuL3ZhcmlhYmxlcyc7XG5cbmNvbnN0IGFuaW1hdGlvbiA9IGtleWZyYW1lc2BcbiAgZnJvbSB7IHRyYW5zZm9ybTogcm90YXRlKDBkZWcpOyB9XG4gIHRvIHsgdHJhbnNmb3JtOiByb3RhdGUoMzYwZGVnKTsgfVxuYDtcblxuZXhwb3J0IGNvbnN0IGxvYWRpbmdDc3MgPSBjc3NgXG4gIGFsaWduLWl0ZW1zOiBjZW50ZXI7XG4gIGRpc3BsYXk6IGZsZXg7XG4gIGZsZXgtZ3JvdzogMTtcbiAganVzdGlmeS1jb250ZW50OiBjZW50ZXI7XG4gIG1pbi1oZWlnaHQ6IDUwMHB4O1xuXG4gID4gZGl2IHtcbiAgICBoZWlnaHQ6ICR7c2l6ZS5sb2FkaW5nfXB4O1xuICAgIHBvc2l0aW9uOiByZWxhdGl2ZTtcbiAgICB3aWR0aDogJHtzaXplLmxvYWRpbmd9cHg7XG4gICAgZGl2IHtcbiAgICAgIGFuaW1hdGlvbjogJHthbmltYXRpb259IDEuMnMgY3ViaWMtYmV6aWVyKDAuNSwgMCwgMC41LCAxKSBpbmZpbml0ZTtcbiAgICAgIGJvcmRlci1jb2xvcjogJHtjb2xvci5tZWRpdW19IHRyYW5zcGFyZW50IHRyYW5zcGFyZW50IHRyYW5zcGFyZW50O1xuICAgICAgYm9yZGVyLXJhZGl1czogNTAlO1xuICAgICAgYm9yZGVyLXN0eWxlOiBzb2xpZDtcbiAgICAgIGJvcmRlci13aWR0aDogJHtzaXplLmxvYWRpbmcgLyAxMH1weDtcbiAgICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7XG4gICAgICBoZWlnaHQ6IDEwMCU7XG4gICAgICBwb3NpdGlvbjogYWJzb2x1dGU7XG4gICAgICB3aWR0aDogMTAwJTtcbiAgICAgICY6bnRoLW9mLXR5cGUoMSkge1xuICAgICAgICBhbmltYXRpb24tZGVsYXk6IC0wLjQ1cztcbiAgICAgIH1cbiAgICAgICY6bnRoLW9mLXR5cGUoMikge1xuICAgICAgICBhbmltYXRpb24tZGVsYXk6IC0wLjNzO1xuICAgICAgfVxuICAgICAgJjpudGgtb2YtdHlwZSgzKSB7XG4gICAgICAgIGFuaW1hdGlvbi1kZWxheTogLTAuMTVzO1xuICAgICAgfVxuICAgIH1cbiAgfVxuYDtcbiJdfQ== */",
-      "name": "13hncpq-loadingCss",
+      "map": "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxvYWRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUzZCIiwiZmlsZSI6ImxvYWRpbmcudHMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjc3MsIGtleWZyYW1lcyB9IGZyb20gJ0BlbW90aW9uL3JlYWN0JztcblxuaW1wb3J0IHsgY29sb3IsIHNpemUgfSBmcm9tICcuL3ZhcmlhYmxlcyc7XG5cbmNvbnN0IGFuaW1hdGlvbiA9IGtleWZyYW1lc2BcbiAgZnJvbSB7IHRyYW5zZm9ybTogcm90YXRlKDBkZWcpOyB9XG4gIHRvIHsgdHJhbnNmb3JtOiByb3RhdGUoMzYwZGVnKTsgfVxuYDtcblxuZXhwb3J0IGNvbnN0IGxvYWRpbmdDc3MgPSBjc3NgXG4gIGFsaWduLWl0ZW1zOiBjZW50ZXI7XG4gIGRpc3BsYXk6IGZsZXg7XG4gIGZsZXgtZ3JvdzogMTtcbiAganVzdGlmeS1jb250ZW50OiBjZW50ZXI7XG4gIG1pbi1oZWlnaHQ6IDUwMHB4O1xuXG4gID4gZGl2IHtcbiAgICBoZWlnaHQ6ICR7c2l6ZS5sb2FkaW5nfXB4O1xuICAgIHBvc2l0aW9uOiByZWxhdGl2ZTtcbiAgICB3aWR0aDogJHtzaXplLmxvYWRpbmd9cHg7XG4gICAgZGl2IHtcbiAgICAgIGFuaW1hdGlvbjogJHthbmltYXRpb259IDEuMnMgY3ViaWMtYmV6aWVyKDAuNSwgMCwgMC41LCAxKSBpbmZpbml0ZTtcbiAgICAgIGJvcmRlci1jb2xvcjogJHtjb2xvci5tZWRpdW19IHRyYW5zcGFyZW50IHRyYW5zcGFyZW50IHRyYW5zcGFyZW50O1xuICAgICAgYm9yZGVyLXJhZGl1czogNTAlO1xuICAgICAgYm9yZGVyLXN0eWxlOiBzb2xpZDtcbiAgICAgIGJvcmRlci13aWR0aDogJHtzaXplLmxvYWRpbmcgLyAxMH1weDtcbiAgICAgIGhlaWdodDogMTAwJTtcbiAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTtcbiAgICAgIHdpZHRoOiAxMDAlO1xuICAgICAgJjpudGgtb2YtdHlwZSgxKSB7XG4gICAgICAgIGFuaW1hdGlvbi1kZWxheTogLTAuNDVzO1xuICAgICAgfVxuICAgICAgJjpudGgtb2YtdHlwZSgyKSB7XG4gICAgICAgIGFuaW1hdGlvbi1kZWxheTogLTAuM3M7XG4gICAgICB9XG4gICAgICAmOm50aC1vZi10eXBlKDMpIHtcbiAgICAgICAgYW5pbWF0aW9uLWRlbGF5OiAtMC4xNXM7XG4gICAgICB9XG4gICAgfVxuICB9XG5gO1xuIl19 */",
+      "name": "tuls2x-loadingCss",
       "next": {
         "name": "animation-w6tfot",
         "next": undefined,
@@ -14,7 +14,7 @@ exports[`<Loading /> 1`] = `
   to { transform: rotate(360deg); }
 }",
       },
-      "styles": "align-items:center;display:flex;flex-grow:1;justify-content:center;min-height:500px;>div{height:64px;position:relative;width:64px;div{animation:animation-w6tfot 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;border-color:color-mix(in srgb, var(--background), var(--text) 15%) transparent transparent transparent;border-radius:50%;border-style:solid;border-width:6.4px;box-sizing:border-box;height:100%;position:absolute;width:100%;&:nth-of-type(1){animation-delay:-0.45s;}&:nth-of-type(2){animation-delay:-0.3s;}&:nth-of-type(3){animation-delay:-0.15s;}}};label:loadingCss;",
+      "styles": "align-items:center;display:flex;flex-grow:1;justify-content:center;min-height:500px;>div{height:64px;position:relative;width:64px;div{animation:animation-w6tfot 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;border-color:color-mix(in srgb, var(--background), var(--text) 15%) transparent transparent transparent;border-radius:50%;border-style:solid;border-width:6.4px;height:100%;position:absolute;width:100%;&:nth-of-type(1){animation-delay:-0.45s;}&:nth-of-type(2){animation-delay:-0.3s;}&:nth-of-type(3){animation-delay:-0.15s;}}};label:loadingCss;",
       "toString": [Function],
     }
   }

src/helpers/__tests__/analytics.spec.ts → test/__tests__/analytics.spec.ts

@@ -1,4 +1,4 @@
-import { analyticsEvent } from '../analytics';
+import { analyticsEvent } from '../../src/helpers/analytics';
 
 window.gtag = jest.fn();
 window.ga = jest.fn();

src/helpers/__tests__/calculate-distances.spec.ts → test/__tests__/calculate-distances.spec.ts

@@ -1,6 +1,6 @@
-import { getDistance } from '../calculate-distances';
-import type { Meeting } from '../../types';
-import { defaults as settings } from '../settings';
+import { getDistance } from '../../src/helpers/calculate-distances';
+import type { Meeting } from '../../src/types';
+import { defaults as settings } from '../../src/helpers/settings';
 
 describe('distance', () => {
   //exact

src/helpers/__tests__/format-address.spec.ts → test/__tests__/format-address.spec.ts

@@ -1,4 +1,4 @@
-import { formatAddress } from '../format-address';
+import { formatAddress } from '../../src/helpers/format-address';
 
 describe('formatAddress', () => {
   it('returns first part of address if length > 3', () => {

src/helpers/__tests__/format-array.spec.ts → test/__tests__/format-array.spec.ts

@@ -1,4 +1,4 @@
-import { formatArray } from '../format-array';
+import { formatArray } from '../../src/helpers/format-array';
 
 describe('formatArray', () => {
   it.each`

src/helpers/__tests__/format-conference-provider.spec.ts → test/__tests__/format-conference-provider.spec.ts

@@ -1,5 +1,5 @@
-import { defaults } from '../settings';
-import { formatConferenceProvider } from '../format-conference-provider';
+import { defaults } from '../../src/helpers/settings';
+import { formatConferenceProvider } from '../../src/helpers/format-conference-provider';
 
 describe('formatConferenceProvider', () => {
   it.each(['foo', 'https://', 'https://foo.com'])(

src/helpers/__tests__/format-directions-url.spec.ts → test/__tests__/format-directions-url.spec.ts

@@ -1,4 +1,4 @@
-import { formatDirectionsUrl } from '../format-directions-url';
+import { formatDirectionsUrl } from '../../src/helpers/format-directions-url';
 
 describe('formatDirectionsUrl', () => {
   const { formatted_address, latitude, longitude } = {

src/helpers/__tests__/format-feedback-email.spec.ts → test/__tests__/format-feedback-email.spec.ts

@@ -1,13 +1,13 @@
-import { defaults } from '../settings';
-import { getQueryString } from '../query-string';
-import { formatFeedbackEmail } from '../format-feedback-email';
-import { Meeting } from '../../types';
+import { defaults } from '../../src/helpers/settings';
+import { getQueryString } from '../../src/helpers/query-string';
+import { formatFeedbackEmail } from '../../src/helpers/format-feedback-email';
+import { Meeting } from '../../src/types';
 
-jest.mock('../format-url', () => ({
+jest.mock('../../src/helpers/format-url', () => ({
   formatUrl: jest.fn().mockReturnValue('https://foo.com'),
 }));
 
-jest.mock('../query-string');
+jest.mock('../../src/helpers/query-string');
 
 const mockedGetQueryString = jest.mocked(getQueryString);
 

src/helpers/__tests__/format-ics.spec.ts → test/__tests__/format-ics.spec.ts

@@ -1,7 +1,7 @@
 import { DateTime } from 'luxon';
 
-import { formatIcs } from '../format-ics';
-import { Meeting } from '../../types';
+import { formatIcs } from '../../src/helpers/format-ics';
+import { Meeting } from '../../src/types';
 
 //TODO: Only requiring the parts needed for this test, should
 //probably integrate fixtures.

src/helpers/__tests__/format-slug.spec.ts → test/__tests__/format-slug.spec.ts

@@ -1,4 +1,4 @@
-import { formatSlug } from '../format-slug';
+import { formatSlug } from '../../src/helpers/format-slug';
 
 describe('formatSlug', () => {
   it('removes accents', () => {

src/helpers/__tests__/format-string.spec.ts → test/__tests__/format-string.spec.ts

@@ -1,4 +1,4 @@
-import { formatString } from '../format-string';
+import { formatString } from '../../src/helpers/format-string';
 
 describe('formatString', () => {
   it('works with mixed params', () => {

src/helpers/__tests__/format-url.spec.ts → test/__tests__/format-url.spec.ts

@@ -1,5 +1,5 @@
-import { formatUrl } from '../format-url';
-import { defaults } from '../settings';
+import { formatUrl } from '../../src/helpers/format-url';
+import { defaults } from '../../src/helpers/settings';
 
 describe('formatUrl', () => {
   it('works with no params', () => {

src/helpers/__tests__/load-meeting-data.spec.ts → test/__tests__/load-meeting-data.spec.ts

@@ -1,6 +1,9 @@
-import type { JSONData } from '../../types';
-import { flattenDays, loadMeetingData } from '../load-meeting-data';
-import { defaults } from '../settings';
+import type { JSONData } from '../../src/types';
+import {
+  flattenDays,
+  loadMeetingData,
+} from '../../src/helpers/load-meeting-data';
+import { defaults } from '../../src/helpers/settings';
 
 describe('loadMeetingData', () => {
   it('loads data correctly', () => {

src/helpers/__tests__/query-string.spec.ts → test/__tests__/query-string.spec.ts

@@ -1,9 +1,9 @@
-import { getQueryString, setQueryString } from '../query-string';
+import { getQueryString, setQueryString } from '../../src/helpers/query-string';
 import { stringify } from 'querystring';
-import { formatUrl } from '../format-url';
-import { defaults } from '../settings';
+import { formatUrl } from '../../src/helpers/format-url';
+import { defaults } from '../../src/helpers/settings';
 
-jest.mock('../format-url', () => ({
+jest.mock('../../src/helpers/format-url', () => ({
   formatUrl: jest.fn().mockReturnValue('foo'),
 }));
 

src/helpers/__tests__/settings.spec.ts → test/__tests__/settings.spec.ts

@@ -1,4 +1,4 @@
-import { mergeSettings } from '../settings';
+import { mergeSettings } from '../../src/helpers/settings';
 
 describe('settings', () => {
   let languageGetter: jest.SpyInstance<string, []>;

src/helpers/__tests__/translate-google-sheet.spec.ts → test/__tests__/translate-google-sheet.spec.ts

@@ -1,9 +1,9 @@
-import { JSONData } from '../../types';
-import { defaults } from '../settings';
+import { JSONData } from '../../src/types';
+import { defaults } from '../../src/helpers/settings';
 import {
   GoogleSheetData,
   translateGoogleSheet,
-} from '../translate-google-sheet';
+} from '../../src/helpers/translate-google-sheet';
 
 describe('translateGoogleSheet', () => {
   const sheetId = 'abc123';

src/helpers/__tests__/user-agent.spec.ts → test/__tests__/user-agent.spec.ts

@@ -1,4 +1,4 @@
-import { iOS } from '../user-agent';
+import { iOS } from '../../src/helpers/user-agent';
 
 let platformGetter: jest.SpyInstance<string, []>;
 let userAgentGetter: jest.SpyInstance<string, []>;

tsconfig.json

@@ -13,5 +13,25 @@
     "strictNullChecks": true,
     "target": "ES2015"
   },
-  "include": ["index.d.ts", "src/app.tsx", "src/**/*.ts"]
+  "include": [
+    "index.d.ts",
+    "src/app.tsx",
+    "src/**/*.ts",
+    "test/__tests__/analytics.spec.ts",
+    "test/__tests__/calculate-distances.spec.ts",
+    "test/__tests__/format-address.spec.ts",
+    "test/__tests__/format-array.spec.ts",
+    "test/__tests__/format-conference-provider.spec.ts",
+    "test/__tests__/format-directions-url.spec.ts",
+    "test/__tests__/format-feedback-email.spec.ts",
+    "test/__tests__/format-ics.spec.ts",
+    "test/__tests__/format-slug.spec.ts",
+    "test/__tests__/format-string.spec.ts",
+    "test/__tests__/format-url.spec.ts",
+    "test/__tests__/load-meeting-data.spec.ts",
+    "test/__tests__/query-string.spec.ts",
+    "test/__tests__/settings.spec.ts",
+    "test/__tests__/translate-google-sheet.spec.ts",
+    "test/__tests__/user-agent.spec.ts"
+  ]
 }