make all the tests pass

Some codemods used some internal canonicalization stuff, so this commit
makes that work.

Author: RobinMalfait

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

@@ -4,10 +4,9 @@ import {
   createSignatureOptions,
   prepareDesignSystemStorage,
   UTILITY_SIGNATURE_KEY,
-import { createSignatureOptions } from '../../../../tailwindcss/src/canonicalize-candidates'
+} from '../../../../tailwindcss/src/canonicalize-candidates'
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { computeUtilitySignature } from '../../../../tailwindcss/src/signatures'
 import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
 import { spliceChangesIntoString, type StringChange } from '../../utils/splice-changes-into-string'
 import { extractRawCandidates } from './candidates'

packages/tailwindcss/src/canonicalize-candidates.ts

@@ -1919,7 +1919,7 @@ export interface SignatureOptions {
 // | `flex`           | `.x { display: flex; }` |
 //
 // These produce the same signature, therefore they represent the same utility.
-const UTILITY_SIGNATURE_KEY = Symbol()
+export const UTILITY_SIGNATURE_KEY = Symbol()
 function createUtilitySignatureCache(
   designSystem: DesignSystem,
 ): DesignSystem['storage'][typeof UTILITY_SIGNATURE_KEY] {

packages/tailwindcss/src/expand-declaration.test.ts

@@ -1,8 +1,8 @@
 import { describe, expect, test } from 'vitest'
 import { toCss } from './ast'
+import { SignatureFeatures } from './canonicalize-candidates'
 import { parse } from './css-parser'
 import { expandDeclaration } from './expand-declaration'
-import { SignatureFeatures } from './signatures'
 import { walk, WalkAction } from './walk'
 
 const css = String.raw