Skip to content

Commit 0c24648

Browse files
Joshua KrautwurstJoshua Krautwurst
Joshua Krautwurst
authored and
Joshua Krautwurst
committed
hotfix for sass-variable-import-into-js breakage as part of our dependency upgrades -- see facebook/create-react-app#10047 for details
1 parent 40a8c0e commit 0c24648

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

src/common/styles/_layout.scss

-16
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,3 @@ $lg-height-min: 48.875rem;
1515
$whenPageIsMediumHeightAndWidth: '(min-height: #{$md-height-min}) and (min-width: #{$md-layout-width-min})';
1616
$whenPageIsTallAndMediumWidth: '(min-width: #{$md-layout-width-min}) and (min-height: #{$lg-height-min})';
1717
$whenPageIsIsTallAndWide: '(min-width: #{$lg-layout-width-min}) and (min-height: #{$lg-height-min})';
18-
19-
20-
/* webpack export statement exposes these variables to our JS files */
21-
:export {
22-
extraLargeWidthMin: $xl-layout-width-min;
23-
largeHeightMin: $lg-height-min;
24-
largeWidthMin: $lg-layout-width-min;
25-
mediumHeightMax: $md-height-max;
26-
mediumHeightMin: $md-height-min;
27-
mediumWidthMin: $md-layout-width-min;
28-
mediumWidthMax: $md-layout-width-max;
29-
pageIsAtMediumHeightAndWidth: $whenPageIsMediumHeightAndWidth;
30-
pageIsTallAndMediumWidth: $whenPageIsTallAndMediumWidth;
31-
pageIsTallAndWide: $whenPageIsIsTallAndWide;
32-
smallHeightMax: $sm-height-max;
33-
}

src/common/styles/layout.module.scss

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@import './_layout.scss';
2+
3+
/* webpack export statement exposes these variables to our JS files */
4+
/* we have to do this in a separate *.module.scss file because of this bug https://github.com/facebook/create-react-app/issues/10047 */
5+
:export {
6+
extraLargeWidthMin: $xl-layout-width-min;
7+
largeHeightMin: $lg-height-min;
8+
largeWidthMin: $lg-layout-width-min;
9+
mediumHeightMax: $md-height-max;
10+
mediumHeightMin: $md-height-min;
11+
mediumWidthMin: $md-layout-width-min;
12+
mediumWidthMax: $md-layout-width-max;
13+
pageIsAtMediumHeightAndWidth: $whenPageIsMediumHeightAndWidth;
14+
pageIsTallAndMediumWidth: $whenPageIsTallAndMediumWidth;
15+
pageIsTallAndWide: $whenPageIsIsTallAndWide;
16+
smallHeightMax: $sm-height-max;
17+
}

src/constants/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { toast } from 'react-toastify';
33
import { buildbranch, buildnum } from '../../package.json';
44
import { INITIAL_FILTER_STATE } from '../ducks/event-filter';
55

6-
import layoutVariables from '../common/styles/_layout.scss';
6+
import layoutVariables from '../common/styles/layout.module.scss';
77

88
const { POSITION: TOAST_POSITIONS } = toast;
99

0 commit comments

Comments
 (0)