Release 1.4.4.1

History.md

@@ -1,5 +1,13 @@
 ## v.NEXT
 
+## v1.4.4.1, TBD
+
+* A change in Meteor 1.4.4 to remove "garbage" directories asynchronously
+  in `files.renameDirAlmostAtomically` had unintended consequences for
+  rebuilding some npm packages, so that change was reverted, and those
+  directories are now removed before `files.renameDirAlmostAtomically`
+  returns. [PR #8574](https://github.com/meteor/meteor/pull/8574)
+
 ## v1.4.4, 2017-04-07
 
 * Node has been upgraded to version 4.8.1.

packages/babel-compiler/babel-compiler.js

@@ -1,3 +1,5 @@
+var semver = Npm.require("semver");
+
 /**
  * A compiler that can be instantiated with features and used inside
  * Plugin.registerCompiler
@@ -13,6 +15,10 @@ var BCp = BabelCompiler.prototype;
 var excludedFileExtensionPattern = /\.(es5|min)\.js$/i;
 var hasOwn = Object.prototype.hasOwnProperty;
 
+// There's no way to tell the current Meteor version, but we can infer
+// whether it's Meteor 1.4.4 or earlier by checking the Node version.
+var isMeteorPre144 = semver.lt(process.version, "4.8.1");
+
 BCp.processFilesForTarget = function (inputFiles) {
   // Reset this cache for each batch processed.
   this._babelrcCache = null;
@@ -103,6 +109,19 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       throw e;
     }
 
+    if (isMeteorPre144) {
+      // Versions of meteor-tool earlier than 1.4.4 do not understand that
+      // module.importSync is synonymous with the deprecated module.import
+      // and thus fail to register dependencies for importSync calls.
+      // This string replacement may seem a bit hacky, but it will tide us
+      // over until everyone has updated to Meteor 1.4.4.
+      // https://github.com/meteor/meteor/issues/8572
+      result.code = result.code.replace(
+        /\bmodule\.importSync\b/g,
+        "module.import"
+      );
+    }
+
     toBeAdded.data = result.code;
     toBeAdded.hash = result.hash;
     toBeAdded.sourceMap = result.map;

packages/babel-compiler/package.js

@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.18.0'
+  version: '6.18.1'
 });
 
 Npm.depends({

packages/ecmascript/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.1',
+  version: '0.7.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });

packages/meteor-tool/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.4'
+  version: '1.4.4_1'
 });
 
 Package.includeTool();

scripts/admin/meteor-release-experimental.json

@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.4-rc.9",
+ "version": "1.4.4.1-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

scripts/admin/meteor-release-official.json

@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "1.4.4",
+  "version": "1.4.4.1",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"

tools/fs/files.js

@@ -1038,7 +1038,7 @@ files.renameDirAlmostAtomically =
     // ... and take out the trash.
     if (cleanupGarbage) {
       // We don't care about how long this takes, so we'll let it go async.
-      files.rm_recursive_async(garbageDir);
+      files.rm_recursive(garbageDir);
     }
   });