diff --git a/dist/fundme-amd.js b/dist/fundme-amd.js index ad0f0a2..1b66692 100644 --- a/dist/fundme-amd.js +++ b/dist/fundme-amd.js @@ -46,10 +46,20 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; const noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; const invalidFundmeServerSide = 'invalid fundme on the server-side.'; +<<<<<<< HEAD let relativeWeightPointers = []; let fixedWeightPointers = []; let totalRelativeChance = 0; let pointerPoolSum = 0; +======= + var noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; + var invalidFundmeServerSide = "invalid fundme parameters on the server-side."; + + var relativeWeightPointers = []; + var fixedWeightPointers = []; + var totalRelativeChance = 0; + var pointerPoolSum = 0; +>>>>>>> parent of fd157ad... migrate babel -> swc function clear() { relativeWeightPointers = []; fixedWeightPointers = []; @@ -63,6 +73,7 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; }; } function calculateRelativeWeight(pool) { +<<<<<<< HEAD clear(); pointerPoolSum = getPoolWeightSum(pool); let relativeWeightPointers1; @@ -73,8 +84,18 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; ...normalizeFixedPointers(fixedWeightPointers, totalRelativeChance), ...normalizeRelativePointers(relativeWeightPointers1), ]; +======= + clear(); + pointerPoolSum = getPoolWeightSum(pool); + var relativeWeightPointers; + relativeWeightPointers = pool.filter(filterRelativeWeight); + if (!fixedWeightPointers.length) throw FundmeError(paymentPointersMustHaveAtLeastOneFixedPointer); + return [].concat(_toConsumableArray(normalizeFixedPointers(fixedWeightPointers, totalRelativeChance)), _toConsumableArray(normalizeRelativePointers(relativeWeightPointers))); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function filterRelativeWeight(pointer) { +<<<<<<< HEAD if (pointer.weight === undefined) return false; let weight = pointer.weight; if (typeof weight === 'string' && weight.endsWith('%')) { @@ -90,10 +111,40 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; return false; } throw FundmeError(invalidWeight(pointer.address, weight)); +======= + var _pointer$address, _pointer$address2; + + if (pointer.weight === undefined) throw FundmeError(invalidWeight((_pointer$address = pointer.address) !== null && _pointer$address !== void 0 ? _pointer$address : pointer, "")); + var weight = pointer.weight; + + if (typeof weight === "string" && weight.endsWith("%")) { + var convertedWeight = weight.slice(0, -1); + + if (!isNumberOnly(convertedWeight)) { + throw FundmeError(invalidRelativeWeight(pointer.address)); + } + + registerRelativeWeight(pointer); + return true; + } + + if (isNumberOnly(weight)) { + registerFixedWeight(pointer); + return false; + } + + throw FundmeError(invalidWeight((_pointer$address2 = pointer.address) !== null && _pointer$address2 !== void 0 ? _pointer$address2 : pointer, weight)); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function registerRelativeWeight(pointer) { +<<<<<<< HEAD pointer.weight = getRelativeWeight(pointer); relativeWeightPointers.push(pointer); +======= + pointer.weight = getWeight(pointer); + relativeWeightPointers.push(pointer); +>>>>>>> parent of fd157ad... migrate babel -> swc } function registerFixedWeight(pointer) { if (typeof pointer.weight === 'string') { @@ -101,7 +152,9 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; } fixedWeightPointers.push(pointer); } + function normalizeFixedPointers(pool, chance) { +<<<<<<< HEAD if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); chance = 1 - chance; // decrease all fixed pointer weights @@ -117,12 +170,30 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; pointer.weight = weight * chance; return pointer; }); +======= + if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); + chance = 1 - chance; + return pool.map(function (pointer) { + var weight; + + if (typeof pointer.weight === "string") { + weight = parseFloat(pointer.weight); + } else { + weight = pointer.weight; + } + + pointer.weight = weight * chance; + return pointer; + }); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function normalizeRelativePointers(pool, sum) { return pool.map((pointer)=>{ return pointer; }); } +<<<<<<< HEAD function getRelativeWeight(pointer) { let chance; if (typeof pointer === 'string') { @@ -161,6 +232,50 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; return setWebMonetizationPointer(pointerAddress); } return pointerAddress; +======= + + function getWeight(pointer) { + var chance; + + if (typeof pointer === "string") { + var weight = pointer.split("#")[1]; + + if (pointer.endsWith("%")) { + chance = parseFloat(weight) / 100; + } else { + throw FundmeError(relativeWeightMustEndsWithPercentage); + } + } else { + if (!pointer.weight) { + var _pointer$address3; + + throw FundmeError(weightForRelativePointerNotFound((_pointer$address3 = pointer.address) !== null && _pointer$address3 !== void 0 ? _pointer$address3 : pointer)); + } + + if (typeof pointer.weight === "string") pointer.weight = parseFloat(pointer.weight); + chance = pointer.weight / 100; + } + + totalRelativeChance += chance; + return pointerPoolSum * chance; // TODO - add % unit to calculate weight + } // Jest related functions + + var DEFAULT_WEIGHT = 5; // TODO check pointer.address with RegEx + + function setPointerMultiple(pointers) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + var pool = createPool(pointers); + pool = calculateRelativeWeight(pool); + var pickedPointer = pickPointer(pool); + var pointerAddress = getPointerAddress(pickedPointer); + setCurrentPointer(pool); + + if (isBrowser(options)) { + return setWebMonetizationPointer(pointerAddress); + } + + return pointerAddress; +>>>>>>> parent of fd157ad... migrate babel -> swc } function getPointerAddress(pointer) { const address = pointer.address; @@ -257,9 +372,18 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; return pointers[pointer]; } } +<<<<<<< HEAD // Decide if this will be the default behavior later // in case unexpected case where choice is greater than all pointers' weight return pointers[0]; +======= + } + + console.error("GET WINNING POOL LEAKED!"); + return { + address: "" + }; // Is this even necessary? +>>>>>>> parent of fd157ad... migrate babel -> swc } function hasAddress(obj) { if (!obj) return false; @@ -468,6 +592,7 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; return pointers; } +<<<<<<< HEAD function clientSideFund(pointer, options) { if (pointer === undefined || pointer === null) { setPointerFromTemplates(); @@ -488,10 +613,81 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; } else { throw FundmeError(defaultAddressNotFound); } +======= + function unwrapExports (x) { + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x; + } + + function createCommonjsModule(fn, basedir, module) { + return module = { + path: basedir, + exports: {}, + require: function (path, base) { + return commonjsRequire(path, (base === undefined || base === null) ? module.path : base); + } + }, fn(module, module.exports), module.exports; + } + + function commonjsRequire () { + throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs'); + } + + var lib = createCommonjsModule(function (module, exports) { + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; + + /* global window self */ + + var isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined'; + + /* eslint-disable no-restricted-globals */ + var isWebWorker = (typeof self === 'undefined' ? 'undefined' : _typeof(self)) === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope'; + /* eslint-enable no-restricted-globals */ + + var isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null; + + /** + * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0 + * @see https://github.com/jsdom/jsdom/issues/1537 + */ + /* eslint-disable no-undef */ + var isJsDom = function isJsDom() { + return typeof window !== 'undefined' && window.name === 'nodejs' || navigator.userAgent.includes('Node.js') || navigator.userAgent.includes('jsdom'); + }; + + exports.isBrowser = isBrowser; + exports.isWebWorker = isWebWorker; + exports.isNode = isNode; + exports.isJsDom = isJsDom; + }); + + var index = /*@__PURE__*/unwrapExports(lib); + + function clientSideFund(pointer) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + + if (pointer === undefined) { + setPointerFromTemplates(); + return setFundType(FundType.isFromTemplate); + } + + if (typeof pointer === "string") { + if (pointer === "default") { + if (getDefaultAddress() !== undefined) { + if (typeof getDefaultAddress() === "string") { + setPointerSingle(getDefaultAddress().toString(), options); + } else { + setPointerMultiple(defaultAddressMultiple(getDefaultAddress()), options); +>>>>>>> parent of fd157ad... migrate babel -> swc } setPointerSingle(pointer, options); return setFundType(FundType.isSingle); } +<<<<<<< HEAD if (isMultiplePointer(pointer)) { setPointerMultiple(pointer, options); return setFundType(FundType.isMultiple); @@ -517,6 +713,41 @@ define(['exports', 'util'], function (exports, util) { 'use strict'; return setPointerMultiple(pointer).toString(); } throw FundmeError(invalidFundmeServerSide); +======= + + setPointerSingle(pointer, options); + return setFundType(FundType.isSingle); + } + + if (isMultiplePointer(pointer)) { + setPointerMultiple(pointer, options); + return setFundType(FundType.isMultiple); + } + + throw FundmeError(invalidAddress); + } + var forceBrowser = false; + var isBrowser = function isBrowser() { + var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + if (options.force === "server") return false; + var forced = forceBrowser; + forceBrowser = false; + return !index.isNode || forced || options.force === "client"; + }; + + function serverSideFund(pointer) { + if (pointer === undefined) throw FundmeError(noUndefinedFundOnServerSide); + + if (typeof pointer === "string") { + return setPointerSingle(pointer).toString(); + } + + if (isMultiplePointer(pointer)) { + return setPointerMultiple(pointer).toString(); + } + + throw FundmeError(invalidFundmeServerSide); +>>>>>>> parent of fd157ad... migrate babel -> swc } var FundType; diff --git a/dist/fundme-cjs.js b/dist/fundme-cjs.js index 286fb45..ba8250a 100644 --- a/dist/fundme-cjs.js +++ b/dist/fundme-cjs.js @@ -50,10 +50,20 @@ const invalidWeight = (address, weight)=>{ const noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; const invalidFundmeServerSide = 'invalid fundme on the server-side.'; +<<<<<<< HEAD let relativeWeightPointers = []; let fixedWeightPointers = []; let totalRelativeChance = 0; let pointerPoolSum = 0; +======= +var noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; +var invalidFundmeServerSide = "invalid fundme parameters on the server-side."; + +var relativeWeightPointers = []; +var fixedWeightPointers = []; +var totalRelativeChance = 0; +var pointerPoolSum = 0; +>>>>>>> parent of fd157ad... migrate babel -> swc function clear() { relativeWeightPointers = []; fixedWeightPointers = []; @@ -67,6 +77,7 @@ function clear() { }; } function calculateRelativeWeight(pool) { +<<<<<<< HEAD clear(); pointerPoolSum = getPoolWeightSum(pool); let relativeWeightPointers1; @@ -77,8 +88,18 @@ function calculateRelativeWeight(pool) { ...normalizeFixedPointers(fixedWeightPointers, totalRelativeChance), ...normalizeRelativePointers(relativeWeightPointers1), ]; +======= + clear(); + pointerPoolSum = getPoolWeightSum(pool); + var relativeWeightPointers; + relativeWeightPointers = pool.filter(filterRelativeWeight); + if (!fixedWeightPointers.length) throw FundmeError(paymentPointersMustHaveAtLeastOneFixedPointer); + return [].concat(_toConsumableArray(normalizeFixedPointers(fixedWeightPointers, totalRelativeChance)), _toConsumableArray(normalizeRelativePointers(relativeWeightPointers))); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function filterRelativeWeight(pointer) { +<<<<<<< HEAD if (pointer.weight === undefined) return false; let weight = pointer.weight; if (typeof weight === 'string' && weight.endsWith('%')) { @@ -94,10 +115,40 @@ function filterRelativeWeight(pointer) { return false; } throw FundmeError(invalidWeight(pointer.address, weight)); +======= + var _pointer$address, _pointer$address2; + + if (pointer.weight === undefined) throw FundmeError(invalidWeight((_pointer$address = pointer.address) !== null && _pointer$address !== void 0 ? _pointer$address : pointer, "")); + var weight = pointer.weight; + + if (typeof weight === "string" && weight.endsWith("%")) { + var convertedWeight = weight.slice(0, -1); + + if (!isNumberOnly(convertedWeight)) { + throw FundmeError(invalidRelativeWeight(pointer.address)); + } + + registerRelativeWeight(pointer); + return true; + } + + if (isNumberOnly(weight)) { + registerFixedWeight(pointer); + return false; + } + + throw FundmeError(invalidWeight((_pointer$address2 = pointer.address) !== null && _pointer$address2 !== void 0 ? _pointer$address2 : pointer, weight)); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function registerRelativeWeight(pointer) { +<<<<<<< HEAD pointer.weight = getRelativeWeight(pointer); relativeWeightPointers.push(pointer); +======= + pointer.weight = getWeight(pointer); + relativeWeightPointers.push(pointer); +>>>>>>> parent of fd157ad... migrate babel -> swc } function registerFixedWeight(pointer) { if (typeof pointer.weight === 'string') { @@ -105,7 +156,9 @@ function registerFixedWeight(pointer) { } fixedWeightPointers.push(pointer); } + function normalizeFixedPointers(pool, chance) { +<<<<<<< HEAD if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); chance = 1 - chance; // decrease all fixed pointer weights @@ -121,12 +174,30 @@ function normalizeFixedPointers(pool, chance) { pointer.weight = weight * chance; return pointer; }); +======= + if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); + chance = 1 - chance; + return pool.map(function (pointer) { + var weight; + + if (typeof pointer.weight === "string") { + weight = parseFloat(pointer.weight); + } else { + weight = pointer.weight; + } + + pointer.weight = weight * chance; + return pointer; + }); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function normalizeRelativePointers(pool, sum) { return pool.map((pointer)=>{ return pointer; }); } +<<<<<<< HEAD function getRelativeWeight(pointer) { let chance; if (typeof pointer === 'string') { @@ -165,6 +236,50 @@ function setPointerMultiple(pointers, options = { return setWebMonetizationPointer(pointerAddress); } return pointerAddress; +======= + +function getWeight(pointer) { + var chance; + + if (typeof pointer === "string") { + var weight = pointer.split("#")[1]; + + if (pointer.endsWith("%")) { + chance = parseFloat(weight) / 100; + } else { + throw FundmeError(relativeWeightMustEndsWithPercentage); + } + } else { + if (!pointer.weight) { + var _pointer$address3; + + throw FundmeError(weightForRelativePointerNotFound((_pointer$address3 = pointer.address) !== null && _pointer$address3 !== void 0 ? _pointer$address3 : pointer)); + } + + if (typeof pointer.weight === "string") pointer.weight = parseFloat(pointer.weight); + chance = pointer.weight / 100; + } + + totalRelativeChance += chance; + return pointerPoolSum * chance; // TODO - add % unit to calculate weight +} // Jest related functions + +var DEFAULT_WEIGHT = 5; // TODO check pointer.address with RegEx + +function setPointerMultiple(pointers) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + var pool = createPool(pointers); + pool = calculateRelativeWeight(pool); + var pickedPointer = pickPointer(pool); + var pointerAddress = getPointerAddress(pickedPointer); + setCurrentPointer(pool); + + if (isBrowser(options)) { + return setWebMonetizationPointer(pointerAddress); + } + + return pointerAddress; +>>>>>>> parent of fd157ad... migrate babel -> swc } function getPointerAddress(pointer) { const address = pointer.address; @@ -261,9 +376,18 @@ function getWinningPointer(pointers, choice) { return pointers[pointer]; } } +<<<<<<< HEAD // Decide if this will be the default behavior later // in case unexpected case where choice is greater than all pointers' weight return pointers[0]; +======= + } + + console.error("GET WINNING POOL LEAKED!"); + return { + address: "" + }; // Is this even necessary? +>>>>>>> parent of fd157ad... migrate babel -> swc } function hasAddress(obj) { if (!obj) return false; @@ -472,6 +596,7 @@ function parseCustomSyntax(template) { return pointers; } +<<<<<<< HEAD function clientSideFund(pointer, options) { if (pointer === undefined || pointer === null) { setPointerFromTemplates(); @@ -492,10 +617,81 @@ function clientSideFund(pointer, options) { } else { throw FundmeError(defaultAddressNotFound); } +======= +function unwrapExports (x) { + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x; +} + +function createCommonjsModule(fn, basedir, module) { + return module = { + path: basedir, + exports: {}, + require: function (path, base) { + return commonjsRequire(path, (base === undefined || base === null) ? module.path : base); + } + }, fn(module, module.exports), module.exports; +} + +function commonjsRequire () { + throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs'); +} + +var lib = createCommonjsModule(function (module, exports) { + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; + +/* global window self */ + +var isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined'; + +/* eslint-disable no-restricted-globals */ +var isWebWorker = (typeof self === 'undefined' ? 'undefined' : _typeof(self)) === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope'; +/* eslint-enable no-restricted-globals */ + +var isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null; + +/** + * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0 + * @see https://github.com/jsdom/jsdom/issues/1537 + */ +/* eslint-disable no-undef */ +var isJsDom = function isJsDom() { + return typeof window !== 'undefined' && window.name === 'nodejs' || navigator.userAgent.includes('Node.js') || navigator.userAgent.includes('jsdom'); +}; + +exports.isBrowser = isBrowser; +exports.isWebWorker = isWebWorker; +exports.isNode = isNode; +exports.isJsDom = isJsDom; +}); + +var index = /*@__PURE__*/unwrapExports(lib); + +function clientSideFund(pointer) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + + if (pointer === undefined) { + setPointerFromTemplates(); + return setFundType(FundType.isFromTemplate); + } + + if (typeof pointer === "string") { + if (pointer === "default") { + if (getDefaultAddress() !== undefined) { + if (typeof getDefaultAddress() === "string") { + setPointerSingle(getDefaultAddress().toString(), options); + } else { + setPointerMultiple(defaultAddressMultiple(getDefaultAddress()), options); +>>>>>>> parent of fd157ad... migrate babel -> swc } setPointerSingle(pointer, options); return setFundType(FundType.isSingle); } +<<<<<<< HEAD if (isMultiplePointer(pointer)) { setPointerMultiple(pointer, options); return setFundType(FundType.isMultiple); @@ -521,6 +717,41 @@ function serverSideFund(pointer) { return setPointerMultiple(pointer).toString(); } throw FundmeError(invalidFundmeServerSide); +======= + + setPointerSingle(pointer, options); + return setFundType(FundType.isSingle); + } + + if (isMultiplePointer(pointer)) { + setPointerMultiple(pointer, options); + return setFundType(FundType.isMultiple); + } + + throw FundmeError(invalidAddress); +} +var forceBrowser = false; +var isBrowser = function isBrowser() { + var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + if (options.force === "server") return false; + var forced = forceBrowser; + forceBrowser = false; + return !index.isNode || forced || options.force === "client"; +}; + +function serverSideFund(pointer) { + if (pointer === undefined) throw FundmeError(noUndefinedFundOnServerSide); + + if (typeof pointer === "string") { + return setPointerSingle(pointer).toString(); + } + + if (isMultiplePointer(pointer)) { + return setPointerMultiple(pointer).toString(); + } + + throw FundmeError(invalidFundmeServerSide); +>>>>>>> parent of fd157ad... migrate babel -> swc } var FundType; diff --git a/dist/fundme-iife.js b/dist/fundme-iife.js index b6f50e2..683ae66 100644 --- a/dist/fundme-iife.js +++ b/dist/fundme-iife.js @@ -47,10 +47,20 @@ var fundme = (function (exports, util) { const noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; const invalidFundmeServerSide = 'invalid fundme on the server-side.'; +<<<<<<< HEAD let relativeWeightPointers = []; let fixedWeightPointers = []; let totalRelativeChance = 0; let pointerPoolSum = 0; +======= + var noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; + var invalidFundmeServerSide = "invalid fundme parameters on the server-side."; + + var relativeWeightPointers = []; + var fixedWeightPointers = []; + var totalRelativeChance = 0; + var pointerPoolSum = 0; +>>>>>>> parent of fd157ad... migrate babel -> swc function clear() { relativeWeightPointers = []; fixedWeightPointers = []; @@ -64,6 +74,7 @@ var fundme = (function (exports, util) { }; } function calculateRelativeWeight(pool) { +<<<<<<< HEAD clear(); pointerPoolSum = getPoolWeightSum(pool); let relativeWeightPointers1; @@ -74,8 +85,18 @@ var fundme = (function (exports, util) { ...normalizeFixedPointers(fixedWeightPointers, totalRelativeChance), ...normalizeRelativePointers(relativeWeightPointers1), ]; +======= + clear(); + pointerPoolSum = getPoolWeightSum(pool); + var relativeWeightPointers; + relativeWeightPointers = pool.filter(filterRelativeWeight); + if (!fixedWeightPointers.length) throw FundmeError(paymentPointersMustHaveAtLeastOneFixedPointer); + return [].concat(_toConsumableArray(normalizeFixedPointers(fixedWeightPointers, totalRelativeChance)), _toConsumableArray(normalizeRelativePointers(relativeWeightPointers))); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function filterRelativeWeight(pointer) { +<<<<<<< HEAD if (pointer.weight === undefined) return false; let weight = pointer.weight; if (typeof weight === 'string' && weight.endsWith('%')) { @@ -91,10 +112,40 @@ var fundme = (function (exports, util) { return false; } throw FundmeError(invalidWeight(pointer.address, weight)); +======= + var _pointer$address, _pointer$address2; + + if (pointer.weight === undefined) throw FundmeError(invalidWeight((_pointer$address = pointer.address) !== null && _pointer$address !== void 0 ? _pointer$address : pointer, "")); + var weight = pointer.weight; + + if (typeof weight === "string" && weight.endsWith("%")) { + var convertedWeight = weight.slice(0, -1); + + if (!isNumberOnly(convertedWeight)) { + throw FundmeError(invalidRelativeWeight(pointer.address)); + } + + registerRelativeWeight(pointer); + return true; + } + + if (isNumberOnly(weight)) { + registerFixedWeight(pointer); + return false; + } + + throw FundmeError(invalidWeight((_pointer$address2 = pointer.address) !== null && _pointer$address2 !== void 0 ? _pointer$address2 : pointer, weight)); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function registerRelativeWeight(pointer) { +<<<<<<< HEAD pointer.weight = getRelativeWeight(pointer); relativeWeightPointers.push(pointer); +======= + pointer.weight = getWeight(pointer); + relativeWeightPointers.push(pointer); +>>>>>>> parent of fd157ad... migrate babel -> swc } function registerFixedWeight(pointer) { if (typeof pointer.weight === 'string') { @@ -102,7 +153,9 @@ var fundme = (function (exports, util) { } fixedWeightPointers.push(pointer); } + function normalizeFixedPointers(pool, chance) { +<<<<<<< HEAD if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); chance = 1 - chance; // decrease all fixed pointer weights @@ -118,12 +171,30 @@ var fundme = (function (exports, util) { pointer.weight = weight * chance; return pointer; }); +======= + if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); + chance = 1 - chance; + return pool.map(function (pointer) { + var weight; + + if (typeof pointer.weight === "string") { + weight = parseFloat(pointer.weight); + } else { + weight = pointer.weight; + } + + pointer.weight = weight * chance; + return pointer; + }); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function normalizeRelativePointers(pool, sum) { return pool.map((pointer)=>{ return pointer; }); } +<<<<<<< HEAD function getRelativeWeight(pointer) { let chance; if (typeof pointer === 'string') { @@ -162,6 +233,50 @@ var fundme = (function (exports, util) { return setWebMonetizationPointer(pointerAddress); } return pointerAddress; +======= + + function getWeight(pointer) { + var chance; + + if (typeof pointer === "string") { + var weight = pointer.split("#")[1]; + + if (pointer.endsWith("%")) { + chance = parseFloat(weight) / 100; + } else { + throw FundmeError(relativeWeightMustEndsWithPercentage); + } + } else { + if (!pointer.weight) { + var _pointer$address3; + + throw FundmeError(weightForRelativePointerNotFound((_pointer$address3 = pointer.address) !== null && _pointer$address3 !== void 0 ? _pointer$address3 : pointer)); + } + + if (typeof pointer.weight === "string") pointer.weight = parseFloat(pointer.weight); + chance = pointer.weight / 100; + } + + totalRelativeChance += chance; + return pointerPoolSum * chance; // TODO - add % unit to calculate weight + } // Jest related functions + + var DEFAULT_WEIGHT = 5; // TODO check pointer.address with RegEx + + function setPointerMultiple(pointers) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + var pool = createPool(pointers); + pool = calculateRelativeWeight(pool); + var pickedPointer = pickPointer(pool); + var pointerAddress = getPointerAddress(pickedPointer); + setCurrentPointer(pool); + + if (isBrowser(options)) { + return setWebMonetizationPointer(pointerAddress); + } + + return pointerAddress; +>>>>>>> parent of fd157ad... migrate babel -> swc } function getPointerAddress(pointer) { const address = pointer.address; @@ -258,9 +373,18 @@ var fundme = (function (exports, util) { return pointers[pointer]; } } +<<<<<<< HEAD // Decide if this will be the default behavior later // in case unexpected case where choice is greater than all pointers' weight return pointers[0]; +======= + } + + console.error("GET WINNING POOL LEAKED!"); + return { + address: "" + }; // Is this even necessary? +>>>>>>> parent of fd157ad... migrate babel -> swc } function hasAddress(obj) { if (!obj) return false; @@ -469,6 +593,7 @@ var fundme = (function (exports, util) { return pointers; } +<<<<<<< HEAD function clientSideFund(pointer, options) { if (pointer === undefined || pointer === null) { setPointerFromTemplates(); @@ -489,10 +614,81 @@ var fundme = (function (exports, util) { } else { throw FundmeError(defaultAddressNotFound); } +======= + function unwrapExports (x) { + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x; + } + + function createCommonjsModule(fn, basedir, module) { + return module = { + path: basedir, + exports: {}, + require: function (path, base) { + return commonjsRequire(path, (base === undefined || base === null) ? module.path : base); + } + }, fn(module, module.exports), module.exports; + } + + function commonjsRequire () { + throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs'); + } + + var lib = createCommonjsModule(function (module, exports) { + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; + + /* global window self */ + + var isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined'; + + /* eslint-disable no-restricted-globals */ + var isWebWorker = (typeof self === 'undefined' ? 'undefined' : _typeof(self)) === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope'; + /* eslint-enable no-restricted-globals */ + + var isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null; + + /** + * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0 + * @see https://github.com/jsdom/jsdom/issues/1537 + */ + /* eslint-disable no-undef */ + var isJsDom = function isJsDom() { + return typeof window !== 'undefined' && window.name === 'nodejs' || navigator.userAgent.includes('Node.js') || navigator.userAgent.includes('jsdom'); + }; + + exports.isBrowser = isBrowser; + exports.isWebWorker = isWebWorker; + exports.isNode = isNode; + exports.isJsDom = isJsDom; + }); + + var index = /*@__PURE__*/unwrapExports(lib); + + function clientSideFund(pointer) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + + if (pointer === undefined) { + setPointerFromTemplates(); + return setFundType(FundType.isFromTemplate); + } + + if (typeof pointer === "string") { + if (pointer === "default") { + if (getDefaultAddress() !== undefined) { + if (typeof getDefaultAddress() === "string") { + setPointerSingle(getDefaultAddress().toString(), options); + } else { + setPointerMultiple(defaultAddressMultiple(getDefaultAddress()), options); +>>>>>>> parent of fd157ad... migrate babel -> swc } setPointerSingle(pointer, options); return setFundType(FundType.isSingle); } +<<<<<<< HEAD if (isMultiplePointer(pointer)) { setPointerMultiple(pointer, options); return setFundType(FundType.isMultiple); @@ -518,6 +714,41 @@ var fundme = (function (exports, util) { return setPointerMultiple(pointer).toString(); } throw FundmeError(invalidFundmeServerSide); +======= + + setPointerSingle(pointer, options); + return setFundType(FundType.isSingle); + } + + if (isMultiplePointer(pointer)) { + setPointerMultiple(pointer, options); + return setFundType(FundType.isMultiple); + } + + throw FundmeError(invalidAddress); + } + var forceBrowser = false; + var isBrowser = function isBrowser() { + var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + if (options.force === "server") return false; + var forced = forceBrowser; + forceBrowser = false; + return !index.isNode || forced || options.force === "client"; + }; + + function serverSideFund(pointer) { + if (pointer === undefined) throw FundmeError(noUndefinedFundOnServerSide); + + if (typeof pointer === "string") { + return setPointerSingle(pointer).toString(); + } + + if (isMultiplePointer(pointer)) { + return setPointerMultiple(pointer).toString(); + } + + throw FundmeError(invalidFundmeServerSide); +>>>>>>> parent of fd157ad... migrate babel -> swc } var FundType; diff --git a/dist/fundme.mjs b/dist/fundme.mjs index 576d087..b0fa431 100644 --- a/dist/fundme.mjs +++ b/dist/fundme.mjs @@ -46,10 +46,20 @@ const invalidWeight = (address, weight)=>{ const noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; const invalidFundmeServerSide = 'invalid fundme on the server-side.'; +<<<<<<< HEAD let relativeWeightPointers = []; let fixedWeightPointers = []; let totalRelativeChance = 0; let pointerPoolSum = 0; +======= +var noUndefinedFundOnServerSide = "can't use fund() with empty parameters in server side."; +var invalidFundmeServerSide = "invalid fundme parameters on the server-side."; + +var relativeWeightPointers = []; +var fixedWeightPointers = []; +var totalRelativeChance = 0; +var pointerPoolSum = 0; +>>>>>>> parent of fd157ad... migrate babel -> swc function clear() { relativeWeightPointers = []; fixedWeightPointers = []; @@ -63,6 +73,7 @@ function clear() { }; } function calculateRelativeWeight(pool) { +<<<<<<< HEAD clear(); pointerPoolSum = getPoolWeightSum(pool); let relativeWeightPointers1; @@ -73,8 +84,18 @@ function calculateRelativeWeight(pool) { ...normalizeFixedPointers(fixedWeightPointers, totalRelativeChance), ...normalizeRelativePointers(relativeWeightPointers1), ]; +======= + clear(); + pointerPoolSum = getPoolWeightSum(pool); + var relativeWeightPointers; + relativeWeightPointers = pool.filter(filterRelativeWeight); + if (!fixedWeightPointers.length) throw FundmeError(paymentPointersMustHaveAtLeastOneFixedPointer); + return [].concat(_toConsumableArray(normalizeFixedPointers(fixedWeightPointers, totalRelativeChance)), _toConsumableArray(normalizeRelativePointers(relativeWeightPointers))); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function filterRelativeWeight(pointer) { +<<<<<<< HEAD if (pointer.weight === undefined) return false; let weight = pointer.weight; if (typeof weight === 'string' && weight.endsWith('%')) { @@ -90,10 +111,40 @@ function filterRelativeWeight(pointer) { return false; } throw FundmeError(invalidWeight(pointer.address, weight)); +======= + var _pointer$address, _pointer$address2; + + if (pointer.weight === undefined) throw FundmeError(invalidWeight((_pointer$address = pointer.address) !== null && _pointer$address !== void 0 ? _pointer$address : pointer, "")); + var weight = pointer.weight; + + if (typeof weight === "string" && weight.endsWith("%")) { + var convertedWeight = weight.slice(0, -1); + + if (!isNumberOnly(convertedWeight)) { + throw FundmeError(invalidRelativeWeight(pointer.address)); + } + + registerRelativeWeight(pointer); + return true; + } + + if (isNumberOnly(weight)) { + registerFixedWeight(pointer); + return false; + } + + throw FundmeError(invalidWeight((_pointer$address2 = pointer.address) !== null && _pointer$address2 !== void 0 ? _pointer$address2 : pointer, weight)); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function registerRelativeWeight(pointer) { +<<<<<<< HEAD pointer.weight = getRelativeWeight(pointer); relativeWeightPointers.push(pointer); +======= + pointer.weight = getWeight(pointer); + relativeWeightPointers.push(pointer); +>>>>>>> parent of fd157ad... migrate babel -> swc } function registerFixedWeight(pointer) { if (typeof pointer.weight === 'string') { @@ -101,7 +152,9 @@ function registerFixedWeight(pointer) { } fixedWeightPointers.push(pointer); } + function normalizeFixedPointers(pool, chance) { +<<<<<<< HEAD if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); chance = 1 - chance; // decrease all fixed pointer weights @@ -117,12 +170,30 @@ function normalizeFixedPointers(pool, chance) { pointer.weight = weight * chance; return pointer; }); +======= + if (chance > 1 || chance === NaN) throw FundmeError(relativeWeightChanceError); + chance = 1 - chance; + return pool.map(function (pointer) { + var weight; + + if (typeof pointer.weight === "string") { + weight = parseFloat(pointer.weight); + } else { + weight = pointer.weight; + } + + pointer.weight = weight * chance; + return pointer; + }); +>>>>>>> parent of fd157ad... migrate babel -> swc } + function normalizeRelativePointers(pool, sum) { return pool.map((pointer)=>{ return pointer; }); } +<<<<<<< HEAD function getRelativeWeight(pointer) { let chance; if (typeof pointer === 'string') { @@ -161,6 +232,50 @@ function setPointerMultiple(pointers, options = { return setWebMonetizationPointer(pointerAddress); } return pointerAddress; +======= + +function getWeight(pointer) { + var chance; + + if (typeof pointer === "string") { + var weight = pointer.split("#")[1]; + + if (pointer.endsWith("%")) { + chance = parseFloat(weight) / 100; + } else { + throw FundmeError(relativeWeightMustEndsWithPercentage); + } + } else { + if (!pointer.weight) { + var _pointer$address3; + + throw FundmeError(weightForRelativePointerNotFound((_pointer$address3 = pointer.address) !== null && _pointer$address3 !== void 0 ? _pointer$address3 : pointer)); + } + + if (typeof pointer.weight === "string") pointer.weight = parseFloat(pointer.weight); + chance = pointer.weight / 100; + } + + totalRelativeChance += chance; + return pointerPoolSum * chance; // TODO - add % unit to calculate weight +} // Jest related functions + +var DEFAULT_WEIGHT = 5; // TODO check pointer.address with RegEx + +function setPointerMultiple(pointers) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + var pool = createPool(pointers); + pool = calculateRelativeWeight(pool); + var pickedPointer = pickPointer(pool); + var pointerAddress = getPointerAddress(pickedPointer); + setCurrentPointer(pool); + + if (isBrowser(options)) { + return setWebMonetizationPointer(pointerAddress); + } + + return pointerAddress; +>>>>>>> parent of fd157ad... migrate babel -> swc } function getPointerAddress(pointer) { const address = pointer.address; @@ -257,9 +372,18 @@ function getWinningPointer(pointers, choice) { return pointers[pointer]; } } +<<<<<<< HEAD // Decide if this will be the default behavior later // in case unexpected case where choice is greater than all pointers' weight return pointers[0]; +======= + } + + console.error("GET WINNING POOL LEAKED!"); + return { + address: "" + }; // Is this even necessary? +>>>>>>> parent of fd157ad... migrate babel -> swc } function hasAddress(obj) { if (!obj) return false; @@ -468,6 +592,7 @@ function parseCustomSyntax(template) { return pointers; } +<<<<<<< HEAD function clientSideFund(pointer, options) { if (pointer === undefined || pointer === null) { setPointerFromTemplates(); @@ -488,10 +613,81 @@ function clientSideFund(pointer, options) { } else { throw FundmeError(defaultAddressNotFound); } +======= +function unwrapExports (x) { + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x; +} + +function createCommonjsModule(fn, basedir, module) { + return module = { + path: basedir, + exports: {}, + require: function (path, base) { + return commonjsRequire(path, (base === undefined || base === null) ? module.path : base); + } + }, fn(module, module.exports), module.exports; +} + +function commonjsRequire () { + throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs'); +} + +var lib = createCommonjsModule(function (module, exports) { + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; + +/* global window self */ + +var isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined'; + +/* eslint-disable no-restricted-globals */ +var isWebWorker = (typeof self === 'undefined' ? 'undefined' : _typeof(self)) === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope'; +/* eslint-enable no-restricted-globals */ + +var isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null; + +/** + * @see https://github.com/jsdom/jsdom/releases/tag/12.0.0 + * @see https://github.com/jsdom/jsdom/issues/1537 + */ +/* eslint-disable no-undef */ +var isJsDom = function isJsDom() { + return typeof window !== 'undefined' && window.name === 'nodejs' || navigator.userAgent.includes('Node.js') || navigator.userAgent.includes('jsdom'); +}; + +exports.isBrowser = isBrowser; +exports.isWebWorker = isWebWorker; +exports.isNode = isNode; +exports.isJsDom = isJsDom; +}); + +var index = /*@__PURE__*/unwrapExports(lib); + +function clientSideFund(pointer) { + var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + + if (pointer === undefined) { + setPointerFromTemplates(); + return setFundType(FundType.isFromTemplate); + } + + if (typeof pointer === "string") { + if (pointer === "default") { + if (getDefaultAddress() !== undefined) { + if (typeof getDefaultAddress() === "string") { + setPointerSingle(getDefaultAddress().toString(), options); + } else { + setPointerMultiple(defaultAddressMultiple(getDefaultAddress()), options); +>>>>>>> parent of fd157ad... migrate babel -> swc } setPointerSingle(pointer, options); return setFundType(FundType.isSingle); } +<<<<<<< HEAD if (isMultiplePointer(pointer)) { setPointerMultiple(pointer, options); return setFundType(FundType.isMultiple); @@ -517,6 +713,41 @@ function serverSideFund(pointer) { return setPointerMultiple(pointer).toString(); } throw FundmeError(invalidFundmeServerSide); +======= + + setPointerSingle(pointer, options); + return setFundType(FundType.isSingle); + } + + if (isMultiplePointer(pointer)) { + setPointerMultiple(pointer, options); + return setFundType(FundType.isMultiple); + } + + throw FundmeError(invalidAddress); +} +var forceBrowser = false; +var isBrowser = function isBrowser() { + var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + if (options.force === "server") return false; + var forced = forceBrowser; + forceBrowser = false; + return !index.isNode || forced || options.force === "client"; +}; + +function serverSideFund(pointer) { + if (pointer === undefined) throw FundmeError(noUndefinedFundOnServerSide); + + if (typeof pointer === "string") { + return setPointerSingle(pointer).toString(); + } + + if (isMultiplePointer(pointer)) { + return setPointerMultiple(pointer).toString(); + } + + throw FundmeError(invalidFundmeServerSide); +>>>>>>> parent of fd157ad... migrate babel -> swc } var FundType; diff --git a/jest.config.js b/jest.config.js index 91ac4a8..f088640 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,7 +1,7 @@ module.exports = { roots: ['/tests'], transform: { - '^.+\\.tsx?$': 'swc-jest', + '^.+\\.tsx?$': 'babel-jest', }, testRegex: '(tests/.*|(\\.|/)(test|spec))\\.tsx?$', moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'], diff --git a/package-lock.json b/package-lock.json index d71423d..4967010 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5950,18 +5950,6 @@ "@sinonjs/commons": "^1.7.0" } }, - "@swc/core": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.2.9.tgz", - "integrity": "sha512-J0TDec/KxTdHI2xEnzJZQK9qG1DauG661LZuxVZE92PVpZW8KvoyGvtVUqLqfoYcNA2C+OwTnG2DzvW0U6FylA==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1", - "node-fetch": "^2.6.0", - "progress": "^2.0.3", - "true-case-path": "^1.0.3" - } - }, "@testing-library/jest-dom": { "version": "5.11.1", "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.1.tgz", @@ -6754,12 +6742,6 @@ "tweetnacl": "^0.14.3" } }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true - }, "binary-extensions": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", @@ -7624,12 +7606,6 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -10650,17 +10626,6 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "dev": true }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -10957,12 +10922,6 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, - "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==", - "dev": true - }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -11869,12 +11828,6 @@ "fsevents": "~2.1.2" } }, - "rollup-plugin-swc": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/rollup-plugin-swc/-/rollup-plugin-swc-0.1.4.tgz", - "integrity": "sha512-KQGQ3ywBMHcfwDJkb+5QLOF944tLN1HyAsnbruNtUzhkeblOaOyILVl9fc1gmf71/CKKj7dpjChU5j3pI9eE/w==", - "dev": true - }, "rsvp": { "version": "4.8.5", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", @@ -12730,25 +12683,6 @@ "supports-color": "^7.0.0" } }, - "swc-jest": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/swc-jest/-/swc-jest-1.0.2.tgz", - "integrity": "sha512-kh+w3AoEUZRmxA6sIsz4g4Lq9+fBov6oDsYyvu+i3u+MAUHjzNBo4dlV8Oit3jfpmJDT1pdkgUZBJzakBvYCjw==", - "dev": true, - "requires": { - "convert-source-map": "^1.7.0" - } - }, - "swc-loader": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/swc-loader/-/swc-loader-0.1.12.tgz", - "integrity": "sha512-DFV2PCxJGaym9S/K2xhUp/sVsTSeNNoPAvjqM/W3eZ9tVteUthjDOFjkQ7wo9TPemskKVBLQ8cTCAqoitXB3GQ==", - "dev": true, - "requires": { - "@swc/core": "^1.1.48", - "loader-utils": "^2.0.0" - } - }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -12935,15 +12869,6 @@ "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", "dev": true }, - "true-case-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", - "dev": true, - "requires": { - "glob": "^7.1.2" - } - }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", diff --git a/package.json b/package.json index dd52604..5c73c2c 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "@rollup/plugin-babel": "^5.0.3", "@rollup/plugin-commonjs": "^14.0.0", "@rollup/plugin-node-resolve": "^8.0.1", - "@swc/core": "^1.2.9", "@testing-library/jest-dom": "^5.10.1", "@types/jest": "^26.0.5", "@types/node": "^14.0.23", @@ -30,9 +29,6 @@ "jest": "^26.1.0", "prettier": "^2.0.5", "rollup": "^2.16.1", - "rollup-plugin-swc": "^0.1.4", - "swc-jest": "^1.0.2", - "swc-loader": "^0.1.12", "typescript": "^3.9.5", "uglify-es": "^3.3.9" }, diff --git a/rollup.config.js b/rollup.config.js index 2d328be..66ba3eb 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,7 +1,6 @@ import commonjs from '@rollup/plugin-commonjs'; import resolve from '@rollup/plugin-node-resolve'; import babel from '@rollup/plugin-babel' -import swc from 'rollup-plugin-swc' const extensions = [ '.js', '.jsx', '.ts', '.tsx', @@ -13,15 +12,7 @@ export default { plugins: [ resolve({ extensions }), commonjs(), - swc({ - jsc: { - parser: { - syntax: 'typescript', - }, - target: 'es2018', - }, - }), - // babel({ extensions, babelHelpers: 'bundled', include: ['src/**/*'] }), + babel({ extensions, babelHelpers: 'bundled', include: ['src/**/*'] }), ], output: [{ file: 'dist/fundme-iife.js',