diff --git a/lib/SerializerAppend.js b/lib/SerializerAppend.js index 57afccda..843d4883 100644 --- a/lib/SerializerAppend.js +++ b/lib/SerializerAppend.js @@ -436,11 +436,13 @@ class AppendSerializer { } return _lock(_this, mustLock, promise => - promise.then(() => _read()).catch(e => - _closeLog(_this).then(() => { - throw e; - }), - ), + promise + .then(() => _read()) + .catch(e => + _closeLog(_this).then(() => { + throw e; + }), + ), ); } diff --git a/lib/TransformBasicDependencyPluginLegacy.js b/lib/TransformBasicDependencyPluginLegacy.js index 004b9042..af3dd2f6 100644 --- a/lib/TransformBasicDependencyPluginLegacy.js +++ b/lib/TransformBasicDependencyPluginLegacy.js @@ -111,6 +111,7 @@ const DependencySchemas2 = [ 'originModule', 'range', 'rangeStatement', + 'prefix', ], ['HarmonyExportHeaderDependency', 'range', 'rangeStatement'], [ @@ -248,6 +249,7 @@ const DependencySchemas3 = [ 'originModule', 'range', 'rangeStatement', + 'prefix', ], ['HarmonyExportHeaderDependency', 'range', 'rangeStatement'], [ @@ -692,11 +694,10 @@ class TransformBasicDependencyPluginLegacy { if (frozen && dependency.getWarnings) { const warnings = dependency.getWarnings(); if (warnings && warnings.length) { - frozen.warnings = warnings.map( - ({ stack }) => - stack.includes('\n at pluginCompat.tap') - ? stack.split('\n at pluginCompat.tap')[0] - : stack.split('\n at Compiler.pluginCompat.tap')[0], + frozen.warnings = warnings.map(({ stack }) => + stack.includes('\n at pluginCompat.tap') + ? stack.split('\n at pluginCompat.tap')[0] + : stack.split('\n at Compiler.pluginCompat.tap')[0], ); } } diff --git a/lib/schema-4/basic-dependency.json b/lib/schema-4/basic-dependency.json index 604d45b3..2db14f4e 100644 --- a/lib/schema-4/basic-dependency.json +++ b/lib/schema-4/basic-dependency.json @@ -27,7 +27,8 @@ "HarmonyExportExpressionDependency", "originModule", "range", - "rangeStatement" + "rangeStatement", + "prefix" ], ["HarmonyExportHeaderDependency", "range", "rangeStatement"], [ diff --git a/lib/schema-4/index.js b/lib/schema-4/index.js index 3de24fc8..f1660c6d 100644 --- a/lib/schema-4/index.js +++ b/lib/schema-4/index.js @@ -549,6 +549,7 @@ const HarmonyExportExpressionDependencySerial = serial.serial('HarmonyExportExpr originModule: null, range: dependency.range, rangeStatement: dependency.rangeStatement, + prefix: dependency.prefix, }; }, thaw(thawed, frozen, extra, methods) { @@ -556,6 +557,7 @@ const HarmonyExportExpressionDependencySerial = serial.serial('HarmonyExportExpr extra.module, frozen.range, frozen.rangeStatement, + frozen.prefix, ); }, }, diff --git a/lib/util/parity.js b/lib/util/parity.js index c1b09f2b..8a55c608 100644 --- a/lib/util/parity.js +++ b/lib/util/parity.js @@ -91,12 +91,10 @@ class ParityCache { } const createParityToken = (id, ids = null) => { - const token = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace( - /[xy]/g, - c => - c === 'x' - ? ((Math.random() * 16) | 0).toString(16) - : (((Math.random() * 4) | 0) + 8).toString(16), + const token = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => + c === 'x' + ? ((Math.random() * 16) | 0).toString(16) + : (((Math.random() * 4) | 0) + 8).toString(16), ); return new ParityToken(id, token, ids);