mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
Merge pull request #12010 from meteor/fix/unibuild-prelink-watching
Fix reading packages installed before Meteor 1.2
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
// METEOR_PARENT_PID
|
||||
if (process.env.METEOR_HMR_SECRET) {
|
||||
__meteor_runtime_config__._hmrSecret = process.env.METEOR_HMR_SECRET;
|
||||
} else if (process.env.METEOR_PARENT_PID) {
|
||||
|
||||
@@ -1432,6 +1432,9 @@ export function readBufferWithLengthAndOffset(
|
||||
if (count !== length) {
|
||||
throw new Error("couldn't read entire resource");
|
||||
}
|
||||
} catch (err: any) {
|
||||
err.message = `Error while reading ${filename}: ` + err.message;
|
||||
throw err;
|
||||
} finally {
|
||||
close(fd);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,10 @@ export class Unibuild {
|
||||
usesDefaultSourceProcessor: true,
|
||||
legacyPrelink: {
|
||||
packageVariables: unibuildJson.packageVariables || []
|
||||
}
|
||||
},
|
||||
// Only published packages still use prelink resources,
|
||||
// so there is no need to mark this file to be watched
|
||||
_dataUsed: false
|
||||
};
|
||||
|
||||
if (resource.sourceMap) {
|
||||
|
||||
@@ -29,9 +29,6 @@ var defaultWarehouseDir = function () {
|
||||
|
||||
var warehouseBase = files.inCheckout()
|
||||
? files.getCurrentToolsDir() : files.getHomeDir();
|
||||
// XXX This will be `.meteor` soon, once we've written the code to make the
|
||||
// tropohouse and warehouse live together in harmony (eg, allowing tropohouse
|
||||
// tools to springboard to warehouse tools).
|
||||
return files.pathJoin(warehouseBase, ".meteor");
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user