tailwindcss 3.0.3 → 3.0.4

package/CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.0.4] - 2021-12-15
+
+### Fixed
+
+- Insert always on defaults layer in correct spot ([#6526](https://github.com/tailwindlabs/tailwindcss/pull/6526))
+
 ## [3.0.3] - 2021-12-15
 
 ### Added
@@ -1710,7 +1716,8 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.3...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.4...HEAD
+[3.0.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.3...v3.0.4
 [3.0.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.2...v3.0.3
 [3.0.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.0...v3.0.1

package/lib/lib/expandTailwindAtRules.js

@@ -210,18 +210,26 @@ function expandTailwindAtRules(context) {
         let { defaults: defaultNodes , base: baseNodes , components: componentNodes , utilities: utilityNodes , variants: screenNodes ,  } = context.stylesheetCache;
         // ---
         // Replace any Tailwind directives with generated CSS
+        if (layerNodes.base) {
+            layerNodes.base.before((0, _cloneNodes).default([
+                ...baseNodes
+            ], layerNodes.base.source));
+        }
         // @defaults rules are unconditionally added first to ensure that
         // using any utility that relies on defaults will work even when
         // compiled in an isolated environment like CSS modules
         if (context.tailwindConfig[DEFAULTS_LAYER] !== false) {
-            root.prepend((0, _cloneNodes).default([
-                ...defaultNodes
-            ], root.source));
+            if (layerNodes.base) {
+                layerNodes.base.after((0, _cloneNodes).default([
+                    ...defaultNodes
+                ], root.source));
+            } else {
+                root.prepend((0, _cloneNodes).default([
+                    ...defaultNodes
+                ], root.source));
+            }
         }
         if (layerNodes.base) {
-            layerNodes.base.before((0, _cloneNodes).default([
-                ...baseNodes
-            ], layerNodes.base.source));
             layerNodes.base.remove();
         }
         if (layerNodes.components) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",

package/src/lib/expandTailwindAtRules.js

@@ -221,15 +221,22 @@ export default function expandTailwindAtRules(context) {
 
     // Replace any Tailwind directives with generated CSS
 
+    if (layerNodes.base) {
+      layerNodes.base.before(cloneNodes([...baseNodes], layerNodes.base.source))
+    }
+
     // @defaults rules are unconditionally added first to ensure that
     // using any utility that relies on defaults will work even when
     // compiled in an isolated environment like CSS modules
     if (context.tailwindConfig[DEFAULTS_LAYER] !== false) {
-      root.prepend(cloneNodes([...defaultNodes], root.source))
+      if (layerNodes.base) {
+        layerNodes.base.after(cloneNodes([...defaultNodes], root.source))
+      } else {
+        root.prepend(cloneNodes([...defaultNodes], root.source))
+      }
     }
 
     if (layerNodes.base) {
-      layerNodes.base.before(cloneNodes([...baseNodes], layerNodes.base.source))
       layerNodes.base.remove()
     }