@modern-js/plugin-tailwindcss 1.2.0 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/plugin-tailwindcss
 
+## 1.2.3
+
+### Patch Changes
+
+- 8f24a514: fix: UserConfig is missing tools.tailwindcss type
+- Updated dependencies [deeaa602]
+- Updated dependencies [54786e58]
+  - @modern-js/utils@1.3.2
+  - @modern-js/core@1.4.3
+
+## 1.2.2
+
+### Patch Changes
+
+- 6891e4c2: add @modern-js/plugin-design-token, support 'source.designSystem.supportStyledComponents' config
+- Updated dependencies [6891e4c2]
+- Updated dependencies [b376c8d6]
+- Updated dependencies [e62c4efd]
+- Updated dependencies [e2a8233f]
+  - @modern-js/plugin-design-token@1.0.1
+  - @modern-js/core@1.4.2
+
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/utils@1.2.2
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/js/node/cli.js

@@ -9,7 +9,10 @@ var _utils = require("@modern-js/utils");
 
 var _tailwind = require("./tailwind");
 
-const core = _utils.Import.lazy('@modern-js/core', require);
+const core = _utils.Import.lazy('@modern-js/core', require); // support designSystem.supportStyledComponents
+
+
+core.usePlugins([require.resolve('@modern-js/plugin-design-token/cli')]);
 
 var _default = core.createPlugin(() => ({
   validateSchema() {

package/dist/js/node/index.js

@@ -10,6 +10,8 @@ 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/types.js

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

package/dist/types/index.d.ts

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

package/dist/types/types.d.ts

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

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.0",
+  "version": "1.2.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,12 +33,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.2.0",
+    "@modern-js/utils": "^1.3.2",
+    "@modern-js/plugin-design-token": "^1.0.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.3.0",
+    "@modern-js/core": "^1.4.3",
     "@scripts/build": "0.0.0",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
@@ -51,7 +52,7 @@
     "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.3.0",
+    "@modern-js/core": "^1.4.3",
     "tailwindcss": "^2.0.4"
   },
   "sideEffects": false,
@@ -64,8 +65,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": true,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "outDir": "./out",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "paths": {},
+    "types": ["node", "jest"]
+  }
+}

package/src/cli.ts

@@ -1,77 +0,0 @@
-import { Import, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import { getTailwindConfig } from './tailwind';
-
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-
-export default core.createPlugin(
-  () => ({
-    validateSchema() {
-      return 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: Record<string, any>) => {
-            const modernConfig = core.useResolvedConfigContext();
-            const tailwindConfig = 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),
-              ];
-            }
-          },
-        },
-      };
-    },
-    moduleTailwindConfig() {
-      const modernConfig = core.useResolvedConfigContext();
-      const tailwindConfig = 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' },
-) as any;

package/src/index.ts

@@ -1 +0,0 @@
-export { default } from './cli';

package/src/tailwind.ts

@@ -1,78 +0,0 @@
-import type { NormalizedConfig } from '@modern-js/core';
-import { Import, applyOptionsChain, logger } from '@modern-js/utils';
-
-const cloneDeep: typeof import('lodash.clonedeep') = Import.lazy(
-  'lodash.clonedeep',
-  require,
-);
-const merge: typeof import('lodash.merge') = Import.lazy(
-  'lodash.merge',
-  require,
-);
-
-const checkIfExistNotAllowKeys = (
-  tailwindConfig: Record<string, any>,
-): [boolean, string] => {
-  const notAllowExistKeys = ['theme'];
-  let notAllowKey = '';
-
-  const ret = Object.keys(tailwindConfig).some(
-    key => notAllowExistKeys.includes(key) && (notAllowKey = key),
-  );
-
-  return [ret, notAllowKey];
-};
-
-const getPureDesignSystemConfig = (
-  designSystemConfig: Record<string, any> & {
-    supportSytledComponents: boolean;
-  },
-) => {
-  const pureDesignSystemConfig = cloneDeep(designSystemConfig);
-  delete pureDesignSystemConfig.supportStyledComponents;
-  return pureDesignSystemConfig;
-};
-
-const getTailwindConfig = (
-  config: NormalizedConfig,
-  option: { pureConfig?: Record<string, any> } = {},
-) => {
-  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 = {
-    purge: purgeConfig,
-  };
-  const tailwindConfig = applyOptionsChain(
-    defaultTailwindConfig,
-    (config.tools as any).tailwindcss || {},
-  );
-
-  const designSystem = getPureDesignSystemConfig(
-    (config.source as any).designSystem || {},
-  );
-
-  const [exist, key] = checkIfExistNotAllowKeys(tailwindConfig);
-
-  if (exist) {
-    logger.error(
-      `should not exist '${key}' on tools.tailwindcss, please remove it`,
-    );
-    // eslint-disable-next-line no-process-exit
-    process.exit(0);
-  }
-
-  // Because there is no default theme configuration
-  tailwindConfig.theme = designSystem || {};
-
-  return tailwindConfig;
-};
-
-export { getTailwindConfig };

package/src/types.d.ts

@@ -1,10 +0,0 @@
-import '@modern-js/core';
-
-declare module '@modern-js/core' {
-  interface ToolsConfig {
-    tailwind?:
-      | Record<string, any>
-      // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-      | ((options: Record<string, any>) => Record<string, any> | void);
-  }
-}