From d3cbd02b3d9de6cbfb518c31f9c70472508912c3 Mon Sep 17 00:00:00 2001 From: Rens Baardman Date: Tue, 11 Jun 2019 14:11:16 +0200 Subject: Change line endings from carriage returns to line feeds --- LICENSE | 36 ++++++------ lib/__get__.js | 40 ++++++------- lib/detectStrictMode.js | 56 +++++++++--------- test/getImportGlobalsSrc.test.js | 122 +++++++++++++++++++-------------------- 4 files changed, 127 insertions(+), 127 deletions(-) diff --git a/LICENSE b/LICENSE index 09d798f..99b4d47 100644 --- a/LICENSE +++ b/LICENSE @@ -1,18 +1,18 @@ -Copyright (c) 2012 Johannes Ewald - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Copyright (c) 2012 Johannes Ewald + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/lib/__get__.js b/lib/__get__.js index 74e652f..cb6fe68 100644 --- a/lib/__get__.js +++ b/lib/__get__.js @@ -1,21 +1,21 @@ -/** - * This function will be stringified and then injected into every rewired module. - * Then you can leak private variables by calling myModule.__get__("myPrivateVar"); - * - * All variables within this function are namespaced in the arguments array because every - * var declaration could possibly clash with a variable in the module scope. - * - * @param {!String} name name of the variable to retrieve - * @throws {TypeError} - * @return {*} - */ -function __get__() { - arguments.varName = arguments[0]; - if (arguments.varName && typeof arguments.varName === "string") { - return eval(arguments.varName); - } else { - throw new TypeError("__get__ expects a non-empty string"); - } -} - +/** + * This function will be stringified and then injected into every rewired module. + * Then you can leak private variables by calling myModule.__get__("myPrivateVar"); + * + * All variables within this function are namespaced in the arguments array because every + * var declaration could possibly clash with a variable in the module scope. + * + * @param {!String} name name of the variable to retrieve + * @throws {TypeError} + * @return {*} + */ +function __get__() { + arguments.varName = arguments[0]; + if (arguments.varName && typeof arguments.varName === "string") { + return eval(arguments.varName); + } else { + throw new TypeError("__get__ expects a non-empty string"); + } +} + module.exports = __get__; \ No newline at end of file diff --git a/lib/detectStrictMode.js b/lib/detectStrictMode.js index 57dc14d..30f59fd 100644 --- a/lib/detectStrictMode.js +++ b/lib/detectStrictMode.js @@ -1,28 +1,28 @@ -var multiLineComment = /^\s*\/\*.*?\*\//; -var singleLineComment = /^\s*\/\/.*?[\r\n]/; -var strictMode = /^\s*(?:"use strict"|'use strict')[ \t]*(?:[\r\n]|;)/; - -/** - * Returns true if the source code is intended to run in strict mode. Does not detect - * "use strict" if it occurs in a nested function. - * - * @param {String} src - * @return {Boolean} - */ -function detectStrictMode(src) { - var singleLine; - var multiLine; - - while ((singleLine = singleLineComment.test(src)) || (multiLine = multiLineComment.test(src))) { - if (singleLine) { - src = src.replace(singleLineComment, ""); - } - if (multiLine) { - src = src.replace(multiLineComment, ""); - } - } - - return strictMode.test(src); -} - -module.exports = detectStrictMode; +var multiLineComment = /^\s*\/\*.*?\*\//; +var singleLineComment = /^\s*\/\/.*?[\r\n]/; +var strictMode = /^\s*(?:"use strict"|'use strict')[ \t]*(?:[\r\n]|;)/; + +/** + * Returns true if the source code is intended to run in strict mode. Does not detect + * "use strict" if it occurs in a nested function. + * + * @param {String} src + * @return {Boolean} + */ +function detectStrictMode(src) { + var singleLine; + var multiLine; + + while ((singleLine = singleLineComment.test(src)) || (multiLine = multiLineComment.test(src))) { + if (singleLine) { + src = src.replace(singleLineComment, ""); + } + if (multiLine) { + src = src.replace(multiLineComment, ""); + } + } + + return strictMode.test(src); +} + +module.exports = detectStrictMode; diff --git a/test/getImportGlobalsSrc.test.js b/test/getImportGlobalsSrc.test.js index 0c40e5a..b85736c 100644 --- a/test/getImportGlobalsSrc.test.js +++ b/test/getImportGlobalsSrc.test.js @@ -1,61 +1,61 @@ -var expect = require("expect.js"), - vm = require("vm"), - getImportGlobalsSrc = require("../lib/getImportGlobalsSrc.js"); - -describe("getImportGlobalsSrc", function () { - it("should declare all globals with a var", function () { - var context = { - global: global - }, - expectedGlobals, - src, - actualGlobals; - - // Temporarily set module-internal variables on the global scope to check if getImportGlobalsSrc() - // ignores them properly - global.module = module; - global.exports = exports; - global.require = require; - - // Also make sure it ignores invalid variable names - global['a-b'] = true; - - src = getImportGlobalsSrc(); - - delete global.module; - delete global.exports; - delete global.require; - delete global['__core-js_shared__']; - delete global['a-b']; - - expectedGlobals = Object.keys(global); - - vm.runInNewContext(src, context); - actualGlobals = Object.keys(context); - actualGlobals.sort(); - expectedGlobals.sort(); - expect(actualGlobals).to.eql(expectedGlobals); - expect(actualGlobals.length).to.be.above(1); - }); - it("should ignore the given variables", function () { - var context = { - global: global - }, - ignore = ["console", "setTimeout"], - src, - actualGlobals, - expectedGlobals = Object.keys(global); - - // getImportGlobalsSrc modifies the ignore array, so let's create a copy - src = getImportGlobalsSrc(ignore.slice(0)); - expectedGlobals = expectedGlobals.filter(function filterIgnoredVars(value) { - return ignore.indexOf(value) === -1; - }); - vm.runInNewContext(src, context); - actualGlobals = Object.keys(context); - actualGlobals.sort(); - expectedGlobals.sort(); - expect(actualGlobals).to.eql(expectedGlobals); - expect(actualGlobals.length).to.be.above(1); - }); -}); +var expect = require("expect.js"), + vm = require("vm"), + getImportGlobalsSrc = require("../lib/getImportGlobalsSrc.js"); + +describe("getImportGlobalsSrc", function () { + it("should declare all globals with a var", function () { + var context = { + global: global + }, + expectedGlobals, + src, + actualGlobals; + + // Temporarily set module-internal variables on the global scope to check if getImportGlobalsSrc() + // ignores them properly + global.module = module; + global.exports = exports; + global.require = require; + + // Also make sure it ignores invalid variable names + global['a-b'] = true; + + src = getImportGlobalsSrc(); + + delete global.module; + delete global.exports; + delete global.require; + delete global['__core-js_shared__']; + delete global['a-b']; + + expectedGlobals = Object.keys(global); + + vm.runInNewContext(src, context); + actualGlobals = Object.keys(context); + actualGlobals.sort(); + expectedGlobals.sort(); + expect(actualGlobals).to.eql(expectedGlobals); + expect(actualGlobals.length).to.be.above(1); + }); + it("should ignore the given variables", function () { + var context = { + global: global + }, + ignore = ["console", "setTimeout"], + src, + actualGlobals, + expectedGlobals = Object.keys(global); + + // getImportGlobalsSrc modifies the ignore array, so let's create a copy + src = getImportGlobalsSrc(ignore.slice(0)); + expectedGlobals = expectedGlobals.filter(function filterIgnoredVars(value) { + return ignore.indexOf(value) === -1; + }); + vm.runInNewContext(src, context); + actualGlobals = Object.keys(context); + actualGlobals.sort(); + expectedGlobals.sort(); + expect(actualGlobals).to.eql(expectedGlobals); + expect(actualGlobals.length).to.be.above(1); + }); +}); -- cgit v1.2.3 From 7bec7f88e01bad4829ee2ac3f90fe5d9d2616888 Mon Sep 17 00:00:00 2001 From: Rens Baardman Date: Tue, 11 Jun 2019 13:41:59 +0200 Subject: Fix #167: non-enumerable globals are now also prefixed with `var` --- lib/getImportGlobalsSrc.js | 14 +++++++++++--- test/getImportGlobalsSrc.test.js | 22 ++++++++++++++++------ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/lib/getImportGlobalsSrc.js b/lib/getImportGlobalsSrc.js index 3c29c56..fcce0d0 100644 --- a/lib/getImportGlobalsSrc.js +++ b/lib/getImportGlobalsSrc.js @@ -9,7 +9,6 @@ */ function getImportGlobalsSrc(ignore) { var key, - value, src = "", globalObj = typeof global === "undefined"? window: global; @@ -20,12 +19,21 @@ function getImportGlobalsSrc(ignore) { // shadow the module-internal variables // @see https://github.com/jhnns/rewire-webpack/pull/6 ignore.push("module", "exports", "require"); + // strict mode doesn't allow to (re)define 'undefined', 'eval' & 'arguments' + ignore.push("undefined", "eval", "arguments"); + // 'GLOBAL' and 'root' are deprecated in Node + // (assigning them causes a DeprecationWarning) + ignore.push("GLOBAL", "root"); + // 'NaN' and 'Infinity' are immutable + // (doesn't throw an error if you set 'var NaN = ...', but doesn't work either) + ignore.push("NaN", "Infinity"); - for (key in globalObj) { /* jshint forin: false */ + const globals = Object.getOwnPropertyNames(globalObj); + + for (key of globals) { if (ignore.indexOf(key) !== -1) { continue; } - value = globalObj[key]; // key may be an invalid variable name (e.g. 'a-b') try { diff --git a/test/getImportGlobalsSrc.test.js b/test/getImportGlobalsSrc.test.js index 0c40e5a..51cecbd 100644 --- a/test/getImportGlobalsSrc.test.js +++ b/test/getImportGlobalsSrc.test.js @@ -3,6 +3,7 @@ var expect = require("expect.js"), getImportGlobalsSrc = require("../lib/getImportGlobalsSrc.js"); describe("getImportGlobalsSrc", function () { + it("should declare all globals with a var", function () { var context = { global: global @@ -28,15 +29,20 @@ describe("getImportGlobalsSrc", function () { delete global['__core-js_shared__']; delete global['a-b']; - expectedGlobals = Object.keys(global); + const ignoredGlobals = ["module", "exports", "require", "undefined", "eval", "arguments", "GLOBAL", "root", "NaN", "Infinity"]; + + const globals = Object.getOwnPropertyNames(global); + expectedGlobals = globals.filter((el) => !ignoredGlobals.includes(el)); vm.runInNewContext(src, context); - actualGlobals = Object.keys(context); + actualGlobals = Object.getOwnPropertyNames(context); + actualGlobals.sort(); expectedGlobals.sort(); expect(actualGlobals).to.eql(expectedGlobals); expect(actualGlobals.length).to.be.above(1); }); + it("should ignore the given variables", function () { var context = { global: global @@ -44,18 +50,22 @@ describe("getImportGlobalsSrc", function () { ignore = ["console", "setTimeout"], src, actualGlobals, - expectedGlobals = Object.keys(global); + expectedGlobals = Object.getOwnPropertyNames(global); + + const ignoredGlobals = ["module", "exports", "require", "undefined", "eval", "arguments", "GLOBAL", "root", "NaN", "Infinity"]; + ignore = ignore.concat(ignoredGlobals); // getImportGlobalsSrc modifies the ignore array, so let's create a copy src = getImportGlobalsSrc(ignore.slice(0)); - expectedGlobals = expectedGlobals.filter(function filterIgnoredVars(value) { - return ignore.indexOf(value) === -1; - }); + expectedGlobals = expectedGlobals.filter((el) => !ignore.includes(el)); + vm.runInNewContext(src, context); actualGlobals = Object.keys(context); + actualGlobals.sort(); expectedGlobals.sort(); expect(actualGlobals).to.eql(expectedGlobals); expect(actualGlobals.length).to.be.above(1); }); + }); -- cgit v1.2.3