Tweak error messages

Author: adamwathan

src/lib/expandApplyAtRules.js

@@ -158,12 +158,14 @@ function processApply(root, context) {
           const screenType = apply.parent.params
 
           throw apply.error(
-            `@apply nested inside @screen is not supported. We suggest you write this as @apply ${applyCandidates.map(c => `${screenType}:${c}`).join(' ')} instead.`
+            `@apply is not supported within nested at-rules like @screen. We suggest you write this as @apply ${applyCandidates
+              .map((c) => `${screenType}:${c}`)
+              .join(' ')} instead.`
           )
         }
 
         throw apply.error(
-          `@apply only works for elements and classes. Nesting inside an @${apply.parent.name} is not supported. Please move the @${apply.parent.name} around the element/class selector`
+          `@apply is not supported within nested at-rules like @${apply.parent.name}. You can fix this by un-nesting @${apply.parent.name}.`
         )
       }
 

tests/10-apply.test.js

@@ -7,7 +7,7 @@ function run(input, config = {}) {
   const { currentTestName } = expect.getState()
 
   return postcss([tailwind(config)]).process(input, {
-    from: `${path.resolve(__filename)}?test=${currentTestName}`
+    from: `${path.resolve(__filename)}?test=${currentTestName}`,
   })
 }
 
@@ -162,7 +162,7 @@ test('@apply error with unknown utility', async () => {
   }
 `
 
-  await expect(run(css, config)).rejects.toThrowError("class does not exist")
+  await expect(run(css, config)).rejects.toThrowError('class does not exist')
 })
 
 test('@apply error with nested @screen', async () => {
@@ -186,7 +186,9 @@ test('@apply error with nested @screen', async () => {
   }
 `
 
-  await expect(run(css, config)).rejects.toThrowError("@apply nested inside @screen is not supported")
+  await expect(run(css, config)).rejects.toThrowError(
+    '@apply is not supported within nested at-rules like @screen'
+  )
 })
 
 test('@apply error with nested @anyatrulehere', async () => {
@@ -210,5 +212,7 @@ test('@apply error with nested @anyatrulehere', async () => {
   }
 `
 
-  await expect(run(css, config)).rejects.toThrowError("Nesting inside an @genie is not supported")
+  await expect(run(css, config)).rejects.toThrowError(
+    '@apply is not supported within nested at-rules like @genie'
+  )
 })