From 3b7cfc908eb1be440ddf933dc2ebb49061d10ba3 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 30 Jan 2015 17:17:42 +1100 Subject: [PATCH] use globals module instead of maintaining our own list --- lib/6to5/traverse/global-keys.json | 64 ------------------------------ lib/6to5/traverse/scope.js | 4 +- package.json | 1 + 3 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 lib/6to5/traverse/global-keys.json diff --git a/lib/6to5/traverse/global-keys.json b/lib/6to5/traverse/global-keys.json deleted file mode 100644 index 1ff240b645..0000000000 --- a/lib/6to5/traverse/global-keys.json +++ /dev/null @@ -1,64 +0,0 @@ -[ - "Set", - "Map", - "WeakMap", - "WeakSet", - "Proxy", - "Promise", - "Reflect", - "Symbol", - "System", - "__filename", - "__dirname", - "GLOBAL", - "global", - "module", - "require", - "Buffer", - "console", - "exports", - "process", - "setTimeout", - "clearTimeout", - "setInterval", - "clearInterval", - "setImmediate", - "clearImmediate", - "Array", - "Boolean", - "Date", - "decodeURI", - "decodeURIComponent", - "encodeURI", - "encodeURIComponent", - "Error", - "eval", - "EvalError", - "Function", - "hasOwnProperty", - "isFinite", - "isNaN", - "JSON", - "Map", - "Math", - "Number", - "Object", - "Proxy", - "Promise", - "parseInt", - "parseFloat", - "RangeError", - "ReferenceError", - "RegExp", - "Set", - "String", - "SyntaxError", - "TypeError", - "URIError", - "WeakMap", - "WeakSet", - "arguments", - "NaN", - "window", - "self" -] diff --git a/lib/6to5/traverse/scope.js b/lib/6to5/traverse/scope.js index 75e5f6f2fd..ffbf1dea31 100644 --- a/lib/6to5/traverse/scope.js +++ b/lib/6to5/traverse/scope.js @@ -3,11 +3,13 @@ module.exports = Scope; var traverse = require("./index"); +var globals = require("globals"); var object = require("../helpers/object"); var t = require("../types"); var each = require("lodash/collection/each"); var has = require("lodash/object/has"); var contains = require("lodash/collection/contains"); +var flatten = require("lodash/array/flatten"); var defaults = require("lodash/object/defaults"); var FOR_KEYS = ["left", "init"]; @@ -35,7 +37,7 @@ function Scope(block, parentBlock, parent, file) { this.declarationKinds = info.declarationKinds; } -Scope.defaultDeclarations = require("./global-keys"); +Scope.defaultDeclarations = flatten([globals.builtin, globals.browser, globals.node].map(Object.keys)); Scope.prototype._add = function (node, references, throwOnDuplicate) { if (!node) return; diff --git a/package.json b/package.json index 10e2d81b00..b3bcb89347 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "estraverse": "1.9.1", "esutils": "1.1.6", "fs-readdir-recursive": "0.1.0", + "globals": "^5.1.0", "js-tokenizer": "1.3.3", "lodash": "3.0.0", "output-file-sync": "1.1.0",