Merge branch 'devel' into release-1.7.1

2026-05-02 03:01:46 -04:00 · 2018-08-07 13:30:16 -04:00
parent 5b664d7444 aba03743ad
commit defbf6d6eb
17 changed files with 1387 additions and 1100 deletions
--- a/History.md
+++ b/History.md
@@ -158,6 +158,25 @@
  [PR #9933](https://github.com/meteor/meteor/pull/9933)
  [PR #10050](https://github.com/meteor/meteor/pull/10050)

+## v1.7.0.4, 2018-08-07
+
+* The npm package `@babel/runtime`, which is depended on by most Meteor
+  apps, introduced a breaking change in version `7.0.0-beta.56` with the
+  removal of the `@babel/runtime/helpers/builtin` directory. While this
+  change has clear benefits in the long term, in the short term it has
+  been disruptive for Meteor 1.7.0.x applications that accidentally
+  updated to the latest version of `@babel/runtime`. Meteor 1.7.0.4 is a
+  patch release that provides better warnings about this problem, and
+  ensures newly created Meteor applications do not use `7.0.0-beta.56`.
+  [PR #10134](https://github.com/meteor/meteor/pull/10134)
+
+* The `npm` package has been upgraded to version 6.3.0, and our
+  [fork](https://github.com/meteor/pacote/tree/v8.1.6-meteor) of its
+  `pacote` dependency has been rebased against version 8.1.6.
+  [Issue #9940](https://github.com/meteor/meteor/issues/9940)
+
+* The `reify` npm package has been updated to version 0.16.4.
+
 ## v1.7.0.3, 2018-06-13

 * Fixed [Issue #9991](https://github.com/meteor/meteor/issues/9991),
--- a/packages/babel-runtime/babel-runtime.js
+++ b/packages/babel-runtime/babel-runtime.js
@@ -4,6 +4,7 @@ try {
  var babelRuntimeVersion = require("@babel/runtime/package.json").version;
 } catch (e) {
  throw new Error([
+    "",
    "The @babel/runtime npm package could not be found in your node_modules ",
    "directory. Please run the following command to install it:",
    "",
@@ -14,6 +15,7 @@ try {

 if (parseInt(babelRuntimeVersion, 10) < 6) {
  throw new Error([
+    "",
    "The version of @babel/runtime installed in your node_modules directory ",
    "(" + babelRuntimeVersion + ") is out of date. Please upgrade it by running ",
    "",
@@ -22,4 +24,21 @@ if (parseInt(babelRuntimeVersion, 10) < 6) {
    "in your application directory.",
    ""
  ].join("\n"));
+
+} else if (babelRuntimeVersion.indexOf("7.0.0-beta.") === 0) {
+  var betaVersion = parseInt(babelRuntimeVersion.split(".").pop(), 10);
+  if (betaVersion > 55) {
+    console.warn([
+      "The version of @babel/runtime installed in your node_modules directory ",
+      "(" + babelRuntimeVersion + ") contains a breaking change which was introduced by ",
+      "https://github.com/babel/babel/pull/8266. Please either downgrade by ",
+      "running the following command:",
+      "",
+      "  meteor npm install --save-exact @babel/runtime@7.0.0-beta.55",
+      "",
+      "or update to the latest beta version of Meteor 1.7.1, as explained in ",
+      "this pull request: https://github.com/meteor/meteor/pull/9942.",
+      ""
+    ].join("\n"));
+  }
 }
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
  name: "babel-runtime",
  summary: "Runtime support for output of Babel transpiler",
-  version: '1.2.2',
+  version: '1.2.4',
  documentation: 'README.md'
 });

--- a/scripts/admin/eslint/package-lock.json
+++ b/scripts/admin/eslint/package-lock.json
--- a/scripts/admin/eslint/package.json
+++ b/scripts/admin/eslint/package.json
@@ -5,8 +5,8 @@
  "readme": "no warn",
  "repository": "no warn",
  "dependencies": {
-    "eslint": "0.22.1",
-    "eslint-plugin-react": "2.5.0",
-    "babel-eslint": "4.1.7"
+    "babel-eslint": "4.1.7",
+    "eslint": "^5.3.0",
+    "eslint-plugin-react": "2.5.0"
  }
 }
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,12 +1,13 @@
 {
  "track": "METEOR",
-  "version": "1.7.0.3",
+  "version": "1.7.0.4",
  "recommended": false,
  "official": true,
  "patchFrom": [
    "1.7",
    "1.7.0.1",
-    "1.7.0.2"
+    "1.7.0.2",
+    "1.7.0.3"
  ],
  "description": "The Official Meteor Distribution"
 }
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -960,7 +960,7 @@ export default class ImportScanner {
    // translates it to FEFF, the UTF-16 BOM.
    if (info.dataString.charCodeAt(0) === 0xfeff) {
      info.dataString = info.dataString.slice(1);
-      info.data = Buffer.from(into.dataString, "utf8");
+      info.data = Buffer.from(info.dataString, "utf8");
      info.hash = sha1(info.data);
    }

--- a/tools/tests/apps/app-config/package.json
+++ b/tools/tests/apps/app-config/package.json
@@ -5,9 +5,9 @@
    "start": "meteor run"
  },
  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
+    "@babel/runtime": "7.0.0-beta.55",
    "meteor-node-stubs": "^0.4.1",
-    "puppeteer": "^1.3.0"
+    "puppeteer": "^1.6.2"
  },
  "meteor": {
    "testModule": "tests.js"
--- a/tools/tests/apps/dev-bundle-bin-commands/package.json
+++ b/tools/tests/apps/dev-bundle-bin-commands/package.json
@@ -7,7 +7,7 @@
    "exit-normally": "echo \"This script will exit normally\" && exit 0"
  },
  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
+    "@babel/runtime": "7.0.0-beta.55",
    "meteor-node-stubs": "^0.4.1"
  }
 }
--- a/tools/tests/apps/dynamic-import/.meteor/packages
+++ b/tools/tests/apps/dynamic-import/.meteor/packages
@@ -15,7 +15,7 @@ tracker@1.2.0                 # Meteor's client-side reactive programming librar
 standard-minifier-css@1.4.1   # CSS minifier run for production mode
 standard-minifier-js@2.3.4    # JS minifier run for production mode
 es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.11.0              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.11.1              # Enable ECMAScript2015+ syntax in app code
 shell-server@0.3.1            # Server-side component of the `meteor shell` command

 autopublish@1.0.7             # Publish all data to the clients (for prototyping)
@@ -24,4 +24,4 @@ dynamic-import@0.4.0
 lazy-test-package
 helper-package
 user:colon-name
-underscore
+underscore@1.0.10
--- a/tools/tests/apps/dynamic-import/.meteor/release
+++ b/tools/tests/apps/dynamic-import/.meteor/release
@@ -1 +1 @@
-METEOR@1.7.0.1
+METEOR@1.7.0.4
--- a/tools/tests/apps/dynamic-import/.meteor/versions
+++ b/tools/tests/apps/dynamic-import/.meteor/versions
@@ -1,8 +1,8 @@
 allow-deny@1.1.0
 autopublish@1.0.7
 autoupdate@1.4.0
-babel-compiler@7.1.0
-babel-runtime@1.2.2
+babel-compiler@7.1.1
+babel-runtime@1.2.4
 base64@1.0.11
 binary-heap@1.0.10
 blaze@2.3.2
@@ -21,8 +21,9 @@ ddp-common@1.4.0
 ddp-server@2.2.0
 deps@1.0.12
 diff-sequence@1.1.0
+dispatch:mocha-browser@0.0.4
 dynamic-import@0.4.0
-ecmascript@0.11.0
+ecmascript@0.11.1
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.7.1
 ecmascript-runtime-server@0.7.0
@@ -49,7 +50,7 @@ minimongo@1.4.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
 modern-browsers@0.1.1
-modules@0.12.0
+modules@0.12.2
 modules-runtime@0.10.0
 mongo@1.5.0
 mongo-dev-server@1.1.0
@@ -57,6 +58,7 @@ mongo-id@1.0.7
 npm-mongo@3.0.7
 observe-sequence@1.0.16
 ordered-dict@1.1.0
+practicalmeteor:mocha-core@1.0.1
 promise@0.11.1
 random@1.1.0
 reactive-var@1.0.11
--- a/tools/tests/apps/meteor-ignore/package.json
+++ b/tools/tests/apps/meteor-ignore/package.json
@@ -5,7 +5,7 @@
    "start": "meteor run"
  },
  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
+    "@babel/runtime": "7.0.0-beta.55",
    "meteor-node-stubs": "^0.4.1"
  }
 }
--- a/tools/tests/apps/modules/package-lock.json
+++ b/tools/tests/apps/modules/package-lock.json
@@ -221,9 +221,9 @@
      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
    },
    "aws-sdk": {
-      "version": "2.286.2",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.286.2.tgz",
-      "integrity": "sha512-46a/2+rGEgIlmUz08vZOkYFmZIgj+An/cc+Ngz9XBLkAZbx+3sBzOrxexrlVV69MPkMbckbeZjIq8NEJWV5gPw==",
+      "version": "2.287.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.287.0.tgz",
+      "integrity": "sha512-VXE1j3zdQpNEmBPsyiJhz3IjzzKwNaRTiAC7fAwx/Y88zkioBZ8li2yCstXJ0xSduJHGDnghBPa57DrQNGFeNA==",
      "requires": {
        "buffer": "4.9.1",
        "events": "1.1.1",
@@ -1274,9 +1274,9 @@
      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
    },
    "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
    },
    "pend": {
      "version": "1.2.0",
--- a/tools/tests/apps/package-tests/package.json
+++ b/tools/tests/apps/package-tests/package.json
@@ -5,6 +5,6 @@
    "start": "meteor run"
  },
  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.44"
+    "@babel/runtime": "7.0.0-beta.55"
  }
 }
--- a/tools/tests/apps/shell/package.json
+++ b/tools/tests/apps/shell/package.json
@@ -5,7 +5,7 @@
    "start": "meteor run"
  },
  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
+    "@babel/runtime": "7.0.0-beta.55",
    "meteor-node-stubs": "^0.4.1"
  }
 }
--- a/tools/tests/old/app-with-private/package.json
+++ b/tools/tests/old/app-with-private/package.json
@@ -5,7 +5,7 @@
    "start": "meteor run"
  },
  "dependencies": {
-    "@babel/runtime": "^7.0.0-beta.46",
+    "@babel/runtime": "7.0.0-beta.55",
    "meteor-node-stubs": "^0.4.1"
  }
 }