Skip to content

Commit 208ceb2

Browse files
nickservsmeijer
andauthored
chore: improve DX (#365)
* chore: use standard CSS extension * chore: remove parcel references * chore: install Prettier plugin for Tailwind * chore: format with Prettier plugin for Tailwind * chore: don't ignore config files --------- Co-authored-by: Stephan Meijer <stephan.meijer@gmail.com>
1 parent f3798de commit 208ceb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+260
-185
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
ignorePatterns: ['!**/*'],
23
parser: '@typescript-eslint/parser',
34
extends: [
45
'eslint:recommended',

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
.rts2_cache*
2-
.cache
3-
.parcel-cache
41
cypress/videos
5-
62
dist/
73
node_modules/
84

.lintstagedrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = {
33
`eslint --quiet --fix ${files.join(' ')}`,
44
`jest --passWithNoTests`,
55
],
6-
'**/*.{md,js,json,yml,html,css,pcss}': (files) => [
6+
'**/*.{md,js,json,yml,html,css}': (files) => [
77
`prettier --write ${files.join(' ')}`,
88
],
99
};

devtools/src/devtools/components/MenuBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { getSettings, setSettings } from '../lib/settings';
1515

1616
function MenuBar({ cssPath, suggestion }) {
1717
return (
18-
<div className="h-8 p-2 border-b space-x-4 flex">
18+
<div className="border-b flex h-8 space-x-4 p-2">
1919
<button
2020
className="focus:outline-none"
2121
title="select element"

devtools/src/devtools/pane.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function Panel() {
2424
};
2525

2626
return (
27-
<div className="bg-white p-2 w-screen h-screen">
27+
<div className="h-screen w-screen bg-white p-2">
2828
{result && <Result result={result} dispatch={dispatch} />}
2929
</div>
3030
);

devtools/src/devtools/panel.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ function Panel() {
4747
);
4848

4949
return (
50-
<div className="bg-white w-screen h-screen flex flex-col">
51-
<div className="flex-none w-full">
50+
<div className="flex h-screen w-screen flex-col bg-white">
51+
<div className="w-full flex-none">
5252
<MenuBar
5353
cssPath={result.elements?.[0]?.cssPath}
5454
suggestion={result.expression}
5555
/>
5656
</div>
57-
<div className="grid relative p-2 gap-4 flex-auto grid-cols-1 md:grid-cols-2 grid-equal-cells overflow-hidden">
57+
<div className="grid-equal-cells relative grid flex-auto grid-cols-1 gap-4 overflow-hidden p-2 md:grid-cols-2">
5858
<div className="relative">
5959
<Query
6060
query={''}

package-lock.json

Lines changed: 82 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
"postcss-import": "^15.1.0",
102102
"postcss-modules": "^6.0.0",
103103
"prettier": "^2.2.1",
104+
"prettier-plugin-tailwindcss": "^0.3.0",
104105
"react-test-renderer": "^16.14.0",
105106
"rimraf": "^5.0.1",
106107
"tailwindcss": "^1.9.6",

src/components/DomEvents.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ function EventRecord({ index, style, data }) {
1919

2020
return (
2121
<div
22-
className={`w-full h-8 flex items-center text-sm ${
22+
className={`flex h-8 w-full items-center text-sm ${
2323
index % 2 ? 'bg-gray-100' : ''
2424
}`}
2525
style={style}
2626
>
27-
<div className="p-2 flex-none w-16">{id}</div>
27+
<div className="w-16 flex-none p-2">{id}</div>
2828

29-
<div className="p-2 flex-none w-32">{type}</div>
30-
<div className="p-2 flex-none w-32">{name}</div>
29+
<div className="w-32 flex-none p-2">{type}</div>
30+
<div className="w-32 flex-none p-2">{name}</div>
3131

32-
<div className="p-2 flex-none w-40">{element}</div>
33-
<div className="p-2 flex-auto whitespace-no-wrap">{selector}</div>
32+
<div className="w-40 flex-none p-2">{element}</div>
33+
<div className="whitespace-no-wrap flex-auto p-2">{selector}</div>
3434
</div>
3535
);
3636
}
@@ -56,21 +56,21 @@ function DomEvents() {
5656
.join('\n');
5757

5858
return (
59-
<div className="editor p-4 h-56 flex-auto overflow-hidden">
60-
<div className="h-full w-full flex flex-col">
61-
<div className="h-8 flex items-center w-full text-sm font-bold">
59+
<div className="editor h-56 flex-auto overflow-hidden p-4">
60+
<div className="flex h-full w-full flex-col">
61+
<div className="flex h-8 w-full items-center text-sm font-bold">
6262
<div
63-
className="p-2 w-16 cursor-pointer flex justify-between items-center"
63+
className="flex w-16 cursor-pointer items-center justify-between p-2"
6464
onClick={changeSortDirection}
6565
>
6666
# {getSortIcon()}
6767
</div>
6868

69-
<div className="p-2 w-32 ">type</div>
70-
<div className="p-2 w-32 ">name</div>
69+
<div className="w-32 p-2 ">type</div>
70+
<div className="w-32 p-2 ">name</div>
7171

72-
<div className="p-2 w-40 ">element</div>
73-
<div className="flex-auto p-2 flex justify-between">
72+
<div className="w-40 p-2 ">element</div>
73+
<div className="flex flex-auto justify-between p-2">
7474
<span>selector</span>
7575
<div>
7676
<CopyButton
@@ -85,9 +85,9 @@ function DomEvents() {
8585
</div>
8686
</div>
8787

88-
<div className="flex-auto relative overflow-hidden">
88+
<div className="relative flex-auto overflow-hidden">
8989
{buffer.current.length === 0 ? (
90-
<div className="flex w-full h-full opacity-50 items-end justify-center">
90+
<div className="flex h-full w-full items-end justify-center opacity-50">
9191
<EmptyStreetImg height="80%" />
9292
</div>
9393
) : (

src/components/Editor.js

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -100,56 +100,56 @@ function getQueryHints(cm) {
100100

101101
// copy/edit from: https://stackoverflow.com/a/33908969/913810
102102
const NON_TRIGGER_KEYS = {
103-
'8': 'backspace',
104-
'9': 'tab',
105-
'13': 'enter',
106-
'16': 'shift',
107-
'17': 'ctrl',
108-
'18': 'alt',
109-
'19': 'pause',
110-
'20': 'capslock',
111-
'27': 'escape',
112-
'32': 'space', // added
113-
'33': 'pageup',
114-
'34': 'pagedown',
115-
'35': 'end',
116-
'36': 'home',
117-
'37': 'left',
118-
'38': 'up',
119-
'39': 'right',
120-
'40': 'down',
121-
'45': 'insert',
122-
'46': 'delete',
123-
'91': 'left window key',
124-
'92': 'right window key',
125-
'93': 'select',
126-
'107': 'add',
127-
'109': 'subtract',
128-
'110': 'decimal point',
129-
'111': 'divide',
130-
'112': 'f1',
131-
'113': 'f2',
132-
'114': 'f3',
133-
'115': 'f4',
134-
'116': 'f5',
135-
'117': 'f6',
136-
'118': 'f7',
137-
'119': 'f8',
138-
'120': 'f9',
139-
'121': 'f10',
140-
'122': 'f11',
141-
'123': 'f12',
142-
'144': 'numlock',
143-
'145': 'scrolllock',
144-
'186': 'semicolon',
145-
'187': 'equalsign',
146-
'188': 'comma',
147-
'189': 'dash',
103+
8: 'backspace',
104+
9: 'tab',
105+
13: 'enter',
106+
16: 'shift',
107+
17: 'ctrl',
108+
18: 'alt',
109+
19: 'pause',
110+
20: 'capslock',
111+
27: 'escape',
112+
32: 'space', // added
113+
33: 'pageup',
114+
34: 'pagedown',
115+
35: 'end',
116+
36: 'home',
117+
37: 'left',
118+
38: 'up',
119+
39: 'right',
120+
40: 'down',
121+
45: 'insert',
122+
46: 'delete',
123+
91: 'left window key',
124+
92: 'right window key',
125+
93: 'select',
126+
107: 'add',
127+
109: 'subtract',
128+
110: 'decimal point',
129+
111: 'divide',
130+
112: 'f1',
131+
113: 'f2',
132+
114: 'f3',
133+
115: 'f4',
134+
116: 'f5',
135+
117: 'f6',
136+
118: 'f7',
137+
119: 'f8',
138+
120: 'f9',
139+
121: 'f10',
140+
122: 'f11',
141+
123: 'f12',
142+
144: 'numlock',
143+
145: 'scrolllock',
144+
186: 'semicolon',
145+
187: 'equalsign',
146+
188: 'comma',
147+
189: 'dash',
148148
// '190': 'period',
149-
'191': 'slash',
150-
'192': 'graveaccent',
151-
'220': 'backslash',
152-
'222': 'quote',
149+
191: 'slash',
150+
192: 'graveaccent',
151+
220: 'backslash',
152+
222: 'quote',
153153
};
154154

155155
function formatValue(cm) {
@@ -297,7 +297,7 @@ function Editor(props) {
297297
}, [onChange]);
298298

299299
return (
300-
<div className="w-full h-full">
300+
<div className="h-full w-full">
301301
<textarea ref={elem} />
302302
</div>
303303
);

src/components/Embed.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ function Embed({ dispatch, dirty, gistId, gistVersion }) {
3535
const canAddPane = panes.length < 3;
3636

3737
const loader = (
38-
<div className="flex space-x-4 items-center border rounded w-full py-2 px-3 bg-white text-gray-800 leading-tight">
38+
<div className="border rounded flex w-full items-center space-x-4 bg-white px-3 py-2 leading-tight text-gray-800">
3939
<SyncIcon size={12} className="spinner" />
4040
<span>one sec...</span>
4141
</div>
4242
);
4343

4444
return (
45-
<div className="settings text-sm pb-2">
45+
<div className="settings pb-2 text-sm">
4646
<div className="space-y-6">
4747
<section className="flex flex-col space-y-4">
4848
<div className="flex items-center justify-between">
@@ -61,11 +61,11 @@ function Embed({ dispatch, dirty, gistId, gistVersion }) {
6161
</div>
6262

6363
{/* overflow-hidden is required hide the hidden preview panel */}
64-
<div className="bg-gray-200 px-4 pb-4 -mx-4 overflow-hidden">
65-
<div className="px-4 gap-4 grid grid-flow-col py-1">
64+
<div className="-mx-4 overflow-hidden bg-gray-200 px-4 pb-4">
65+
<div className="grid grid-flow-col gap-4 px-4 py-1">
6666
{panes.map((selected, idx) => (
6767
<div key={idx} className="flex items-center justify-between">
68-
<div className="text-left space-x-2">
68+
<div className="space-x-2 text-left">
6969
{possiblePanes.map((name) => (
7070
<TabButton
7171
key={name}
@@ -132,8 +132,8 @@ function Embed({ dispatch, dirty, gistId, gistVersion }) {
132132
{dirty ? (
133133
loader
134134
) : (
135-
<div className="w-full flex space-x-4">
136-
<code className="p-4 rounded bg-gray-200 text-gray-800 font-mono text-xs">
135+
<div className="flex w-full space-x-4">
136+
<code className="rounded bg-gray-200 p-4 font-mono text-xs text-gray-800">
137137
{embedCode}
138138
</code>
139139
<CopyButton text={embedCode} />

0 commit comments

Comments
 (0)