diff --git a/__tests__/tailwindcss/runner/index.ts b/__tests__/tailwindcss/runner/index.ts index 611bf99..377f807 100644 --- a/__tests__/tailwindcss/runner/index.ts +++ b/__tests__/tailwindcss/runner/index.ts @@ -1,5 +1,5 @@ import { TailwindConfig } from "tailwindcss/tailwind-config"; -import { extractStyles } from "../../../src/babel/native-style-extraction"; +import { extractStyles } from "../../../src/babel/extract-styles"; import { MediaRecord, StyleError, diff --git a/postcss.js b/postcss.js index e5fbae0..3924592 100644 --- a/postcss.js +++ b/postcss.js @@ -1 +1 @@ -module.exports = require("./dist/postcss").plugin; +module.exports = require("./dist/postcss").default; diff --git a/src/babel/native-style-extraction/index.ts b/src/babel/extract-styles.ts similarity index 57% rename from src/babel/native-style-extraction/index.ts rename to src/babel/extract-styles.ts index 11d510c..57a5543 100644 --- a/src/babel/native-style-extraction/index.ts +++ b/src/babel/extract-styles.ts @@ -2,26 +2,20 @@ import { TailwindConfig } from "tailwindcss/tailwind-config"; import postcss from "postcss"; import tailwind from "tailwindcss"; -import plugin from "../../postcss"; +import plugin from "../postcss"; -import { MediaRecord, StyleError, StyleRecord } from "../../types/common"; +import { MediaRecord, StyleError, StyleRecord } from "../types/common"; -/** - * This is used by both Babel and the CLI to extract the files - * - * The CLI watches the TailwindCLI output, so you don't need - * to use the tailwind plugin - */ export function extractStyles( tailwindConfig: TailwindConfig, - cssInput = "@tailwind components;@tailwind utilities;", - includeTailwind = true + cssInput = "@tailwind components;@tailwind utilities;" ) { let styles: StyleRecord = {}; let media: MediaRecord = {}; let errors: StyleError[] = []; const plugins = [ + tailwind(tailwindConfig), plugin({ ...tailwindConfig, done: (output) => { @@ -32,10 +26,6 @@ export function extractStyles( }), ]; - if (includeTailwind) { - plugins.unshift(tailwind(tailwindConfig)); - } - postcss(plugins).process(cssInput).css; return { diff --git a/src/babel/root-visitor.ts b/src/babel/root-visitor.ts index 2f9f459..98a5615 100644 --- a/src/babel/root-visitor.ts +++ b/src/babel/root-visitor.ts @@ -1,7 +1,7 @@ import { Program } from "@babel/types"; import { NodePath } from "@babel/traverse"; -import { extractStyles } from "./native-style-extraction"; +import { extractStyles } from "./extract-styles"; import { appendVariables } from "./transforms/append-variables"; import { prependImport } from "./transforms/append-import"; import { TailwindcssReactNativeBabelOptions, State } from "./types";