github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Go back to writing .meteor-portable-2.json files asynchronously.

Browse Source 
This reverts commit 4e4e204ab0.

This commit caused a strange regression in reliability of the Windows
dynamic-import self-test, which may be an indication of a deeper problem,
so it seems safest to revert this change for now.

In case empty .meteor-portable-2.json files are written, I've added an
additional check that the cached JSON value is a boolean.
This commit is contained in:
Ben Newman
2018-01-19 18:57:44 -05:00
parent 6ae14731a2
commit c60bb394b6
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/isobuild/meteor-npm.js
View File

@@ -496,7 +496,7 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
allowSyntaxError: true
});
if (result) {
if (typeof result === "boolean") {
return result;
}
@@ -528,17 +528,18 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
isPortable(files.pathJoin(dir, itemName)));
if (canCache) {
try {
files.writeFile(
portableFile,
JSON.stringify(result) + "\n",
"utf8"
);
} catch (ignored) {
// Don't worry if the write fails, e.g. because the file system is
// read-only (#6591). Failing to write the file only means more work
// next time.
}
// Write the .meteor-portable file asynchronously, and don't worry
// if it fails, e.g. because the file system is read-only (#6591).
// Failing to write the file only means more work next time.
fs.writeFile(
portableFile,
JSON.stringify(result) + "\n",
error => {
// Once the asynchronous write finishes (successful or not), we no
// longer need to cache the written value in memory.
delete portableCache[portableFile];
},
);
// Cache the result immediately in memory so we don't have to wait for
// file change notifications to invalidate optimisticReadJsonOrNull.