@loaders.gl/loader-utils
Advanced tools
Comparing version 2.0.0-alpha.5 to 2.0.0-beta.1
@@ -174,11 +174,13 @@ "use strict"; | ||
case 13: | ||
_context2.next = 15; | ||
return parser(data, _objectSpread({}, options, { | ||
options = _objectSpread({}, options, { | ||
modules: loader && loader.options && loader.options.modules || {}, | ||
worker: false | ||
}), context, loader); | ||
}); | ||
_context2.next = 16; | ||
return parser(data, _objectSpread({}, options), context, loader); | ||
case 15: | ||
case 16: | ||
return _context2.abrupt("return", _context2.sent); | ||
case 16: | ||
case 17: | ||
case "end": | ||
@@ -185,0 +187,0 @@ return _context2.stop(); |
@@ -22,3 +22,3 @@ "use strict"; | ||
var LATEST = 'beta'; | ||
var VERSION = typeof "2.0.0-alpha.5" !== 'undefined' ? "2.0.0-alpha.5" : LATEST; | ||
var VERSION = typeof "2.0.0-beta.1" !== 'undefined' ? "2.0.0-beta.1" : LATEST; | ||
var loadLibraryPromises = {}; | ||
@@ -25,0 +25,0 @@ |
@@ -12,3 +12,3 @@ "use strict"; | ||
var VERSION = typeof "2.0.0-alpha.5" !== 'undefined' ? "2.0.0-alpha.5" : ''; | ||
var VERSION = typeof "2.0.0-beta.1" !== 'undefined' ? "2.0.0-beta.1" : ''; | ||
@@ -15,0 +15,0 @@ function validateLoaderVersion(loader) { |
@@ -114,5 +114,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty"; | ||
return await parser(data, _objectSpread({}, options, { | ||
options = _objectSpread({}, options, { | ||
modules: loader && loader.options && loader.options.modules || {}, | ||
worker: false | ||
}), context, loader); | ||
}); | ||
return await parser(data, _objectSpread({}, options), context, loader); | ||
} | ||
@@ -119,0 +121,0 @@ |
@@ -5,3 +5,3 @@ import { global, isBrowser, isWorker } from '../env-utils/globals'; | ||
const LATEST = 'beta'; | ||
const VERSION = typeof "2.0.0-alpha.5" !== 'undefined' ? "2.0.0-alpha.5" : LATEST; | ||
const VERSION = typeof "2.0.0-beta.1" !== 'undefined' ? "2.0.0-beta.1" : LATEST; | ||
const loadLibraryPromises = {}; | ||
@@ -8,0 +8,0 @@ export async function loadLibrary(libraryUrl, moduleName = null, options = {}) { |
import assert from './env-utils/assert'; | ||
const VERSION = typeof "2.0.0-alpha.5" !== 'undefined' ? "2.0.0-alpha.5" : ''; | ||
const VERSION = typeof "2.0.0-beta.1" !== 'undefined' ? "2.0.0-beta.1" : ''; | ||
export function validateLoaderVersion(loader, coreVersion = VERSION) { | ||
@@ -4,0 +4,0 @@ assert(loader, 'no loader provided'); |
@@ -161,11 +161,13 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty"; | ||
case 13: | ||
_context2.next = 15; | ||
return parser(data, _objectSpread({}, options, { | ||
options = _objectSpread({}, options, { | ||
modules: loader && loader.options && loader.options.modules || {}, | ||
worker: false | ||
}), context, loader); | ||
}); | ||
_context2.next = 16; | ||
return parser(data, _objectSpread({}, options), context, loader); | ||
case 15: | ||
case 16: | ||
return _context2.abrupt("return", _context2.sent); | ||
case 16: | ||
case 17: | ||
case "end": | ||
@@ -172,0 +174,0 @@ return _context2.stop(); |
@@ -7,3 +7,3 @@ import _regeneratorRuntime from "@babel/runtime/regenerator"; | ||
var LATEST = 'beta'; | ||
var VERSION = typeof "2.0.0-alpha.5" !== 'undefined' ? "2.0.0-alpha.5" : LATEST; | ||
var VERSION = typeof "2.0.0-beta.1" !== 'undefined' ? "2.0.0-beta.1" : LATEST; | ||
var loadLibraryPromises = {}; | ||
@@ -10,0 +10,0 @@ export function loadLibrary(_x) { |
import assert from './env-utils/assert'; | ||
var VERSION = typeof "2.0.0-alpha.5" !== 'undefined' ? "2.0.0-alpha.5" : ''; | ||
var VERSION = typeof "2.0.0-beta.1" !== 'undefined' ? "2.0.0-beta.1" : ''; | ||
export function validateLoaderVersion(loader) { | ||
@@ -4,0 +4,0 @@ var coreVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : VERSION; |
{ | ||
"name": "@loaders.gl/loader-utils", | ||
"version": "2.0.0-alpha.5", | ||
"version": "2.0.0-beta.1", | ||
"description": "Framework-independent loaders for 3D graphics formats", | ||
@@ -41,3 +41,3 @@ "license": "MIT", | ||
}, | ||
"gitHead": "5caa17e70139028b87362bdab8debf337bced509" | ||
"gitHead": "3ea0c59590158d4b77c6c40f57d7cc818dc40081" | ||
} |
@@ -89,3 +89,10 @@ /* eslint-disable no-restricted-globals */ | ||
return await parser(data, {...options, worker: false}, context, loader); | ||
// TODO - proper merge in of loader options... | ||
options = { | ||
...options, | ||
modules: (loader && loader.options && loader.options.modules) || {}, | ||
worker: false | ||
}; | ||
return await parser(data, {...options}, context, loader); | ||
} | ||
@@ -92,0 +99,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
220249
2275