Skip to content

Commit f6c1e15

Browse files
committed
move signatures to core
1 parent c3b55fb commit f6c1e15

10 files changed

+28
-19
lines changed

packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-utilities.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import { printModifier, type Candidate } from '../../../../tailwindcss/src/candidate'
22
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
33
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
4+
import {
5+
computeUtilitySignature,
6+
preComputedUtilities,
7+
} from '../../../../tailwindcss/src/signatures'
48
import type { Writable } from '../../../../tailwindcss/src/types'
59
import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
610
import { dimensions } from '../../../../tailwindcss/src/utils/dimensions'
711
import * as ValueParser from '../../../../tailwindcss/src/value-parser'
812
import { baseCandidate, parseCandidate } from './candidates'
9-
import { computeUtilitySignature, preComputedUtilities } from './signatures'
1013

1114
const baseReplacementsCache = new DefaultMap<DesignSystem, Map<string, Candidate>>(
1215
() => new Map<string, Candidate>(),

packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import {
55
} from '../../../../tailwindcss/src/candidate'
66
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
77
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
8+
import { computeUtilitySignature } from '../../../../tailwindcss/src/signatures'
89
import {
910
isPositiveInteger,
1011
isValidSpacingMultiplier,
1112
} from '../../../../tailwindcss/src/utils/infer-data-type'
1213
import { segment } from '../../../../tailwindcss/src/utils/segment'
1314
import { walkVariants } from '../../utils/walk-variants'
14-
import { computeUtilitySignature } from './signatures'
1515

1616
export function migrateArbitraryValueToBareValue(
1717
designSystem: DesignSystem,

packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
22
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
3+
import {
4+
computeVariantSignature,
5+
preComputedVariants,
6+
} from '../../../../tailwindcss/src/signatures'
37
import type { Writable } from '../../../../tailwindcss/src/types'
48
import { replaceObject } from '../../utils/replace-object'
59
import { walkVariants } from '../../utils/walk-variants'
6-
import { computeVariantSignature, preComputedVariants } from './signatures'
710

811
export function migrateArbitraryVariants(
912
designSystem: DesignSystem,

packages/@tailwindcss-upgrade/src/codemods/template/migrate-bare-utilities.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import { type Candidate } from '../../../../tailwindcss/src/candidate'
22
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
33
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
4+
import {
5+
computeUtilitySignature,
6+
preComputedUtilities,
7+
} from '../../../../tailwindcss/src/signatures'
48
import type { Writable } from '../../../../tailwindcss/src/types'
59
import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
610
import { baseCandidate, parseCandidate } from './candidates'
7-
import { computeUtilitySignature, preComputedUtilities } from './signatures'
811

912
const baseReplacementsCache = new DefaultMap<DesignSystem, Map<string, Candidate>>(
1013
() => new Map<string, Candidate>(),

packages/@tailwindcss-upgrade/src/codemods/template/migrate-deprecated-utilities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
22
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
3+
import { computeUtilitySignature } from '../../../../tailwindcss/src/signatures'
34
import type { Writable } from '../../../../tailwindcss/src/types'
45
import { baseCandidate, parseCandidate, printUnprefixedCandidate } from './candidates'
5-
import { computeUtilitySignature } from './signatures'
66

77
const DEPRECATION_MAP = new Map([['order-none', 'order-0']])
88

packages/@tailwindcss-upgrade/src/codemods/template/migrate-drop-unnecessary-data-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
22
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
3-
import { computeUtilitySignature } from './signatures'
3+
import { computeUtilitySignature } from '../../../../tailwindcss/src/signatures'
44

55
export function migrateDropUnnecessaryDataTypes(
66
designSystem: DesignSystem,

packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import SelectorParser from 'postcss-selector-parser'
22
import { parseCandidate, type Variant } from '../../../../tailwindcss/src/candidate'
33
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
44
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
5+
import { computeVariantSignature } from '../../../../tailwindcss/src/signatures'
56
import { isPositiveInteger } from '../../../../tailwindcss/src/utils/infer-data-type'
67
import * as ValueParser from '../../../../tailwindcss/src/value-parser'
78
import { replaceObject } from '../../utils/replace-object'
89
import { walkVariants } from '../../utils/walk-variants'
9-
import { computeVariantSignature } from './signatures'
1010

1111
export function migrateModernizeArbitraryValues(
1212
designSystem: DesignSystem,

packages/@tailwindcss-upgrade/src/codemods/template/migrate-optimize-modifier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { NamedUtilityValue } from '../../../../tailwindcss/src/candidate'
22
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
33
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
4+
import { computeUtilitySignature } from '../../../../tailwindcss/src/signatures'
45
import type { Writable } from '../../../../tailwindcss/src/types'
5-
import { computeUtilitySignature } from './signatures'
66

77
// Optimize the modifier
88
//

packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import fs from 'node:fs/promises'
22
import path, { extname } from 'node:path'
33
import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
44
import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
5+
import { computeUtilitySignature } from '../../../../tailwindcss/src/signatures'
56
import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
67
import { spliceChangesIntoString, type StringChange } from '../../utils/splice-changes-into-string'
78
import { extractRawCandidates } from './candidates'
@@ -24,7 +25,6 @@ import { migrateOptimizeModifier } from './migrate-optimize-modifier'
2425
import { migratePrefix } from './migrate-prefix'
2526
import { migrateSimpleLegacyClasses } from './migrate-simple-legacy-classes'
2627
import { migrateVariantOrder } from './migrate-variant-order'
27-
import { computeUtilitySignature } from './signatures'
2828

2929
export type Migration = (
3030
designSystem: DesignSystem,
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { substituteAtApply } from '../../../../tailwindcss/src/apply'
2-
import { atRule, styleRule, toCss, walk, type AstNode } from '../../../../tailwindcss/src/ast'
3-
import { printArbitraryValue } from '../../../../tailwindcss/src/candidate'
4-
import * as SelectorParser from '../../../../tailwindcss/src/compat/selector-parser'
5-
import { CompileAstFlags, type DesignSystem } from '../../../../tailwindcss/src/design-system'
6-
import { ThemeOptions } from '../../../../tailwindcss/src/theme'
7-
import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
8-
import { dimensions } from '../../../../tailwindcss/src/utils/dimensions'
9-
import { isValidSpacingMultiplier } from '../../../../tailwindcss/src/utils/infer-data-type'
10-
import * as ValueParser from '../../../../tailwindcss/src/value-parser'
1+
import { substituteAtApply } from './apply'
2+
import { atRule, styleRule, toCss, walk, type AstNode } from './ast'
3+
import { printArbitraryValue } from './candidate'
4+
import * as SelectorParser from './compat/selector-parser'
5+
import { CompileAstFlags, type DesignSystem } from './design-system'
6+
import { ThemeOptions } from './theme'
7+
import { DefaultMap } from './utils/default-map'
8+
import { dimensions } from './utils/dimensions'
9+
import { isValidSpacingMultiplier } from './utils/infer-data-type'
10+
import * as ValueParser from './value-parser'
1111

1212
// Given a utility, compute a signature that represents the utility. The
1313
// signature will be a normalised form of the generated CSS for the utility, or

0 commit comments

Comments
 (0)