Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: do not emit empty CSS files",
"packageName": "@griffel/webpack-extraction-plugin",
"email": "olfedias@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { __styles } from '@griffel/react';

export const useStyles = __styles(
{
root: {},
},
{},
);
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["bundle.js"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { __css as _css } from '@griffel/react';
import { __styles } from '@griffel/react';
export const useStyles = _css({
root: {},
});
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ describe('webpackLoader', () => {
testFixture('reset');
testFixture('reset-media');
testFixture('mixed');
testFixture('empty');

// Multiple calls of __styles
testFixture('multiple');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ describe('webpackLoader', () => {
testFixture('basic-rules');
testFixture('reset');
testFixture('mixed');
testFixture('empty');

// Multiple
testFixture('multiple');
Expand Down
9 changes: 8 additions & 1 deletion packages/webpack-extraction-plugin/src/webpackLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,14 @@ function webpackLoader(
const resultSourceMap = unstable_keepOriginalCode ? inputSourceMap : result.sourceMap;

if (result.cssRulesByBucket) {
const css = Object.entries(result.cssRulesByBucket).reduce((acc, [cssBucketName, cssBucketRules]) => {
const entries = Object.entries(result.cssRulesByBucket);

if (entries.length === 0) {
this.callback(null, resultCode, resultSourceMap);
return;
}

const css = entries.reduce((acc, [cssBucketName, cssBucketRules]) => {
if (cssBucketName === 'm') {
return (
acc +
Expand Down
5 changes: 5 additions & 0 deletions packages/webpack-loader/__fixtures__/empty/code.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { makeStyles } from '@griffel/react';

export const useStyles = makeStyles({
root: {},
});
7 changes: 7 additions & 0 deletions packages/webpack-loader/__fixtures__/empty/output.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { __styles } from '@griffel/react';
export const useStyles = __styles(
{
root: {},
},
{},
);
1 change: 1 addition & 0 deletions packages/webpack-loader/src/webpackLoader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ describe('webpackLoader', () => {
testFixture('object');
testFixture('function');
testFixture('reset');
testFixture('empty');

// Integration fixtures for config functionality
testFixture('config-modules', {
Expand Down