Convert CSS to TailwindCSS 3.x (#353)

* add initial CSS data

* add packages

* add `css-to-tailwindcss3` page

* update `css-to-tailwindcss` package

* chore: replace old `css-to-tailwind` page and remove unnecessary dependencies
This commit is contained in:
Salakhutdinov Salavat authored and GitHub committed 2023-01-30 12:50:22 +05:30
1 parent 5693b3d1bf
commit 45c27fb825
7 files changed
+436 -775

No files matched your search

+57 -1
View File
@@ -113,6 +113,62 @@ export const css2 = `.alert {
}
`;
export const css3 = `:root {
--some-color: #090909;
}
.foo {
padding: 0.875em 256px;
margin-left: 16px;
text-align: center;
font-size: 12px;
transition: color, background-color, border-color, text-decoration-color, fill,
stroke 200ms cubic-bezier(0, 0, 0.2, 1);
animation-delay: 200ms;
&:hover {
filter: blur(4px) brightness(0.5) sepia(100%) contrast(1) hue-rotate(30deg)
invert(0) opacity(0.05) saturate(1.5);
color: hsl(27, 96%, 61%);
font-size: 1.25rem;
}
&[aria-disabled="true"] {
width: 25%;
color: var(--some-color);
font-size: 1em;
}
@media (min-width: 768px) {
top: auto;
bottom: auto;
left: 25%;
right: 25%;
}
@media (min-width: 768px) and (max-width: 1024px) {
min-width: 100%;
margin-right: -24px;
}
@supports (display: grid) {
display: grid;
grid-column: span 1 / span 1;
}
}
.foo.bar {
padding: 0.875rem 256px 15%;
transform: translateX(12px) translateY(-0.5em) skew(1deg, 3deg)
scale(-0.75, 1.05) rotate(-0.25turn);
&::after {
content: "*";
animation: spin 1s linear infinite;
}
}
`;
export const javascript = `const container = css({
flex: 1,
padding: 10,
@@ -489,4 +545,4 @@ export const cadence = `pub struct StructContainsManyType {
pub fun main(): StructContainsManyType {
return StructContainsManyType()
}
`
`;
+2 -3
View File
@@ -53,7 +53,7 @@
"babel-plugin-object-styles-to-template": "^0.2.2",
"babel-standalone": "^6.26.0",
"clipboard-copy": "^4.0.1",
"css-to-tailwind": "^1.0.3",
"css-to-tailwindcss": "^0.2.5",
"evergreen-ui": "^4.28.0",
"flowgen": "^1.14.1",
"formik": "^2.2.9",
@@ -78,6 +78,7 @@
"nprogress": "^0.2.0",
"postcss": "^8.3.5",
"postcss-js": "^3.0.3",
"postcss-nested": "^6.0.0",
"postcss7": "npm:postcss@7.x.x",
"prettier": "^1.18.2",
"react": "^17.0.2",
@@ -89,8 +90,6 @@
"stringify-object": "^3.3.0",
"svg-to-dataurl": "^1.0.0",
"svgo": "^1.3.2",
"tailwindcss": "^2.2.4",
"tailwindcss1": "npm:tailwindcss@1.9.6",
"tempy": "^1.0.1",
"text-encoding-utf-8": "^1.0.2",
"transform-json-types": "^0.7.0",
-12
View File
@@ -1,12 +0,0 @@
import { NextApiRequest, NextApiResponse } from "next";
import tailwindCss from "@utils/tailwindcss";
export default async (req: NextApiRequest, res: NextApiResponse) => {
try {
const { tailwindConfig, postCssInput } = req.body;
const css = await tailwindCss(tailwindConfig, postCssInput);
res.status(200).send(css);
} catch (e) {
res.status(500).send(e.message);
}
};
+151 -250
View File
@@ -1,295 +1,200 @@
import ConversionPanel, { Transformer } from "@components/ConversionPanel";
import NoSSR from "@components/NoSSR";
import * as React from "react";
import { useState, useCallback } from "react";
import request from "@utils/request";
import tailwindCss from "@utils/tailwindcss";
import React, { useCallback, useMemo, useState } from "react";
import { promises as fs } from "fs";
import path from "path";
import cssToTailwind from "css-to-tailwind/browser";
import isEqual from "lodash/isEqual";
import { useSettings } from "@hooks/useSettings";
import dynamic from "next/dynamic";
import {
Dialog,
Pane,
Tablist,
Tab,
Alert,
Button,
Icon,
Tooltip,
toaster
toaster,
TextInput,
Heading,
Text
} from "evergreen-ui";
import tailwindResolve from "tailwindcss1/resolveConfig";
import dynamic from "next/dynamic";
import { TailwindConverter, TailwindConverterConfig } from "css-to-tailwindcss";
import ConversionPanel, { Transformer } from "@components/ConversionPanel";
import { useSettings } from "@hooks/useSettings";
const Monaco = dynamic(() => import("../components/Monaco"), {
ssr: false
});
const options = {
fontSize: 14,
readOnly: false,
codeLens: false,
fontFamily: "Menlo, Consolas, monospace, sans-serif",
minimap: {
enabled: false
},
quickSuggestions: false,
lineNumbers: "on",
renderValidationDecorations: "off"
};
interface RawSettings {
tailwindConfig?: string;
remInPx?: string | null;
}
const tabs = [
{ label: "TailwindCSS Config", language: "javascript" },
{ label: "PostCSS Input", language: "css" }
];
const evalConfig = (configValue: string) =>
eval(`const module = {}; ${configValue}; module.exports;`);
const DEFAULT_POSTCSS_PLUGINS = [require("postcss-nested")];
function CssToTailwindSettings({
open,
toggle,
onConfirm,
settings
}: {
open: boolean;
toggle: () => void;
onConfirm: (props: {
tailwindConfig: string;
remInPx: string;
}) => boolean | Promise<boolean>;
settings: RawSettings;
}) {
const [tailwindConfig, setTailwindConfig] = useState(settings.tailwindConfig);
const [remInPx, setRemInPx] = useState(settings.remInPx);
function CssToTailwindSettings({ open, toggle, onConfirm, settings }) {
const [selectedIndex, setSelectedIndex] = useState(0);
const [isConfirmLoading, setConfirmLoading] = useState(false);
const [tailwindConfigValue, setTailwindConfigValue] = useState(
settings.tailwindConfig
);
const [postCssInputValue, setPostCssInputValue] = useState(
settings.postCssInput
);
return (
<Dialog
title={
<>
TailwindCSS Settings
title="Converter Configuration"
isShown={open}
onCloseComplete={toggle}
onConfirm={async close => {
const isSuccess = await onConfirm({
tailwindConfig,
remInPx
});
if (isSuccess) {
close();
}
}}
onCancel={close => {
setTailwindConfig(settings.tailwindConfig);
setRemInPx(settings.remInPx);
close();
}}
>
<>
<Heading>Root font size in pixels</Heading>
<Text>Used to convert rem CSS values to their px equivalents</Text>
<TextInput
borderBottomRightRadius={0}
borderTopRightRadius={0}
placeholder="Enter URL"
onChange={e => setRemInPx(e.target.value)}
value={remInPx || ""}
/>
<Heading marginTop={30}>
Tailwind configuration
<a
href="https://tailwindcss.com/docs/configuration"
target="_blank"
style={{ verticalAlign: "middle" }}
>
<Tooltip content="Open the TailwindCSS docs...">
<Icon icon="help" color="info" marginLeft={16} />
<Icon icon="help" color="info" marginLeft={16} size={16} />
</Tooltip>
</a>
</>
}
isShown={open}
isConfirmLoading={isConfirmLoading}
confirmLabel={isConfirmLoading ? "Running PostCSS..." : "Confirm"}
onCloseComplete={toggle}
onConfirm={async close => {
setConfirmLoading(true);
const isSuccess = await onConfirm({
tailwindConfigValue,
postCssInputValue
});
setConfirmLoading(false);
if (isSuccess) {
close();
}
}}
onCancel={close => {
setTailwindConfigValue(settings.tailwindConfig);
setPostCssInputValue(settings.postCssInput);
close();
}}
>
<>
<Tablist marginBottom={16} flexBasis={240} marginRight={24}>
{tabs.map(({ label }, index) => (
<Tab
key={label}
onSelect={() => setSelectedIndex(index)}
isSelected={index === selectedIndex}
>
{label}
</Tab>
))}
</Tablist>
<Pane padding={16} flex="1">
<Pane height={300}>
<Monaco
language={tabs[selectedIndex].language}
value={
selectedIndex === 0 ? tailwindConfigValue : postCssInputValue
}
onChange={
selectedIndex === 0
? setTailwindConfigValue
: setPostCssInputValue
}
options={options}
height={300}
/>
</Pane>
</Heading>
<Pane height={300}>
<Monaco
language="javascript"
value={tailwindConfig}
onChange={setTailwindConfig}
options={{
fontSize: 14,
readOnly: false,
codeLens: false,
fontFamily: "Menlo, Consolas, monospace, sans-serif",
minimap: {
enabled: false
},
quickSuggestions: false,
lineNumbers: "on",
renderValidationDecorations: "off"
}}
height={300}
/>
</Pane>
</>
</Dialog>
);
}
function SettingsInfo({ isDefaultConfig, resetSettings }) {
if (isDefaultConfig) {
return null;
}
// opting out from SSR, because something goes wrong with the Alert component otherwise
return (
<NoSSR>
<div style={{ minHeight: 20 }}>
<Alert
intent="warning"
backgroundColor="#FEF8E7"
title={
<>
Custom config is applied to TailwindCSS
<Pane
display="inline-block"
position="absolute"
right="10px"
marginTop="-2px"
>
<Button
appearance="minimal"
intent="warning"
height={24}
onClick={resetSettings}
>
Reset
</Button>
</Pane>
</>
}
/>
</div>
</NoSSR>
);
}
function formatOutput(results) {
const content = results
.map(result => {
const { selector, tailwind, missing } = result;
let output = `/* ℹ️ Base selector: ${selector} */`;
if (tailwind.length) {
output += `\n/* ✨ TailwindCSS: "${tailwind}" */`;
const { base, ...missingVariants } = missing;
if (base && base.length) {
output += `\n/* ⚠️ Some properties could not be matched with Tailwind classes. Use @apply to extend a CSS rule: */
${selector} {
@apply ${tailwind};
${base.map(([prop, value]) => `${prop}: ${value};`).join("\n ")}
}`;
}
if (Object.keys(missingVariants).length) {
output += `\n/* ⚠️ Some properties are requiring specific variants, but the variant does not support those. Consider extending your Tailwind config.\n`;
Object.entries(missingVariants).forEach(([variant, values]) => {
const properties = (values as [string, string])
.map(([prop, value]) => `\t${prop}: ${value};`)
.join("\n ");
output += `${variant}:\n${properties}\n`;
});
output += "*/";
}
} else {
output += `\n/* ❌ Could not match any TailwindCSS classes. */`;
}
return output;
})
.join("\n\n");
const success = results.filter(result => result.tailwind.length);
(window as any).cssToTailwindResults = results;
return `/* ${success.length}/${results.length} base rules are converted successfully. */\n/* Gather results from the console with \`copy(window.cssToTailwindResults)\` */\n\n${content}`;
}
export default function CssToTailwind({ defaultSettings }) {
const [settings, setSettings] = useSettings(
export default function CssToTailwind3({ defaultSettings }) {
const [rawSettings, setRawSettings] = useSettings(
"css-to-tailwind",
defaultSettings
);
) as [RawSettings, React.Dispatch<React.SetStateAction<RawSettings>>];
const onSettingsSubmit = useCallback(
async ({ tailwindConfigValue, postCssInputValue }) => {
try {
const resolvedTailwindConfig = tailwindResolve(
eval(`const module = {}; ${tailwindConfigValue}; module.exports;`)
);
const converterConfig = useMemo(() => {
const config: Partial<TailwindConverterConfig> = {
remInPx: rawSettings.remInPx ? parseInt(rawSettings.remInPx, 10) : null
};
try {
const newTailwindCss = await request("/api/build-tailwind-css", {
tailwindConfig: resolvedTailwindConfig,
postCssInput: postCssInputValue
});
toaster.success("Custom TailwindCSS config is successfully applied");
if (isNaN(config["remInPx"])) {
toaster.danger(
"Invalid `REM in PIXELS` value (only `number` or `null` allowed). Fallback to `null` value"
);
setSettings({
tailwindConfig: tailwindConfigValue,
postCssInput: postCssInputValue,
tailwindCss: newTailwindCss
});
config["remInPx"] = null;
}
// indicate submit was successful
return true;
} catch (e) {
toaster.danger(
"Something went wrong trying to build TailwindCSS with custom config",
{
description: "Now the default config is used instead"
}
);
try {
config["tailwindConfig"] = evalConfig(rawSettings.tailwindConfig);
} catch (e) {
toaster.danger(
"Something went wrong trying to resolve TailwindCSS config. Fallback to default tailwind config",
{
description: e.message
}
);
}
return config;
}, [rawSettings]);
const tailwindConverter = useMemo(() => {
return new TailwindConverter({
postCSSPlugins: DEFAULT_POSTCSS_PLUGINS,
...converterConfig
});
}, [converterConfig]);
const transformer = useCallback<Transformer>(
async ({ value }) => {
try {
return (
await tailwindConverter.convertCSS(value)
).convertedRoot.toString();
} catch (e) {
toaster.danger(
"Something went wrong trying to resolve TailwindCSS config",
{
description: e.message
}
);
toaster.danger("Unable to convert CSS", {
description: e.message
});
return "Unable to convert CSS";
}
},
[]
[tailwindConverter]
);
const transformer = useCallback<Transformer>(async ({ value }) => {
const results = await cssToTailwind(value, settings.tailwindCss);
return formatOutput(results);
}, []);
const resetSettings = useCallback(() => {
setSettings(defaultSettings);
}, []);
return (
<ConversionPanel
transformer={transformer}
editorTitle="CSS"
editorLanguage="css"
editorDefaultValue="css2"
resultTitle="TailwindCSS 1"
resultLanguage={"css"}
editorDefaultValue="css3"
resultTitle="TailwindCSS 3.x"
resultLanguage="css"
settings={rawSettings}
editorProps={{
settingElement: ({ open, toggle }) => {
return (
<CssToTailwindSettings
key={`${settings.tailwindConfig}${settings.postCssInput}`}
key={`${rawSettings.tailwindConfig}${rawSettings.remInPx}`}
open={open}
toggle={toggle}
onConfirm={onSettingsSubmit}
settings={settings}
/>
);
},
topNotifications: () => {
return (
<SettingsInfo
isDefaultConfig={isEqual(settings, defaultSettings)}
resetSettings={resetSettings}
onConfirm={async rawSettings => {
setRawSettings(rawSettings);
return true;
}}
settings={rawSettings}
/>
);
}
@@ -299,23 +204,19 @@ export default function CssToTailwind({ defaultSettings }) {
}
export async function getStaticProps() {
const tailwindConfig = await fs.readFile(
path.resolve("./node_modules/tailwindcss/stubs/simpleConfig.stub.js"),
const rawTailwindConfig = await fs.readFile(
path.resolve(
"./node_modules/css-to-tailwindcss/node_modules/tailwindcss/stubs/simpleConfig.stub.js"
),
"utf-8"
);
const postCssInput = await fs.readFile(
path.resolve("./node_modules/tailwindcss/tailwind.css"),
"utf-8"
);
const config = eval(`const module = {}; ${tailwindConfig}; module.exports;`);
const css = await tailwindCss(config, postCssInput);
return {
props: {
defaultSettings: {
tailwindConfig,
postCssInput,
tailwindCss: css
}
tailwindConfig: rawTailwindConfig,
remInPx: "16"
} as RawSettings
}
};
}
+2 -2
View File
@@ -205,8 +205,8 @@ export const categorizedRoutes = [
{
label: "to TailwindCSS",
path: "/css-to-tailwind",
packageUrl: "https://github.com/miklosme/css-to-tailwind",
packageName: "css-to-tailwind"
packageUrl: "https://github.com/Jackardios/css-to-tailwindcss",
packageName: "css-to-tailwindcss"
}
]
},
-16
View File
@@ -1,16 +0,0 @@
import postcss from "postcss7";
import tailwindcss from "tailwindcss1";
import defaultConfig from "tailwindcss1/stubs/simpleConfig.stub.js";
import autoprefixer from "autoprefixer9";
export default async function buildTailwindCss(
tailwindConfig: any,
postCssInput: string
): Promise<string> {
const { css } = await postcss([
tailwindConfig ? tailwindcss(tailwindConfig) : tailwindcss(defaultConfig),
autoprefixer
]).process(postCssInput, { from: "tailwind.css" });
return css;
}
+224 -491
View File
File diff suppressed because it is too large. Load diff