@modern-js/plugin-tailwindcss 2.15.0 → 2.16.0

package/dist/esm/utils.js

@@ -1,194 +1,200 @@
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    } else {
-        Promise.resolve(value).then(_next, _throw);
-    }
+  try {
+    var info = gen[key](arg);
+    var value = info.value;
+  } catch (error) {
+    reject(error);
+    return;
+  }
+  if (info.done) {
+    resolve(value);
+  } else {
+    Promise.resolve(value).then(_next, _throw);
+  }
 }
-function _asyncToGenerator(fn) {
-    return function() {
-        var self = this, args = arguments;
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
+function _async_to_generator(fn) {
+  return function() {
+    var self = this, args = arguments;
+    return new Promise(function(resolve, reject) {
+      var gen = fn.apply(self, args);
+      function _next(value) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+      }
+      function _throw(err) {
+        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+      }
+      _next(void 0);
+    });
+  };
 }
-var __generator = this && this.__generator || function(thisArg, body) {
-    var f, y, t, g, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
+var __generator = function(thisArg, body) {
+  var f, y, t, g, _ = {
+    label: 0,
+    sent: function() {
+      if (t[0] & 1)
+        throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  };
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+    return this;
+  }), g;
+  function verb(n) {
+    return function(v) {
+      return step([
+        n,
+        v
+      ]);
     };
-    return(g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g);
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
+  }
+  function step(op) {
+    if (f)
+      throw new TypeError("Generator is already executing.");
+    while (_)
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
+          return t;
+        if (y = 0, t)
+          op = [
+            op[0] & 2,
+            t.value
+          ];
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+          case 5:
+            _.label++;
+            y = op[1];
             op = [
-                6,
-                e
+              0
             ];
-            y = 0;
-        } finally{
-            f = t = 0;
+            continue;
+          case 7:
+            op = _.ops.pop();
+            _.trys.pop();
+            continue;
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+              _.ops.push(op);
+              break;
+            }
+            if (t[2])
+              _.ops.pop();
+            _.trys.pop();
+            continue;
         }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [
+          6,
+          e
+        ];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    if (op[0] & 5)
+      throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
 };
 import path from "path";
 import { fs } from "@modern-js/utils";
-var template = function(configPath) {
-    return "\nfunction _interopRequireDefault(obj) {\n    return obj && obj.__esModule ? obj : { default: obj };\n}\nconst modernConfig = _interopRequireDefault(require('".concat(configPath, "')).default;\n\nconst theme =\n    modernConfig && modernConfig.source && modernConfig.source.designSystem\n      ? modernConfig.source.designSystem\n      : {};\nconst tailwindcss =\n    modernConfig && modernConfig.tools && modernConfig.tools.tailwindcss\n      ? modernConfig.tools.tailwindcss\n      : {};\n\nmodule.exports = {\n    theme,\n    ...tailwindcss,\n};\n");
+export var template = function(configPath) {
+  return "\nfunction _interopRequireDefault(obj) {\n    return obj && obj.__esModule ? obj : { default: obj };\n}\nconst modernConfig = _interopRequireDefault(require('".concat(configPath, "')).default;\n\nconst theme =\n    modernConfig && modernConfig.source && modernConfig.source.designSystem\n      ? modernConfig.source.designSystem\n      : {};\nconst tailwindcss =\n    modernConfig && modernConfig.tools && modernConfig.tools.tailwindcss\n      ? modernConfig.tools.tailwindcss\n      : {};\n\nmodule.exports = {\n    theme,\n    ...tailwindcss,\n};\n");
 };
 var TWIN_MACRO_NAME = "twin.macro";
-var checkTwinMacroExist = function() {
-    var _ref = _asyncToGenerator(function(appDirectory) {
-        var packageJson;
-        return __generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        fs.readJSON(path.join(appDirectory, "package.json"), {
-                            throws: false
-                        })
-                    ];
-                case 1:
-                    packageJson = _state.sent() || {};
-                    return [
-                        2,
-                        Boolean(typeof packageJson.dependencies === "object" && packageJson.dependencies[TWIN_MACRO_NAME] || typeof packageJson.devDependencies === "object" && packageJson.devDependencies[TWIN_MACRO_NAME])
-                    ];
-            }
-        });
+export var checkTwinMacroExist = function() {
+  var _ref = _async_to_generator(function(appDirectory) {
+    var packageJson;
+    return __generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return [
+            4,
+            fs.readJSON(path.join(appDirectory, "package.json"), {
+              throws: false
+            })
+          ];
+        case 1:
+          packageJson = _state.sent() || {};
+          return [
+            2,
+            Boolean(typeof packageJson.dependencies === "object" && packageJson.dependencies[TWIN_MACRO_NAME] || typeof packageJson.devDependencies === "object" && packageJson.devDependencies[TWIN_MACRO_NAME])
+          ];
+      }
     });
-    return function checkTwinMacroExist(appDirectory) {
-        return _ref.apply(this, arguments);
-    };
+  });
+  return function checkTwinMacroExist2(appDirectory) {
+    return _ref.apply(this, arguments);
+  };
 }();
-var getTwinMacroMajorVersion = function(appDirectory) {
-    try {
-        var pkgJsonPath = require.resolve("".concat(TWIN_MACRO_NAME, "/package.json"), {
-            paths: [
-                appDirectory
-            ]
-        });
-        var version = require(pkgJsonPath).version;
-        return Number(version.split(".")[0]);
-    } catch (err) {
-        return null;
-    }
+export var getTwinMacroMajorVersion = function(appDirectory) {
+  try {
+    var pkgJsonPath = require.resolve("".concat(TWIN_MACRO_NAME, "/package.json"), {
+      paths: [
+        appDirectory
+      ]
+    });
+    var version = require(pkgJsonPath).version;
+    return Number(version.split(".")[0]);
+  } catch (err) {
+    return null;
+  }
 };
-function getTailwindPath(appDirectory) {
-    try {
-        return require.resolve("tailwindcss", {
-            paths: [
-                appDirectory,
-                __dirname
-            ]
-        });
-    } catch (err) {
-        return "tailwindcss";
-    }
+export function getTailwindPath(appDirectory) {
+  try {
+    return require.resolve("tailwindcss", {
+      paths: [
+        appDirectory,
+        __dirname
+      ]
+    });
+  } catch (err) {
+    return "tailwindcss";
+  }
 }
-function getTailwindVersion(appDirectory) {
-    try {
-        var packageJsonPath = require.resolve("tailwindcss/package.json", {
-            paths: [
-                appDirectory,
-                __dirname
-            ]
-        });
-        return require(packageJsonPath).version.split(".")[0];
-    } catch (err) {
-        return "3";
-    }
+export function getTailwindVersion(appDirectory) {
+  try {
+    var packageJsonPath = require.resolve("tailwindcss/package.json", {
+      paths: [
+        appDirectory,
+        __dirname
+      ]
+    });
+    return require(packageJsonPath).version.split(".")[0];
+  } catch (err) {
+    return "3";
+  }
 }
-export { checkTwinMacroExist, getTailwindPath, getTailwindVersion, getTwinMacroMajorVersion, template };

package/dist/esm-node/cli.js

@@ -1,158 +1,130 @@
 import path from "path";
-import {
-  PLUGIN_SCHEMAS,
-  fs,
-  CONFIG_CACHE_DIR,
-  globby,
-  nanoid,
-  slash
-} from "@modern-js/utils";
+import { PLUGIN_SCHEMAS, fs, CONFIG_CACHE_DIR, globby, nanoid, slash } from "@modern-js/utils";
 import designTokenPlugin from "./design-token/cli";
 import { getTailwindConfig } from "./tailwind";
-import {
-  template,
-  checkTwinMacroExist,
-  getTailwindPath,
-  getTailwindVersion,
-  getTwinMacroMajorVersion
-} from "./utils";
+import { template, checkTwinMacroExist, getTailwindPath, getTailwindVersion, getTwinMacroMajorVersion } from "./utils";
 const supportCssInJsLibrary = "styled-components";
-const getRandomTwConfigFileName = (internalDirectory) => {
-  return slash(
-    path.join(
-      internalDirectory,
-      `tailwind.config.${Date.now()}.${nanoid()}.js`
-    )
-  );
+export const getRandomTwConfigFileName = (internalDirectory) => {
+  return slash(path.join(internalDirectory, `tailwind.config.${Date.now()}.${nanoid()}.js`));
 };
-var cli_default = ({ pluginName } = {
+export default ({ pluginName } = {
   pluginName: "@modern-js/plugin-tailwindcss"
-}) => ({
-  name: "@modern-js/plugin-tailwindcss",
-  // support designSystem.supportStyledComponents
-  usePlugins: [
-    designTokenPlugin({
-      pluginName
-    })
-  ],
-  setup: async (api) => {
-    const { appDirectory, internalDirectory } = api.useAppContext();
-    let internalTwConfigPath = "";
-    const haveTwinMacro = await checkTwinMacroExist(appDirectory);
-    const tailwindPath = getTailwindPath(appDirectory);
-    const tailwindVersion = getTailwindVersion(appDirectory);
-    const defaultContent = [
-      "./config/html/**/*.html",
-      "./config/html/**/*.ejs",
-      "./config/html/**/*.hbs",
-      "./src/**/*.js",
-      "./src/**/*.jsx",
-      "./src/**/*.ts",
-      "./src/**/*.tsx",
-      // about storybook
-      "./storybook/**/*"
-    ];
-    return {
-      prepare() {
-        if (haveTwinMacro) {
-          const twinMajorVersion = getTwinMacroMajorVersion(appDirectory);
-          const useConfigPath = twinMajorVersion && twinMajorVersion < 3;
-          if (useConfigPath) {
-            internalTwConfigPath = getRandomTwConfigFileName(internalDirectory);
-            const globPattern = slash(
-              path.join(appDirectory, CONFIG_CACHE_DIR, "*.cjs")
-            );
-            const files = globby.sync(globPattern, {
-              absolute: true
-            });
-            if (files.length > 0) {
-              fs.writeFileSync(
-                internalTwConfigPath,
-                template(files[files.length - 1]),
-                "utf-8"
-              );
+}) => {
+  return {
+    name: "@modern-js/plugin-tailwindcss",
+    // support designSystem.supportStyledComponents
+    usePlugins: [
+      designTokenPlugin({
+        pluginName
+      })
+    ],
+    setup: async (api) => {
+      const { appDirectory, internalDirectory } = api.useAppContext();
+      let internalTwConfigPath = "";
+      const haveTwinMacro = await checkTwinMacroExist(appDirectory);
+      const tailwindPath = getTailwindPath(appDirectory);
+      const tailwindVersion = getTailwindVersion(appDirectory);
+      const defaultContent = [
+        "./config/html/**/*.html",
+        "./config/html/**/*.ejs",
+        "./config/html/**/*.hbs",
+        "./src/**/*.js",
+        "./src/**/*.jsx",
+        "./src/**/*.ts",
+        "./src/**/*.tsx",
+        // about storybook
+        "./storybook/**/*"
+      ];
+      return {
+        prepare() {
+          if (haveTwinMacro) {
+            const twinMajorVersion = getTwinMacroMajorVersion(appDirectory);
+            const useConfigPath = twinMajorVersion && twinMajorVersion < 3;
+            if (useConfigPath) {
+              internalTwConfigPath = getRandomTwConfigFileName(internalDirectory);
+              const globPattern = slash(path.join(appDirectory, CONFIG_CACHE_DIR, "*.cjs"));
+              const files = globby.sync(globPattern, {
+                absolute: true
+              });
+              if (files.length > 0) {
+                fs.writeFileSync(internalTwConfigPath, template(files[files.length - 1]), "utf-8");
+              }
             }
           }
-        }
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/plugin-tailwindcss"];
-      },
-      config() {
-        let tailwindConfig;
-        const initTailwindConfig = () => {
-          var _a, _b;
-          if (!tailwindConfig) {
-            const modernConfig = api.useResolvedConfigContext();
-            tailwindConfig = getTailwindConfig(
-              tailwindVersion,
-              (_a = modernConfig == null ? void 0 : modernConfig.tools) == null ? void 0 : _a.tailwindcss,
-              (_b = modernConfig == null ? void 0 : modernConfig.source) == null ? void 0 : _b.designSystem,
-              {
+        },
+        validateSchema() {
+          return PLUGIN_SCHEMAS["@modern-js/plugin-tailwindcss"];
+        },
+        config() {
+          let tailwindConfig;
+          const initTailwindConfig = () => {
+            if (!tailwindConfig) {
+              var _modernConfig_tools, _modernConfig_source;
+              const modernConfig = api.useResolvedConfigContext();
+              tailwindConfig = getTailwindConfig(tailwindVersion, modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_tools = modernConfig.tools) === null || _modernConfig_tools === void 0 ? void 0 : _modernConfig_tools.tailwindcss, modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_source = modernConfig.source) === null || _modernConfig_source === void 0 ? void 0 : _modernConfig_source.designSystem, {
                 pureConfig: {
                   content: defaultContent
                 }
-              }
-            );
-          }
-        };
-        return {
-          tools: {
-            // TODO: Add interface about postcss config
-            // TODO: In module project, also is called, but should not be called.
-            postcss: (config) => {
-              initTailwindConfig();
-              const tailwindPlugin = require(tailwindPath)(tailwindConfig);
-              if (Array.isArray(config.postcssOptions.plugins)) {
-                config.postcssOptions.plugins.push(tailwindPlugin);
-              } else {
-                config.postcssOptions.plugins = [tailwindPlugin];
-              }
-            },
-            babel(_, { addPlugins }) {
-              if (haveTwinMacro) {
+              });
+            }
+          };
+          return {
+            tools: {
+              // TODO: Add interface about postcss config
+              // TODO: In module project, also is called, but should not be called.
+              postcss: (config) => {
                 initTailwindConfig();
-                addPlugins([
-                  [
-                    require.resolve("babel-plugin-macros"),
-                    {
-                      twin: {
-                        preset: supportCssInJsLibrary,
-                        config: internalTwConfigPath || tailwindConfig
+                const tailwindPlugin = require(tailwindPath)(tailwindConfig);
+                if (Array.isArray(config.postcssOptions.plugins)) {
+                  config.postcssOptions.plugins.push(tailwindPlugin);
+                } else {
+                  config.postcssOptions.plugins = [
+                    tailwindPlugin
+                  ];
+                }
+              },
+              babel(_, { addPlugins }) {
+                if (haveTwinMacro) {
+                  initTailwindConfig();
+                  addPlugins([
+                    [
+                      require.resolve("babel-plugin-macros"),
+                      {
+                        twin: {
+                          preset: supportCssInJsLibrary,
+                          config: internalTwConfigPath || tailwindConfig
+                        }
                       }
-                    }
-                  ]
-                ]);
+                    ]
+                  ]);
+                }
               }
             }
-          }
-        };
-      },
-      beforeBuildTask(config) {
-        const modernConfig = api.useResolvedConfigContext();
-        const { designSystem } = modernConfig;
-        const tailwindConfig = getTailwindConfig(
-          tailwindVersion,
-          config.style.tailwindCss,
-          designSystem,
-          {
+          };
+        },
+        beforeBuildTask(config) {
+          const modernConfig = api.useResolvedConfigContext();
+          const { designSystem } = modernConfig;
+          const tailwindConfig = getTailwindConfig(tailwindVersion, config.style.tailwindCss, designSystem, {
             pureConfig: {
               content: defaultContent
             }
+          });
+          const tailwindPlugin = require(tailwindPath)(tailwindConfig);
+          if (Array.isArray(config.style.postcss.plugins)) {
+            config.style.postcss.plugins.push(tailwindPlugin);
+          } else {
+            config.style.postcss.plugins = [
+              tailwindPlugin
+            ];
           }
-        );
-        const tailwindPlugin = require(tailwindPath)(tailwindConfig);
-        if (Array.isArray(config.style.postcss.plugins)) {
-          config.style.postcss.plugins.push(tailwindPlugin);
-        } else {
-          config.style.postcss.plugins = [tailwindPlugin];
+          return config;
+        },
+        modifyLibuild(config, next) {
+          config.transformCache = false;
+          return next(config);
         }
-        return config;
-      }
-    };
-  }
-});
-export {
-  cli_default as default,
-  getRandomTwConfigFileName
+      };
+    }
+  };
 };