@modern-js/plugin-tailwindcss 1.1.3-rc.0 → 1.2.1

package/CHANGELOG.md

@@ -1,18 +1,44 @@
 # @modern-js/plugin-tailwindcss
 
-## 1.1.3-rc.0
+## 1.2.1
 
 ### Patch Changes
 
-- Updated dependencies [d927bc83]
-- Updated dependencies [d73ff455]
-- Updated dependencies [9c1ab865]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-  - @modern-js/utils@1.1.4-rc.0
-  - @modern-js/core@1.1.4-rc.0
+- 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
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+  - @modern-js/utils@1.2.0
+  - @modern-js/core@1.3.0
+
+## 1.1.3
+
+### Patch Changes
+
+- ca7dcb32: fix ignore style files in src dir
+- Updated dependencies [90eeb72c]
+- Updated dependencies [e04914ce]
+- Updated dependencies [5a4c557e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [ca7dcb32]
+- Updated dependencies [ecb344dc]
+  - @modern-js/core@1.2.0
+  - @modern-js/utils@1.1.5
 
 ## 1.1.2
 

package/dist/js/node/cli.js

@@ -44,7 +44,7 @@ var _default = core.createPlugin(() => ({
     const modernConfig = core.useResolvedConfigContext();
     const tailwindConfig = (0, _tailwind.getTailwindConfig)(modernConfig, {
       pureConfig: {
-        content: ['./src/**/*.js', './src/**/*.jsx', './src/**/*.ts', './src/**/*.tsx', './styles/**/*.less', './styles/**/*.css', './styles/**/*.sass', './styles/**/*.scss']
+        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);

package/dist/js/node/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _cli.default;
+  }
+});
+
+var _cli = _interopRequireDefault(require("./cli"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/types/index.d.ts

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

package/jest.config.js

@@ -0,0 +1,8 @@
+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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3-rc.0",
+  "version": "1.2.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,33 +20,38 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
     },
-    "./cli": "./dist/js/node/cli.js"
+    "./cli": {
+      "jsnext:source": "./src/cli.ts",
+      "default": "./dist/js/node/cli.js"
+    }
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.1.4-rc.0",
+    "@modern-js/utils": "^1.2.2",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.1.4-rc.0",
-    "@modern-js/module-tools": "^1.1.1",
-    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/core": "^1.3.2",
+    "@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",
-    "tailwindcss": "^2.0.4"
+    "tailwindcss": "^2.0.4",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.1.4-rc.0",
+    "@modern-js/core": "^1.3.2",
     "tailwindcss": "^2.0.4"
   },
   "sideEffects": false,
@@ -57,10 +62,15 @@
       }
     }
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
+  },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/tests/index.test.ts

@@ -0,0 +1,7 @@
+import plugin from '../src';
+
+describe('plugin-tailwind', () => {
+  it('default', () => {
+    expect(plugin).toBeDefined();
+  });
+});

package/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }

package/src/cli.ts

@@ -1,73 +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',
-            './styles/**/*.less',
-            './styles/**/*.css',
-            './styles/**/*.sass',
-            './styles/**/*.scss',
-          ],
-        },
-      });
-      return require('tailwindcss')(tailwindConfig);
-    },
-  }),
-  { name: '@modern-js/plugin-tailwindcss' },
-) as any;

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);
-  }
-}