fix: more
This commit is contained in:
evilebottnawi
parent
6fd47ea9ee
commit
fd7c4c8dd5
|
|
@ -181,6 +181,7 @@
|
|||
"destructure",
|
||||
"onconnect",
|
||||
"nwjs",
|
||||
"redeclaration",
|
||||
|
||||
"webassemblyjs",
|
||||
"fsevents",
|
||||
|
|
@ -218,7 +219,8 @@
|
|||
"codecov",
|
||||
"opencollective",
|
||||
"dependabot",
|
||||
"browserslist"
|
||||
"browserslist",
|
||||
"samsunginternet"
|
||||
],
|
||||
"ignoreRegExpList": ["/Author.+/", "/data:.*/", "/\"mappings\":\".+\"/"],
|
||||
"ignorePaths": ["**/dist/**", "examples/**/README.md"]
|
||||
|
|
|
|||
|
|
@ -75,51 +75,6 @@ const load = (input, context) => {
|
|||
* @returns {EcmaTargetProperties & PlatformTargetProperties & ApiTargetProperties} target properties
|
||||
*/
|
||||
const resolve = browsers => {
|
||||
/**
|
||||
* Checks only browser against the browserslist feature query
|
||||
* @param {string} feature an ES feature to test
|
||||
* @returns {boolean} true if supports
|
||||
*/
|
||||
const browserslistChecker = feature => {
|
||||
const supportsFeature = browserslist(`supports ${feature}`);
|
||||
return browsers.every(v => /^node /.test(v) || supportsFeature.includes(v));
|
||||
};
|
||||
|
||||
/**
|
||||
* Compare node.js versions
|
||||
* @param {number} requiredMajor required major version
|
||||
* @param {number | undefined} requiredMinor required minor version
|
||||
* @param {string} parsedMajor parser major version
|
||||
* @param {string | undefined} parserMinor parser minor version
|
||||
* @returns {boolean} true if supports
|
||||
*/
|
||||
const versionComparator = (
|
||||
requiredMajor,
|
||||
requiredMinor,
|
||||
parsedMajor,
|
||||
parserMinor
|
||||
) => {
|
||||
if (!requiredMinor) requiredMinor = 0;
|
||||
if (!parserMinor) parserMinor = "0";
|
||||
return requiredMajor === +parsedMajor
|
||||
? +parserMinor >= requiredMinor
|
||||
: +parsedMajor > requiredMajor;
|
||||
};
|
||||
|
||||
/**
|
||||
* Checks only node.js version against a version
|
||||
* @param {number} major major version
|
||||
* @param {number=} minor minor version
|
||||
* @returns {boolean} true if supports
|
||||
*/
|
||||
const nodeChecker = (major, minor) => {
|
||||
return browsers.every(v => {
|
||||
const match = /^node (\d+)(?:\.(\d+))/.exec(v);
|
||||
if (!match) return true;
|
||||
const [, v1, v2] = match;
|
||||
return versionComparator(major, minor, v1, v2);
|
||||
});
|
||||
};
|
||||
/**
|
||||
* Checks all against a version number
|
||||
* @param {Record<string, number | [number, number]>} versions first supported version
|
||||
|
|
@ -127,26 +82,75 @@ const resolve = browsers => {
|
|||
*/
|
||||
const rawChecker = versions => {
|
||||
return browsers.every(v => {
|
||||
const match = /^([^ ]+) (\d+)(?:\.(\d+))?/.exec(v);
|
||||
if (!match) return false;
|
||||
const [, name, major, minor] = match;
|
||||
const version = versions[name];
|
||||
if (!version) return false;
|
||||
if (typeof version === "number") return +major >= version;
|
||||
return versionComparator(version[0], version[1], major, minor);
|
||||
const [name, parsedVersion] = v.split(" ");
|
||||
if (!name) return false;
|
||||
const requiredVersion = versions[name];
|
||||
if (!requiredVersion) return false;
|
||||
const [parsedMajor, parserMinor] = parsedVersion.split(".");
|
||||
if (typeof requiredVersion === "number") {
|
||||
return +parsedMajor >= requiredVersion;
|
||||
}
|
||||
return requiredVersion[0] === +parsedMajor
|
||||
? +parserMinor >= requiredVersion[1]
|
||||
: +parsedMajor > requiredVersion[0];
|
||||
});
|
||||
};
|
||||
const anyNode = browsers.some(b => /^node /.test(b));
|
||||
const anyBrowser = browsers.some(b => /^(?!node)/.test(b));
|
||||
const browserProperty = !anyBrowser ? false : anyNode ? null : true;
|
||||
const nodeProperty = !anyNode ? false : anyBrowser ? null : true;
|
||||
const letConst = browserslistChecker("let");
|
||||
const arrowFunctions = browserslistChecker("arrow-functions");
|
||||
const es6DynamicImport = browserslistChecker("es6-module-dynamic-import");
|
||||
const node6 = nodeChecker(6);
|
||||
const es6DynamicImport = rawChecker({
|
||||
chrome: 63,
|
||||
chrome_android: 63,
|
||||
edge: 79,
|
||||
firefox: 67,
|
||||
firefox_android: 67,
|
||||
// ie: Not supported,
|
||||
// Since Node.js 13.14.0 no warning about usage, but it was added 8.5.0 with some limitations and it was improved in 12.0.0 and 13.2.0
|
||||
node: [13, 14],
|
||||
opera: 50,
|
||||
opera_android: 46,
|
||||
safari: [11, 1],
|
||||
safari_ios: [11, 3],
|
||||
samsunginternet_android: [8, 0],
|
||||
webview_android: 63
|
||||
});
|
||||
|
||||
return {
|
||||
const: letConst && node6,
|
||||
arrowFunction: arrowFunctions && node6,
|
||||
const: rawChecker({
|
||||
chrome: 21,
|
||||
chrome_android: 25,
|
||||
edge: 12,
|
||||
// Prior to Firefox 13, <code>const</code> is implemented, but re-assignment is not failing.
|
||||
// Prior to Firefox 46, a <code>TypeError</code> was thrown on redeclaration instead of a <code>SyntaxError</code>.
|
||||
firefox: 36,
|
||||
firefox_android: 36,
|
||||
ie: 11,
|
||||
node: [6, 0],
|
||||
opera: 9,
|
||||
opera_android: [10, 1],
|
||||
safari: [5, 1],
|
||||
safari_ios: 6,
|
||||
samsunginternet_android: [1, 5],
|
||||
webview_android: 37
|
||||
}),
|
||||
arrowFunction: rawChecker({
|
||||
chrome: 45,
|
||||
chrome_android: 45,
|
||||
edge: 12,
|
||||
// The initial implementation of arrow functions in Firefox made them automatically strict. This has been changed as of Firefox 24. The use of <code>'use strict';</code> is now required.
|
||||
// Prior to Firefox 39, a line terminator (<code>\\n</code>) was incorrectly allowed after arrow function arguments. This has been fixed to conform to the ES2015 specification and code like <code>() \\n => {}</code> will now throw a <code>SyntaxError</code> in this and later versions.
|
||||
firefox: 39,
|
||||
firefox_android: 39,
|
||||
// ie: Not supported,
|
||||
node: [6, 0],
|
||||
opera: 32,
|
||||
opera_android: 32,
|
||||
safari: 10,
|
||||
safari_ios: 10,
|
||||
samsunginternet_android: [5, 0],
|
||||
webview_android: 45
|
||||
}),
|
||||
forOf: rawChecker({
|
||||
chrome: 38,
|
||||
chrome_android: 38,
|
||||
|
|
@ -160,8 +164,7 @@ const resolve = browsers => {
|
|||
opera_android: 25,
|
||||
safari: 7,
|
||||
safari_ios: 7,
|
||||
// cspell:word samsunginternet
|
||||
samsunginternet_android: 3,
|
||||
samsunginternet_android: [3, 0],
|
||||
webview_android: 38
|
||||
}),
|
||||
destructuring: rawChecker({
|
||||
|
|
@ -176,14 +179,46 @@ const resolve = browsers => {
|
|||
opera_android: 36,
|
||||
safari: 8,
|
||||
safari_ios: 8,
|
||||
// cspell:word samsunginternet
|
||||
samsunginternet_android: 5,
|
||||
samsunginternet_android: [5, 0],
|
||||
webview_android: 49
|
||||
}),
|
||||
bigIntLiteral: browserslistChecker("bigint") && nodeChecker(10, 4),
|
||||
module: browserslistChecker("es6-module") && nodeChecker(12, 17),
|
||||
dynamicImport: es6DynamicImport && nodeChecker(10, 17),
|
||||
dynamicImportInWorker: es6DynamicImport && nodeChecker(Infinity),
|
||||
bigIntLiteral: rawChecker({
|
||||
chrome: 67,
|
||||
chrome_android: 67,
|
||||
edge: 79,
|
||||
firefox: 68,
|
||||
firefox_android: 68,
|
||||
// ie: Not supported,
|
||||
node: [10, 4],
|
||||
opera: 54,
|
||||
opera_android: 48,
|
||||
safari: 14,
|
||||
safari_ios: 14,
|
||||
samsunginternet_android: [9, 0],
|
||||
webview_android: 67
|
||||
}),
|
||||
// Support syntax `import` and `export` and no limitations and bugs on Node.js
|
||||
// Not include `export * as namespace`
|
||||
module: rawChecker({
|
||||
chrome: 61,
|
||||
chrome_android: 61,
|
||||
edge: 16,
|
||||
firefox: 60,
|
||||
firefox_android: 60,
|
||||
// ie: Not supported,
|
||||
// Since Node.js 13.14.0 no warning about usage, but it was added 8.5.0 with some limitations and it was improved in 12.0.0 and 13.2.0
|
||||
node: [13, 14],
|
||||
opera: 48,
|
||||
opera_android: 45,
|
||||
safari: [10, 1],
|
||||
safari_ios: [10, 3],
|
||||
samsunginternet_android: [8, 0]
|
||||
// webview_android: Not supported,
|
||||
}),
|
||||
|
||||
// browserslistChecker("es6-module") && rawChecker({ node: [12, 17] }),
|
||||
dynamicImport: es6DynamicImport,
|
||||
dynamicImportInWorker: es6DynamicImport && !anyNode,
|
||||
// browserslist does not have info about globalThis
|
||||
// so this is based on mdn-browser-compat-data
|
||||
globalThis: rawChecker({
|
||||
|
|
@ -193,12 +228,11 @@ const resolve = browsers => {
|
|||
firefox: 65,
|
||||
firefox_android: 65,
|
||||
// ie: Not supported,
|
||||
node: 12,
|
||||
node: [12, 0],
|
||||
opera: 58,
|
||||
opera_android: 50,
|
||||
safari: [12, 1],
|
||||
safari_ios: [12, 2],
|
||||
// cspell:word samsunginternet
|
||||
samsunginternet_android: [10, 0],
|
||||
webview_android: 71
|
||||
}),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,32 @@
|
|||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`browserslist target ["chrome 80","node 12.19.0"] 1`] = `
|
||||
Object {
|
||||
"arrowFunction": true,
|
||||
"bigIntLiteral": true,
|
||||
"browser": null,
|
||||
"const": true,
|
||||
"destructuring": true,
|
||||
"document": null,
|
||||
"dynamicImport": false,
|
||||
"dynamicImportInWorker": false,
|
||||
"electron": false,
|
||||
"fetchWasm": null,
|
||||
"forOf": true,
|
||||
"global": null,
|
||||
"globalThis": true,
|
||||
"importScripts": false,
|
||||
"importScriptsInWorker": true,
|
||||
"module": false,
|
||||
"node": null,
|
||||
"nodeBuiltins": null,
|
||||
"nwjs": false,
|
||||
"require": null,
|
||||
"web": null,
|
||||
"webworker": false,
|
||||
}
|
||||
`;
|
||||
|
||||
exports[`browserslist target ["chrome 80"] 1`] = `
|
||||
Object {
|
||||
"arrowFunction": true,
|
||||
|
|
@ -27,16 +54,16 @@ Object {
|
|||
}
|
||||
`;
|
||||
|
||||
exports[`browserslist target ["firefox 80 ","chrome 80"] 1`] = `
|
||||
exports[`browserslist target ["firefox 80","chrome 80"] 1`] = `
|
||||
Object {
|
||||
"arrowFunction": false,
|
||||
"bigIntLiteral": false,
|
||||
"arrowFunction": true,
|
||||
"bigIntLiteral": true,
|
||||
"browser": true,
|
||||
"const": false,
|
||||
"const": true,
|
||||
"destructuring": true,
|
||||
"document": true,
|
||||
"dynamicImport": false,
|
||||
"dynamicImportInWorker": false,
|
||||
"dynamicImport": true,
|
||||
"dynamicImportInWorker": true,
|
||||
"electron": false,
|
||||
"fetchWasm": true,
|
||||
"forOf": true,
|
||||
|
|
@ -44,7 +71,7 @@ Object {
|
|||
"globalThis": true,
|
||||
"importScripts": false,
|
||||
"importScriptsInWorker": true,
|
||||
"module": false,
|
||||
"module": true,
|
||||
"node": false,
|
||||
"nodeBuiltins": false,
|
||||
"nwjs": false,
|
||||
|
|
@ -170,7 +197,7 @@ Object {
|
|||
"const": true,
|
||||
"destructuring": true,
|
||||
"document": false,
|
||||
"dynamicImport": true,
|
||||
"dynamicImport": false,
|
||||
"dynamicImportInWorker": false,
|
||||
"electron": false,
|
||||
"fetchWasm": false,
|
||||
|
|
@ -189,7 +216,7 @@ Object {
|
|||
}
|
||||
`;
|
||||
|
||||
exports[`browserslist target ["node 12"] 1`] = `
|
||||
exports[`browserslist target ["node 12.19.0"] 1`] = `
|
||||
Object {
|
||||
"arrowFunction": true,
|
||||
"bigIntLiteral": true,
|
||||
|
|
@ -197,8 +224,8 @@ Object {
|
|||
"const": true,
|
||||
"destructuring": true,
|
||||
"document": false,
|
||||
"dynamicImport": true,
|
||||
"dynamicImportInWorker": true,
|
||||
"dynamicImport": false,
|
||||
"dynamicImportInWorker": false,
|
||||
"electron": false,
|
||||
"fetchWasm": false,
|
||||
"forOf": true,
|
||||
|
|
@ -206,7 +233,7 @@ Object {
|
|||
"globalThis": true,
|
||||
"importScripts": false,
|
||||
"importScriptsInWorker": true,
|
||||
"module": true,
|
||||
"module": false,
|
||||
"node": true,
|
||||
"nodeBuiltins": true,
|
||||
"nwjs": false,
|
||||
|
|
@ -272,14 +299,14 @@ Object {
|
|||
|
||||
exports[`browserslist target ["safari 12.0"] 1`] = `
|
||||
Object {
|
||||
"arrowFunction": false,
|
||||
"arrowFunction": true,
|
||||
"bigIntLiteral": false,
|
||||
"browser": true,
|
||||
"const": false,
|
||||
"const": true,
|
||||
"destructuring": true,
|
||||
"document": true,
|
||||
"dynamicImport": false,
|
||||
"dynamicImportInWorker": false,
|
||||
"dynamicImport": true,
|
||||
"dynamicImportInWorker": true,
|
||||
"electron": false,
|
||||
"fetchWasm": true,
|
||||
"forOf": true,
|
||||
|
|
@ -287,7 +314,7 @@ Object {
|
|||
"globalThis": false,
|
||||
"importScripts": false,
|
||||
"importScriptsInWorker": true,
|
||||
"module": false,
|
||||
"module": true,
|
||||
"node": false,
|
||||
"nodeBuiltins": false,
|
||||
"nwjs": false,
|
||||
|
|
@ -353,14 +380,14 @@ Object {
|
|||
|
||||
exports[`browserslist target ["safari TP"] 1`] = `
|
||||
Object {
|
||||
"arrowFunction": true,
|
||||
"bigIntLiteral": true,
|
||||
"arrowFunction": false,
|
||||
"bigIntLiteral": false,
|
||||
"browser": true,
|
||||
"const": true,
|
||||
"const": false,
|
||||
"destructuring": false,
|
||||
"document": true,
|
||||
"dynamicImport": true,
|
||||
"dynamicImportInWorker": true,
|
||||
"dynamicImport": false,
|
||||
"dynamicImportInWorker": false,
|
||||
"electron": false,
|
||||
"fetchWasm": true,
|
||||
"forOf": false,
|
||||
|
|
@ -368,7 +395,7 @@ Object {
|
|||
"globalThis": false,
|
||||
"importScripts": false,
|
||||
"importScriptsInWorker": true,
|
||||
"module": true,
|
||||
"module": false,
|
||||
"node": false,
|
||||
"nodeBuiltins": false,
|
||||
"nwjs": false,
|
||||
|
|
|
|||
|
|
@ -8,14 +8,15 @@ describe("browserslist target", () => {
|
|||
["node 0.12.0"],
|
||||
["node 10.0.0"],
|
||||
["node 10.17.0"],
|
||||
["node 12"],
|
||||
["node 12.19.0"],
|
||||
["safari 10"],
|
||||
["safari TP"],
|
||||
["safari 11"],
|
||||
["safari 12.0"],
|
||||
["safari 12.1"],
|
||||
["safari 13"],
|
||||
["firefox 80 ", "chrome 80"]
|
||||
["firefox 80", "chrome 80"],
|
||||
["chrome 80", "node 12.19.0"]
|
||||
];
|
||||
|
||||
for (const test of tests) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue