Skip to content

Commit c03f9ad

Browse files
RobinMalfaitRobinMalfait
authored
Improve public API (#5526)
* introduce `public` folder This can contain all of the `public` functions we want to expose. This will be a bit nicer for example when you want to use internal/private functions (we use some in the vscode intellisense plugin). * use public `resolveConfig` function * expose resolveConfig in the root This will use the resolveConfig we expose from the `public` folder. We can probably generate these as well. * make `colors` public * make `default config` public * make `default theme` public * make `create plugin` public * update to public paths * remove `@tailwindcss/aspect-ratio` from tests This should be tested in its own repo instead. * remove `@tailwindcss/aspect-ratio` as a dependency * drop `Build` step from CI The build step is not a prerequisite anymore for running the tests. When we want to release a new (insiders) release, the `prepublishOnly` step will be executed for us. Before this change, it would have been executed twice: - Once before the tests - Once before the actual release * improve paths for caching purposes * add pretest scrip for generating the plugin list Now that we can use `SWC`, automatically generating the plugin list before running the tests is super fast and you don't even have to think about it anymore!
1 parent c3906b4 commit c03f9ad

25 files changed

+341
-414
lines changed

‎.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/cache@v2
2828
with:
2929
path: node_modules
30-
key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}-tailwindcss
30+
key: nodeModules-${{ hashFiles('./package-lock.json') }}-${{ matrix.node-version }}-tailwindcss
3131
restore-keys: |
3232
nodeModules-
3333
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/cache@v2
4646
with:
4747
path: ./integrations/**/node_modules
48-
key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}-${{ matrix.integration }}-integrations
48+
key: nodeModules-${{ hashFiles('./integrations/**/package-lock.json') }}-${{ matrix.node-version }}-${{ matrix.integration }}-integrations
4949
restore-keys: |
5050
nodeModules-
5151

‎.github/workflows/nodejs.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,22 @@ jobs:
2323
uses: actions/setup-node@v2
2424
with:
2525
node-version: ${{ matrix.node-version }}
26+
2627
- name: Use cached node_modules
2728
id: cache
2829
uses: actions/cache@v2
2930
with:
3031
path: node_modules
31-
key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
32+
key: nodeModules-${{ hashFiles('./package-lock.json') }}-${{ matrix.node-version }}
3233
restore-keys: |
3334
nodeModules-
3435
- name: Install dependencies
3536
if: steps.cache.outputs.cache-hit != 'true'
3637
run: npm install
3738
env:
3839
CI: true
39-
- run: npm run prepublishOnly
40-
- run: npm test
40+
41+
- name: Test
42+
run: npm test
4143
env:
4244
CI: true

‎.github/workflows/release-insiders.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ jobs:
3636
env:
3737
CI: true
3838

39-
- name: Build
40-
run: npm run prepublishOnly
41-
4239
- name: Test
4340
run: npm test
4441
env:

‎.github/workflows/release.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ jobs:
3636
env:
3737
CI: true
3838

39-
- name: Build
40-
run: npm run prepublishOnly
41-
4239
- name: Test
4340
run: npm test
4441
env:

‎colors.js

Lines changed: 1 addition & 304 deletions
Original file line numberDiff line numberDiff line change
@@ -1,304 +1 @@
1-
const log = require('./lib/util/log').default
2-
3-
let warned = []
4-
5-
function warn({ version, from, to }) {
6-
if (!warned.includes(from)) {
7-
log.warn([
8-
`As of Tailwind CSS ${version}, \`${from}\` has been renamed to \`${to}\`.`,
9-
'Please update your color palette to eliminate this warning.',
10-
])
11-
warned.push(from)
12-
}
13-
}
14-
15-
module.exports = {
16-
transparent: 'transparent',
17-
current: 'currentColor',
18-
black: '#000',
19-
white: '#fff',
20-
slate: {
21-
50: '#f8fafc',
22-
100: '#f1f5f9',
23-
200: '#e2e8f0',
24-
300: '#cbd5e1',
25-
400: '#94a3b8',
26-
500: '#64748b',
27-
600: '#475569',
28-
700: '#334155',
29-
800: '#1e293b',
30-
900: '#0f172a',
31-
},
32-
gray: {
33-
50: '#f9fafb',
34-
100: '#f3f4f6',
35-
200: '#e5e7eb',
36-
300: '#d1d5db',
37-
400: '#9ca3af',
38-
500: '#6b7280',
39-
600: '#4b5563',
40-
700: '#374151',
41-
800: '#1f2937',
42-
900: '#111827',
43-
},
44-
zinc: {
45-
50: '#fafafa',
46-
100: '#f4f4f5',
47-
200: '#e4e4e7',
48-
300: '#d4d4d8',
49-
400: '#a1a1aa',
50-
500: '#71717a',
51-
600: '#52525b',
52-
700: '#3f3f46',
53-
800: '#27272a',
54-
900: '#18181b',
55-
},
56-
neutral: {
57-
50: '#fafafa',
58-
100: '#f5f5f5',
59-
200: '#e5e5e5',
60-
300: '#d4d4d4',
61-
400: '#a3a3a3',
62-
500: '#737373',
63-
600: '#525252',
64-
700: '#404040',
65-
800: '#262626',
66-
900: '#171717',
67-
},
68-
stone: {
69-
50: '#fafaf9',
70-
100: '#f5f5f4',
71-
200: '#e7e5e4',
72-
300: '#d6d3d1',
73-
400: '#a8a29e',
74-
500: '#78716c',
75-
600: '#57534e',
76-
700: '#44403c',
77-
800: '#292524',
78-
900: '#1c1917',
79-
},
80-
red: {
81-
50: '#fef2f2',
82-
100: '#fee2e2',
83-
200: '#fecaca',
84-
300: '#fca5a5',
85-
400: '#f87171',
86-
500: '#ef4444',
87-
600: '#dc2626',
88-
700: '#b91c1c',
89-
800: '#991b1b',
90-
900: '#7f1d1d',
91-
},
92-
orange: {
93-
50: '#fff7ed',
94-
100: '#ffedd5',
95-
200: '#fed7aa',
96-
300: '#fdba74',
97-
400: '#fb923c',
98-
500: '#f97316',
99-
600: '#ea580c',
100-
700: '#c2410c',
101-
800: '#9a3412',
102-
900: '#7c2d12',
103-
},
104-
amber: {
105-
50: '#fffbeb',
106-
100: '#fef3c7',
107-
200: '#fde68a',
108-
300: '#fcd34d',
109-
400: '#fbbf24',
110-
500: '#f59e0b',
111-
600: '#d97706',
112-
700: '#b45309',
113-
800: '#92400e',
114-
900: '#78350f',
115-
},
116-
yellow: {
117-
50: '#fefce8',
118-
100: '#fef9c3',
119-
200: '#fef08a',
120-
300: '#fde047',
121-
400: '#facc15',
122-
500: '#eab308',
123-
600: '#ca8a04',
124-
700: '#a16207',
125-
800: '#854d0e',
126-
900: '#713f12',
127-
},
128-
lime: {
129-
50: '#f7fee7',
130-
100: '#ecfccb',
131-
200: '#d9f99d',
132-
300: '#bef264',
133-
400: '#a3e635',
134-
500: '#84cc16',
135-
600: '#65a30d',
136-
700: '#4d7c0f',
137-
800: '#3f6212',
138-
900: '#365314',
139-
},
140-
green: {
141-
50: '#f0fdf4',
142-
100: '#dcfce7',
143-
200: '#bbf7d0',
144-
300: '#86efac',
145-
400: '#4ade80',
146-
500: '#22c55e',
147-
600: '#16a34a',
148-
700: '#15803d',
149-
800: '#166534',
150-
900: '#14532d',
151-
},
152-
emerald: {
153-
50: '#ecfdf5',
154-
100: '#d1fae5',
155-
200: '#a7f3d0',
156-
300: '#6ee7b7',
157-
400: '#34d399',
158-
500: '#10b981',
159-
600: '#059669',
160-
700: '#047857',
161-
800: '#065f46',
162-
900: '#064e3b',
163-
},
164-
teal: {
165-
50: '#f0fdfa',
166-
100: '#ccfbf1',
167-
200: '#99f6e4',
168-
300: '#5eead4',
169-
400: '#2dd4bf',
170-
500: '#14b8a6',
171-
600: '#0d9488',
172-
700: '#0f766e',
173-
800: '#115e59',
174-
900: '#134e4a',
175-
},
176-
cyan: {
177-
50: '#ecfeff',
178-
100: '#cffafe',
179-
200: '#a5f3fc',
180-
300: '#67e8f9',
181-
400: '#22d3ee',
182-
500: '#06b6d4',
183-
600: '#0891b2',
184-
700: '#0e7490',
185-
800: '#155e75',
186-
900: '#164e63',
187-
},
188-
sky: {
189-
50: '#f0f9ff',
190-
100: '#e0f2fe',
191-
200: '#bae6fd',
192-
300: '#7dd3fc',
193-
400: '#38bdf8',
194-
500: '#0ea5e9',
195-
600: '#0284c7',
196-
700: '#0369a1',
197-
800: '#075985',
198-
900: '#0c4a6e',
199-
},
200-
blue: {
201-
50: '#eff6ff',
202-
100: '#dbeafe',
203-
200: '#bfdbfe',
204-
300: '#93c5fd',
205-
400: '#60a5fa',
206-
500: '#3b82f6',
207-
600: '#2563eb',
208-
700: '#1d4ed8',
209-
800: '#1e40af',
210-
900: '#1e3a8a',
211-
},
212-
indigo: {
213-
50: '#eef2ff',
214-
100: '#e0e7ff',
215-
200: '#c7d2fe',
216-
300: '#a5b4fc',
217-
400: '#818cf8',
218-
500: '#6366f1',
219-
600: '#4f46e5',
220-
700: '#4338ca',
221-
800: '#3730a3',
222-
900: '#312e81',
223-
},
224-
violet: {
225-
50: '#f5f3ff',
226-
100: '#ede9fe',
227-
200: '#ddd6fe',
228-
300: '#c4b5fd',
229-
400: '#a78bfa',
230-
500: '#8b5cf6',
231-
600: '#7c3aed',
232-
700: '#6d28d9',
233-
800: '#5b21b6',
234-
900: '#4c1d95',
235-
},
236-
purple: {
237-
50: '#faf5ff',
238-
100: '#f3e8ff',
239-
200: '#e9d5ff',
240-
300: '#d8b4fe',
241-
400: '#c084fc',
242-
500: '#a855f7',
243-
600: '#9333ea',
244-
700: '#7e22ce',
245-
800: '#6b21a8',
246-
900: '#581c87',
247-
},
248-
fuchsia: {
249-
50: '#fdf4ff',
250-
100: '#fae8ff',
251-
200: '#f5d0fe',
252-
300: '#f0abfc',
253-
400: '#e879f9',
254-
500: '#d946ef',
255-
600: '#c026d3',
256-
700: '#a21caf',
257-
800: '#86198f',
258-
900: '#701a75',
259-
},
260-
pink: {
261-
50: '#fdf2f8',
262-
100: '#fce7f3',
263-
200: '#fbcfe8',
264-
300: '#f9a8d4',
265-
400: '#f472b6',
266-
500: '#ec4899',
267-
600: '#db2777',
268-
700: '#be185d',
269-
800: '#9d174d',
270-
900: '#831843',
271-
},
272-
rose: {
273-
50: '#fff1f2',
274-
100: '#ffe4e6',
275-
200: '#fecdd3',
276-
300: '#fda4af',
277-
400: '#fb7185',
278-
500: '#f43f5e',
279-
600: '#e11d48',
280-
700: '#be123c',
281-
800: '#9f1239',
282-
900: '#881337',
283-
},
284-
get lightBlue() {
285-
warn({ version: 'v2.2', from: 'lightBlue', to: 'sky' })
286-
return this.sky
287-
},
288-
get warmGray() {
289-
warn({ version: 'v3.0', from: 'warmGray', to: 'stone' })
290-
return this.stone
291-
},
292-
get trueGray() {
293-
warn({ version: 'v3.0', from: 'trueGray', to: 'neutral' })
294-
return this.neutral
295-
},
296-
get coolGray() {
297-
warn({ version: 'v3.0', from: 'coolGray', to: 'gray' })
298-
return this.gray
299-
},
300-
get blueGray() {
301-
warn({ version: 'v3.0', from: 'blueGray', to: 'slate' })
302-
return this.slate
303-
},
304-
}
1+
module.exports = require('./lib/public/colors').default

‎defaultConfig.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
let { cloneDeep } = require('./lib/util/cloneDeep')
2-
let defaultConfig = require('./stubs/defaultConfig.stub.js')
3-
4-
module.exports = cloneDeep(defaultConfig)
1+
module.exports = require('./lib/public/default-config').default

‎defaultTheme.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
let { cloneDeep } = require('./lib/util/cloneDeep')
2-
let defaultConfig = require('./stubs/defaultConfig.stub.js')
3-
4-
module.exports = cloneDeep(defaultConfig.theme)
1+
module.exports = require('./lib/public/default-theme').default

0 commit comments

Comments
 (0)