Merge pull request #10442 from webpack/feat-migrate-on-mime-types
refactor: migrate on `mime-types`
This commit is contained in:
commit
1a79ebbb45
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const mime = require("mime");
|
const mimeTypes = require("mime-types");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { RawSource } = require("webpack-sources");
|
const { RawSource } = require("webpack-sources");
|
||||||
const Generator = require("../Generator");
|
const Generator = require("../Generator");
|
||||||
|
@ -67,7 +67,8 @@ class AssetGenerator extends Generator {
|
||||||
} else {
|
} else {
|
||||||
const encoding = this.dataUrlOptions.encoding;
|
const encoding = this.dataUrlOptions.encoding;
|
||||||
const ext = path.extname(module.nameForCondition());
|
const ext = path.extname(module.nameForCondition());
|
||||||
const mimeType = this.dataUrlOptions.mimetype || mime.getType(ext);
|
const mimeType =
|
||||||
|
this.dataUrlOptions.mimetype || mimeTypes.lookup(ext);
|
||||||
|
|
||||||
if (!mimeType) {
|
if (!mimeType) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
"json-parse-better-errors": "^1.0.2",
|
"json-parse-better-errors": "^1.0.2",
|
||||||
"loader-runner": "^3.1.0",
|
"loader-runner": "^3.1.0",
|
||||||
"loader-utils": "^1.2.3",
|
"loader-utils": "^1.2.3",
|
||||||
"mime": "^2.4.4",
|
"mime-types": "^2.1.26",
|
||||||
"neo-async": "^2.6.1",
|
"neo-async": "^2.6.1",
|
||||||
"pkg-dir": "^4.2.0",
|
"pkg-dir": "^4.2.0",
|
||||||
"schema-utils": "^2.5.0",
|
"schema-utils": "^2.5.0",
|
||||||
|
|
12
yarn.lock
12
yarn.lock
|
@ -4157,6 +4157,11 @@ mime-db@1.40.0:
|
||||||
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
|
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
|
||||||
integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
|
integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
|
||||||
|
|
||||||
|
mime-db@1.43.0:
|
||||||
|
version "1.43.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
|
||||||
|
integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
|
||||||
|
|
||||||
mime-types@^2.1.12, mime-types@~2.1.19:
|
mime-types@^2.1.12, mime-types@~2.1.19:
|
||||||
version "2.1.24"
|
version "2.1.24"
|
||||||
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
|
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
|
||||||
|
@ -4164,6 +4169,13 @@ mime-types@^2.1.12, mime-types@~2.1.19:
|
||||||
dependencies:
|
dependencies:
|
||||||
mime-db "1.40.0"
|
mime-db "1.40.0"
|
||||||
|
|
||||||
|
mime-types@^2.1.26:
|
||||||
|
version "2.1.26"
|
||||||
|
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
|
||||||
|
integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
|
||||||
|
dependencies:
|
||||||
|
mime-db "1.43.0"
|
||||||
|
|
||||||
mime@^1.4.1:
|
mime@^1.4.1:
|
||||||
version "1.6.0"
|
version "1.6.0"
|
||||||
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
|
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
|
||||||
|
|
Loading…
Reference in New Issue