Fix Node.js 4 support (#5142)

* Fix Node.js 4 support * Use Babel to fix spread operator for Node.js 4 * Fix apply removal
jestjs · Dec 21, 2017 · 72983d4 · 72983d4
1 parent 1521c51
commit 72983d4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.babelrc b/.babelrc
@@ -4,6 +4,7 @@
     "transform-flow-strip-types",
     "transform-es2015-destructuring",
     "transform-es2015-parameters",
+    "transform-es2015-spread",
     "transform-async-to-generator",
     "transform-strict-mode",
     ["transform-es2015-modules-commonjs", {"allowTopLevelThis": true}]

diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "babel-plugin-transform-es2015-destructuring": "^6.23.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-plugin-transform-es2015-parameters": "^6.23.0",
+    "babel-plugin-transform-es2015-spread": "^6.22.0",
     "babel-plugin-transform-flow-strip-types": "^6.18.0",
     "babel-plugin-transform-inline-imports-commonjs": "^1.2.0",
     "babel-plugin-transform-runtime": "^6.23.0",

diff --git a/packages/jest-config/src/normalize.js b/packages/jest-config/src/normalize.js
@@ -282,10 +282,10 @@ const buildTestPathPattern = (argv: Argv): string => {
   const patterns = [];
 
   if (argv._) {
-    patterns.push.apply(patterns, argv._);
+    patterns.push(...argv._);
   }
   if (argv.testPathPattern) {
-    patterns.push.apply(patterns, argv.testPathPattern);
+    patterns.push(...argv.testPathPattern);
   }
 
   const testPathPattern = patterns.map(replacePathSepForRegex).join('|');

diff --git a/packages/jest-editor-support/src/Runner.js b/packages/jest-editor-support/src/Runner.js
@@ -99,10 +99,10 @@ export default class Runner extends EventEmitter {
 
   runJestWithUpdateForSnapshots(completion: any, args: string[]) {
     const defaultArgs = ['--updateSnapshot'];
-    const updateProcess = this._createProcess(
-      this.workspace,
-      [].concat(defaultArgs).concat(args ? args : []),
-    );
+    const updateProcess = this._createProcess(this.workspace, [
+      ...defaultArgs,
+      ...(args ? args : []),
+    ]);
     updateProcess.on('close', () => {
       completion();
     });

diff --git a/packages/jest-resolve/src/index.js b/packages/jest-resolve/src/index.js
@@ -119,15 +119,13 @@ class Resolver {
     const defaultPlatform = this._options.defaultPlatform;
     const extensions = this._options.extensions.slice();
     if (this._supportsNativePlatform()) {
-      extensions.unshift.apply(
-        extensions,
-        this._options.extensions.map(ext => '.' + NATIVE_PLATFORM + ext),
+      extensions.unshift(
+        ...this._options.extensions.map(ext => '.' + NATIVE_PLATFORM + ext),
       );
     }
     if (defaultPlatform) {
-      extensions.unshift.apply(
-        extensions,
-        this._options.extensions.map(ext => '.' + defaultPlatform + ext),
+      extensions.unshift(
+        ...this._options.extensions.map(ext => '.' + defaultPlatform + ext),
       );
     }