Skip to content

refactor: Node.js v10 dropped #1326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [10.x, 12.x, 14.x]
node-version: [12.x, 14.x, 16.x]
webpack-version: [latest]

runs-on: ${{ matrix.os }}
Expand Down
1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = (api) => {
"@babel/preset-env",
{
targets: {
node: "10.13.0",
node: "12.13.0",
},
},
],
Expand Down
14,718 changes: 7,813 additions & 6,905 deletions package-lock.json

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"main": "dist/cjs.js",
"engines": {
"node": ">= 10.13.0"
"node": ">= 12.13.0"
},
"scripts": {
"start": "npm run build -- -w",
Expand Down Expand Up @@ -52,41 +52,41 @@
"semver": "^7.3.5"
},
"devDependencies": {
"@babel/cli": "^7.14.3",
"@babel/core": "^7.14.3",
"@babel/preset-env": "^7.14.2",
"@babel/cli": "^7.14.5",
"@babel/core": "^7.14.6",
"@babel/preset-env": "^7.14.7",
"@commitlint/cli": "^12.1.4",
"@commitlint/config-conventional": "^12.1.4",
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
"babel-jest": "^26.6.3",
"cross-env": "^7.0.3",
"del": "^6.0.0",
"del-cli": "^3.0.1",
"es-check": "^5.2.3",
"eslint": "^7.26.0",
"del-cli": "^4.0.0",
"es-check": "^5.2.4",
"eslint": "^7.30.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.2",
"eslint-plugin-import": "^2.23.4",
"file-loader": "^6.2.0",
"husky": "^6.0.0",
"husky": "^7.0.1",
"jest": "^26.6.3",
"less": "^4.1.1",
"less-loader": "^7.1.0",
"lint-staged": "^11.0.0",
"less-loader": "^10.0.1",
"lint-staged": "^11.0.1",
"memfs": "^3.2.2",
"mini-css-extract-plugin": "^1.6.0",
"mini-css-extract-plugin": "^2.1.0",
"npm-run-all": "^4.1.5",
"postcss-loader": "^4.3.0",
"postcss-preset-env": "^6.7.0",
"prettier": "^2.3.0",
"sass": "^1.32.13",
"sass-loader": "^10.2.0",
"prettier": "^2.3.2",
"sass": "^1.35.2",
"sass-loader": "^12.1.0",
"standard-version": "^9.3.0",
"strip-ansi": "^6.0.0",
"style-loader": "^2.0.0",
"style-loader": "^3.1.0",
"stylus": "^0.54.8",
"stylus-loader": "^4.3.3",
"stylus-loader": "^6.1.0",
"url-loader": "^4.1.1",
"webpack": "^5.37.1"
"webpack": "^5.44.0"
},
"keywords": [
"webpack",
Expand Down
28 changes: 23 additions & 5 deletions test/__snapshots__/sourceMap-option.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
exports[`"sourceMap" option false should generate source maps when css was extracted: errors 1`] = `Array []`;

exports[`"sourceMap" option false should generate source maps when css was extracted: extracted css 1`] = `
".nested {
"/*!*******************************************************************************************!*\\\\
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/nested/nested.css ***!
\\\\*******************************************************************************************/
.nested {
color: blue;
}

/*!***********************************************************************************!*\\\\
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/basic.css ***!
\\\\***********************************************************************************/
.class {
color: red;
}
Expand Down Expand Up @@ -286,10 +292,16 @@ exports[`"sourceMap" option true should generate source maps and do not change "
exports[`"sourceMap" option true should generate source maps when css was extracted and do not change "[contenthash]" on different platform: errors 1`] = `Array []`;

exports[`"sourceMap" option true should generate source maps when css was extracted and do not change "[contenthash]" on different platform: extracted css 1`] = `
".nested {
"/*!*****************************************************************************************************!*\\\\
!*** css ./src/index.js??ruleSet[1].rules[0].rules[1]!./test/fixtures/source-map/nested/nested.css ***!
\\\\*****************************************************************************************************/
.nested {
color: blue;
}

/*!*********************************************************************************************!*\\\\
!*** css ./src/index.js??ruleSet[1].rules[0].rules[1]!./test/fixtures/source-map/basic.css ***!
\\\\*********************************************************************************************/
.class {
color: red;
}
Expand All @@ -301,7 +313,7 @@ exports[`"sourceMap" option true should generate source maps when css was extrac
exports[`"sourceMap" option true should generate source maps when css was extracted and do not change "[contenthash]" on different platform: source map 1`] = `
Object {
"file": "main.xxxxxxxxxxxxxxxxxxxx.css",
"mappings": "AAAA;EACE,WAAW;AACb;;ACAA;EACE,UAAU;AACZ",
"mappings": "AAAA;EACE,WAAW;AACb;;;;;ACAA;EACE,UAAU;AACZ",
"names": Array [],
"sourceRoot": "",
"sources": Array [
Expand Down Expand Up @@ -329,10 +341,16 @@ exports[`"sourceMap" option true should generate source maps when css was extrac
exports[`"sourceMap" option true should generate source maps when css was extracted: errors 1`] = `Array []`;

exports[`"sourceMap" option true should generate source maps when css was extracted: extracted css 1`] = `
".nested {
"/*!*******************************************************************************************!*\\\\
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/nested/nested.css ***!
\\\\*******************************************************************************************/
.nested {
color: blue;
}

/*!***********************************************************************************!*\\\\
!*** css ../../src/index.js??ruleSet[1].rules[0].rules[1]!./source-map/basic.css ***!
\\\\***********************************************************************************/
.class {
color: red;
}
Expand All @@ -344,7 +362,7 @@ exports[`"sourceMap" option true should generate source maps when css was extrac
exports[`"sourceMap" option true should generate source maps when css was extracted: source map 1`] = `
Object {
"file": "main.css",
"mappings": "AAAA;EACE,WAAW;AACb;;ACAA;EACE,UAAU;AACZ",
"mappings": "AAAA;EACE,WAAW;AACb;;;;;ACAA;EACE,UAAU;AACZ",
"names": Array [],
"sourceRoot": "",
"sources": Array [
Expand Down
8 changes: 7 additions & 1 deletion test/__snapshots__/url-option.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1686,10 +1686,16 @@ Warning
`;

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

/*!************************************************************************!*\\\\
!*** css ../../src/index.js??ruleSet[1].rules[0].use[1]!./url/url.css ***!
\\\\************************************************************************/
.class {
background: url(/webpack/public/path/img.png);
}
Expand Down
2 changes: 1 addition & 1 deletion test/sourceMap-option.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ describe('"sourceMap" option', () => {

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

expect(chunkName).toBe("main.695010bdb768b7260e76.css");
expect(chunkName).toBe("main.166835fe802ce402ea56.css");

expect(
extractedCSS.replace(
Expand Down