Skip to content

Commit

Permalink
bump ast-metadata-inferer (#323)
Browse files Browse the repository at this point in the history
* bump ast-metadata-inferer

* add additional test cases
  • Loading branch information
amilajack committed May 17, 2020
1 parent 9b73574 commit 7c56d63
Show file tree
Hide file tree
Showing 17 changed files with 1,219 additions and 1,093 deletions.
22 changes: 9 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@
"@babel/preset-env": "^7.9.6",
"@babel/preset-flow": "^7.9.0",
"cross-env": "^7.0.2",
"eslint": "^6.8.0",
"eslint-config-bliss": "^4.8.1",
"eslint": "^7.0.0",
"eslint-config-bliss": "^5.0.0",
"eslint-plugin-prettier": "^3.1.3",
"flow-bin": "^0.123.0",
"flow-bin": "^0.124.0",
"flow-typed": "^3.1.0",
"jest": "^25.5.3"
"jest": "^26.0.1"
},
"dependencies": {
"ast-metadata-inferer": "^0.1.1",
"browserslist": "^4.11.1",
"caniuse-db": "^1.0.30001040",
"ast-metadata-inferer": "^0.2.0-0",
"browserslist": "^4.12.0",
"caniuse-db": "^1.0.30001059",
"core-js": "^3.6.5",
"lodash.memoize": "4.1.2",
"mdn-browser-compat-data": "^1.0.17",
"semver": "7.2.2"
"mdn-browser-compat-data": "^1.0.21",
"semver": "7.3.2"
},
"peerDependencies": {
"eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
Expand Down Expand Up @@ -98,10 +98,6 @@
"renovate": {
"extends": [
"bliss"
],
"ignoreDeps": [
"caniuse-db",
"mdn-browser-compat-data"
]
}
}
2 changes: 1 addition & 1 deletion src/Lint.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @flow
import type { Node, ESLintNode } from './LintTypes';
import type { Node, ESLintNode } from "./LintTypes";

export function lintCallExpression(
reporter: Function,
Expand Down
4 changes: 2 additions & 2 deletions src/LintTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export type BrowserListConfig =
| null;

export type node = {
type?: 'MemberExpression' | 'NewExpression' | 'CallExpression',
type?: "MemberExpression" | "NewExpression" | "CallExpression",
name?: string,
object: string,
property: string | void,
Expand All @@ -18,7 +18,7 @@ export type node = {

export type Target = {
target: string,
version: number | string | 'all'
version: number | string | "all"
};

export type Targets = Array<string>;
Expand Down
67 changes: 34 additions & 33 deletions src/Versioning.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
/* eslint no-nested-ternary: off */
// @flow
import browserslist from 'browserslist';
import type { BrowserListConfig } from './LintTypes';
import browserslist from "browserslist";
import type { BrowserListConfig } from "./LintTypes";

export const STANDARD_TARGET_NAME_MAPPING = {
chrome: 'Chrome',
firefox: 'Firefox',
safari: 'Safari',
ios_saf: 'iOS Safari',
ie: 'IE',
ie_mob: 'IE Mobile',
edge: 'Edge',
baidu: 'Baidu',
electron: 'Electron',
blackberry_browser: 'Blackberry Browser',
edge_mobile: 'Edge Mobile',
and_uc: 'Android UC Browser',
and_chrome: 'Android Chrome',
and_firefox: 'Android Firefox',
and_webview: 'Android Webview',
and_samsung: 'Samsung Browser',
and_opera: 'Opera Android',
opera: 'Opera',
opera_mini: 'Opera Mini',
opera_mobile: 'Opera Mobile',
node: 'Node.js',
kaios: 'KaiOS'
chrome: "Chrome",
firefox: "Firefox",
safari: "Safari",
ios_saf: "iOS Safari",
ie: "IE",
ie_mob: "IE Mobile",
edge: "Edge",
baidu: "Baidu",
electron: "Electron",
blackberry_browser: "Blackberry Browser",
edge_mobile: "Edge Mobile",
and_uc: "Android UC Browser",
and_chrome: "Android Chrome",
and_firefox: "Android Firefox",
and_webview: "Android Webview",
and_samsung: "Samsung Browser",
and_opera: "Opera Android",
opera: "Opera",
opera_mini: "Opera Mini",
opera_mobile: "Opera Mobile",
node: "Node.js",
kaios: "KaiOS"
};

export function reverseTargetMappings(targetMappings) {
Expand All @@ -37,7 +38,7 @@ export function reverseTargetMappings(targetMappings) {
type TargetListItem = {
target: string,
parsedVersion: number,
version: string | 'all'
version: string | "all"
};

/**
Expand All @@ -51,11 +52,11 @@ export default function DetermineTargetsFromConfig(
): Array<string> {
const browserslistOpts = { path: configPath };

if (Array.isArray(config) || typeof config === 'string') {
if (Array.isArray(config) || typeof config === "string") {
return browserslist(config, browserslistOpts);
}

if (config && typeof config === 'object') {
if (config && typeof config === "object") {
return browserslist(
[...(config.production || []), ...(config.development || [])],
browserslistOpts
Expand All @@ -74,15 +75,15 @@ export function Versioning(targetslist: Array<string>): Array<TargetListItem> {
targetslist
// Sort the targets by target name and then version number in ascending order
.map((e: string): TargetListItem => {
const [target, version] = e.split(' ');
const [target, version] = e.split(" ");
return {
target,
version,
parsedVersion:
version === 'all'
version === "all"
? 0
: version.includes('-')
? parseFloat(version.split('-')[0])
: version.includes("-")
? parseFloat(version.split("-")[0])
: parseFloat(version)
};
})
Expand All @@ -92,8 +93,8 @@ export function Versioning(targetslist: Array<string>): Array<TargetListItem> {
if (b.target === a.target) {
// If any version === 'all', return 0. The only version of op_mini is 'all'
// Otherwise, compare the versions
return typeof b.parsedVersion === 'string' ||
typeof a.parsedVersion === 'string'
return typeof b.parsedVersion === "string" ||
typeof a.parsedVersion === "string"
? 0
: b.parsedVersion - a.parsedVersion;
}
Expand Down
4 changes: 2 additions & 2 deletions src/config/recommended.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default {
plugins: ['compat'],
plugins: ["compat"],
env: {
browser: true
},
rules: {
'compat/compat': 'error'
"compat/compat": "error"
}
};
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
//------------------------------------------------------------------------------
// Requirements
//------------------------------------------------------------------------------
import recommended from './config/recommended';
import recommended from "./config/recommended";

//------------------------------------------------------------------------------
// Plugin Definition
//------------------------------------------------------------------------------

// import all rules in lib/rules
import compat from './rules/compat';
import compat from "./rules/compat";

export const configs = {
recommended
Expand Down
Loading

0 comments on commit 7c56d63

Please sign in to comment.