@modern-js/plugin-tailwindcss 2.4.1-beta.0 → 2.5.0

package/CHANGELOG.md

@@ -1,14 +1,26 @@
 # @modern-js/plugin-tailwindcss
 
-## 2.4.1-beta.0
+## 2.5.0
 
 ### Patch Changes
 
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- Updated dependencies [89ca6cc]
+- Updated dependencies [7cb8bb4]
+- Updated dependencies [30614fa]
 - Updated dependencies [7a25271]
+- Updated dependencies [8871bb8]
+- Updated dependencies [1b0ce87]
+- Updated dependencies [0d75c27]
 - Updated dependencies [11c053b]
 - Updated dependencies [a0f2ab1]
-  - @modern-js/runtime@2.4.1-beta.0
-  - @modern-js/utils@2.4.1-beta.0
+  - @modern-js/runtime@2.5.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/cli.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default,
@@ -70,10 +50,10 @@ var cli_default = ({ pluginName } = {
       pluginName
     })
   ],
-  setup: (api) => __async(void 0, null, function* () {
+  setup: async (api) => {
     const { appDirectory, internalDirectory } = api.useAppContext();
     let internalTwConfigPath = "";
-    const haveTwinMacro = yield (0, import_utils2.checkTwinMacroExist)(appDirectory);
+    const haveTwinMacro = await (0, import_utils2.checkTwinMacroExist)(appDirectory);
     const tailwindPath = (0, import_utils2.getTailwindPath)(appDirectory);
     const tailwindVersion = (0, import_utils2.getTailwindVersion)(appDirectory);
     const defaultContent = [
@@ -182,7 +162,7 @@ var cli_default = ({ pluginName } = {
         return config;
       }
     };
-  })
+  }
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/design-token/cli/index.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -43,7 +29,7 @@ var cli_default = ({ pluginName } = { pluginName: "@modern-js/plugin-tailwindcss
     const PLUGIN_IDENTIFIER = "designToken";
     const getDesignTokens = (designSystem) => {
       const tailwindcssConfig = {};
-      tailwindcssConfig.theme = designSystem ? __spreadValues({}, designSystem) : {};
+      tailwindcssConfig.theme = designSystem ? { ...designSystem } : {};
       if (!designSystem) {
         tailwindcssConfig.presets = [];
       }

package/dist/{js/node → cjs}/design-token/runtime/plugin.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -63,22 +49,30 @@ var plugin_default = (options = {}) => ({
             theme: token,
             children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DesignTokenContext.Provider, {
               value: token,
-              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues({}, props))
+              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                ...props
+              })
             })
           });
         } else if (useStyledComponentsThemeProvider) {
           const { ThemeProvider } = require("@modern-js/runtime/styled");
           return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ThemeProvider, {
             theme: token,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues({}, props))
+            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+              ...props
+            })
           });
         } else if (useDesignTokenContext) {
           return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DesignTokenContext.Provider, {
             value: token,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues({}, props))
+            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+              ...props
+            })
           });
         } else {
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues({}, props));
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+            ...props
+          });
         }
       };
       return next({

package/dist/{js/node → cjs}/utils.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var utils_exports = {};
 __export(utils_exports, {
   checkTwinMacroExist: () => checkTwinMacroExist,
@@ -73,14 +53,14 @@ module.exports = {
 };
 `;
 const TWIN_MACRO_NAME = "twin.macro";
-const checkTwinMacroExist = (appDirectory) => __async(void 0, null, function* () {
-  const packageJson = (yield import_utils.fs.readJSON(import_path.default.join(appDirectory, "package.json"), {
+const checkTwinMacroExist = async (appDirectory) => {
+  const packageJson = await import_utils.fs.readJSON(import_path.default.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]
   );
-});
+};
 const getTwinMacroMajorVersion = (appDirectory) => {
   try {
     const pkgJsonPath = require.resolve(`${TWIN_MACRO_NAME}/package.json`, {

package/dist/{js/modern → esm-node}/cli.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import path from "path";
 import {
   PLUGIN_SCHEMAS,
@@ -54,10 +34,10 @@ var cli_default = ({ pluginName } = {
       pluginName
     })
   ],
-  setup: (api) => __async(void 0, null, function* () {
+  setup: async (api) => {
     const { appDirectory, internalDirectory } = api.useAppContext();
     let internalTwConfigPath = "";
-    const haveTwinMacro = yield checkTwinMacroExist(appDirectory);
+    const haveTwinMacro = await checkTwinMacroExist(appDirectory);
     const tailwindPath = getTailwindPath(appDirectory);
     const tailwindVersion = getTailwindVersion(appDirectory);
     const defaultContent = [
@@ -166,7 +146,7 @@ var cli_default = ({ pluginName } = {
         return config;
       }
     };
-  })
+  }
 });
 export {
   cli_default as default,

package/dist/{js/modern → esm-node}/design-token/cli/index.js

@@ -1,19 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 import {
   lazyImport,
   PLUGIN_SCHEMAS,
@@ -27,7 +11,7 @@ var cli_default = ({ pluginName } = { pluginName: "@modern-js/plugin-tailwindcss
     const PLUGIN_IDENTIFIER = "designToken";
     const getDesignTokens = (designSystem) => {
       const tailwindcssConfig = {};
-      tailwindcssConfig.theme = designSystem ? __spreadValues({}, designSystem) : {};
+      tailwindcssConfig.theme = designSystem ? { ...designSystem } : {};
       if (!designSystem) {
         tailwindcssConfig.presets = [];
       }

package/dist/{js/modern → esm-node}/design-token/runtime/plugin.js

@@ -1,19 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 import { jsx } from "react/jsx-runtime";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import React, { useContext } from "react";
@@ -35,22 +19,30 @@ var plugin_default = (options = {}) => ({
             theme: token,
             children: /* @__PURE__ */ jsx(DesignTokenContext.Provider, {
               value: token,
-              children: /* @__PURE__ */ jsx(App, __spreadValues({}, props))
+              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, __spreadValues({}, props))
+            children: /* @__PURE__ */ jsx(App, {
+              ...props
+            })
           });
         } else if (useDesignTokenContext) {
           return /* @__PURE__ */ jsx(DesignTokenContext.Provider, {
             value: token,
-            children: /* @__PURE__ */ jsx(App, __spreadValues({}, props))
+            children: /* @__PURE__ */ jsx(App, {
+              ...props
+            })
           });
         } else {
-          return /* @__PURE__ */ jsx(App, __spreadValues({}, props));
+          return /* @__PURE__ */ jsx(App, {
+            ...props
+          });
         }
       };
       return next({

package/dist/{js/modern → esm-node}/utils.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import path from "path";
 import { fs } from "@modern-js/utils";
 const template = (configPath) => `
@@ -41,14 +21,14 @@ module.exports = {
 };
 `;
 const TWIN_MACRO_NAME = "twin.macro";
-const checkTwinMacroExist = (appDirectory) => __async(void 0, null, function* () {
-  const packageJson = (yield fs.readJSON(path.join(appDirectory, "package.json"), {
+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]
   );
-});
+};
 const getTwinMacroMajorVersion = (appDirectory) => {
   try {
     const pkgJsonPath = require.resolve(`${TWIN_MACRO_NAME}/package.json`, {

package/package.json

@@ -11,28 +11,27 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "require": "./dist/js/node/index.js"
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli.ts",
-      "default": "./dist/js/node/cli.js"
+      "default": "./dist/cjs/cli.js"
     },
     "./runtime-design-token": {
       "jsnext:source": "./src/design-token/index.js",
-      "node": "./dist/js/node/design-token/index.js",
-      "default": "./dist/js/treeshaking/design-token/index.js"
+      "node": "./dist/cjs/design-token/index.js",
+      "default": "./dist/esm/design-token/index.js"
     }
   },
   "typesVersions": {
@@ -46,7 +45,7 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-macros": "3.1.0",
     "hoist-non-react-statics": "^3.3.2",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "@types/jest": "^27",
@@ -56,17 +55,17 @@
     "jest": "^27",
     "react": "^18",
     "postcss": "8.4.21",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/module-tools": "2.5.0-beta.0",
-    "@modern-js/runtime": "2.4.1-beta.0",
-    "@modern-js/types": "2.4.0",
-    "@scripts/build": "2.4.0",
-    "@modern-js/app-tools": "3.0.0-beta.0",
-    "@scripts/jest-config": "2.4.0"
+    "@modern-js/core": "2.5.0",
+    "@modern-js/runtime": "2.5.0",
+    "@modern-js/module-tools": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@modern-js/app-tools": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "peerDependencies": {
     "tailwindcss": ">= 2.0.0 || >= 3.0.0",
-    "@modern-js/runtime": "^2.4.1-beta.0"
+    "@modern-js/runtime": "^2.5.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {