Skip to content

Commit fba2433

Browse files
author
chengyu.chengyulia
committed
feat: remove node-sass
1 parent 3b777d2 commit fba2433

File tree

5 files changed

+168
-332
lines changed

5 files changed

+168
-332
lines changed

declare/npm.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ declare module 'normalize-path';
2121
declare module 'preload-webpack-plugin';
2222
declare module 'gulp';
2323
declare module 'gulp-babel';
24-
declare module 'gulp-sass';
24+
declare module 'gulp-dart-sass';
2525
declare module 'gulp-concat';
2626
declare module 'gulp-typescript';
2727
declare module 'gulp-watch';

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pri",
3-
"version": "4.2.11-beta.0",
3+
"version": "4.2.11-beta.1",
44
"types": "src/node/index.ts",
55
"main": "built/node/index.js",
66
"scripts": {
@@ -102,9 +102,9 @@
102102
"gulp-babel": "^8.0.0",
103103
"gulp-clean-css": "^4.2.0",
104104
"gulp-concat-css": "^3.1.0",
105+
"gulp-dart-sass": "1.0.2",
105106
"gulp-if": "^3.0.0",
106107
"gulp-less": "^4.0.1",
107-
"gulp-sass": "^4.0.2",
108108
"gulp-sourcemaps": "^2.6.5",
109109
"gulp-strip-css-comments": "^2.0.0",
110110
"gulp-watch": "^5.0.1",
@@ -138,7 +138,8 @@
138138
"react-hot-loader": "4.12.19",
139139
"react-router-dom": "5.1.2",
140140
"rimraf": "3.0.0",
141-
"sass-loader": "7.1.0",
141+
"sass": "1.22.10",
142+
"sass-loader": "7.2.0",
142143
"semver": "6.3.0",
143144
"signale": "1.4.0",
144145
"socket.io": "2.3.0",

src/utils/ts-plus-babel.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as gulp from 'gulp';
22
import * as fs from 'fs-extra';
33
import * as gulpBabel from 'gulp-babel';
4-
import * as gulpSass from 'gulp-sass';
4+
import * as gulpSass from 'gulp-dart-sass';
55
import * as gulpLess from 'gulp-less';
66
import * as gulpWatch from 'gulp-watch';
77
import * as gulpStripCssComments from 'gulp-strip-css-comments';

src/utils/webpack-config.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,13 @@ export const getWebpackConfig = async (opts: IOptions) => {
118118

119119
const sassLoader = {
120120
loader: 'sass-loader',
121-
options: plugin.buildConfigSassLoaderOptionsPipes.reduce((options, fn) => {
122-
return fn(options);
123-
}, {}),
121+
options: plugin.buildConfigSassLoaderOptionsPipes.reduce(
122+
(options, fn) => {
123+
return fn(options);
124+
},
125+
// eslint-disable-next-line global-require
126+
{ implementation: require('sass') },
127+
),
124128
};
125129

126130
const lessLoader = {

0 commit comments

Comments
 (0)