Skip to content

Commit d9001d8

Browse files
committed
fix pipeline
1 parent 633b44e commit d9001d8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

tools/file_packager.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ def generate_js(data_target, data_files, metadata):
814814
if options.support_node:
815815
code += '''
816816
if (isNode) {
817-
return errback();
817+
errback();
818818
}'''
819819
code += '''
820820
if (typeof indexedDB == 'undefined') {
@@ -823,7 +823,7 @@ def generate_js(data_target, data_files, metadata):
823823
try {
824824
var openRequest = indexedDB.open(DB_NAME, DB_VERSION);
825825
} catch (e) {
826-
return errback(e);
826+
errback(e);
827827
}
828828
openRequest.onupgradeneeded = (event) => {
829829
var db = /** @type {IDBDatabase} */ (event.target.result);
@@ -924,7 +924,7 @@ def generate_js(data_target, data_files, metadata):
924924
var getRequest = packages.get(`package/${packageName}/${chunkId}`);
925925
getRequest.onsuccess = (event) => {
926926
if (!event.target.result) {
927-
return errback(new Error(`CachedPackageNotFound for: ${packageName}`));
927+
errback(new Error(`CachedPackageNotFound for: ${packageName}`));
928928
}
929929
// If there's only 1 chunk, there's nothing to concatenate it with so we can just return it now
930930
if (chunkCount == 1) {
@@ -963,7 +963,7 @@ def generate_js(data_target, data_files, metadata):
963963
if (isNode) {
964964
require('fs').readFile(packageName, (err, contents) => {
965965
if (err) {
966-
return errback(err);
966+
errback(err);
967967
} else {
968968
callback(contents.buffer);
969969
}
@@ -979,7 +979,7 @@ def generate_js(data_target, data_files, metadata):
979979
.catch((cause) => errback(new Error(`Network Error: ${packageName}`, {cause}))) // If fetch fails, rewrite the error to include the failing URL & the cause.
980980
.then((response) => {
981981
if (!response.ok) {
982-
return errback(new Error(`${response.status}: ${response.url}`));
982+
errback(new Error(`${response.status}: ${response.url}`));
983983
}
984984
985985
if (!response.body && response.arrayBuffer) { // If we're using the polyfill, readers won't be available...
@@ -988,7 +988,7 @@ def generate_js(data_target, data_files, metadata):
988988
989989
const reader = response.body.getReader();
990990
const iterate = () => reader.read().then(handleChunk).catch((cause) => {
991-
return errback(new Error(`Unexpected error while handling : ${response.url} ${cause}`, {cause}));
991+
errback(new Error(`Unexpected error while handling : ${response.url} ${cause}`, {cause}));
992992
});
993993
994994
const chunks = [];
@@ -1117,7 +1117,7 @@ def generate_js(data_target, data_files, metadata):
11171117
if (isNode) {
11181118
require('fs').readFile(metadataUrl, 'utf8', (err, contents) => {
11191119
if (err) {
1120-
return handleError(err);
1120+
throwPackageError(err);
11211121
} else {
11221122
loadPackage(JSON.parse(contents));
11231123
}
@@ -1139,9 +1139,9 @@ def generate_js(data_target, data_files, metadata):
11391139
return response.json();
11401140
}
11411141
})
1142-
.catch((cause) => {
1143-
return handleError(new Error(`Network Error: ${packageName}`, {cause})
1144-
})) // If fetch fails, rewrite the error to include the failing URL & the cause.
1142+
.catch((cause) =>
1143+
throwPackageError(new Error(`Network Error: ${packageName}`, {cause}))
1144+
) // If fetch fails, rewrite the error to include the failing URL & the cause.
11451145
.then(loadPackage);
11461146
}
11471147

0 commit comments

Comments
 (0)