Repository: aurora Updated Branches: refs/heads/master c746452e5 -> 0f3dc939e
Replace node-sass with sass.js Reviewed at https://reviews.apache.org/r/64015/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/0f3dc939 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/0f3dc939 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/0f3dc939 Branch: refs/heads/master Commit: 0f3dc939e2af1fb5751109e0ff7b6a0f7df70ac0 Parents: c746452 Author: David McLaughlin <[email protected]> Authored: Tue Nov 21 17:22:25 2017 -0800 Committer: David McLaughlin <[email protected]> Committed: Tue Nov 21 17:22:25 2017 -0800 ---------------------------------------------------------------------- ui/package.json | 4 ++-- ui/src/main/sass/components/_base.scss | 2 +- ui/webpack.config.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/0f3dc939/ui/package.json ---------------------------------------------------------------------- diff --git a/ui/package.json b/ui/package.json index 634d0f7..567dd78 100644 --- a/ui/package.json +++ b/ui/package.json @@ -38,9 +38,9 @@ "file-loader": "^1.1.5", "jest": "^21.2.0", "jest-cli": "^21.2.0", - "node-sass": "^4.5.3", "react-test-renderer": "^16.0.0", - "sass-loader": "^6.0.6", + "sass.js": "^0.10.7", + "sassjs-loader": "^1.0.0", "style-loader": "^0.18.2", "url-loader": "^0.6.2", "webpack": "^2.6.1" http://git-wip-us.apache.org/repos/asf/aurora/blob/0f3dc939/ui/src/main/sass/components/_base.scss ---------------------------------------------------------------------- diff --git a/ui/src/main/sass/components/_base.scss b/ui/src/main/sass/components/_base.scss index cf65986..380562f 100644 --- a/ui/src/main/sass/components/_base.scss +++ b/ui/src/main/sass/components/_base.scss @@ -1,4 +1,4 @@ -@import 'modules/all'; +@import '../modules/all'; html, html a { -webkit-font-smoothing: antialiased !important; http://git-wip-us.apache.org/repos/asf/aurora/blob/0f3dc939/ui/webpack.config.js ---------------------------------------------------------------------- diff --git a/ui/webpack.config.js b/ui/webpack.config.js index 363abdd..1540293 100644 --- a/ui/webpack.config.js +++ b/ui/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { }, { loader: 'css-loader' }, { - loader: 'sass-loader', + loader: 'sassjs-loader', options: { includePaths: [path.resolve(__dirname, 'src/main/sass')] }
