forked from salesforce/tough-cookie
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR fixes salesforce#222 by: - introducing a fallback for the `util.*` code paths used as indicated in [this comment](salesforce#222 (comment)) - adding a dependency on `url-parse` to act as a polyfill for the usage of `require('url').parse`
- Loading branch information
1 parent
a6bd776
commit 626dfde
Showing
5 changed files
with
90 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// a stand-in for util that does nothing but prevent the existing | ||
// node:util code paths from exploding | ||
function nullUtilInspect() { | ||
return ""; | ||
} | ||
nullUtilInspect.custom = Symbol.for("nodejs.util.inspect.custom"); | ||
const nullUtil = { inspect: nullUtilInspect }; | ||
|
||
module.exports = function nodeUtil() { | ||
try { | ||
const jscCompatibility = | ||
process && process.env && process.env.JSC_COMPATIBILITY === "enabled"; | ||
if (!jscCompatibility) { | ||
return require("util"); | ||
} | ||
} catch (e) { | ||
// ignore | ||
} | ||
return nullUtil; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/*! | ||
* Copyright (c) 2015, Salesforce.com, Inc. | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, | ||
* this list of conditions and the following disclaimer. | ||
* | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||
* this list of conditions and the following disclaimer in the documentation | ||
* and/or other materials provided with the distribution. | ||
* | ||
* 3. Neither the name of Salesforce.com nor the names of its contributors may | ||
* be used to endorse or promote products derived from this software without | ||
* specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
"use strict"; | ||
const vows = require("vows"); | ||
const assert = require("assert"); | ||
const tough = require("../lib/cookie"); | ||
const util = require("util"); | ||
const nodeUtil = require("../lib/node-util"); | ||
const Cookie = tough.Cookie; | ||
|
||
vows | ||
.describe("JavaScriptCore Compatibility") | ||
.addBatch({ | ||
util: { | ||
topic: function() { | ||
process.env.JSC_COMPATIBILITY = "enabled"; | ||
return new Cookie(); | ||
}, | ||
"should not error out on util.* code paths": function(c) { | ||
const nullUtil = nodeUtil(); | ||
assert.equal(nullUtil.inspect(c), ""); | ||
assert.equal(nullUtil.inspect.custom, util.inspect.custom); | ||
}, | ||
teardown: function() { | ||
delete process.env.JSC_COMPATIBILITY; | ||
} | ||
} | ||
}) | ||
.export(module); |