balm-core 4.18.0 → 4.20.0

package/README.md

@@ -172,9 +172,9 @@ We'd love for you to contribute and make BalmJS even better than it is today! Pl
 
 © 2016-present, [Elf-mousE](http://elf-mouse.me/)
 
-[balm-core-image]: https://img.shields.io/npm/v/balm-core/next.svg
+[balm-core-image]: https://img.shields.io/npm/v/balm-core.svg
 [balm-core-url]: https://npmjs.org/package/balm-core
-[balm-image]: https://img.shields.io/npm/v/balm/next.svg
+[balm-image]: https://img.shields.io/npm/v/balm.svg
 [balm-url]: https://npmjs.org/package/balm
 [license-image]: https://img.shields.io/npm/l/balm-core.svg?sanitize=true
 [license-url]: https://www.npmjs.com/package/balm-core

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

@@ -1,5 +1,9 @@
+import fs from 'node:fs';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import { cssRegex, cssModuleRegex, sassRegex, sassModuleRegex } from '../config/regex.js';
+// Check if Tailwind config exists
+const useTailwind = fs.existsSync(node.path.join(BalmJS.config.workspace, 'tailwind.config.js'));
+
 // common function to get style loaders
 function getStyleLoaders(styleLoader, cssOptions, preProcessor = '', sassOptions = {}) {
   const {
@@ -17,7 +21,7 @@ function getStyleLoaders(styleLoader, cssOptions, preProcessor = '', sassOptions
     loader: requireModule.resolve('postcss-loader'),
     options: Object.assign({
       postcssOptions: {
-        plugins: BalmJS.plugins.postcssPlugins(true)
+        plugins: BalmJS.plugins.postcssPlugins(true, useTailwind)
       },
       sourceMap
     }, BalmJS.config.scripts.postcssLoaderOptions)

package/lib/config/styles.js

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

package/lib/plugins/postcss-plugins.js

@@ -3,8 +3,8 @@ import postcssFlexbugsFixes from 'postcss-flexbugs-fixes';
 import postcssPresetEnv from 'postcss-preset-env';
 import autoprefixer from 'autoprefixer';
 import cssnano from 'cssnano';
-function getDefaultPostcssPlugins(isPostCSS = false) {
-  const defaultPostcssPlugins = isPostCSS || BalmJS.config.styles.extname === 'css' ? [atImport({
+function getDefaultPostcssPlugins(isPostCSS = false, useTailwind = false) {
+  const defaultPostcssPlugins = isPostCSS || BalmJS.config.styles.extname === 'css' ? [...(useTailwind ? ['tailwindcss'] : []), atImport({
     path: BalmJS.file.stylePaths
   }), postcssFlexbugsFixes(), postcssPresetEnv(BalmJS.config.styles.postcssEnvOptions)] : [];
   const cssnanoPlugin = BalmJS.config.env.isProd || BalmJS.config.styles.minify ? [cssnano(BalmJS.config.styles.options)] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "4.18.0",
+  "version": "4.20.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -41,16 +41,16 @@
     "directory": "packages/balm-core"
   },
   "dependencies": {
-    "@rollup/plugin-terser": "^0.4.0",
+    "@rollup/plugin-terser": "^0.4.3",
     "ansi-colors": "^4.1.3",
     "async": "^3.2.4",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
-    "browser-sync": "^2.29.0",
+    "browser-sync": "^2.29.3",
     "connect-history-api-fallback": "^2.0.0",
-    "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^4.2.2",
-    "cssnano": "^5.1.15",
+    "css-loader": "^6.7.4",
+    "css-minimizer-webpack-plugin": "^5.0.0",
+    "cssnano": "^6.0.1",
     "del": "^7.0.0",
     "dotenv": "^16.0.3",
     "dotenv-expand": "^10.0.0",
@@ -67,41 +67,42 @@
     "gulp.spritesmith": "^6.13.0",
     "html-loader": "^4.2.0",
     "html-minifier": "^4.0.0",
-    "html-webpack-plugin": "^5.5.0",
+    "html-webpack-plugin": "^5.5.1",
     "http-proxy-middleware": "^2.0.6",
     "imagemin": "^8.0.1",
     "istextorbinary": "^6.0.0",
     "less": "^4.1.3",
-    "mini-css-extract-plugin": "^2.7.5",
+    "mini-css-extract-plugin": "^2.7.6",
     "modernizr": "^3.12.0",
     "parents": "^1.0.1",
     "plugin-error": "^2.0.1",
-    "postcss": "^8.4.21",
+    "postcss": "^8.4.23",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^15.1.0",
     "postcss-load-config": "^4.0.1",
-    "postcss-loader": "7.1.0",
-    "postcss-preset-env": "^8.0.1",
+    "postcss-loader": "7.3.0",
+    "postcss-preset-env": "^8.4.1",
     "pretty-bytes": "^6.1.0",
-    "readable-stream": "^4.3.0",
+    "readable-stream": "^4.4.0",
     "replace-ext": "^2.0.0",
-    "rollup": "^3.20.0",
-    "sass": "^1.59.3",
-    "sass-loader": "^13.2.1",
-    "ssh2": "^1.11.0",
+    "rollup": "^3.23.0",
+    "sass": "^1.62.1",
+    "sass-loader": "^13.3.0",
+    "ssh2": "^1.13.0",
     "strip-ansi": "^7.0.1",
-    "style-loader": "^3.3.2",
-    "terser": "^5.16.6",
-    "terser-webpack-plugin": "^5.3.7",
+    "style-loader": "^3.3.3",
+    "tailwindcss": "^3.3.2",
+    "terser": "^5.17.6",
+    "terser-webpack-plugin": "^5.3.9",
     "through2": "^4.0.2",
     "through2-concurrent": "^2.0.0",
-    "tslib": "^2.5.0",
+    "tslib": "^2.5.2",
     "vinyl-sourcemaps-apply": "^0.2.1",
-    "webpack": "^5.76.2",
+    "webpack": "^5.83.1",
     "webpack-bundle-analyzer": "^4.8.0",
-    "webpack-dev-middleware": "^6.0.2",
+    "webpack-dev-middleware": "^6.1.1",
     "webpack-hot-middleware": "^2.25.3",
-    "webpack-merge": "^5.8.0",
+    "webpack-merge": "^5.9.0",
     "workbox-build": "^6.5.4"
   },
   "devDependencies": {
@@ -120,5 +121,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "6d1a813df5ac474dfece8749cd69a17930cd280d"
+  "gitHead": "fbfeddf07dc8e7bdbae235ba7123e518db069597"
 }

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

@@ -1,5 +1,7 @@
+import fs from 'node:fs';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import { cssRegex, cssModuleRegex, sassRegex, sassModuleRegex } from '../config/regex.js';
+const useTailwind = fs.existsSync(node.path.join(BalmJS.config.workspace, 'tailwind.config.js'));
 function getStyleLoaders(styleLoader, cssOptions, preProcessor = '', sassOptions = {}) {
     const { sourceMap } = cssOptions;
     const loaders = [
@@ -19,7 +21,7 @@ function getStyleLoaders(styleLoader, cssOptions, preProcessor = '', sassOptions
             loader: requireModule.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

@@ -10,10 +10,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

@@ -3,9 +3,10 @@ import postcssFlexbugsFixes from 'postcss-flexbugs-fixes';
 import postcssPresetEnv from 'postcss-preset-env';
 import autoprefixer from 'autoprefixer';
 import cssnano from 'cssnano';
-function getDefaultPostcssPlugins(isPostCSS = false) {
+function getDefaultPostcssPlugins(isPostCSS = false, useTailwind = false) {
     const defaultPostcssPlugins = isPostCSS || BalmJS.config.styles.extname === 'css'
         ? [
+            ...(useTailwind ? ['tailwindcss'] : []),
             atImport({ path: BalmJS.file.stylePaths }),
             postcssFlexbugsFixes(),
             postcssPresetEnv(BalmJS.config.styles.postcssEnvOptions)