Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/uniwind/src/metro/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ type UniwindConfig = {
polyfills?: Polyfills
}

export declare function withUniwindConfig(config: MetroConfig, options: UniwindConfig): () => Promise<MetroConfig>
export declare function withUniwindConfig(config: MetroConfig, options: UniwindConfig): MetroConfig
21 changes: 1 addition & 20 deletions packages/uniwind/src/metro/metro-transformer.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { Scanner } from '@tailwindcss/oxide'
import fs from 'fs'
import type { JsTransformerConfig, JsTransformOptions, TransformResponse } from 'metro-transform-worker'
import type { JsTransformerConfig, JsTransformOptions } from 'metro-transform-worker'
import path from 'path'
import { name } from '../../package.json'
import { compileVirtual } from './compileVirtual'
import { getSources } from './getSources'
import { injectThemes } from './injectThemes'
import { Platform, UniwindConfig } from './types'
import { areSetsEqual } from './utils'

let worker: typeof import('metro-transform-worker')

Expand All @@ -17,12 +16,6 @@ try {
worker = require('metro-transform-worker')
}

const uniwindCache = {
css: '',
candidates: new Set<string>(),
cachedTransforms: new Map<Platform, TransformResponse>(),
}

export const transform = async (
config: JsTransformerConfig & {
uniwind: UniwindConfig
Expand Down Expand Up @@ -58,17 +51,7 @@ export const transform = async (
const css = fs.readFileSync(filePath, 'utf-8')
const sources = getSources(css, path.dirname(cssPath))
const platform = options.platform as Platform
const cached = uniwindCache.cachedTransforms.get(platform)
const candidates = new Scanner({ sources }).scan()
const candidatesSet = new Set(candidates)

if (cached && uniwindCache.css === css && areSetsEqual(uniwindCache.candidates, candidatesSet)) {
return cached
}

uniwindCache.css = css
uniwindCache.candidates = candidatesSet

const virtualCode = await compileVirtual({
css,
platform,
Expand Down Expand Up @@ -98,8 +81,6 @@ export const transform = async (
options,
)

uniwindCache.cachedTransforms.set(platform, transform)

transform.output[0].data.css ??= {}
transform.output[0].data.css.skipCache = true

Expand Down
14 changes: 0 additions & 14 deletions packages/uniwind/src/metro/utils/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,6 @@ export const percentageToFloat = (value: string) => {
return Number(value.replace('%', '')) / 100
}

export const areSetsEqual = <T>(a: Set<T>, b: Set<T>) => {
if (a.size !== b.size) {
return false
}

for (const item of a) {
if (!b.has(item)) {
return false
}
}

return true
}

export const addMissingSpaces = (str: string) =>
pipe(str)(
x => x.trim(),
Expand Down