Skip to content

Commit 946a5a1

Browse files
refactor!: nodejs v10 dropped (#1326)
1 parent 3eab0f9 commit 946a5a1

File tree

8 files changed

+7864
-6933
lines changed

8 files changed

+7864
-6933
lines changed

.github/workflows/nodejs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
strategy:
5656
matrix:
5757
os: [ubuntu-latest, windows-latest, macos-latest]
58-
node-version: [10.x, 12.x, 14.x]
58+
node-version: [12.x, 14.x, 16.x]
5959
webpack-version: [latest]
6060

6161
runs-on: ${{ matrix.os }}

.husky/.gitignore

-1
This file was deleted.

babel.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = (api) => {
1010
"@babel/preset-env",
1111
{
1212
targets: {
13-
node: "10.13.0",
13+
node: "12.13.0",
1414
},
1515
},
1616
],

package-lock.json

+7,813-6,905
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"main": "dist/cjs.js",
1515
"engines": {
16-
"node": ">= 10.13.0"
16+
"node": ">= 12.13.0"
1717
},
1818
"scripts": {
1919
"start": "npm run build -- -w",
@@ -52,41 +52,41 @@
5252
"semver": "^7.3.5"
5353
},
5454
"devDependencies": {
55-
"@babel/cli": "^7.14.3",
56-
"@babel/core": "^7.14.3",
57-
"@babel/preset-env": "^7.14.2",
55+
"@babel/cli": "^7.14.5",
56+
"@babel/core": "^7.14.6",
57+
"@babel/preset-env": "^7.14.7",
5858
"@commitlint/cli": "^12.1.4",
5959
"@commitlint/config-conventional": "^12.1.4",
6060
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
6161
"babel-jest": "^26.6.3",
6262
"cross-env": "^7.0.3",
6363
"del": "^6.0.0",
64-
"del-cli": "^3.0.1",
65-
"es-check": "^5.2.3",
66-
"eslint": "^7.26.0",
64+
"del-cli": "^4.0.0",
65+
"es-check": "^5.2.4",
66+
"eslint": "^7.30.0",
6767
"eslint-config-prettier": "^8.3.0",
68-
"eslint-plugin-import": "^2.23.2",
68+
"eslint-plugin-import": "^2.23.4",
6969
"file-loader": "^6.2.0",
70-
"husky": "^6.0.0",
70+
"husky": "^7.0.1",
7171
"jest": "^26.6.3",
7272
"less": "^4.1.1",
73-
"less-loader": "^7.1.0",
74-
"lint-staged": "^11.0.0",
73+
"less-loader": "^10.0.1",
74+
"lint-staged": "^11.0.1",
7575
"memfs": "^3.2.2",
76-
"mini-css-extract-plugin": "^1.6.0",
76+
"mini-css-extract-plugin": "^2.1.0",
7777
"npm-run-all": "^4.1.5",
7878
"postcss-loader": "^4.3.0",
7979
"postcss-preset-env": "^6.7.0",
80-
"prettier": "^2.3.0",
81-
"sass": "^1.32.13",
82-
"sass-loader": "^10.2.0",
80+
"prettier": "^2.3.2",
81+
"sass": "^1.35.2",
82+
"sass-loader": "^12.1.0",
8383
"standard-version": "^9.3.0",
8484
"strip-ansi": "^6.0.0",
85-
"style-loader": "^2.0.0",
85+
"style-loader": "^3.1.0",
8686
"stylus": "^0.54.8",
87-
"stylus-loader": "^4.3.3",
87+
"stylus-loader": "^6.1.0",
8888
"url-loader": "^4.1.1",
89-
"webpack": "^5.37.1"
89+
"webpack": "^5.44.0"
9090
},
9191
"keywords": [
9292
"webpack",

test/__snapshots__/sourceMap-option.test.js.snap

+23-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33
exports[`"sourceMap" option false should generate source maps when css was extracted: errors 1`] = `Array []`;
44

55
exports[`"sourceMap" option false should generate source maps when css was extracted: extracted css 1`] = `
6-
".nested {
6+
"/*!*******************************************************************************************!*\\\\
7+
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/nested/nested.css ***!
8+
\\\\*******************************************************************************************/
9+
.nested {
710
color: blue;
811
}
912
13+
/*!***********************************************************************************!*\\\\
14+
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/basic.css ***!
15+
\\\\***********************************************************************************/
1016
.class {
1117
color: red;
1218
}
@@ -286,10 +292,16 @@ exports[`"sourceMap" option true should generate source maps and do not change "
286292
exports[`"sourceMap" option true should generate source maps when css was extracted and do not change "[contenthash]" on different platform: errors 1`] = `Array []`;
287293

288294
exports[`"sourceMap" option true should generate source maps when css was extracted and do not change "[contenthash]" on different platform: extracted css 1`] = `
289-
".nested {
295+
"/*!*****************************************************************************************************!*\\\\
296+
!*** css ./src/index.js??ruleSet[1].rules[0].rules[1]!./test/fixtures/source-map/nested/nested.css ***!
297+
\\\\*****************************************************************************************************/
298+
.nested {
290299
color: blue;
291300
}
292301
302+
/*!*********************************************************************************************!*\\\\
303+
!*** css ./src/index.js??ruleSet[1].rules[0].rules[1]!./test/fixtures/source-map/basic.css ***!
304+
\\\\*********************************************************************************************/
293305
.class {
294306
color: red;
295307
}
@@ -301,7 +313,7 @@ exports[`"sourceMap" option true should generate source maps when css was extrac
301313
exports[`"sourceMap" option true should generate source maps when css was extracted and do not change "[contenthash]" on different platform: source map 1`] = `
302314
Object {
303315
"file": "main.xxxxxxxxxxxxxxxxxxxx.css",
304-
"mappings": "AAAA;EACE,WAAW;AACb;;ACAA;EACE,UAAU;AACZ",
316+
"mappings": "AAAA;EACE,WAAW;AACb;;;;;ACAA;EACE,UAAU;AACZ",
305317
"names": Array [],
306318
"sourceRoot": "",
307319
"sources": Array [
@@ -329,10 +341,16 @@ exports[`"sourceMap" option true should generate source maps when css was extrac
329341
exports[`"sourceMap" option true should generate source maps when css was extracted: errors 1`] = `Array []`;
330342

331343
exports[`"sourceMap" option true should generate source maps when css was extracted: extracted css 1`] = `
332-
".nested {
344+
"/*!*******************************************************************************************!*\\\\
345+
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/nested/nested.css ***!
346+
\\\\*******************************************************************************************/
347+
.nested {
333348
color: blue;
334349
}
335350
351+
/*!***********************************************************************************!*\\\\
352+
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/basic.css ***!
353+
\\\\***********************************************************************************/
336354
.class {
337355
color: red;
338356
}
@@ -344,7 +362,7 @@ exports[`"sourceMap" option true should generate source maps when css was extrac
344362
exports[`"sourceMap" option true should generate source maps when css was extracted: source map 1`] = `
345363
Object {
346364
"file": "main.css",
347-
"mappings": "AAAA;EACE,WAAW;AACb;;ACAA;EACE,UAAU;AACZ",
365+
"mappings": "AAAA;EACE,WAAW;AACb;;;;;ACAA;EACE,UAAU;AACZ",
348366
"names": Array [],
349367
"sourceRoot": "",
350368
"sources": Array [

test/__snapshots__/url-option.test.js.snap

+7-1
Original file line numberDiff line numberDiff line change
@@ -1686,10 +1686,16 @@ Warning
16861686
`;
16871687

16881688
exports[`"url" option should work with mini-css-extract-plugin: css 1`] = `
1689-
".bar {
1689+
"/*!*****************************************************************************!*\\\\
1690+
!*** css ../../src/index.js??ruleSet[1].rules[0].use[1]!./url/imported.css ***!
1691+
\\\\*****************************************************************************/
1692+
.bar {
16901693
background: url(/webpack/public/path/img-from-imported.png);
16911694
}
16921695

1696+
/*!************************************************************************!*\\\\
1697+
!*** css ../../src/index.js??ruleSet[1].rules[0].use[1]!./url/url.css ***!
1698+
\\\\************************************************************************/
16931699
.class {
16941700
background: url(/webpack/public/path/img.png);
16951701
}

test/sourceMap-option.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ describe('"sourceMap" option', () => {
602602

603603
const extractedCSS = readAsset(chunkName, compiler, stats);
604604

605-
expect(chunkName).toBe("main.695010bdb768b7260e76.css");
605+
expect(chunkName).toBe("main.166835fe802ce402ea56.css");
606606

607607
expect(
608608
extractedCSS.replace(

0 commit comments

Comments
 (0)