@modern-js/plugin-tailwindcss 0.0.0-next-20221211034006 → 0.0.0-next-20221211140544

package/CHANGELOG.md

@@ -1,14 +1,14 @@
 # @modern-js/plugin-tailwindcss
 
-## 0.0.0-next-20221211034006
+## 0.0.0-next-20221211140544
 
 ### Major Changes
 
-- dda38c9c3e: chore: v2
+- dda38c9c3: chore: v2
 
 ### Minor Changes
 
-- 92f0eade39: feat:
+- 92f0eade3: feat:
 
   1. add style config and add new hook
   2. add dts alias logic
@@ -24,7 +24,7 @@
   4. 添加日志逻辑
   5. 添加 skipDeps 配置
 
-- 92f0eade39: feat:
+- 92f0eade3: feat:
 
   1. core: 增加 test 函数
   2. module plugins: 增加 `babel`, `mainField`, `target` 插件
@@ -40,51 +40,56 @@
 
 ### Patch Changes
 
-- d6546ad916: add buildConfig style in module-tools-v2 and remove tools
+- d6546ad91: add buildConfig style in module-tools-v2 and remove tools
   在 module-tools-v2 里新增 buildConfig style 并删除 tools
-- Updated dependencies [2344eb26ed]
-- Updated dependencies [a11fcf8b50]
-- Updated dependencies [e7ce0636d1]
-- Updated dependencies [b18fa8f3ed]
-- Updated dependencies [7879e8f711]
-- Updated dependencies [50d4675e5b]
-- Updated dependencies [c9e800d39a]
-- Updated dependencies [6604f1b8b3]
-- Updated dependencies [6aca875011]
-- Updated dependencies [fda836fe8a]
-- Updated dependencies [3e57f2bd58]
-- Updated dependencies [2e6031955e]
-- Updated dependencies [fbf5eed5aa]
-- Updated dependencies [a2509bfbdb]
-- Updated dependencies [425e57092d]
-- Updated dependencies [e4357f1856]
-- Updated dependencies [4369648ae2]
-- Updated dependencies [92f0eade39]
-- Updated dependencies [92c0994468]
-- Updated dependencies [edd1cfb1af]
-- Updated dependencies [cc971eabfc]
-- Updated dependencies [5b9049f2e9]
-- Updated dependencies [6bda14ed71]
-- Updated dependencies [92004d1906]
-- Updated dependencies [b8bbe036c7]
-- Updated dependencies [40ed5874c6]
-- Updated dependencies [60d5378632]
-- Updated dependencies [d5a31df781]
-- Updated dependencies [dda38c9c3e]
-- Updated dependencies [8b8e1bb571]
-- Updated dependencies [3bbea92b2a]
-- Updated dependencies [b710adb843]
-- Updated dependencies [18aaf42249]
-- Updated dependencies [34702d5d47]
-- Updated dependencies [fcace5b5b9]
-- Updated dependencies [ea7cf06257]
-- Updated dependencies [bbe4c4ab64]
-- Updated dependencies [e4558a0bc4]
-- Updated dependencies [abf3421a75]
-- Updated dependencies [543be9558e]
-- Updated dependencies [14b712da84]
-  - @modern-js/runtime@0.0.0-next-20221211034006
-  - @modern-js/utils@0.0.0-next-20221211034006
+- 67472ca1c: fix: move babel-plugin-marcos to plugin-tailwindcss
+
+  fix: 将 babel-plugin-marcos 依赖移动到 plugin-tailwindcss 中
+
+- Updated dependencies [2344eb26e]
+- Updated dependencies [a11fcf8b5]
+- Updated dependencies [e7ce0636d]
+- Updated dependencies [b18fa8f3e]
+- Updated dependencies [7879e8f71]
+- Updated dependencies [50d4675e5]
+- Updated dependencies [c9e800d39]
+- Updated dependencies [6604f1b8b]
+- Updated dependencies [6aca87501]
+- Updated dependencies [fda836fe8]
+- Updated dependencies [3e57f2bd5]
+- Updated dependencies [2e6031955]
+- Updated dependencies [fbf5eed5a]
+- Updated dependencies [a2509bfbd]
+- Updated dependencies [a7c68832b]
+- Updated dependencies [425e57092]
+- Updated dependencies [e4357f185]
+- Updated dependencies [4369648ae]
+- Updated dependencies [92f0eade3]
+- Updated dependencies [92c099446]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f2e]
+- Updated dependencies [6bda14ed7]
+- Updated dependencies [92004d190]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [40ed5874c]
+- Updated dependencies [60d537863]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9c3]
+- Updated dependencies [8b8e1bb57]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [b710adb84]
+- Updated dependencies [18aaf4224]
+- Updated dependencies [34702d5d4]
+- Updated dependencies [fcace5b5b]
+- Updated dependencies [ea7cf0625]
+- Updated dependencies [bbe4c4ab6]
+- Updated dependencies [e4558a0bc]
+- Updated dependencies [abf3421a7]
+- Updated dependencies [543be9558]
+- Updated dependencies [14b712da8]
+  - @modern-js/runtime@0.0.0-next-20221211140544
+  - @modern-js/utils@0.0.0-next-20221211140544
 
 ## 2.0.0-beta.3
 

package/dist/js/modern/cli.js

@@ -1,6 +1,3 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import path from 'path';
 import { PLUGIN_SCHEMAS, fs, CONFIG_CACHE_DIR, globby, nanoid, slash } from '@modern-js/utils';
 import DesignTokenPlugin from "./design-token/cli";
@@ -66,34 +63,18 @@ export default (({
                 config.postcssOptions.plugins = [require('tailwindcss')(tailwindConfig)];
               }
             },
-            babel(config) {
-              var _config$plugins;
+            babel(_, {
+              addPlugins
+            }) {
               if (notHaveTwinMacro) {
                 return;
               }
-              const twinConfig = {
+              addPlugins([[require.resolve('babel-plugin-macros'), {
                 twin: {
                   preset: supportCssInJsLibrary,
                   config: internalTwConfigPath
                 }
-              };
-              (_config$plugins = config.plugins) === null || _config$plugins === void 0 ? void 0 : _config$plugins.some(plugin => {
-                if (Array.isArray(plugin) && plugin[0]) {
-                  const pluginTarget = plugin[0];
-                  let pluginOptions = plugin[1];
-                  if (typeof pluginTarget === 'string' &&
-                  // TODO: use babel chain
-                  slash(pluginTarget).includes('compiled/babel-plugin-macros')) {
-                    if (pluginOptions) {
-                      pluginOptions = _objectSpread(_objectSpread({}, pluginOptions), twinConfig);
-                    } else {
-                      plugin.push(twinConfig);
-                    }
-                    return true;
-                  }
-                }
-                return false;
-              });
+              }]]);
             }
           }
         };

package/dist/js/modern/design-token/cli/index.js

@@ -1,6 +1,8 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { lazyImport, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
 export default (({
   pluginName

package/dist/js/modern/design-token/runtime/plugin.js

@@ -1,6 +1,8 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import React, { useContext } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";

package/dist/js/node/cli.js

@@ -10,9 +10,6 @@ var _cli = _interopRequireDefault(require("./design-token/cli"));
 var _tailwind = require("./tailwind");
 var _utils2 = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 const supportCssInJsLibrary = 'styled-components';
 const getRandomTwConfigFileName = internalDirectory => {
   return (0, _utils.slash)(_path.default.join(internalDirectory, `tailwind.config.${Date.now()}.${(0, _utils.nanoid)()}.js`));
@@ -74,34 +71,18 @@ var _default = ({
                 config.postcssOptions.plugins = [require('tailwindcss')(tailwindConfig)];
               }
             },
-            babel(config) {
-              var _config$plugins;
+            babel(_, {
+              addPlugins
+            }) {
               if (notHaveTwinMacro) {
                 return;
               }
-              const twinConfig = {
+              addPlugins([[require.resolve('babel-plugin-macros'), {
                 twin: {
                   preset: supportCssInJsLibrary,
                   config: internalTwConfigPath
                 }
-              };
-              (_config$plugins = config.plugins) === null || _config$plugins === void 0 ? void 0 : _config$plugins.some(plugin => {
-                if (Array.isArray(plugin) && plugin[0]) {
-                  const pluginTarget = plugin[0];
-                  let pluginOptions = plugin[1];
-                  if (typeof pluginTarget === 'string' &&
-                  // TODO: use babel chain
-                  (0, _utils.slash)(pluginTarget).includes('compiled/babel-plugin-macros')) {
-                    if (pluginOptions) {
-                      pluginOptions = _objectSpread(_objectSpread({}, pluginOptions), twinConfig);
-                    } else {
-                      plugin.push(twinConfig);
-                    }
-                    return true;
-                  }
-                }
-                return false;
-              });
+              }]]);
             }
           }
         };

package/dist/js/node/design-token/cli/index.js

@@ -7,7 +7,9 @@ exports.default = void 0;
 var _utils = require("@modern-js/utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var _default = ({
   pluginName
 } = {

package/dist/js/node/design-token/runtime/plugin.js

@@ -12,7 +12,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const DesignTokenContext = /*#__PURE__*/_react.default.createContext({});
 exports.DesignTokenContext = DesignTokenContext;
 const useDesignTokens = () => (0, _react.useContext)(DesignTokenContext);

package/dist/js/treeshaking/cli.js

@@ -1,5 +1,4 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import path from 'path';
 import { PLUGIN_SCHEMAS, fs, CONFIG_CACHE_DIR, globby, nanoid, slash } from '@modern-js/utils';
@@ -72,40 +71,23 @@ export default (function () {
                             config.postcssOptions.plugins = [require('tailwindcss')(tailwindConfig)];
                           }
                         },
-                        babel: function babel(config) {
-                          var _config$plugins;
+                        babel: function babel(_, _ref2) {
+                          var addPlugins = _ref2.addPlugins;
                           if (notHaveTwinMacro) {
                             return;
                           }
-                          var twinConfig = {
+                          addPlugins([[require.resolve('babel-plugin-macros'), {
                             twin: {
                               preset: supportCssInJsLibrary,
                               config: internalTwConfigPath
                             }
-                          };
-                          (_config$plugins = config.plugins) === null || _config$plugins === void 0 ? void 0 : _config$plugins.some(function (plugin) {
-                            if (Array.isArray(plugin) && plugin[0]) {
-                              var pluginTarget = plugin[0];
-                              var pluginOptions = plugin[1];
-                              if (typeof pluginTarget === 'string' &&
-                              // TODO: use babel chain
-                              slash(pluginTarget).includes('compiled/babel-plugin-macros')) {
-                                if (pluginOptions) {
-                                  pluginOptions = _objectSpread(_objectSpread({}, pluginOptions), twinConfig);
-                                } else {
-                                  plugin.push(twinConfig);
-                                }
-                                return true;
-                              }
-                            }
-                            return false;
-                          });
+                          }]]);
                         }
                       }
                     };
                   },
-                  beforeBuildTask: function beforeBuildTask(_ref2) {
-                    var config = _ref2.config;
+                  beforeBuildTask: function beforeBuildTask(_ref3) {
+                    var config = _ref3.config;
                     var modernConfig = api.useResolvedConfigContext();
                     var designSystem = modernConfig.designSystem;
                     var tailwindConfig = getTailwindConfig(config.style.tailwindCss, designSystem, {

package/dist/types/types.d.ts

@@ -1,4 +1,4 @@
-export declare type DesignSystem = Record<string, any> & {
+export type DesignSystem = Record<string, any> & {
   supportStyledComponents?: boolean;
 };
-export declare type Tailwind = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
+export type Tailwind = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-20221211034006",
+  "version": "0.0.0-next-20221211140544",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -44,8 +44,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
+    "babel-plugin-macros": "3.1.0",
     "hoist-non-react-statics": "^3.3.2",
-    "@modern-js/utils": "0.0.0-next-20221211034006"
+    "@modern-js/utils": "0.0.0-next-20221211140544"
   },
   "devDependencies": {
     "@types/jest": "^27",
@@ -56,17 +57,17 @@
     "jest": "^27",
     "react": "^18",
     "postcss": "^8.4.14",
-    "@modern-js/core": "0.0.0-next-20221211034006",
-    "@modern-js/module-tools-v2": "0.0.0-next-20221211034006",
-    "@modern-js/runtime": "0.0.0-next-20221211034006",
-    "@modern-js/types": "0.0.0-next-20221211034006",
-    "@scripts/build": "0.0.0-next-20221211034006",
-    "@modern-js/app-tools": "0.0.0-next-20221211034006",
-    "@scripts/jest-config": "0.0.0-next-20221211034006"
+    "@modern-js/core": "0.0.0-next-20221211140544",
+    "@modern-js/module-tools-v2": "0.0.0-next-20221211140544",
+    "@modern-js/runtime": "0.0.0-next-20221211140544",
+    "@modern-js/types": "0.0.0-next-20221211140544",
+    "@scripts/build": "0.0.0-next-20221211140544",
+    "@modern-js/app-tools": "0.0.0-next-20221211140544",
+    "@scripts/jest-config": "0.0.0-next-20221211140544"
   },
   "peerDependencies": {
     "tailwindcss": "^2.0.4",
-    "@modern-js/runtime": "^0.0.0-next-20221211034006"
+    "@modern-js/runtime": "0.0.0-next-20221211140544"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {