Skip to content

Commit 6fa1f87

Browse files
Merge pull request #164 from emulsify-ds/fix-postcss-babel-extension
Fix: postcss babel project config override
2 parents 8d43494 + 3d237d2 commit 6fa1f87

3 files changed

Lines changed: 86 additions & 74 deletions

File tree

config/webpack/loaders.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ let babelConfig;
1010
let postcssConfig;
1111

1212
// Check if custom babel config is available.
13-
if (fs.existsSync('./config/babel.config.js')) {
14-
babelConfig = './config/babel.config.js';
13+
if (fs.existsSync('./config/emulsify-core/webpack/babel.config.cjs')) {
14+
babelConfig = './config/emulsify-core/webpack/babel.config.cjs';
1515
} else {
1616
babelConfig = './node_modules/@emulsify/core/config/babel.config.js';
1717
}
1818

1919
// Check if custom postcss config is available.
20-
if (fs.existsSync('./config/postcss.config.js')) {
21-
postcssConfig = './config/postcss.config.js';
20+
if (fs.existsSync('./config/emulsify-core/webpack/postcss.config.cjs')) {
21+
postcssConfig = './config/emulsify-core/webpack/postcss.config.cjs';
2222
} else {
2323
postcssConfig = './node_modules/@emulsify/core/config/postcss.config.js';
2424
}

package-lock.json

Lines changed: 78 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@emulsify/core",
3-
"version": "3.0.1",
3+
"version": "3.0.2",
44
"description": "Bundled tooling for Storybook development + Webpack Build",
55
"keywords": [
66
"component library",
@@ -50,7 +50,7 @@
5050
"twatch": "jest --no-coverage --watch --verbose"
5151
},
5252
"dependencies": {
53-
"@babel/core": "^7.27.1",
53+
"@babel/core": "^7.27.3",
5454
"@babel/eslint-parser": "^7.27.1",
5555
"@babel/preset-env": "^7.27.2",
5656
"@emulsify/cli": "^1.11.4",
@@ -80,7 +80,7 @@
8080
"eslint": "^9.27.0",
8181
"eslint-config-prettier": "^10.1.5",
8282
"eslint-plugin-import": "^2.31.0",
83-
"eslint-plugin-jest": "^28.11.0",
83+
"eslint-plugin-jest": "^28.11.1",
8484
"eslint-plugin-prettier": "^5.4.0",
8585
"eslint-plugin-security": "^3.0.1",
8686
"eslint-plugin-storybook": "^0.12.0",
@@ -137,7 +137,7 @@
137137
"@semantic-release/github": "^11.0.3",
138138
"@semantic-release/release-notes-generator": "^14.0.3",
139139
"husky": "^9.1.7",
140-
"lint-staged": "^16.0.0",
140+
"lint-staged": "^16.1.0",
141141
"semantic-release": "^24.2.5"
142142
},
143143
"overrides": {

0 commit comments

Comments
 (0)