make it behave as-if modifiers didn't exist

src/lib/setupContextUtils.js

@@ -582,15 +582,9 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
  api.addVariant(
  isSpecial ? `${variant}${key}` : `${variant}-${key}`,
  ({ args, container }) => {
- // For backwards compatibility reasons for older versions of the vscode intellisense
- // plugin and the JetBrains plugin.
- if (!args) {
- return null
- }
-
  return variantFn(
  value,
- modifiersEnabled ? { modifier: args.modifier, container } : { container }
+ modifiersEnabled ? { modifier: args?.modifier, container } : { container }
  )
  },
 
@@ -609,19 +603,13 @@ function buildPluginApi(tailwindConfig, context, { variantList, variantMap, offs
  api.addVariant(
  variant,
  ({ args, container }) => {
- // For backwards compatibility reasons for older versions of the vscode intellisense
- // plugin and the JetBrains plugin.
- if (!args) {
- return null
- }
-
- if (args.value === sharedState.NONE && !hasDefault) {
+ if (args?.value === sharedState.NONE && !hasDefault) {
  return null
  }
 
  return variantFn(
- args.value === sharedState.NONE ? options.values.DEFAULT : args.value,
- modifiersEnabled ? { modifier: args.modifier, container } : { container }
+ args?.value === sharedState.NONE ? options.values.DEFAULT : args?.value,
+ modifiersEnabled ? { modifier: args?.modifier, container } : { container }
  )
  },
  {

tests/match-variants.test.js

@@ -827,30 +827,20 @@ it('should be possible to use `undefined` as a DEFAULT value', () => {
 })
 
 it('should not break things', () => {
- let config = {
- plugins: [
- ({ matchVariant }) => {
- matchVariant(
- 'foo',
- (_value, { modifier: _modifier }) => {
- expect(true).toBe(true) // Should not be called
- return `.foo &`
- },
- {
- modifiers: {
- bar: 'bar',
- },
- }
- )
- },
- ],
- }
+ let config = {}
 
  let context = createContext(resolveConfig(config))
- let [[, fn]] = context.variantMap.get('foo')
- expect(fn()).toBe(null)
- expect(fn({})).toBe(null)
- expect(fn({ format() {} })).toBe(null)
+ let [[, fn]] = context.variantMap.get('group')
+
+ let format
+
+ expect(
+ fn({
+ format(input) {
+ format = input
+ },
+ })
+ ).toBe(undefined)
 
- expect.assertions(3)
+ expect(format).toBe(':merge(.group) &')
 })