balm-core 3.30.1 → 3.31.0

package/lib/bundler/webpack/rules/css.js

@@ -1,10 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _fs = _interopRequireDefault(require("fs"));
 var _regex = require("../config/regex");
+// Check if Tailwind config exists
+var useTailwind = _fs["default"].existsSync(path.join(BalmJS.config.workspace, 'tailwind.config.js'));
 function cssLoader() {
   var styleLoader = {
     loader: require.resolve('style-loader'),
@@ -52,7 +56,7 @@ function cssLoader() {
       loader: require.resolve('postcss-loader'),
       options: Object.assign({
         postcssOptions: {
-          plugins: BalmJS.plugins.postcssPlugins(true)
+          plugins: BalmJS.plugins.postcssPlugins(true, useTailwind)
         },
         sourceMap: sourceMap
       }, BalmJS.config.scripts.postcssLoaderOptions)

package/lib/config/styles.js

@@ -36,10 +36,10 @@ var lessOptions = {};
  * @reference https://github.com/csstools/postcss-preset-env#options
  */
 var postcssEnvOptions = {
-  stage: 0,
   autoprefixer: {
     flexbox: 'no-2009'
-  }
+  },
+  stage: 3
 };
 /**
  * PostCSS plugins

package/lib/plugins/postcss-plugins.js

@@ -8,13 +8,15 @@ exports["default"] = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 function getDefaultPostcssPlugins() {
   var isPostCSS = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var postcssPresetEnv = require('postcss-preset-env');
+  var useTailwind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var atImport = require('postcss-import');
+  var postcssFlexbugsFixes = require('postcss-flexbugs-fixes');
+  var postcssPresetEnv = require('postcss-preset-env');
   var autoprefixer = require('autoprefixer');
   var cssnano = require('cssnano');
-  var defaultPostcssPlugins = isPostCSS || BalmJS.config.styles.extname === 'css' ? [postcssPresetEnv(BalmJS.config.styles.postcssEnvOptions), atImport({
+  var defaultPostcssPlugins = isPostCSS || BalmJS.config.styles.extname === 'css' ? [].concat((0, _toConsumableArray2["default"])(useTailwind ? ['tailwindcss'] : []), [atImport({
     path: BalmJS.file.stylePaths
-  })] : [];
+  }), postcssFlexbugsFixes(), postcssPresetEnv(BalmJS.config.styles.postcssEnvOptions)]) : [];
   var cssnanoPlugin = BalmJS.config.env.isProd || BalmJS.config.styles.minify ? [cssnano(Object.assign(BalmJS.config.styles.options, {
     autoprefixer: false
   }))] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "3.30.1",
+  "version": "3.31.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -74,6 +74,7 @@
     "parents": "^1.0.1",
     "plugin-error": "^2.0.1",
     "postcss": "7",
+    "postcss-flexbugs-fixes": "4",
     "postcss-import": "12",
     "postcss-load-config": "2",
     "postcss-loader": "4",
@@ -89,6 +90,7 @@
     "ssh2": "0.8.9",
     "strip-ansi": "6",
     "style-loader": "2",
+    "tailwindcss": "npm:@tailwindcss/postcss7-compat",
     "terser": "^5.16.6",
     "terser-webpack-plugin": "4",
     "through2": "^4.0.2",
@@ -117,5 +119,5 @@
   "engines": {
     "node": ">=10.13.0"
   },
-  "gitHead": "fd25a9b3407f40c3ca76d56b0f58c2b6f1b18b7b"
+  "gitHead": "c8dba4cdbc84c9ea0f7e2912fb3f3b4b04b01caa"
 }

package/tslib/bundler/webpack/rules/css.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
 const regex_1 = require("../config/regex");
+const useTailwind = fs_1.default.existsSync(path.join(BalmJS.config.workspace, 'tailwind.config.js'));
 function cssLoader() {
     let styleLoader = {
         loader: require.resolve('style-loader'),
@@ -48,7 +51,7 @@ function cssLoader() {
                 loader: require.resolve('postcss-loader'),
                 options: Object.assign({
                     postcssOptions: {
-                        plugins: BalmJS.plugins.postcssPlugins(true)
+                        plugins: BalmJS.plugins.postcssPlugins(true, useTailwind)
                     },
                     sourceMap
                 }, BalmJS.config.scripts.postcssLoaderOptions)

package/tslib/config/styles.js

@@ -12,10 +12,10 @@ const options = {
 const sassOptions = {};
 const lessOptions = {};
 const postcssEnvOptions = {
-    stage: 0,
     autoprefixer: {
         flexbox: 'no-2009'
-    }
+    },
+    stage: 3
 };
 const postcssPlugins = [];
 const imageBasePath = '../';

package/tslib/plugins/postcss-plugins.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function getDefaultPostcssPlugins(isPostCSS = false) {
-    const postcssPresetEnv = require('postcss-preset-env');
+function getDefaultPostcssPlugins(isPostCSS = false, useTailwind = false) {
     const atImport = require('postcss-import');
+    const postcssFlexbugsFixes = require('postcss-flexbugs-fixes');
+    const postcssPresetEnv = require('postcss-preset-env');
     const autoprefixer = require('autoprefixer');
     const cssnano = require('cssnano');
     const defaultPostcssPlugins = isPostCSS || BalmJS.config.styles.extname === 'css'
         ? [
-            postcssPresetEnv(BalmJS.config.styles.postcssEnvOptions),
-            atImport({ path: BalmJS.file.stylePaths })
+            ...(useTailwind ? ['tailwindcss'] : []),
+            atImport({ path: BalmJS.file.stylePaths }),
+            postcssFlexbugsFixes(),
+            postcssPresetEnv(BalmJS.config.styles.postcssEnvOptions)
         ]
         : [];
     const cssnanoPlugin = BalmJS.config.env.isProd || BalmJS.config.styles.minify