@modern-js/plugin-tailwindcss 1.2.4 → 1.2.7

package/.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    // the base path used to search for `tsconfig.json`
+    tsconfigRootDir: __dirname,
+    // the relative path to sub-package's `tsconfig.json`
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @modern-js/plugin-tailwindcss
 
+## 1.2.7
+
+### Patch Changes
+
+- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/utils@1.4.0
+  - @modern-js/plugin-design-token@1.0.3
+
+## 1.2.6
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- 132f7b53: feat: move config declarations to @modern-js/core
+- Updated dependencies [bebb39b6]
+- Updated dependencies [132f7b53]
+  - @modern-js/plugin-design-token@1.0.3
+  - @modern-js/utils@1.3.7
+
+## 1.2.5
+
+### Patch Changes
+
+- b851d628: feat: convert to new plugin
+- 61e3f623: feat: convert to new plugin
+- Updated dependencies [c2046f37]
+- Updated dependencies [10379961]
+- Updated dependencies [61e3f623]
+  - @modern-js/utils@1.3.6
+  - @modern-js/plugin-design-token@1.0.2
+
 ## 1.2.4
 
 ### Patch Changes

package/dist/js/node/cli.js

@@ -7,54 +7,56 @@ exports.default = void 0;
 
 var _utils = require("@modern-js/utils");
 
-var _tailwind = require("./tailwind");
-
-const core = _utils.Import.lazy('@modern-js/core', require); // support designSystem.supportStyledComponents
-
-
-core.usePlugins([require.resolve('@modern-js/plugin-design-token/cli')]);
+var _cli = _interopRequireDefault(require("@modern-js/plugin-design-token/cli"));
 
-var _default = core.createPlugin(() => ({
-  validateSchema() {
-    return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-tailwindcss'];
-  },
+var _tailwind = require("./tailwind");
 
-  config() {
-    return {
-      tools: {
-        // TODO: Add interface about postcss config
-        // TODO: In module project, also is called, but should not be called.
-        postcss: config => {
-          const modernConfig = core.useResolvedConfigContext();
-          const tailwindConfig = (0, _tailwind.getTailwindConfig)(modernConfig, {
-            pureConfig: {
-              content: ['./config/html/**/*.html', './config/html/**/*.ejs', './config/html/**/*.hbs', './src/**/*.js', './src/**/*.jsx', './src/**/*.ts', './src/**/*.tsx', // about storybook
-              './storybook/**/*', './styles/**/*.less', './styles/**/*.css', './styles/**/*.sass', './styles/**/*.scss']
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = () => ({
+  name: '@modern-js/plugin-tailwindcss',
+  // support designSystem.supportStyledComponents
+  usePlugins: [(0, _cli.default)()],
+  setup: api => ({
+    validateSchema() {
+      return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-tailwindcss'];
+    },
+
+    config() {
+      return {
+        tools: {
+          // TODO: Add interface about postcss config
+          // TODO: In module project, also is called, but should not be called.
+          postcss: config => {
+            const modernConfig = api.useResolvedConfigContext();
+            const tailwindConfig = (0, _tailwind.getTailwindConfig)(modernConfig, {
+              pureConfig: {
+                content: ['./config/html/**/*.html', './config/html/**/*.ejs', './config/html/**/*.hbs', './src/**/*.js', './src/**/*.jsx', './src/**/*.ts', './src/**/*.tsx', // about storybook
+                './storybook/**/*', './styles/**/*.less', './styles/**/*.css', './styles/**/*.sass', './styles/**/*.scss']
+              }
+            });
+
+            if (Array.isArray(config.postcssOptions.plugins)) {
+              config.postcssOptions.plugins.push(require('tailwindcss')(tailwindConfig));
+            } else {
+              config.postcssOptions.plugins = [require('tailwindcss')(tailwindConfig)];
             }
-          });
-
-          if (Array.isArray(config.postcssOptions.plugins)) {
-            config.postcssOptions.plugins.push(require('tailwindcss')(tailwindConfig));
-          } else {
-            config.postcssOptions.plugins = [require('tailwindcss')(tailwindConfig)];
           }
         }
-      }
-    };
-  },
-
-  moduleTailwindConfig() {
-    const modernConfig = core.useResolvedConfigContext();
-    const tailwindConfig = (0, _tailwind.getTailwindConfig)(modernConfig, {
-      pureConfig: {
-        content: ['./src/**/*.js', './src/**/*.jsx', './src/**/*.ts', './src/**/*.tsx', './src/**/*.less', './src/**/*.css', './src/**/*.sass', './src/**/*.scss', './styles/**/*.less', './styles/**/*.css', './styles/**/*.sass', './styles/**/*.scss']
-      }
-    });
-    return require('tailwindcss')(tailwindConfig);
-  }
-
-}), {
-  name: '@modern-js/plugin-tailwindcss'
+      };
+    },
+
+    moduleTailwindConfig() {
+      const modernConfig = api.useResolvedConfigContext();
+      const tailwindConfig = (0, _tailwind.getTailwindConfig)(modernConfig, {
+        pureConfig: {
+          content: ['./src/**/*.js', './src/**/*.jsx', './src/**/*.ts', './src/**/*.tsx', './src/**/*.less', './src/**/*.css', './src/**/*.sass', './src/**/*.scss', './styles/**/*.less', './styles/**/*.css', './styles/**/*.sass', './styles/**/*.scss']
+        }
+      });
+      return require('tailwindcss')(tailwindConfig);
+    }
+
+  })
 });
 
 exports.default = _default;

package/dist/js/node/index.js

@@ -10,8 +10,6 @@ Object.defineProperty(exports, "default", {
   }
 });
 
-require("./types");
-
 var _cli = _interopRequireDefault(require("./cli"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/js/node/tailwind.js

@@ -7,9 +7,7 @@ exports.getTailwindConfig = void 0;
 
 var _utils = require("@modern-js/utils");
 
-const cloneDeep = _utils.Import.lazy('lodash.clonedeep', require);
-
-const merge = _utils.Import.lazy('lodash.merge', require);
+var _lodash = require("@modern-js/utils/lodash");
 
 const checkIfExistNotAllowKeys = tailwindConfig => {
   const notAllowExistKeys = ['theme'];
@@ -19,13 +17,13 @@ const checkIfExistNotAllowKeys = tailwindConfig => {
 };
 
 const getPureDesignSystemConfig = designSystemConfig => {
-  const pureDesignSystemConfig = cloneDeep(designSystemConfig);
+  const pureDesignSystemConfig = (0, _lodash.cloneDeep)(designSystemConfig);
   delete pureDesignSystemConfig.supportStyledComponents;
   return pureDesignSystemConfig;
 };
 
 const getTailwindConfig = (config, option = {}) => {
-  const purgeConfig = merge({
+  const purgeConfig = (0, _lodash.merge)({
     // TODO: how the operating environment is determined
     enabled: process.env.NODE_ENV === 'production',
     // TODO: Remove or not

package/dist/types/cli.d.ts

@@ -1,3 +1,5 @@
-declare const _default: any;
+import type { CliPlugin } from '@modern-js/core';
+
+declare const _default: () => CliPlugin;
 
 export default _default;

package/dist/types/index.d.ts

@@ -1,2 +1 @@
-import './types';
 export { default } from './cli';

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/modern.config.js

@@ -1,2 +1,8 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {};
+module.exports = {
+  output: {
+    packageFields: {
+      main: 'CJS+ES6',
+    },
+  },
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.4",
+  "version": "1.2.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,39 +29,17 @@
     "./cli": {
       "jsnext:source": "./src/cli.ts",
       "default": "./dist/js/node/cli.js"
-    },
-    "./types": {
-      "node": {
-        "import": "./dist/js/modern/types.js",
-        "require": "./dist/js/node/types.js",
-        "types": "./dist/types/types.d.ts"
-      },
-      "default": "./dist/js/treeshaking/types.js"
-    }
-  },
-  "typesVersions": {
-    "*": {
-      ".": [
-        "./dist/types/index.d.ts"
-      ],
-      "types": [
-        "./dist/types/types.d.ts"
-      ]
     }
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.3.3",
-    "@modern-js/plugin-design-token": "^1.0.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.merge": "^4.6.2"
+    "@modern-js/utils": "^1.4.0",
+    "@modern-js/plugin-design-token": "^1.0.3"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.4.4",
+    "@modern-js/core": "1.7.0",
     "@scripts/build": "0.0.0",
     "@types/jest": "^26",
-    "@types/lodash.clonedeep": "^4.5.6",
-    "@types/lodash.merge": "^4.6.6",
     "@types/node": "^14",
     "@types/tailwindcss": "^2.2.1",
     "typescript": "^4",
@@ -70,23 +48,16 @@
     "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.4.4",
     "tailwindcss": "^2.0.4"
   },
   "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageFields": {
-        "main": "CJS+ES6"
-      }
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "scripts": {
     "new": "modern new",
+    "dev": "modern build --watch",
     "build": "modern build",
     "test": "jest --passWithNoTests"
   },

package/dist/js/node/types.js

@@ -1,3 +0,0 @@
-"use strict";
-
-require("@modern-js/core");

package/dist/types/types.d.ts

@@ -1,9 +0,0 @@
-import '@modern-js/core';
-declare module '@modern-js/core' {
-  interface ToolsConfig {
-    tailwindcss?: Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
-  }
-  interface SourceConfig {
-    designSystem?: Record<string, any>;
-  }
-}