Skip to content

Commit 7ba4850

Browse files
Merge pull request #670 from opentripplanner/reduce-bundle-size
Reduce Bundle Size pt 1
2 parents c479916 + 8fd319f commit 7ba4850

14 files changed

+71
-2466
lines changed

Diff for: lib/components/admin/call-record.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable react/prop-types */
22
import { Circle } from '@styled-icons/fa-solid/Circle'
3-
import { Clock } from '@styled-icons/fa-regular'
3+
import { Clock } from '@styled-icons/fa-regular/Clock'
44
import { differenceInMilliseconds, format } from 'date-fns'
55
import { Phone } from '@styled-icons/fa-solid/Phone'
66
import { PhoneAlt } from '@styled-icons/fa-solid/PhoneAlt'

Diff for: lib/components/admin/call-taker-controls.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
import { connect } from 'react-redux'
2+
import { GraduationCap } from '@styled-icons/fa-solid/GraduationCap'
3+
import { History } from '@styled-icons/fa-solid/History'
24
import { injectIntl, IntlShape, WrappedComponentProps } from 'react-intl'
5+
import { Phone } from '@styled-icons/fa-solid/Phone'
6+
import { Plus } from '@styled-icons/fa-solid/Plus'
7+
import { Stop } from '@styled-icons/fa-solid/Stop'
38
import React, { Component } from 'react'
49

510
import * as apiActions from '../../actions/api'
611
import * as callTakerActions from '../../actions/call-taker'
712
import * as fieldTripActions from '../../actions/field-trip'
813
import * as uiActions from '../../actions/ui'
9-
import {
10-
GraduationCap,
11-
History,
12-
Phone,
13-
Plus,
14-
Stop
15-
} from '@styled-icons/fa-solid'
1614
import { isModuleEnabled, Modules } from '../../util/config'
1715

1816
import {

Diff for: lib/components/admin/draggable-window.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Times } from '@styled-icons/fa-solid'
1+
import { Times } from '@styled-icons/fa-solid/Times'
22
import Draggable, { DraggableProps } from 'react-draggable'
33
import React, { HTMLAttributes, ReactNode } from 'react'
44

Diff for: lib/components/admin/field-trip-notes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable react/prop-types */
22
import { Badge, Button as BsButton } from 'react-bootstrap'
33
import { Plus } from '@styled-icons/fa-solid/Plus'
4-
import { StickyNote } from '@styled-icons/fa-regular'
4+
import { StickyNote } from '@styled-icons/fa-regular/StickyNote'
55
import { Trash } from '@styled-icons/fa-solid/Trash'
66
import React, { Component } from 'react'
77
import styled from 'styled-components'

Diff for: lib/components/form/date-time-preview.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { CaretUp } from '@styled-icons/fa-solid/CaretUp'
88
import { Clock } from '@styled-icons/fa-regular/Clock'
99
import { connect } from 'react-redux'
1010
import { injectIntl } from 'react-intl'
11-
import { PencilAlt } from '@styled-icons/fa-solid'
11+
import { PencilAlt } from '@styled-icons/fa-solid/PencilAlt'
1212
import { toDate } from 'date-fns-tz'
1313
import PropTypes from 'prop-types'
1414
import React, { Component } from 'react'

Diff for: lib/components/form/settings-preview.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
/* eslint-disable jsx-a11y/no-static-element-interactions */
33
/* eslint-disable jsx-a11y/click-events-have-key-events */
44
import { Button } from 'react-bootstrap'
5-
import { CaretDown, CaretUp, PencilAlt } from '@styled-icons/fa-solid'
5+
import { CaretDown } from '@styled-icons/fa-solid/CaretDown'
6+
import { CaretUp } from '@styled-icons/fa-solid/CaretUp'
67
import { connect } from 'react-redux'
8+
import { PencilAlt } from '@styled-icons/fa-solid/PencilAlt'
79
import { useIntl } from 'react-intl'
810
import coreUtils from '@opentripplanner/core-utils'
911
import PropTypes from 'prop-types'

Diff for: lib/components/map/map.js

+1-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { setMapillaryId } from '../../actions/map'
99
import DefaultMap from './default-map'
1010
import LegDiagram from './leg-diagram'
1111
import MapillaryFrame from './mapillary-frame'
12-
import StylizedMap from './stylized-map'
1312

1413
class Map extends Component {
1514
constructor() {
@@ -19,16 +18,6 @@ class Map extends Component {
1918
}
2019
}
2120

22-
getComponentForView(view) {
23-
// TODO: allow a 'CUSTOM' type
24-
switch (view.type) {
25-
case 'DEFAULT':
26-
return <DefaultMap />
27-
case 'STYLIZED':
28-
return <StylizedMap />
29-
}
30-
}
31-
3221
render() {
3322
const { activeMapillaryImage, diagramLeg, mapConfig, setMapillaryId } =
3423
this.props
@@ -52,7 +41,7 @@ class Map extends Component {
5241
i === this.state.activeViewIndex ? 'visible' : 'hidden'
5342
}}
5443
>
55-
{this.getComponentForView(view)}
44+
<DefaultMap />
5645
</div>
5746
)
5847
})}

Diff for: lib/components/map/stylized-map.js

-143
This file was deleted.

Diff for: lib/components/mobile/batch-results-screen.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* eslint-disable react/prop-types */
2+
import { ArrowsAlt } from '@styled-icons/fa-solid/ArrowsAlt'
23
import { Button } from 'react-bootstrap'
34
import { connect } from 'react-redux'
45
import { FormattedMessage } from 'react-intl'
6+
import { ListUl } from '@styled-icons/fa-solid/ListUl'
57
import coreUtils from '@opentripplanner/core-utils'
68
import React from 'react'
79
import styled, { css } from 'styled-components'
810

911
import * as uiActions from '../../actions/ui'
10-
import { ArrowsAlt, ListUl } from '@styled-icons/fa-solid'
1112
import {
1213
getActiveItineraries,
1314
getActiveSearch,

Diff for: lib/components/user/back-to-trip-planner.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ArrowLeft } from '@styled-icons/fa-solid'
1+
import { ArrowLeft } from '@styled-icons/fa-solid/ArrowLeft'
22
import { FormattedMessage } from 'react-intl'
33
import React from 'react'
44
import styled from 'styled-components'

Diff for: lib/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import SettingsPreview from './components/form/settings-preview'
1414
import SwitchButton from './components/form/switch-button'
1515
import DefaultMap from './components/map/default-map'
1616
import Map from './components/map/map'
17-
import StylizedMap from './components/map/stylized-map'
1817
import DefaultItinerary from './components/narrative/default/default-itinerary'
1918
import MetroItinerary from './components/narrative/metro/metro-itinerary'
2019
import ItineraryCarousel from './components/narrative/itinerary-carousel'
@@ -69,7 +68,6 @@ export {
6968
LocationField,
7069
PlanTripButton,
7170
SettingsPreview,
72-
StylizedMap,
7371
SwitchButton,
7472

7573
// map components

Diff for: lib/util/mailables.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { format } from 'date-fns'
22
import blobStream from 'blob-stream'
33

4-
import PDFDocument from './PDFDocumentWithTables'
5-
64
/**
75
* Fields use to construct PDF letter. The nested arrays
86
* correspond to rows of inputs in the form layout.

Diff for: package.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@opentripplanner/geocoder": "^1.3.0",
4545
"@opentripplanner/humanize-distance": "^1.2.0",
4646
"@opentripplanner/icons": "^1.2.5",
47-
"@opentripplanner/itinerary-body": "^4.1.0",
47+
"@opentripplanner/itinerary-body": "^4.1.1",
4848
"@opentripplanner/location-field": "1.12.7",
4949
"@opentripplanner/location-icon": "^1.4.0",
5050
"@opentripplanner/park-and-ride-overlay": "^2.0.1",
@@ -66,10 +66,7 @@
6666
"clone": "^2.1.0",
6767
"connected-react-router": "^6.8.0",
6868
"copy-to-clipboard": "^3.0.8",
69-
"country-flag-icons": "^1.4.19",
7069
"currency-formatter": "^1.4.2",
71-
"d3-selection": "^1.3.0",
72-
"d3-zoom": "^1.7.1",
7370
"date-fns": "^2.23.0",
7471
"date-fns-tz": "^1.1.4",
7572
"deepmerge": "^4.2.2",
@@ -120,7 +117,6 @@
120117
"seamless-immutable": "^7.1.3",
121118
"styled-components": "^5.0.0",
122119
"tinycolor2": "^1.4.2",
123-
"transitive-js": "^0.14.1",
124120
"yup": "^0.29.3"
125121
},
126122
"devDependencies": {
@@ -170,6 +166,7 @@
170166
"husky": "^6.0.0",
171167
"jest-transform-stub": "^2.0.0",
172168
"jest-yaml-transform": "^0.2.0",
169+
"json-loader": "^0.5.7",
173170
"lint-staged": "^11.1.2",
174171
"nock": "^9.0.9",
175172
"patch-package": "^6.4.7",

0 commit comments

Comments
 (0)