Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Theming] Convert Components (Part IV) #477

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b094431
Bump @types/react from 16.9.53 to 16.9.55 (#473)
dependabot-preview[bot] Oct 29, 2020
52c2f2b
Bump @types/react-dom from 16.9.8 to 16.9.9 (#469)
dependabot-preview[bot] Oct 29, 2020
f0d3f99
Bump @types/enzyme from 3.10.7 to 3.10.8 (#470)
dependabot-preview[bot] Oct 29, 2020
6e5eca8
Bump lint-staged from 10.4.0 to 10.5.0 (#468)
dependabot-preview[bot] Oct 29, 2020
4240182
Merge branch 'master' into epic/add-theming-functionality
michaeljaltamirano Oct 29, 2020
872009b
Rename primary and secondary files to match default export name, expo…
michaeljaltamirano Oct 29, 2020
4b66b66
Export values as const for type inference, add secondary tints for la…
michaeljaltamirano Oct 29, 2020
3f3ed2f
Button update: add theming, constrict typing, remove unnecessary css …
michaeljaltamirano Oct 29, 2020
0a1807e
Update size snapshot, new items due to new COLORS_PROP_TYPES usage
michaeljaltamirano Oct 29, 2020
5c240de
Decorate tests
michaeljaltamirano Oct 29, 2020
80f936d
Add back base button css composition, since typography depends on it
michaeljaltamirano Oct 29, 2020
f7d1517
Tighten textColor typing, too
michaeljaltamirano Oct 29, 2020
abc4d1a
Override prettier, TODO: use prettier-eslint
michaeljaltamirano Oct 29, 2020
0dd1441
Commit Typography WIP, save for last
michaeljaltamirano Oct 29, 2020
c42f733
Merge branch 'master' into epic/add-theming-functionality
michaeljaltamirano Oct 29, 2020
a9b773c
Merge branch 'epic/add-theming-functionality' into theming/convert-co…
michaeljaltamirano Oct 29, 2020
79876a1
Fix build, update .size-snapshot, replace all TYPOGRAPHY_STYLE usages…
michaeljaltamirano Oct 29, 2020
a929512
Reconfigure stories/tsconfig, export ThemeColors instead for improved DX
michaeljaltamirano Oct 29, 2020
afd198b
Fix bizarre formatting
michaeljaltamirano Oct 29, 2020
a5ac19f
Fix formatting pt. 2
michaeljaltamirano Oct 30, 2020
5059e2a
One last eslint fix and prettier write cleanup
michaeljaltamirano Oct 30, 2020
0fdcad6
try running through eslint-plugin-prettier
michaeljaltamirano Oct 30, 2020
94dc1e9
Conform to docs order
michaeljaltamirano Oct 30, 2020
8186be5
Remove floating semicolons
michaeljaltamirano Oct 30, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
"project": "./.eslint.tsconfig.json"
},
"extends": [
"plugin:prettier/recommended",
"curology",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking"
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"prettier",
"prettier/react",
"prettier/@typescript-eslint"
],
"plugins": ["emotion"],
"globals": {
Expand Down Expand Up @@ -54,12 +58,6 @@
}
],
"no-use-before-define": "off",
"object-curly-newline": [
"warn",
{
"ObjectPattern": { "multiline": false }
}
],
"react/jsx-filename-extension": [
"warn",
{
Expand Down
2 changes: 0 additions & 2 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
module.exports = {
'src/**/*.{js,ts,tsx}': [
'prettier --write',
'eslint --fix',
() => 'tsc -p tsconfig.json --noEmit --emitDeclarationOnly false',
],
'stories/**/*.{ts,tsx}': [
'prettier --write',
'eslint --fix',
() => 'tsc -p stories/tsconfig.json --noEmit',
],
Expand Down
168 changes: 84 additions & 84 deletions .size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"bundle.js": {
"bundled": 900185,
"minified": 831422,
"gzipped": 95073
"bundled": 852635,
"minified": 783404,
"gzipped": 92446
},
"bundle.umd.js": {
"bundled": 909593,
"minified": 807073,
"gzipped": 90840
"bundled": 862161,
"minified": 759409,
"gzipped": 88484
},
"shared-components/avatar/index.js": {
"bundled": 550,
Expand Down Expand Up @@ -80,16 +80,16 @@
}
},
"shared-components/typography/index.js": {
"bundled": 92303,
"minified": 91514,
"gzipped": 6077,
"bundled": 52997,
"minified": 51950,
"gzipped": 3536,
"treeshaked": {
"rollup": {
"code": 2277,
"import_statements": 245
"code": 2693,
"import_statements": 166
},
"webpack": {
"code": 3622
"code": 3924
}
}
},
Expand Down Expand Up @@ -444,30 +444,30 @@
}
},
"shared-components/chip/style.js": {
"bundled": 7258,
"minified": 6800,
"gzipped": 2600,
"bundled": 7380,
"minified": 6895,
"gzipped": 2630,
"treeshaked": {
"rollup": {
"code": 1261,
"code": 1300,
"import_statements": 172
},
"webpack": {
"code": 2369
"code": 2408
}
}
},
"shared-components/button/style.js": {
"bundled": 46132,
"minified": 44241,
"gzipped": 6957,
"bundled": 35974,
"minified": 34106,
"gzipped": 6775,
"treeshaked": {
"rollup": {
"code": 4466,
"import_statements": 344
"code": 4650,
"import_statements": 308
},
"webpack": {
"code": 5941
"code": 6092
}
}
},
Expand Down Expand Up @@ -514,9 +514,9 @@
}
},
"shared-components/dialogModal/style.js": {
"bundled": 15836,
"minified": 15611,
"gzipped": 3599,
"bundled": 15808,
"minified": 15583,
"gzipped": 3592,
"treeshaked": {
"rollup": {
"code": 1798,
Expand All @@ -528,30 +528,30 @@
}
},
"shared-components/progressBar/style.js": {
"bundled": 7979,
"minified": 7521,
"gzipped": 2251,
"bundled": 7971,
"minified": 7515,
"gzipped": 2253,
"treeshaked": {
"rollup": {
"code": 1496,
"code": 1495,
"import_statements": 258
},
"webpack": {
"code": 2658
"code": 2657
}
}
},
"shared-components/field/style.js": {
"bundled": 34739,
"minified": 34053,
"gzipped": 4795,
"bundled": 35325,
"minified": 34582,
"gzipped": 4808,
"treeshaked": {
"rollup": {
"code": 2411,
"code": 2492,
"import_statements": 254
},
"webpack": {
"code": 3635
"code": 3716
}
}
},
Expand Down Expand Up @@ -626,16 +626,16 @@
}
},
"shared-components/tabs/style.js": {
"bundled": 5190,
"minified": 5003,
"gzipped": 2364,
"bundled": 5300,
"minified": 5086,
"gzipped": 2391,
"treeshaked": {
"rollup": {
"code": 1056,
"code": 1095,
"import_statements": 327
},
"webpack": {
"code": 2289
"code": 2328
}
}
},
Expand All @@ -654,23 +654,23 @@
}
},
"shared-components/indicator/style.js": {
"bundled": 2133,
"minified": 2019,
"gzipped": 1191,
"bundled": 2226,
"minified": 2086,
"gzipped": 1227,
"treeshaked": {
"rollup": {
"code": 642,
"code": 681,
"import_statements": 172
},
"webpack": {
"code": 1748
"code": 1787
}
}
},
"shared-components/loadingSpinner/style.js": {
"bundled": 9681,
"minified": 9300,
"gzipped": 2830,
"bundled": 9621,
"minified": 9240,
"gzipped": 2786,
"treeshaked": {
"rollup": {
"code": 1413,
Expand Down Expand Up @@ -710,30 +710,30 @@
}
},
"shared-components/optionButton/style.js": {
"bundled": 37578,
"minified": 36425,
"gzipped": 4774,
"bundled": 38541,
"minified": 37360,
"gzipped": 4891,
"treeshaked": {
"rollup": {
"code": 2581,
"code": 2620,
"import_statements": 273
},
"webpack": {
"code": 3782
"code": 3821
}
}
},
"shared-components/verificationMessages/style.js": {
"bundled": 4512,
"minified": 4316,
"gzipped": 1629,
"bundled": 4684,
"minified": 4468,
"gzipped": 1686,
"treeshaked": {
"rollup": {
"code": 406,
"code": 426,
"import_statements": 125
},
"webpack": {
"code": 1477
"code": 1497
}
}
},
Expand Down Expand Up @@ -1004,16 +1004,16 @@
}
},
"shared-components/carousel/arrow/style.js": {
"bundled": 4889,
"minified": 4571,
"gzipped": 1999,
"bundled": 5005,
"minified": 4677,
"gzipped": 2054,
"treeshaked": {
"rollup": {
"code": 989,
"code": 1000,
"import_statements": 122
},
"webpack": {
"code": 2081
"code": 2092
}
}
},
Expand Down Expand Up @@ -1088,23 +1088,23 @@
}
},
"shared-components/accordion/thumbnails/style.js": {
"bundled": 11354,
"minified": 11104,
"gzipped": 2309,
"bundled": 11587,
"minified": 11311,
"gzipped": 2350,
"treeshaked": {
"rollup": {
"code": 881,
"code": 920,
"import_statements": 147
},
"webpack": {
"code": 1991
"code": 2030
}
}
},
"shared-components/button/shared-components/loader/style.js": {
"bundled": 6770,
"minified": 6001,
"gzipped": 2699,
"bundled": 6674,
"minified": 5905,
"gzipped": 2574,
"treeshaked": {
"rollup": {
"code": 1710,
Expand Down Expand Up @@ -1172,9 +1172,9 @@
}
},
"shared-components/button/components/roundButton/style.js": {
"bundled": 28922,
"minified": 27237,
"gzipped": 5190,
"bundled": 28622,
"minified": 26937,
"gzipped": 5180,
"treeshaked": {
"rollup": {
"code": 630,
Expand Down Expand Up @@ -1242,9 +1242,9 @@
}
},
"shared-components/button/components/linkButton/style.js": {
"bundled": 1730,
"minified": 1481,
"gzipped": 892,
"bundled": 1753,
"minified": 1504,
"gzipped": 874,
"treeshaked": {
"rollup": {
"code": 41,
Expand Down Expand Up @@ -1298,9 +1298,9 @@
}
},
"shared-components/dropdown/desktopDropdown.js": {
"bundled": 9468,
"minified": 7851,
"gzipped": 3407,
"bundled": 9432,
"minified": 7815,
"gzipped": 3433,
"treeshaked": {
"rollup": {
"code": 250,
Expand All @@ -1312,9 +1312,9 @@
}
},
"shared-components/accordion/style.js": {
"bundled": 36286,
"minified": 35230,
"gzipped": 4828,
"bundled": 36238,
"minified": 35182,
"gzipped": 4829,
"treeshaked": {
"rollup": {
"code": 2701,
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
"eslint-plugin-emotion": "10.0.27",
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0",
"husky": "^4.3.0",
Expand Down
3 changes: 1 addition & 2 deletions src/constants/fonts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ export default {
"'nocturno', Georgia, TimesNewRoman, 'Times New Roman', Times, Baskerville, serif",
baseFont:
"'larssiet', 'Avant Garde', Avantgarde, 'Century Gothic', CenturyGothic, AppleGothic, Verdana, sans-serif",
monoFont:
"'apercu mono', 'Lucida Console', Monaco, monospace",
monoFont: "'apercu mono', 'Lucida Console', Monaco, monospace",
};
Loading