Skip to content

feat(sui-bundler): add plainCssPackages config to bypass sass-loader #1988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomasmax wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(sui-bundler): add plainCssPackages config to bypass sass-loader #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion packages/sui-bundler/shared/module-rules-sass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')

const {cleanList, config, when, isTailwindEnabled} = require('./index')

module.exports = {
const plainCssPackages = config.plainCssPackages || []

const plainCssExclude = plainCssPackages.length
? new RegExp(
`node_modules[\\\\/](${plainCssPackages.map(p => p.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|')})[\\\\/]`
)
: null

const sassRule = {
test: /(\.css|\.scss)$/,
...(plainCssExclude ? {exclude: plainCssExclude} : {}),
use: cleanList([
MiniCssExtractPlugin.loader,
require.resolve('css-loader'),
Expand All @@ -29,3 +38,13 @@ module.exports = {
require.resolve('@s-ui/sass-loader')
])
}

const plainCssRule = plainCssExclude
? {
test: /\.css$/,
include: plainCssExclude,
use: [MiniCssExtractPlugin.loader, require.resolve('css-loader')]
}
: null

module.exports = plainCssRule ? [sassRule, plainCssRule] : sassRule
31 changes: 3 additions & 28 deletions packages/sui-bundler/webpack.config.client.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const HtmlWebpackInjectAttributesPlugin = require('html-webpack-inject-attributes-plugin')
const {withHydrationOverlayWebpack} = require('@builder.io/react-hydration-overlay/webpack')

const {envVars, MAIN_ENTRY_POINT, config, cleanList, when, isTailwindEnabled} = require('./shared/index.js')
const {envVars, MAIN_ENTRY_POINT, config, cleanList, when} = require('./shared/index.js')
const definePlugin = require('./shared/define.js')
const manifestLoaderRules = require('./shared/module-rules-manifest-loader.js')
const sassRules = require('./shared/module-rules-sass.js')
const createSVGSpritemapPlugin = require('./shared/svg-spritemap')
const {aliasFromConfig, defaultAlias} = require('./shared/resolve-alias.js')
const {supportLegacyBrowsers, cacheDirectory} = require('./shared/config.js')
Expand Down Expand Up @@ -96,33 +97,7 @@ const webpackConfig = {
module: {
rules: cleanList([
createCompilerRules({supportLegacyBrowsers, isDevelopment: true}),
{
test: /(\.css|\.scss)$/,
use: cleanList([
MiniCssExtractPlugin.loader,
require.resolve('css-loader'),
when(config['externals-manifest'], () => ({
loader: 'externals-manifest-loader',
options: {
manifestURL: config['externals-manifest']
}
})),
{
loader: require.resolve('postcss-loader'),
options: {
postcssOptions: {
plugins: [
...(isTailwindEnabled() ? [require('tailwindcss')()] : []),
require('autoprefixer')({
overrideBrowserslist: config.targets
})
]
}
}
},
require.resolve('@s-ui/sass-loader')
])
},
...(Array.isArray(sassRules) ? sassRules : [sassRules]),
when(config['externals-manifest'], () => manifestLoaderRules(config['externals-manifest']))
])
},
Expand Down
17 changes: 17 additions & 0 deletions packages/sui-bundler/webpack.config.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ const {supportLegacyBrowsers, cacheDirectory} = require('./shared/config.js')
const {resolveLoader} = require('./shared/resolve-loader.js')
const createCompilerRules = require('./shared/module-rules-compiler.js')

const plainCssPackages = config.plainCssPackages || []
const plainCssExclude = plainCssPackages.length
? new RegExp(
`node_modules[\\\\/](${plainCssPackages.map(p => p.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|')})[\\\\/]`
)
: null

const outputPath = path.join(process.cwd(), 'dist')

const {CI = false} = process.env
Expand Down Expand Up @@ -90,6 +97,7 @@ const webpackConfig = {
createCompilerRules({supportLegacyBrowsers, isDevelopment: true}),
{
test: /(\.css|\.scss)$/,
...(plainCssExclude ? {exclude: plainCssExclude} : {}),
use: cleanList([
require.resolve('style-loader'),
when(config['externals-manifest'], () => ({
Expand All @@ -115,6 +123,15 @@ const webpackConfig = {
require.resolve('@s-ui/sass-loader')
])
},
...(plainCssExclude
? [
{
test: /\.css$/,
include: plainCssExclude,
use: [require.resolve('style-loader'), require.resolve('css-loader')]
}
]
: []),
when(config['externals-manifest'], () => manifestLoaderRules(config['externals-manifest']))
])
},
Expand Down
2 changes: 1 addition & 1 deletion packages/sui-bundler/webpack.config.lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ module.exports = ({chunkCss} = {}) => {
definePlugin()
]),
module: {
rules: [createCompilerRules({supportLegacyBrowsers}), sassRules]
rules: [createCompilerRules({supportLegacyBrowsers}), ...(Array.isArray(sassRules) ? sassRules : [sassRules])]
}
}
}
2 changes: 1 addition & 1 deletion packages/sui-bundler/webpack.config.prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const webpackConfig = {
module: {
rules: cleanList([
createCompilerRules({supportLegacyBrowsers}),
sassRules,
...(Array.isArray(sassRules) ? sassRules : [sassRules]),
when(config['externals-manifest'], () => manifestLoaderRules(config['externals-manifest']))
])
},
Expand Down
Loading