Skip to content

Commit

Permalink
Merge pull request #57 from hepsiburada/feature/node-sass-upgrade
Browse files Browse the repository at this point in the history
feat: replaced node-sass with sass package
  • Loading branch information
oguzhanaslan authored Dec 17, 2024
2 parents c3fba20 + f15fdad commit a7aa59b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "voltranjs",
"version": "1.1.10",
"version": "1.1.11",
"main": "src/index.js",
"author": "Hepsiburada Technology Team",
"bin": {
Expand Down Expand Up @@ -66,7 +66,6 @@
"js-cookie": "^2.2.1",
"mini-css-extract-plugin": "2.5.2",
"newrelic": "^9.1.0",
"node-sass": "9.0.0",
"pixrem": "4.0.1",
"pleeease-filters": "4.0.0",
"postcss": "7.0.5",
Expand All @@ -83,11 +82,10 @@
"react-router-dom": "5.1.2",
"regenerator-runtime": "^0.13.9",
"rimraf": "3.0.2",
"sass-loader": "12.4.0",
"serve-static": "1.14.1",
"source-map-support": "0.5.21",
"string-replace-loader": "3.1.0",
"style-loader": "3.3.1",
"style-loader": "3.3.4",
"styled-components": "5.1.0",
"svg-url-loader": "7.1.1",
"terser-webpack-plugin": "5.3.1",
Expand All @@ -100,6 +98,8 @@
"webpack-merge": "5.8.0",
"webpack-node-externals": "3.0.0",
"whatwg-fetch": "2.0.4",
"sass": "^1.82.0",
"sass-loader": "^16.0.4",
"xss": "^1.0.8"
},
"devDependencies": {
Expand All @@ -109,7 +109,8 @@
"enzyme-adapter-react-16": "^1.15.5",
"enzyme-to-json": "^3.6.1",
"jest": "^26.6.3",
"sass-resources-loader": "2.2.5"

"sass-resources-loader": "^2.2.5"
},
"scripts": {
"lint": "npm run eslint && npm run prettier",
Expand Down
10 changes: 8 additions & 2 deletions webpack.client.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ const clientConfig = merge(commonConfig, voltranClientConfig, {
: `${voltranConfig.prefix}-[path][name]__[local]`,
localIdentHashSalt: packageJson.name
},
importLoaders: 1,
importLoaders: 2,
sourceMap: isDebug
}
},
Expand All @@ -183,7 +183,13 @@ const clientConfig = merge(commonConfig, voltranClientConfig, {
options: postCssConfig
},
{
loader: "sass-loader"
loader: "sass-loader",
options: {
implementation: require("sass"),
sassOptions: {
outputStyle: "compressed"
}
}
},
...(voltranConfig.sassResources
? [
Expand Down

0 comments on commit a7aa59b

Please sign in to comment.