@modern-js/plugin-tailwindcss 2.15.0 → 2.17.0

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

@@ -1,99 +1,90 @@
-import {
-  lazyImport,
-  PLUGIN_SCHEMAS,
-  createRuntimeExportsUtils
-} from "@modern-js/utils";
-var cli_default = ({ pluginName } = { pluginName: "@modern-js/plugin-tailwindcss" }) => ({
-  name: "@modern-js/plugin-design-token",
-  setup(api) {
-    let pluginsExportsUtils;
-    const resolveConfig = lazyImport("tailwindcss/resolveConfig", require);
-    const PLUGIN_IDENTIFIER = "designToken";
-    const getDesignTokens = (designSystem) => {
-      const tailwindcssConfig = {};
-      tailwindcssConfig.theme = designSystem ? { ...designSystem } : {};
-      if (!designSystem) {
-        tailwindcssConfig.presets = [];
-      }
-      if (designSystem) {
-        delete tailwindcssConfig.theme.supportStyledComponents;
-      }
-      return resolveConfig(tailwindcssConfig).theme || {};
-    };
-    return {
-      config() {
-        const appContext = api.useAppContext();
-        pluginsExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          "plugins"
-        );
-        return {
-          source: {
-            alias: {
-              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
-            }
-          },
-          tools: {
-            // TODO: support less、scss、css vars
-            // less: https://github.com/web-infra-dev/modern.js/pull/398/files#diff-f77c749e403fbf1fb676d5687bef3d7138a230331c849298d8afaff9b6afbc3dR166
-            // sass: https://github.com/web-infra-dev/modern.js/pull/398/files#diff-f77c749e403fbf1fb676d5687bef3d7138a230331c849298d8afaff9b6afbc3dR229
-            // postcss: https://github.com/web-infra-dev/modern.js/pull/398/files#diff-f77c749e403fbf1fb676d5687bef3d7138a230331c849298d8afaff9b6afbc3dR281
-          }
-        };
-      },
-      modifyEntryImports({ entrypoint, imports }) {
-        var _a, _b;
-        const userConfig = api.useResolvedConfigContext();
-        const designSystem = (_b = (_a = userConfig.source) == null ? void 0 : _a.designSystem) != null ? _b : {};
-        if (typeof designSystem === "object" && designSystem.supportStyledComponents) {
-          const designTokens = getDesignTokens(userConfig.source.designSystem);
-          imports.push({
-            value: "@modern-js/runtime/plugins",
-            specifiers: [
-              {
-                imported: PLUGIN_IDENTIFIER
-              }
-            ],
-            initialize: `
-  const designTokens = ${JSON.stringify(designTokens)};
-            `
-          });
+import { lazyImport, PLUGIN_SCHEMAS, createRuntimeExportsUtils } from "@modern-js/utils";
+export default ({ pluginName } = {
+  pluginName: "@modern-js/plugin-tailwindcss"
+}) => {
+  return {
+    name: "@modern-js/plugin-design-token",
+    setup(api) {
+      let pluginsExportsUtils;
+      const resolveConfig = lazyImport("tailwindcss/resolveConfig", require);
+      const PLUGIN_IDENTIFIER = "designToken";
+      const getDesignTokens = (designSystem) => {
+        const tailwindcssConfig = {};
+        tailwindcssConfig.theme = designSystem ? {
+          ...designSystem
+        } : {};
+        if (!designSystem) {
+          tailwindcssConfig.presets = [];
         }
-        return {
-          entrypoint,
-          imports
-        };
-      },
-      modifyEntryRuntimePlugins({ entrypoint, plugins }) {
-        var _a, _b;
-        const userConfig = api.useResolvedConfigContext();
-        const designSystem = (_b = (_a = userConfig.source) == null ? void 0 : _a.designSystem) != null ? _b : {};
-        let useSCThemeProvider = true;
         if (designSystem) {
-          useSCThemeProvider = (designSystem == null ? void 0 : designSystem.supportStyledComponents) || false;
+          delete tailwindcssConfig.theme.supportStyledComponents;
         }
-        if (typeof designSystem === "object" && designSystem.supportStyledComponents) {
-          plugins.push({
-            name: PLUGIN_IDENTIFIER,
-            options: `{token: designTokens, useStyledComponentsThemeProvider: ${useSCThemeProvider ? "true" : "false"}, useDesignTokenContext: false}`
-          });
+        return resolveConfig(tailwindcssConfig).theme || {};
+      };
+      return {
+        config() {
+          const appContext = api.useAppContext();
+          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          return {
+            source: {
+              alias: {
+                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
+              }
+            },
+            tools: {}
+          };
+        },
+        modifyEntryImports({ entrypoint, imports }) {
+          var _userConfig_source;
+          const userConfig = api.useResolvedConfigContext();
+          var _userConfig_source_designSystem;
+          const designSystem = (_userConfig_source_designSystem = (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.designSystem) !== null && _userConfig_source_designSystem !== void 0 ? _userConfig_source_designSystem : {};
+          if (typeof designSystem === "object" && designSystem.supportStyledComponents) {
+            const designTokens = getDesignTokens(userConfig.source.designSystem);
+            imports.push({
+              value: "@modern-js/runtime/plugins",
+              specifiers: [
+                {
+                  imported: PLUGIN_IDENTIFIER
+                }
+              ],
+              initialize: `
+  const designTokens = ${JSON.stringify(designTokens)};
+            `
+            });
+          }
+          return {
+            entrypoint,
+            imports
+          };
+        },
+        modifyEntryRuntimePlugins({ entrypoint, plugins }) {
+          var _userConfig_source;
+          const userConfig = api.useResolvedConfigContext();
+          var _userConfig_source_designSystem;
+          const designSystem = (_userConfig_source_designSystem = (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.designSystem) !== null && _userConfig_source_designSystem !== void 0 ? _userConfig_source_designSystem : {};
+          let useSCThemeProvider = true;
+          if (designSystem) {
+            useSCThemeProvider = (designSystem === null || designSystem === void 0 ? void 0 : designSystem.supportStyledComponents) || false;
+          }
+          if (typeof designSystem === "object" && designSystem.supportStyledComponents) {
+            plugins.push({
+              name: PLUGIN_IDENTIFIER,
+              options: `{token: designTokens, useStyledComponentsThemeProvider: ${useSCThemeProvider ? "true" : "false"}, useDesignTokenContext: false}`
+            });
+          }
+          return {
+            entrypoint,
+            plugins
+          };
+        },
+        validateSchema() {
+          return PLUGIN_SCHEMAS["@modern-js/plugin-design-token"];
+        },
+        addRuntimeExports() {
+          pluginsExportsUtils.addExport(`export { default as designToken } from '${pluginName}/runtime-design-token'`);
         }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/plugin-design-token"];
-      },
-      addRuntimeExports() {
-        pluginsExportsUtils.addExport(
-          `export { default as designToken } from '${pluginName}/runtime-design-token'`
-        );
-      }
-    };
-  }
-});
-export {
-  cli_default as default
+      };
+    }
+  };
 };

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

@@ -1,5 +1,2 @@
-import { default as default2 } from "./runtime";
+export { default } from "./runtime";
 export * from "./runtime";
-export {
-  default2 as default
-};

package/dist/esm-node/design-token/postcss-plugin/index.js

@@ -1,6 +1,4 @@
-var postcss_plugin_default = ({
-  cssVarsHash = {}
-} = {}) => ({
+export default ({ cssVarsHash = {} } = {}) => ({
   postcssPlugin: "postcss-replace-css-vars",
   Declaration(decl) {
     if (decl.value && typeof decl.value === "string") {
@@ -13,6 +11,3 @@ var postcss_plugin_default = ({
     }
   }
 });
-export {
-  postcss_plugin_default as default
-};

package/dist/esm-node/design-token/runtime/index.js

@@ -1,6 +1,3 @@
 import designTokenPlugin from "./plugin";
 export * from "./plugin";
-var runtime_default = designTokenPlugin;
-export {
-  runtime_default as default
-};
+export default designTokenPlugin;

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

@@ -1,28 +1,44 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import React, { useContext } from "react";
-const DesignTokenContext = React.createContext({});
-const useDesignTokens = () => useContext(DesignTokenContext);
-var plugin_default = (options = {}) => ({
+export const DesignTokenContext = /* @__PURE__ */ React.createContext({});
+export const useDesignTokens = () => useContext(DesignTokenContext);
+export default (options = {}) => ({
   name: "@modern-js/plugin-design-token",
   setup: () => ({
     hoc({ App }, next) {
       const DesignTokenAppWrapper = (props) => {
-        const {
-          token = {},
-          useStyledComponentsThemeProvider = false,
-          useDesignTokenContext = false
-        } = options;
+        const { token = {}, useStyledComponentsThemeProvider = false, useDesignTokenContext = false } = options;
         if (useStyledComponentsThemeProvider && useDesignTokenContext) {
           const { ThemeProvider } = require("@modern-js/runtime/styled");
-          return /* @__PURE__ */ jsx(ThemeProvider, { theme: token, children: /* @__PURE__ */ jsx(DesignTokenContext.Provider, { value: token, children: /* @__PURE__ */ jsx(App, { ...props }) }) });
+          return /* @__PURE__ */ _jsx(ThemeProvider, {
+            theme: token,
+            children: /* @__PURE__ */ _jsx(DesignTokenContext.Provider, {
+              value: token,
+              children: /* @__PURE__ */ _jsx(App, {
+                ...props
+              })
+            })
+          });
         } else if (useStyledComponentsThemeProvider) {
           const { ThemeProvider } = require("@modern-js/runtime/styled");
-          return /* @__PURE__ */ jsx(ThemeProvider, { theme: token, children: /* @__PURE__ */ jsx(App, { ...props }) });
+          return /* @__PURE__ */ _jsx(ThemeProvider, {
+            theme: token,
+            children: /* @__PURE__ */ _jsx(App, {
+              ...props
+            })
+          });
         } else if (useDesignTokenContext) {
-          return /* @__PURE__ */ jsx(DesignTokenContext.Provider, { value: token, children: /* @__PURE__ */ jsx(App, { ...props }) });
+          return /* @__PURE__ */ _jsx(DesignTokenContext.Provider, {
+            value: token,
+            children: /* @__PURE__ */ _jsx(App, {
+              ...props
+            })
+          });
         } else {
-          return /* @__PURE__ */ jsx(App, { ...props });
+          return /* @__PURE__ */ _jsx(App, {
+            ...props
+          });
         }
       };
       return next({
@@ -31,8 +47,3 @@ var plugin_default = (options = {}) => ({
     }
   })
 });
-export {
-  DesignTokenContext,
-  plugin_default as default,
-  useDesignTokens
-};

package/dist/esm-node/index.js

@@ -1,4 +1 @@
-import { default as default2 } from "./cli";
-export {
-  default2 as default
-};
+export { default } from "./cli";

package/dist/esm-node/tailwind.js

@@ -1,12 +1,15 @@
 import { applyOptionsChain, logger } from "@modern-js/utils";
 import { merge, cloneDeep } from "@modern-js/utils/lodash";
 const checkIfExistNotAllowKeys = (tailwindConfig) => {
-  const notAllowExistKeys = ["theme"];
+  const notAllowExistKeys = [
+    "theme"
+  ];
   let notAllowKey = "";
-  const ret = Object.keys(tailwindConfig).some(
-    (key) => notAllowExistKeys.includes(key) && (notAllowKey = key)
-  );
-  return [ret, notAllowKey];
+  const ret = Object.keys(tailwindConfig).some((key) => notAllowExistKeys.includes(key) && (notAllowKey = key));
+  return [
+    ret,
+    notAllowKey
+  ];
 };
 const getPureDesignSystemConfig = (designSystemConfig) => {
   const pureDesignSystemConfig = cloneDeep(designSystemConfig);
@@ -14,34 +17,28 @@ const getPureDesignSystemConfig = (designSystemConfig) => {
   return pureDesignSystemConfig;
 };
 const getTailwindConfig = (tailwindVersion, tailwindcss, designSystem, option = {}) => {
-  const purgeConfig = merge(
-    {
-      // TODO: how the operating environment is determined
-      enabled: process.env.NODE_ENV === "production",
-      // TODO: Remove or not
-      layers: ["utilities"],
-      content: []
-    },
-    option.pureConfig || {}
-  );
-  const defaultTailwindConfig = tailwindVersion === "3" ? { content: purgeConfig.content } : {
+  const purgeConfig = merge({
+    // TODO: how the operating environment is determined
+    enabled: process.env.NODE_ENV === "production",
+    // TODO: Remove or not
+    layers: [
+      "utilities"
+    ],
+    content: []
+  }, option.pureConfig || {});
+  const defaultTailwindConfig = tailwindVersion === "3" ? {
+    content: purgeConfig.content
+  } : {
     purge: purgeConfig
   };
-  const tailwindConfig = applyOptionsChain(
-    defaultTailwindConfig,
-    tailwindcss || {}
-  );
-  const designSystemConfig = getPureDesignSystemConfig(designSystem != null ? designSystem : {});
+  const tailwindConfig = applyOptionsChain(defaultTailwindConfig, tailwindcss || {});
+  const designSystemConfig = getPureDesignSystemConfig(designSystem !== null && designSystem !== void 0 ? designSystem : {});
   const [exist, key] = checkIfExistNotAllowKeys(tailwindConfig);
   if (exist) {
-    logger.error(
-      `should not exist '${key}' on tools.tailwindcss, please remove it`
-    );
+    logger.error(`should not exist '${key}' on tools.tailwindcss, please remove it`);
     process.exit(0);
   }
   tailwindConfig.theme = designSystemConfig || {};
   return tailwindConfig;
 };
-export {
-  getTailwindConfig
-};
+export { getTailwindConfig };

package/dist/esm-node/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm-node/utils.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { fs } from "@modern-js/utils";
-const template = (configPath) => `
+export const template = (configPath) => `
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : { default: obj };
 }
@@ -21,18 +21,18 @@ module.exports = {
 };
 `;
 const TWIN_MACRO_NAME = "twin.macro";
-const checkTwinMacroExist = async (appDirectory) => {
+export const checkTwinMacroExist = async (appDirectory) => {
   const packageJson = await fs.readJSON(path.join(appDirectory, "package.json"), {
     throws: false
   }) || {};
-  return Boolean(
-    typeof packageJson.dependencies === "object" && packageJson.dependencies[TWIN_MACRO_NAME] || typeof packageJson.devDependencies === "object" && packageJson.devDependencies[TWIN_MACRO_NAME]
-  );
+  return Boolean(typeof packageJson.dependencies === "object" && packageJson.dependencies[TWIN_MACRO_NAME] || typeof packageJson.devDependencies === "object" && packageJson.devDependencies[TWIN_MACRO_NAME]);
 };
-const getTwinMacroMajorVersion = (appDirectory) => {
+export const getTwinMacroMajorVersion = (appDirectory) => {
   try {
     const pkgJsonPath = require.resolve(`${TWIN_MACRO_NAME}/package.json`, {
-      paths: [appDirectory]
+      paths: [
+        appDirectory
+      ]
     });
     const { version } = require(pkgJsonPath);
     return Number(version.split(".")[0]);
@@ -40,27 +40,28 @@ const getTwinMacroMajorVersion = (appDirectory) => {
     return null;
   }
 };
-function getTailwindPath(appDirectory) {
+export function getTailwindPath(appDirectory) {
   try {
-    return require.resolve("tailwindcss", { paths: [appDirectory, __dirname] });
+    return require.resolve("tailwindcss", {
+      paths: [
+        appDirectory,
+        __dirname
+      ]
+    });
   } catch (err) {
     return "tailwindcss";
   }
 }
-function getTailwindVersion(appDirectory) {
+export function getTailwindVersion(appDirectory) {
   try {
     const packageJsonPath = require.resolve("tailwindcss/package.json", {
-      paths: [appDirectory, __dirname]
+      paths: [
+        appDirectory,
+        __dirname
+      ]
     });
     return require(packageJsonPath).version.split(".")[0];
   } catch (err) {
     return "3";
   }
 }
-export {
-  checkTwinMacroExist,
-  getTailwindPath,
-  getTailwindVersion,
-  getTwinMacroMajorVersion,
-  template
-};

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/cli/plugin-tailwind"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -45,7 +49,7 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-macros": "3.1.0",
     "hoist-non-react-statics": "^3.3.2",
-    "@modern-js/utils": "2.15.0"
+    "@modern-js/utils": "2.17.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -55,17 +59,17 @@
     "jest": "^29",
     "react": "^18",
     "postcss": "8.4.21",
-    "@modern-js/module-tools": "2.15.0",
-    "@modern-js/runtime": "2.15.0",
-    "@modern-js/core": "2.15.0",
-    "@modern-js/types": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@modern-js/app-tools": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/core": "2.17.0",
+    "@modern-js/module-tools": "2.17.0",
+    "@modern-js/runtime": "2.17.0",
+    "@modern-js/types": "2.17.0",
+    "@scripts/build": "2.17.0",
+    "@modern-js/app-tools": "2.17.0",
+    "@scripts/jest-config": "2.17.0"
   },
   "peerDependencies": {
     "tailwindcss": ">= 2.0.0 || >= 3.0.0",
-    "@modern-js/runtime": "^2.15.0"
+    "@modern-js/runtime": "^2.17.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {