From a27de27f41a3c6157ab9ac81d64632d817d71e2f Mon Sep 17 00:00:00 2001 From: cap-Bernardito Date: Tue, 26 May 2020 19:55:06 +0300 Subject: [PATCH 1/3] refactor: remove whatwg-encoding --- package-lock.json | 29 +++++- package.json | 4 +- src/labels-to-names.json | 207 +++++++++++++++++++++++++++++++++++++++ src/utils.js | 11 ++- 4 files changed, 245 insertions(+), 6 deletions(-) create mode 100644 src/labels-to-names.json diff --git a/package-lock.json b/package-lock.json index 79a83e1..17abfdb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6624,6 +6624,17 @@ "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "extglob": { @@ -7941,9 +7952,9 @@ } }, "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz", + "integrity": "sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==", "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -15223,8 +15234,20 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, "requires": { "iconv-lite": "0.4.24" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "whatwg-mimetype": { diff --git a/package.json b/package.json index d6ba112..8f524f9 100644 --- a/package.json +++ b/package.json @@ -42,10 +42,10 @@ }, "dependencies": { "data-urls": "^2.0.0", + "iconv-lite": "^0.5.1", "loader-utils": "^2.0.0", "schema-utils": "^2.6.6", - "source-map": "^0.6.0", - "whatwg-encoding": "^1.0.5" + "source-map": "^0.6.0" }, "devDependencies": { "@babel/cli": "^7.8.4", diff --git a/src/labels-to-names.json b/src/labels-to-names.json new file mode 100644 index 0000000..9978fcf --- /dev/null +++ b/src/labels-to-names.json @@ -0,0 +1,207 @@ +{ + "866": "IBM866", + "unicode-1-1-utf-8": "UTF-8", + "utf-8": "UTF-8", + "utf8": "UTF-8", + "cp866": "IBM866", + "csibm866": "IBM866", + "ibm866": "IBM866", + "csisolatin2": "ISO-8859-2", + "iso-8859-2": "ISO-8859-2", + "iso-ir-101": "ISO-8859-2", + "iso8859-2": "ISO-8859-2", + "iso88592": "ISO-8859-2", + "iso_8859-2": "ISO-8859-2", + "iso_8859-2:1987": "ISO-8859-2", + "l2": "ISO-8859-2", + "latin2": "ISO-8859-2", + "csisolatin3": "ISO-8859-3", + "iso-8859-3": "ISO-8859-3", + "iso-ir-109": "ISO-8859-3", + "iso8859-3": "ISO-8859-3", + "iso88593": "ISO-8859-3", + "iso_8859-3": "ISO-8859-3", + "iso_8859-3:1988": "ISO-8859-3", + "l3": "ISO-8859-3", + "latin3": "ISO-8859-3", + "csisolatin4": "ISO-8859-4", + "iso-8859-4": "ISO-8859-4", + "iso-ir-110": "ISO-8859-4", + "iso8859-4": "ISO-8859-4", + "iso88594": "ISO-8859-4", + "iso_8859-4": "ISO-8859-4", + "iso_8859-4:1988": "ISO-8859-4", + "l4": "ISO-8859-4", + "latin4": "ISO-8859-4", + "csisolatincyrillic": "ISO-8859-5", + "cyrillic": "ISO-8859-5", + "iso-8859-5": "ISO-8859-5", + "iso-ir-144": "ISO-8859-5", + "iso8859-5": "ISO-8859-5", + "iso88595": "ISO-8859-5", + "iso_8859-5": "ISO-8859-5", + "iso_8859-5:1988": "ISO-8859-5", + "arabic": "ISO-8859-6", + "asmo-708": "ISO-8859-6", + "csiso88596e": "ISO-8859-6", + "csiso88596i": "ISO-8859-6", + "csisolatinarabic": "ISO-8859-6", + "ecma-114": "ISO-8859-6", + "iso-8859-6": "ISO-8859-6", + "iso-8859-6-e": "ISO-8859-6", + "iso-8859-6-i": "ISO-8859-6", + "iso-ir-127": "ISO-8859-6", + "iso8859-6": "ISO-8859-6", + "iso88596": "ISO-8859-6", + "iso_8859-6": "ISO-8859-6", + "iso_8859-6:1987": "ISO-8859-6", + "csisolatingreek": "ISO-8859-7", + "ecma-118": "ISO-8859-7", + "elot_928": "ISO-8859-7", + "greek": "ISO-8859-7", + "greek8": "ISO-8859-7", + "iso-8859-7": "ISO-8859-7", + "iso-ir-126": "ISO-8859-7", + "iso8859-7": "ISO-8859-7", + "iso88597": "ISO-8859-7", + "iso_8859-7": "ISO-8859-7", + "iso_8859-7:1987": "ISO-8859-7", + "sun_eu_greek": "ISO-8859-7", + "csiso88598e": "ISO-8859-8", + "csisolatinhebrew": "ISO-8859-8", + "hebrew": "ISO-8859-8", + "iso-8859-8": "ISO-8859-8", + "iso-8859-8-e": "ISO-8859-8", + "iso-ir-138": "ISO-8859-8", + "iso8859-8": "ISO-8859-8", + "iso88598": "ISO-8859-8", + "iso_8859-8": "ISO-8859-8", + "iso_8859-8:1988": "ISO-8859-8", + "visual": "ISO-8859-8", + "csisolatin6": "ISO-8859-10", + "iso-8859-10": "ISO-8859-10", + "iso-ir-157": "ISO-8859-10", + "iso8859-10": "ISO-8859-10", + "iso885910": "ISO-8859-10", + "l6": "ISO-8859-10", + "latin6": "ISO-8859-10", + "iso-8859-13": "ISO-8859-13", + "iso8859-13": "ISO-8859-13", + "iso885913": "ISO-8859-13", + "iso-8859-14": "ISO-8859-14", + "iso8859-14": "ISO-8859-14", + "iso885914": "ISO-8859-14", + "csisolatin9": "ISO-8859-15", + "iso-8859-15": "ISO-8859-15", + "iso8859-15": "ISO-8859-15", + "iso885915": "ISO-8859-15", + "iso_8859-15": "ISO-8859-15", + "l9": "ISO-8859-15", + "iso-8859-16": "ISO-8859-16", + "cskoi8r": "KOI8-R", + "koi": "KOI8-R", + "koi8": "KOI8-R", + "koi8-r": "KOI8-R", + "koi8_r": "KOI8-R", + "koi8-ru": "KOI8-U", + "koi8-u": "KOI8-U", + "csmacintosh": "macintosh", + "mac": "macintosh", + "macintosh": "macintosh", + "x-mac-roman": "macintosh", + "dos-874": "windows-874", + "iso-8859-11": "windows-874", + "iso8859-11": "windows-874", + "iso885911": "windows-874", + "tis-620": "windows-874", + "windows-874": "windows-874", + "cp1250": "windows-1250", + "windows-1250": "windows-1250", + "x-cp1250": "windows-1250", + "cp1251": "windows-1251", + "windows-1251": "windows-1251", + "x-cp1251": "windows-1251", + "ansi_x3.4-1968": "windows-1252", + "ascii": "windows-1252", + "cp1252": "windows-1252", + "cp819": "windows-1252", + "csisolatin1": "windows-1252", + "ibm819": "windows-1252", + "iso-8859-1": "windows-1252", + "iso-ir-100": "windows-1252", + "iso8859-1": "windows-1252", + "iso88591": "windows-1252", + "iso_8859-1": "windows-1252", + "iso_8859-1:1987": "windows-1252", + "l1": "windows-1252", + "latin1": "windows-1252", + "us-ascii": "windows-1252", + "windows-1252": "windows-1252", + "x-cp1252": "windows-1252", + "cp1253": "windows-1253", + "windows-1253": "windows-1253", + "x-cp1253": "windows-1253", + "cp1254": "windows-1254", + "csisolatin5": "windows-1254", + "iso-8859-9": "windows-1254", + "iso-ir-148": "windows-1254", + "iso8859-9": "windows-1254", + "iso88599": "windows-1254", + "iso_8859-9": "windows-1254", + "iso_8859-9:1989": "windows-1254", + "l5": "windows-1254", + "latin5": "windows-1254", + "windows-1254": "windows-1254", + "x-cp1254": "windows-1254", + "cp1255": "windows-1255", + "windows-1255": "windows-1255", + "x-cp1255": "windows-1255", + "cp1256": "windows-1256", + "windows-1256": "windows-1256", + "x-cp1256": "windows-1256", + "cp1257": "windows-1257", + "windows-1257": "windows-1257", + "x-cp1257": "windows-1257", + "cp1258": "windows-1258", + "windows-1258": "windows-1258", + "x-cp1258": "windows-1258", + "chinese": "GBK", + "csgb2312": "GBK", + "csiso58gb231280": "GBK", + "gb2312": "GBK", + "gb_2312": "GBK", + "gb_2312-80": "GBK", + "gbk": "GBK", + "iso-ir-58": "GBK", + "x-gbk": "GBK", + "gb18030": "gb18030", + "big5": "Big5", + "big5-hkscs": "Big5", + "cn-big5": "Big5", + "csbig5": "Big5", + "x-x-big5": "Big5", + "cseucpkdfmtjapanese": "EUC-JP", + "euc-jp": "EUC-JP", + "x-euc-jp": "EUC-JP", + "csshiftjis": "Shift_JIS", + "ms932": "Shift_JIS", + "ms_kanji": "Shift_JIS", + "shift-jis": "Shift_JIS", + "shift_jis": "Shift_JIS", + "sjis": "Shift_JIS", + "windows-31j": "Shift_JIS", + "x-sjis": "Shift_JIS", + "cseuckr": "EUC-KR", + "csksc56011987": "EUC-KR", + "euc-kr": "EUC-KR", + "iso-ir-149": "EUC-KR", + "korean": "EUC-KR", + "ks_c_5601-1987": "EUC-KR", + "ks_c_5601-1989": "EUC-KR", + "ksc5601": "EUC-KR", + "ksc_5601": "EUC-KR", + "windows-949": "EUC-KR", + "utf-16be": "UTF-16BE", + "utf-16": "UTF-16LE", + "utf-16le": "UTF-16LE" +} diff --git a/src/utils.js b/src/utils.js index aa1336c..73f146b 100644 --- a/src/utils.js +++ b/src/utils.js @@ -3,10 +3,13 @@ import urlUtils from 'url'; import sourceMap from 'source-map'; import parseDataURL from 'data-urls'; -import { labelToName, decode } from 'whatwg-encoding'; + +import { decode } from 'iconv-lite'; import { urlToRequest } from 'loader-utils'; +const labelsToNames = require('./labels-to-names.json'); + // Matches only the last occurrence of sourceMappingURL const innerRegex = /\s*[#@]\s*sourceMappingURL\s*=\s*([^\s'"]*)\s*/; @@ -29,6 +32,12 @@ const sourceMappingURLRegex = RegExp( ); /* eslint-enable prefer-template */ +function labelToName(label) { + const labelLowercase = String(label).trim().toLowerCase(); + + return labelsToNames[labelLowercase] || null; +} + async function flattenSourceMap(map) { const consumer = await new sourceMap.SourceMapConsumer(map); const generatedMap = map.file From 9e47495fa206eec8015c054c4488bfbacf0b17d4 Mon Sep 17 00:00:00 2001 From: cap-Bernardito Date: Tue, 26 May 2020 20:11:40 +0300 Subject: [PATCH 2/3] refactor: remove whatwg-encoding --- src/labels-to-names.js | 209 +++++++++++++++++++++++++++++++++++++++ src/labels-to-names.json | 207 -------------------------------------- src/utils.js | 2 +- 3 files changed, 210 insertions(+), 208 deletions(-) create mode 100644 src/labels-to-names.js delete mode 100644 src/labels-to-names.json diff --git a/src/labels-to-names.js b/src/labels-to-names.js new file mode 100644 index 0000000..49f545b --- /dev/null +++ b/src/labels-to-names.js @@ -0,0 +1,209 @@ +const labelToNames = { + '866': 'IBM866', + 'unicode-1-1-utf-8': 'UTF-8', + 'utf-8': 'UTF-8', + utf8: 'UTF-8', + cp866: 'IBM866', + csibm866: 'IBM866', + ibm866: 'IBM866', + csisolatin2: 'ISO-8859-2', + 'iso-8859-2': 'ISO-8859-2', + 'iso-ir-101': 'ISO-8859-2', + 'iso8859-2': 'ISO-8859-2', + iso88592: 'ISO-8859-2', + 'iso_8859-2': 'ISO-8859-2', + 'iso_8859-2:1987': 'ISO-8859-2', + l2: 'ISO-8859-2', + latin2: 'ISO-8859-2', + csisolatin3: 'ISO-8859-3', + 'iso-8859-3': 'ISO-8859-3', + 'iso-ir-109': 'ISO-8859-3', + 'iso8859-3': 'ISO-8859-3', + iso88593: 'ISO-8859-3', + 'iso_8859-3': 'ISO-8859-3', + 'iso_8859-3:1988': 'ISO-8859-3', + l3: 'ISO-8859-3', + latin3: 'ISO-8859-3', + csisolatin4: 'ISO-8859-4', + 'iso-8859-4': 'ISO-8859-4', + 'iso-ir-110': 'ISO-8859-4', + 'iso8859-4': 'ISO-8859-4', + iso88594: 'ISO-8859-4', + 'iso_8859-4': 'ISO-8859-4', + 'iso_8859-4:1988': 'ISO-8859-4', + l4: 'ISO-8859-4', + latin4: 'ISO-8859-4', + csisolatincyrillic: 'ISO-8859-5', + cyrillic: 'ISO-8859-5', + 'iso-8859-5': 'ISO-8859-5', + 'iso-ir-144': 'ISO-8859-5', + 'iso8859-5': 'ISO-8859-5', + iso88595: 'ISO-8859-5', + 'iso_8859-5': 'ISO-8859-5', + 'iso_8859-5:1988': 'ISO-8859-5', + arabic: 'ISO-8859-6', + 'asmo-708': 'ISO-8859-6', + csiso88596e: 'ISO-8859-6', + csiso88596i: 'ISO-8859-6', + csisolatinarabic: 'ISO-8859-6', + 'ecma-114': 'ISO-8859-6', + 'iso-8859-6': 'ISO-8859-6', + 'iso-8859-6-e': 'ISO-8859-6', + 'iso-8859-6-i': 'ISO-8859-6', + 'iso-ir-127': 'ISO-8859-6', + 'iso8859-6': 'ISO-8859-6', + iso88596: 'ISO-8859-6', + 'iso_8859-6': 'ISO-8859-6', + 'iso_8859-6:1987': 'ISO-8859-6', + csisolatingreek: 'ISO-8859-7', + 'ecma-118': 'ISO-8859-7', + elot_928: 'ISO-8859-7', + greek: 'ISO-8859-7', + greek8: 'ISO-8859-7', + 'iso-8859-7': 'ISO-8859-7', + 'iso-ir-126': 'ISO-8859-7', + 'iso8859-7': 'ISO-8859-7', + iso88597: 'ISO-8859-7', + 'iso_8859-7': 'ISO-8859-7', + 'iso_8859-7:1987': 'ISO-8859-7', + sun_eu_greek: 'ISO-8859-7', + csiso88598e: 'ISO-8859-8', + csisolatinhebrew: 'ISO-8859-8', + hebrew: 'ISO-8859-8', + 'iso-8859-8': 'ISO-8859-8', + 'iso-8859-8-e': 'ISO-8859-8', + 'iso-ir-138': 'ISO-8859-8', + 'iso8859-8': 'ISO-8859-8', + iso88598: 'ISO-8859-8', + 'iso_8859-8': 'ISO-8859-8', + 'iso_8859-8:1988': 'ISO-8859-8', + visual: 'ISO-8859-8', + csisolatin6: 'ISO-8859-10', + 'iso-8859-10': 'ISO-8859-10', + 'iso-ir-157': 'ISO-8859-10', + 'iso8859-10': 'ISO-8859-10', + iso885910: 'ISO-8859-10', + l6: 'ISO-8859-10', + latin6: 'ISO-8859-10', + 'iso-8859-13': 'ISO-8859-13', + 'iso8859-13': 'ISO-8859-13', + iso885913: 'ISO-8859-13', + 'iso-8859-14': 'ISO-8859-14', + 'iso8859-14': 'ISO-8859-14', + iso885914: 'ISO-8859-14', + csisolatin9: 'ISO-8859-15', + 'iso-8859-15': 'ISO-8859-15', + 'iso8859-15': 'ISO-8859-15', + iso885915: 'ISO-8859-15', + 'iso_8859-15': 'ISO-8859-15', + l9: 'ISO-8859-15', + 'iso-8859-16': 'ISO-8859-16', + cskoi8r: 'KOI8-R', + koi: 'KOI8-R', + koi8: 'KOI8-R', + 'koi8-r': 'KOI8-R', + koi8_r: 'KOI8-R', + 'koi8-ru': 'KOI8-U', + 'koi8-u': 'KOI8-U', + csmacintosh: 'macintosh', + mac: 'macintosh', + macintosh: 'macintosh', + 'x-mac-roman': 'macintosh', + 'dos-874': 'windows-874', + 'iso-8859-11': 'windows-874', + 'iso8859-11': 'windows-874', + iso885911: 'windows-874', + 'tis-620': 'windows-874', + 'windows-874': 'windows-874', + cp1250: 'windows-1250', + 'windows-1250': 'windows-1250', + 'x-cp1250': 'windows-1250', + cp1251: 'windows-1251', + 'windows-1251': 'windows-1251', + 'x-cp1251': 'windows-1251', + 'ansi_x3.4-1968': 'windows-1252', + ascii: 'windows-1252', + cp1252: 'windows-1252', + cp819: 'windows-1252', + csisolatin1: 'windows-1252', + ibm819: 'windows-1252', + 'iso-8859-1': 'windows-1252', + 'iso-ir-100': 'windows-1252', + 'iso8859-1': 'windows-1252', + iso88591: 'windows-1252', + 'iso_8859-1': 'windows-1252', + 'iso_8859-1:1987': 'windows-1252', + l1: 'windows-1252', + latin1: 'windows-1252', + 'us-ascii': 'windows-1252', + 'windows-1252': 'windows-1252', + 'x-cp1252': 'windows-1252', + cp1253: 'windows-1253', + 'windows-1253': 'windows-1253', + 'x-cp1253': 'windows-1253', + cp1254: 'windows-1254', + csisolatin5: 'windows-1254', + 'iso-8859-9': 'windows-1254', + 'iso-ir-148': 'windows-1254', + 'iso8859-9': 'windows-1254', + iso88599: 'windows-1254', + 'iso_8859-9': 'windows-1254', + 'iso_8859-9:1989': 'windows-1254', + l5: 'windows-1254', + latin5: 'windows-1254', + 'windows-1254': 'windows-1254', + 'x-cp1254': 'windows-1254', + cp1255: 'windows-1255', + 'windows-1255': 'windows-1255', + 'x-cp1255': 'windows-1255', + cp1256: 'windows-1256', + 'windows-1256': 'windows-1256', + 'x-cp1256': 'windows-1256', + cp1257: 'windows-1257', + 'windows-1257': 'windows-1257', + 'x-cp1257': 'windows-1257', + cp1258: 'windows-1258', + 'windows-1258': 'windows-1258', + 'x-cp1258': 'windows-1258', + chinese: 'GBK', + csgb2312: 'GBK', + csiso58gb231280: 'GBK', + gb2312: 'GBK', + gb_2312: 'GBK', + 'gb_2312-80': 'GBK', + gbk: 'GBK', + 'iso-ir-58': 'GBK', + 'x-gbk': 'GBK', + gb18030: 'gb18030', + big5: 'Big5', + 'big5-hkscs': 'Big5', + 'cn-big5': 'Big5', + csbig5: 'Big5', + 'x-x-big5': 'Big5', + cseucpkdfmtjapanese: 'EUC-JP', + 'euc-jp': 'EUC-JP', + 'x-euc-jp': 'EUC-JP', + csshiftjis: 'Shift_JIS', + ms932: 'Shift_JIS', + ms_kanji: 'Shift_JIS', + 'shift-jis': 'Shift_JIS', + shift_jis: 'Shift_JIS', + sjis: 'Shift_JIS', + 'windows-31j': 'Shift_JIS', + 'x-sjis': 'Shift_JIS', + cseuckr: 'EUC-KR', + csksc56011987: 'EUC-KR', + 'euc-kr': 'EUC-KR', + 'iso-ir-149': 'EUC-KR', + korean: 'EUC-KR', + 'ks_c_5601-1987': 'EUC-KR', + 'ks_c_5601-1989': 'EUC-KR', + ksc5601: 'EUC-KR', + ksc_5601: 'EUC-KR', + 'windows-949': 'EUC-KR', + 'utf-16be': 'UTF-16BE', + 'utf-16': 'UTF-16LE', + 'utf-16le': 'UTF-16LE', +}; + +module.exports = labelToNames; diff --git a/src/labels-to-names.json b/src/labels-to-names.json deleted file mode 100644 index 9978fcf..0000000 --- a/src/labels-to-names.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "866": "IBM866", - "unicode-1-1-utf-8": "UTF-8", - "utf-8": "UTF-8", - "utf8": "UTF-8", - "cp866": "IBM866", - "csibm866": "IBM866", - "ibm866": "IBM866", - "csisolatin2": "ISO-8859-2", - "iso-8859-2": "ISO-8859-2", - "iso-ir-101": "ISO-8859-2", - "iso8859-2": "ISO-8859-2", - "iso88592": "ISO-8859-2", - "iso_8859-2": "ISO-8859-2", - "iso_8859-2:1987": "ISO-8859-2", - "l2": "ISO-8859-2", - "latin2": "ISO-8859-2", - "csisolatin3": "ISO-8859-3", - "iso-8859-3": "ISO-8859-3", - "iso-ir-109": "ISO-8859-3", - "iso8859-3": "ISO-8859-3", - "iso88593": "ISO-8859-3", - "iso_8859-3": "ISO-8859-3", - "iso_8859-3:1988": "ISO-8859-3", - "l3": "ISO-8859-3", - "latin3": "ISO-8859-3", - "csisolatin4": "ISO-8859-4", - "iso-8859-4": "ISO-8859-4", - "iso-ir-110": "ISO-8859-4", - "iso8859-4": "ISO-8859-4", - "iso88594": "ISO-8859-4", - "iso_8859-4": "ISO-8859-4", - "iso_8859-4:1988": "ISO-8859-4", - "l4": "ISO-8859-4", - "latin4": "ISO-8859-4", - "csisolatincyrillic": "ISO-8859-5", - "cyrillic": "ISO-8859-5", - "iso-8859-5": "ISO-8859-5", - "iso-ir-144": "ISO-8859-5", - "iso8859-5": "ISO-8859-5", - "iso88595": "ISO-8859-5", - "iso_8859-5": "ISO-8859-5", - "iso_8859-5:1988": "ISO-8859-5", - "arabic": "ISO-8859-6", - "asmo-708": "ISO-8859-6", - "csiso88596e": "ISO-8859-6", - "csiso88596i": "ISO-8859-6", - "csisolatinarabic": "ISO-8859-6", - "ecma-114": "ISO-8859-6", - "iso-8859-6": "ISO-8859-6", - "iso-8859-6-e": "ISO-8859-6", - "iso-8859-6-i": "ISO-8859-6", - "iso-ir-127": "ISO-8859-6", - "iso8859-6": "ISO-8859-6", - "iso88596": "ISO-8859-6", - "iso_8859-6": "ISO-8859-6", - "iso_8859-6:1987": "ISO-8859-6", - "csisolatingreek": "ISO-8859-7", - "ecma-118": "ISO-8859-7", - "elot_928": "ISO-8859-7", - "greek": "ISO-8859-7", - "greek8": "ISO-8859-7", - "iso-8859-7": "ISO-8859-7", - "iso-ir-126": "ISO-8859-7", - "iso8859-7": "ISO-8859-7", - "iso88597": "ISO-8859-7", - "iso_8859-7": "ISO-8859-7", - "iso_8859-7:1987": "ISO-8859-7", - "sun_eu_greek": "ISO-8859-7", - "csiso88598e": "ISO-8859-8", - "csisolatinhebrew": "ISO-8859-8", - "hebrew": "ISO-8859-8", - "iso-8859-8": "ISO-8859-8", - "iso-8859-8-e": "ISO-8859-8", - "iso-ir-138": "ISO-8859-8", - "iso8859-8": "ISO-8859-8", - "iso88598": "ISO-8859-8", - "iso_8859-8": "ISO-8859-8", - "iso_8859-8:1988": "ISO-8859-8", - "visual": "ISO-8859-8", - "csisolatin6": "ISO-8859-10", - "iso-8859-10": "ISO-8859-10", - "iso-ir-157": "ISO-8859-10", - "iso8859-10": "ISO-8859-10", - "iso885910": "ISO-8859-10", - "l6": "ISO-8859-10", - "latin6": "ISO-8859-10", - "iso-8859-13": "ISO-8859-13", - "iso8859-13": "ISO-8859-13", - "iso885913": "ISO-8859-13", - "iso-8859-14": "ISO-8859-14", - "iso8859-14": "ISO-8859-14", - "iso885914": "ISO-8859-14", - "csisolatin9": "ISO-8859-15", - "iso-8859-15": "ISO-8859-15", - "iso8859-15": "ISO-8859-15", - "iso885915": "ISO-8859-15", - "iso_8859-15": "ISO-8859-15", - "l9": "ISO-8859-15", - "iso-8859-16": "ISO-8859-16", - "cskoi8r": "KOI8-R", - "koi": "KOI8-R", - "koi8": "KOI8-R", - "koi8-r": "KOI8-R", - "koi8_r": "KOI8-R", - "koi8-ru": "KOI8-U", - "koi8-u": "KOI8-U", - "csmacintosh": "macintosh", - "mac": "macintosh", - "macintosh": "macintosh", - "x-mac-roman": "macintosh", - "dos-874": "windows-874", - "iso-8859-11": "windows-874", - "iso8859-11": "windows-874", - "iso885911": "windows-874", - "tis-620": "windows-874", - "windows-874": "windows-874", - "cp1250": "windows-1250", - "windows-1250": "windows-1250", - "x-cp1250": "windows-1250", - "cp1251": "windows-1251", - "windows-1251": "windows-1251", - "x-cp1251": "windows-1251", - "ansi_x3.4-1968": "windows-1252", - "ascii": "windows-1252", - "cp1252": "windows-1252", - "cp819": "windows-1252", - "csisolatin1": "windows-1252", - "ibm819": "windows-1252", - "iso-8859-1": "windows-1252", - "iso-ir-100": "windows-1252", - "iso8859-1": "windows-1252", - "iso88591": "windows-1252", - "iso_8859-1": "windows-1252", - "iso_8859-1:1987": "windows-1252", - "l1": "windows-1252", - "latin1": "windows-1252", - "us-ascii": "windows-1252", - "windows-1252": "windows-1252", - "x-cp1252": "windows-1252", - "cp1253": "windows-1253", - "windows-1253": "windows-1253", - "x-cp1253": "windows-1253", - "cp1254": "windows-1254", - "csisolatin5": "windows-1254", - "iso-8859-9": "windows-1254", - "iso-ir-148": "windows-1254", - "iso8859-9": "windows-1254", - "iso88599": "windows-1254", - "iso_8859-9": "windows-1254", - "iso_8859-9:1989": "windows-1254", - "l5": "windows-1254", - "latin5": "windows-1254", - "windows-1254": "windows-1254", - "x-cp1254": "windows-1254", - "cp1255": "windows-1255", - "windows-1255": "windows-1255", - "x-cp1255": "windows-1255", - "cp1256": "windows-1256", - "windows-1256": "windows-1256", - "x-cp1256": "windows-1256", - "cp1257": "windows-1257", - "windows-1257": "windows-1257", - "x-cp1257": "windows-1257", - "cp1258": "windows-1258", - "windows-1258": "windows-1258", - "x-cp1258": "windows-1258", - "chinese": "GBK", - "csgb2312": "GBK", - "csiso58gb231280": "GBK", - "gb2312": "GBK", - "gb_2312": "GBK", - "gb_2312-80": "GBK", - "gbk": "GBK", - "iso-ir-58": "GBK", - "x-gbk": "GBK", - "gb18030": "gb18030", - "big5": "Big5", - "big5-hkscs": "Big5", - "cn-big5": "Big5", - "csbig5": "Big5", - "x-x-big5": "Big5", - "cseucpkdfmtjapanese": "EUC-JP", - "euc-jp": "EUC-JP", - "x-euc-jp": "EUC-JP", - "csshiftjis": "Shift_JIS", - "ms932": "Shift_JIS", - "ms_kanji": "Shift_JIS", - "shift-jis": "Shift_JIS", - "shift_jis": "Shift_JIS", - "sjis": "Shift_JIS", - "windows-31j": "Shift_JIS", - "x-sjis": "Shift_JIS", - "cseuckr": "EUC-KR", - "csksc56011987": "EUC-KR", - "euc-kr": "EUC-KR", - "iso-ir-149": "EUC-KR", - "korean": "EUC-KR", - "ks_c_5601-1987": "EUC-KR", - "ks_c_5601-1989": "EUC-KR", - "ksc5601": "EUC-KR", - "ksc_5601": "EUC-KR", - "windows-949": "EUC-KR", - "utf-16be": "UTF-16BE", - "utf-16": "UTF-16LE", - "utf-16le": "UTF-16LE" -} diff --git a/src/utils.js b/src/utils.js index 73f146b..175c6b4 100644 --- a/src/utils.js +++ b/src/utils.js @@ -8,7 +8,7 @@ import { decode } from 'iconv-lite'; import { urlToRequest } from 'loader-utils'; -const labelsToNames = require('./labels-to-names.json'); +import labelsToNames from './labels-to-names'; // Matches only the last occurrence of sourceMappingURL const innerRegex = /\s*[#@]\s*sourceMappingURL\s*=\s*([^\s'"]*)\s*/; From 97dc2dcaa63b3aaf982ffea920bac801a05d44c7 Mon Sep 17 00:00:00 2001 From: cap-Bernardito Date: Tue, 26 May 2020 20:20:06 +0300 Subject: [PATCH 3/3] refactor: remove whatwg-encoding --- src/labels-to-names.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/labels-to-names.js b/src/labels-to-names.js index 49f545b..ec23c90 100644 --- a/src/labels-to-names.js +++ b/src/labels-to-names.js @@ -206,4 +206,4 @@ const labelToNames = { 'utf-16le': 'UTF-16LE', }; -module.exports = labelToNames; +export default labelToNames;