tailwindcss 3.1.1 → 3.1.2

package/CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [3.1.2] - 2022-06-10
+
+### Fixed
+
+- Ensure `\` is a valid arbitrary variant token ([#8576](https://github.com/tailwindlabs/tailwindcss/pull/8576))
+- Enable `postcss-import` in the CLI by default in watch mode ([#8574](https://github.com/tailwindlabs/tailwindcss/pull/8574), [#8580](https://github.com/tailwindlabs/tailwindcss/pull/8580))
+
 ## [3.1.1] - 2022-06-09
 
 ### Fixed
@@ -1961,7 +1968,8 @@ No release notes
 
 - Everything!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.1...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.2...HEAD
+[3.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.1...v3.1.2
 [3.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.0...v3.1.1
 [3.1.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.24...v3.1.0
 [3.0.24]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.23...v3.0.24

package/lib/cli.js

@@ -428,6 +428,43 @@ async function build() {
             config1.options
         ];
     }
+    function loadBuiltinPostcssPlugins() {
+        let postcss = loadPostcss();
+        let IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ";
+        return [
+            [
+                (root)=>{
+                    root.walkAtRules("import", (rule)=>{
+                        if (rule.params.slice(1).startsWith("tailwindcss/")) {
+                            rule.after(postcss.comment({
+                                text: IMPORT_COMMENT + rule.params
+                            }));
+                            rule.remove();
+                        }
+                    });
+                },
+                (()=>{
+                    try {
+                        return require("postcss-import");
+                    } catch  {}
+                    return (0, _indexJs).lazyPostcssImport();
+                })(),
+                (root)=>{
+                    root.walkComments((rule)=>{
+                        if (rule.text.startsWith(IMPORT_COMMENT)) {
+                            rule.after(postcss.atRule({
+                                name: "import",
+                                params: rule.text.replace(IMPORT_COMMENT, "")
+                            }));
+                            rule.remove();
+                        }
+                    });
+                }, 
+            ],
+            [],
+            {}, 
+        ];
+    }
     function resolveConfig() {
         let config = configPath ? require(configPath) : {};
         if (args["--purge"]) {
@@ -503,40 +540,7 @@ async function build() {
             };
         };
         tailwindPlugin.postcss = true;
-        let IMPORT_COMMENT = "__TAILWIND_RESTORE_IMPORT__: ";
-        let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins() : [
-            [
-                (root)=>{
-                    root.walkAtRules("import", (rule)=>{
-                        if (rule.params.slice(1).startsWith("tailwindcss/")) {
-                            rule.after(postcss.comment({
-                                text: IMPORT_COMMENT + rule.params
-                            }));
-                            rule.remove();
-                        }
-                    });
-                },
-                (()=>{
-                    try {
-                        return require("postcss-import");
-                    } catch  {}
-                    return (0, _indexJs).lazyPostcssImport();
-                })(),
-                (root)=>{
-                    root.walkComments((rule)=>{
-                        if (rule.text.startsWith(IMPORT_COMMENT)) {
-                            rule.after(postcss.atRule({
-                                name: "import",
-                                params: rule.text.replace(IMPORT_COMMENT, "")
-                            }));
-                            rule.remove();
-                        }
-                    });
-                }, 
-            ],
-            [],
-            {}, 
-        ];
+        let [beforePlugins, afterPlugins, postcssOptions] = includePostCss ? await loadPostCssPlugins() : loadBuiltinPostcssPlugins();
         let plugins = [
             ...beforePlugins,
             tailwindPlugin,
@@ -623,10 +627,7 @@ async function build() {
             env.DEBUG && console.timeEnd("Module dependencies");
             return resolveConfig();
         }
-        let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : [
-            [],
-            []
-        ];
+        let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : loadBuiltinPostcssPlugins();
         let plugins = [
             ...beforePlugins,
             "__TAILWIND_PLUGIN_POSITION__",

package/lib/lib/defaultExtractor.js

@@ -95,7 +95,7 @@ function* buildRegExps(context) {
         "((?=((",
         regex.any([
             regex.pattern([
-                /([^\s"'`\[\\]+-)?\[[^\s"'`\\]+\]/,
+                /([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/,
                 separator
             ]),
             regex.pattern([

package/package.json

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

package/src/cli.js

@@ -484,6 +484,45 @@ async function build() {
     return [beforePlugins, afterPlugins, config.options]
   }
 
+  function loadBuiltinPostcssPlugins() {
+    let postcss = loadPostcss()
+    let IMPORT_COMMENT = '__TAILWIND_RESTORE_IMPORT__: '
+    return [
+      [
+        (root) => {
+          root.walkAtRules('import', (rule) => {
+            if (rule.params.slice(1).startsWith('tailwindcss/')) {
+              rule.after(postcss.comment({ text: IMPORT_COMMENT + rule.params }))
+              rule.remove()
+            }
+          })
+        },
+        (() => {
+          try {
+            return require('postcss-import')
+          } catch {}
+
+          return lazyPostcssImport()
+        })(),
+        (root) => {
+          root.walkComments((rule) => {
+            if (rule.text.startsWith(IMPORT_COMMENT)) {
+              rule.after(
+                postcss.atRule({
+                  name: 'import',
+                  params: rule.text.replace(IMPORT_COMMENT, ''),
+                })
+              )
+              rule.remove()
+            }
+          })
+        },
+      ],
+      [],
+      {},
+    ]
+  }
+
   function resolveConfig() {
     let config = configPath ? require(configPath) : {}
 
@@ -568,44 +607,9 @@ async function build() {
 
     tailwindPlugin.postcss = true
 
-    let IMPORT_COMMENT = '__TAILWIND_RESTORE_IMPORT__: '
-
     let [beforePlugins, afterPlugins, postcssOptions] = includePostCss
       ? await loadPostCssPlugins()
-      : [
-          [
-            (root) => {
-              root.walkAtRules('import', (rule) => {
-                if (rule.params.slice(1).startsWith('tailwindcss/')) {
-                  rule.after(postcss.comment({ text: IMPORT_COMMENT + rule.params }))
-                  rule.remove()
-                }
-              })
-            },
-            (() => {
-              try {
-                return require('postcss-import')
-              } catch {}
-
-              return lazyPostcssImport()
-            })(),
-            (root) => {
-              root.walkComments((rule) => {
-                if (rule.text.startsWith(IMPORT_COMMENT)) {
-                  rule.after(
-                    postcss.atRule({
-                      name: 'import',
-                      params: rule.text.replace(IMPORT_COMMENT, ''),
-                    })
-                  )
-                  rule.remove()
-                }
-              })
-            },
-          ],
-          [],
-          {},
-        ]
+      : loadBuiltinPostcssPlugins()
 
     let plugins = [
       ...beforePlugins,
@@ -705,7 +709,9 @@ async function build() {
       return resolveConfig()
     }
 
-    let [beforePlugins, afterPlugins] = includePostCss ? await loadPostCssPlugins() : [[], []]
+    let [beforePlugins, afterPlugins] = includePostCss
+      ? await loadPostCssPlugins()
+      : loadBuiltinPostcssPlugins()
 
     let plugins = [
       ...beforePlugins,

package/src/lib/defaultExtractor.js

@@ -69,7 +69,7 @@ function* buildRegExps(context) {
     '((?=((',
     regex.any(
       [
-        regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s"'`\\]+\]/, separator]),
+        regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/, separator]),
         regex.pattern([/[^\s"'`\[\\]+/, separator]),
       ],
       true