Skip to content

Commit 1ed825d

Browse files
committed
Add support loader-utils@3.x.x
1 parent eae275d commit 1ed825d

File tree

7 files changed

+1184
-1336
lines changed

7 files changed

+1184
-1336
lines changed

package.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "clean-css-loader",
3-
"version": "4.1.0",
3+
"version": "4.2.0",
44
"main": "lib/index.js",
55
"types": "lib/index.d.ts",
66
"dependencies": {
77
"clean-css": "^5.0.0"
88
},
99
"peerDependencies": {
10-
"loader-utils": "^1.0.0 || ^2.0.0",
10+
"loader-utils": "^1.0.0 || ^2.0.0 || ^3.0.0",
1111
"webpack": ">=2.0.0"
1212
},
1313
"peerDependenciesMeta": {
@@ -38,23 +38,25 @@
3838
"repository": "https://github.com/retyui/clean-css-loader",
3939
"author": "David <4661784+retyui@users.noreply.github.com>",
4040
"license": "MIT",
41-
"files": ["lib"],
41+
"files": [
42+
"lib"
43+
],
4244
"engines": {
43-
"node": ">= 10.0.0"
45+
"node": ">= 12.0.0"
4446
},
4547
"devDependencies": {
46-
"@tsconfig/node10": "^1.0.8",
47-
"@types/clean-css": "^4.2.5",
48+
"@tsconfig/node12": "^1.0.11",
49+
"@types/clean-css": "^4.2.6",
4850
"@types/loader-utils": "^2.0.3",
49-
"@types/node": "^16.9.6",
51+
"@types/node": "^16.18.11",
5052
"@types/schema-utils": "^2.4.0",
51-
"jest": "^27.1.0",
52-
"loader-utils": "^2.0.0",
53-
"prettier": "^2.4.1",
53+
"jest": "^29.3.1",
54+
"loader-utils": "^3.2.1",
55+
"prettier": "^2.8.2",
5456
"rimraf": "^3.0.2",
55-
"schema-utils": "^3.1.1",
57+
"schema-utils": "^4.0.0",
5658
"source-maps": "^1.0.12",
57-
"typescript": "^4.4.3",
58-
"webpack": "^5.53.0"
59+
"typescript": "^4.9.4",
60+
"webpack": "^5.75.0"
5961
}
6062
}

src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ function cleanCssLoader(
5252
const callback = this.async();
5353
// 1.x.x return null if empty query
5454
// 2.x.x return empty object if empty query
55-
const loaderOptions = getOptions(this) || {};
55+
// 3.x.x removed `getOptions` need to use `this.getOptions`
56+
const loaderOptions = (typeof this.getOptions === 'function' ? this.getOptions() : getOptions?.(this)) || {};
5657

5758
validate(schema as JSONSchema7, loaderOptions, {
5859
name: "clean-css-loader",

test/e2e/webpack5/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
"postinstall": "yarn link clean-css-loader"
99
},
1010
"devDependencies": {
11-
"css-loader": "^6.3.0",
11+
"css-loader": "^6.7.3",
1212
"raw-loader": "^4.0.2",
13-
"webpack": "^5.53.0",
14-
"webpack-cli": "^4.8.0"
13+
"webpack": "^5.75.0",
14+
"webpack-cli": "^5.0.1",
15+
"loader-utils": "^3.2.1"
1516
}
1617
}

0 commit comments

Comments
 (0)