This repository was archived by the owner on Aug 5, 2025. It is now read-only.

Commit 772bc41

committed

feat(webpack5-react): merge plugin-sass

1 parent ae43067 commit 772bc41Copy full SHA for 772bc41

File tree

+24

-4

lines changed

packages/plugin-webpack5-react
- package.json
- src/webpack/rules/style
  - index.ts

+24

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@alicloud/console-toolkit-plugin-webpack5-react",`
`3`		`- "version": "1.1.9",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"description": "console toolkit plugin for base react app",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"scripts": {`
`@@ -42,14 +42,15 @@`
`42`	`42`	`"@gem-mine/webpack-chain": "^7.0.0",`
`43`	`43`	`"@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",`
`44`	`44`	`"assert": "^1.4.1",`
`45`		`- "autoprefixer": "^9.6.0",`
	`45`	`+ "autoprefixer": "^10.0.0",`
`46`	`46`	`"babel-loader": "^8.0.5",`
`47`	`47`	`"cheerio": "^1.0.0-rc.3",`
`48`	`48`	`"core-js": "^3.37.1",`
`49`	`49`	`"css-loader": "^6.0.0",`
`50`	`50`	`"css-minimizer-webpack-plugin": "^6.0.0",`
`51`	`51`	`"error-overlay-webpack-plugin": "^1.0.0",`
`52`	`52`	`"es5-imcompatible-versions": "^0.1.62",`
	`53`	`+ "fast-sass-loader": "^2.0.1",`
`53`	`54`	`"file-loader": "^6.2.0",`
`54`	`55`	`"fs-extra": "^11.1.1",`
`55`	`56`	`"html-webpack-plugin": "^5.0.0",`
`@@ -58,8 +59,8 @@`
`58`	`59`	`"lodash": "^4.17.11",`
`59`	`60`	`"mini-css-extract-plugin": "^2.6.1",`
`60`	`61`	`"pkg-up": "^3.1.0",`
`61`		`- "postcss-less": "^6.0.0",`
`62`	`62`	`"postcss-loader": "^8.0.1",`
	`63`	`+ "sass": "^1.67.0",`
`63`	`64`	`"semver": "^7.3.2",`
`64`	`65`	`"simple-progress-webpack-plugin": "^1.1.2",`
`65`	`66`	`"style-loader": "^3.0.0",`

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import * as path from 'path';`
`1`	`2`	`import * as autoprefixer from 'autoprefixer';`
`2`	`3`	`import * as Chain from '@gem-mine/webpack-chain';`
`3`	`4`	`import * as webpack from 'webpack';`
`@@ -132,10 +133,16 @@ export const style = (config: Chain, options: BreezrStyleOptions) => {`
`132`	`133`	`const lessLoaderOptions = {`
`133`	`134`	`lessOptions: {`
`134`	`135`	`javascriptEnabled: true,`
`135`		`- modifyVars: options.theme ? normalizeTheme(options.theme, {cwd}) : {}`
	`136`	`+ modifyVars: options.theme ? normalizeTheme(options.theme, {cwd}) : {}`
`136`	`137`	`}`
`137`	`138`	`};`
`138`	`139`
	`140`	`+ const sassLoaderOptions = {`
	`141`	`+ includePaths: [`
	`142`	`+ path.resolve(cwd, 'node_modules')`
	`143`	`+ ],`
	`144`	`+ };`
	`145`	`+`
`139`	`146`	`createCssRules('css', { test: /\.css$/ });`
`140`	`147`
`141`	`148`	`/*`
`@@ -164,6 +171,18 @@ export const style = (config: Chain, options: BreezrStyleOptions) => {`
`164`	`171`	`modules: true,`
`165`	`172`	`});`
`166`	`173`
	`174`	`+ // .sass`
	`175`	`+ createCssRules('sass', { test: /\.sass$/ }, {`
	`176`	`+ loader: 'fast-sass-loader',`
	`177`	`+ loaderOptions: sassLoaderOptions,`
	`178`	`+ });`
	`179`	`+`
	`180`	`+ // .scss`
	`181`	`+ createCssRules('scss', { test: /\.scss$/ }, {`
	`182`	`+ loader: 'fast-sass-loader',`
	`183`	`+ loaderOptions: sassLoaderOptions,`
	`184`	`+ });`
	`185`	`+`
`167`	`186`	`if (shouldExtract) {`
`168`	`187`	`// NOTE there 'extract-css' used by breezr-plugin-long-term-caching`
`169`	`188`	`config.plugin('extract-css')`

Comments

(0)